Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-18451] Elevated privileges do not exempt from remove pin unlock policy #4791

Merged
merged 1 commit into from
Feb 26, 2025
Merged

[PM-18451] Elevated privileges do not exempt from remove pin unlock policy #4791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType
* @property name The name of the organization (if applicable).
* @property shouldManageResetPassword Indicates that this user has the permission to manage their
* own password.
* @property shouldManagePolicies Indicates that this user has the permission to manage policies.
* @property shouldUseKeyConnector Indicates that the organization uses a key connector.
* @property role The user's role in the organization.
*/
data class Organization(
val id: String,
val name: String?,
val shouldManageResetPassword: Boolean,
val shouldManagePolicies: Boolean,
val shouldUseKeyConnector: Boolean,
val role: OrganizationType,
)
1 change: 0 additions & 1 deletion ...src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ fun SyncResponseJson.Profile.Organization.toOrganization(): Organization =
shouldUseKeyConnector = this.shouldUseKeyConnector,
role = this.type,
shouldManageResetPassword = this.permissions.shouldManageResetPassword,
shouldManagePolicies = this.permissions.shouldManagePolicies,
)

/**
Expand Down
24 changes: 16 additions & 8 deletions app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,21 @@ class PolicyManagerImpl(
organization: SyncResponseJson.Profile.Organization,
policyType: PolicyTypeJson,
): Boolean =
if (policyType == PolicyTypeJson.MAXIMUM_VAULT_TIMEOUT) {
organization.type == OrganizationType.OWNER
} else if (policyType == PolicyTypeJson.PASSWORD_GENERATOR) {
false
} else {
(organization.type == OrganizationType.OWNER ||
organization.type == OrganizationType.ADMIN) ||
organization.permissions.shouldManagePolicies
when (policyType) {
PolicyTypeJson.MAXIMUM_VAULT_TIMEOUT -> {
organization.type == OrganizationType.OWNER
}

PolicyTypeJson.PASSWORD_GENERATOR,
PolicyTypeJson.REMOVE_UNLOCK_WITH_PIN,
-> {
false
}

else -> {
(organization.type == OrganizationType.OWNER ||
organization.type == OrganizationType.ADMIN) ||
organization.permissions.shouldManagePolicies
}
}
}
21 changes: 2 additions & 19 deletions .../x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.Organization
import com.x8bit.bitwarden.data.auth.repository.model.PolicyInformation
import com.x8bit.bitwarden.data.auth.repository.model.UserFingerprintResult
import com.x8bit.bitwarden.data.auth.repository.util.policyInformation
Expand All @@ -22,9 +21,7 @@ import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout
import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction
import com.x8bit.bitwarden.data.platform.repository.util.baseWebVaultUrlOrDefault
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType
import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
import com.x8bit.bitwarden.ui.platform.base.BaseViewModel
import com.x8bit.bitwarden.ui.platform.base.util.Text
Expand Down Expand Up @@ -116,10 +113,10 @@ class AccountSecurityViewModel @Inject constructor(
.launchIn(viewModelScope)

policyManager
.getActivePoliciesFlow(type = (PolicyTypeJson.REMOVE_UNLOCK_WITH_PIN))
.getActivePoliciesFlow(type = PolicyTypeJson.REMOVE_UNLOCK_WITH_PIN)
.map { policies ->
AccountSecurityAction.Internal.RemovePinPolicyUpdateReceive(
removeUnlockWithPinPolicyEnabled = arePoliciesValid(policies),
removeUnlockWithPinPolicyEnabled = policies.isNotEmpty(),
)
}
.onEach(::sendAction)
Expand Down Expand Up @@ -169,20 +166,6 @@ class AccountSecurityViewModel @Inject constructor(
}
}

private fun arePoliciesValid(policies: List<SyncResponseJson.Policy>) =
policies.any { policy ->
authRepository.userStateFlow.value?.activeAccount?.organizations?.any { org ->
(policy.organizationId == org.id) && !isExemptFromPolicy(org)
} == true
}

private fun isExemptFromPolicy(
userOrg: Organization,
) = userOrg.role == OrganizationType.OWNER ||
userOrg.role == OrganizationType.ADMIN ||
(userOrg.role == OrganizationType.CUSTOM &&
userOrg.shouldManagePolicies)

override fun handleAction(action: AccountSecurityAction): Unit = when (action) {
AccountSecurityAction.AccountFingerprintPhraseClick -> handleAccountFingerprintPhraseClick()
is AccountSecurityAction.AuthenticatorSyncToggle -> handleAuthenticatorSyncToggle(action)
Expand Down
3 changes: 0 additions & 3 deletions app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4450,7 +4450,6 @@ class AuthRepositoryTest {
every { name } returns "orgName"
every { permissions } returns mockk {
every { shouldManageResetPassword } returns false
every { shouldManagePolicies } returns false
}
every { shouldUseKeyConnector } returns true
every { type } returns OrganizationType.USER
Expand All @@ -4476,7 +4475,6 @@ class AuthRepositoryTest {
every { name } returns "orgName"
every { permissions } returns mockk {
every { shouldManageResetPassword } returns false
every { shouldManagePolicies } returns false
}
every { shouldUseKeyConnector } returns true
every { type } returns OrganizationType.USER
Expand Down Expand Up @@ -4513,7 +4511,6 @@ class AuthRepositoryTest {
every { name } returns "orgName"
every { permissions } returns mockk {
every { shouldManageResetPassword } returns false
every { shouldManagePolicies } returns false
}
every { shouldUseKeyConnector } returns true
every { type } returns OrganizationType.USER
Expand Down
6 changes: 0 additions & 6 deletions ...c/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ class AuthDiskSourceExtensionsTest {
shouldManageResetPassword = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
shouldManagePolicies = false,
),
),
),
Expand All @@ -205,7 +204,6 @@ class AuthDiskSourceExtensionsTest {
id = "mockId-2",
name = "mockName-2",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand All @@ -218,7 +216,6 @@ class AuthDiskSourceExtensionsTest {
id = "mockId-3",
name = "mockName-3",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -366,7 +363,6 @@ class AuthDiskSourceExtensionsTest {
id = "mockId-1",
name = "mockName-1",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -398,7 +394,6 @@ class AuthDiskSourceExtensionsTest {
id = "mockId-1",
name = "mockName-1",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand All @@ -411,7 +406,6 @@ class AuthDiskSourceExtensionsTest {
id = "mockId-2",
name = "mockName-2",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down
3 changes: 0 additions & 3 deletions ...test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class SyncResponseJsonExtensionsTest {
id = "mockId-1",
name = "mockName-1",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand All @@ -37,15 +36,13 @@ class SyncResponseJsonExtensionsTest {
id = "mockId-1",
name = "mockName-1",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = true,
role = OrganizationType.ADMIN,
),
Organization(
id = "mockId-2",
name = "mockName-2",
shouldManageResetPassword = true,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.USER,
),
Expand Down
16 changes: 0 additions & 16 deletions ...rc/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -429,7 +428,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -474,7 +472,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -535,7 +532,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -581,7 +577,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -650,7 +645,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -696,7 +690,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -765,7 +758,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -811,7 +803,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -880,7 +871,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -927,7 +917,6 @@ class UserStateJsonExtensionsTest {
// Key part of the result #1, this is true or the role is owner or
// admin
shouldManageResetPassword = true,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.USER,
),
Expand Down Expand Up @@ -999,7 +988,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = true,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.USER,
),
Expand Down Expand Up @@ -1204,7 +1192,6 @@ class UserStateJsonExtensionsTest {
// Key part of the result #1, this is true or the role is owner or
// admin
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.USER,
),
Expand Down Expand Up @@ -1275,7 +1262,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.USER,
),
Expand Down Expand Up @@ -1321,7 +1307,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down Expand Up @@ -1392,7 +1377,6 @@ class UserStateJsonExtensionsTest {
id = "organizationId",
name = "organizationName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = false,
role = OrganizationType.ADMIN,
),
Expand Down
1 change: 0 additions & 1 deletion ...st/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ private val DEFAULT_ACCOUNT = UserState.Account(
id = "orgId",
name = ORGANIZATION_NAME,
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = true,
role = OrganizationType.USER,
),
Expand Down
1 change: 0 additions & 1 deletion app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@ class RootNavViewModelTest : BaseViewModelTest() {
id = "orgId",
name = "orgName",
shouldManageResetPassword = false,
shouldManagePolicies = false,
shouldUseKeyConnector = true,
role = OrganizationType.USER,
),
Expand Down
Loading