Allow building a weak shield (#347)

* Uniffi expose primary threshold * Add remove all override factors function * Update shield validation * Add time period as recovery emergency fallback * Add samples. Add test * Add samples. Add test * Add extensions * Add swift tests * Expose functions and add tests * PR review * Shield builder status * Add tests. Allow adding fs while violating rules * WIP * Fix * Update shield saving result * Test * Add asserts * Renaming * Remove years time period * Add missing errors * Release 1.1.113 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] Generated by cargo-workspaces
radixdlt · Jan 21, 2025 · 4131464 · 4131464
1 parent 91655f5
commit 4131464
Show file tree

Hide file tree

Showing 94 changed files with 923 additions and 360 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apple/Tests/TestCases/Profile/MFA/SecurityShieldsBuilderTests.swift b/apple/Tests/TestCases/Profile/MFA/SecurityShieldsBuilderTests.swift
@@ -58,7 +58,7 @@ struct ShieldTests {
 	@Test("primary override validation status trustedContact")
 	func primValidationStatusTrustedContact() {
 		let builder = SecurityShieldBuilder()
-		#expect(builder.validationForAdditionOfFactorSourceToPrimaryOverrideForEach(factorSources: [TrustedContactFactorSource.sample.asGeneral.id]).compactMap(\.reasonIfInvalid) == [FactorSourceValidationStatusReasonIfInvalid.nonBasic(SecurityShieldBuilderInvalidReason.PrimaryCannotContainTrustedContact)])
+		#expect(builder.validationForAdditionOfFactorSourceToPrimaryOverrideForEach(factorSources: [TrustedContactFactorSource.sample.asGeneral.id]).compactMap(\.reasonIfInvalid) == [FactorSourceValidationStatusReasonIfInvalid.nonBasic(SecurityShieldBuilderRuleViolation.PrimaryCannotContainTrustedContact)])
 	}
 
 	@Test("Auto lowering of threshold upon deletion")
@@ -88,32 +88,6 @@ struct ShieldTests {
 		#expect(builder.primaryRoleThresholdFactors == [])
 	}
 
-	@Test("basic validation")
-	func basicValidation() throws {
-		var builder = SecurityShieldBuilder()
-		#expect(builder.validate() == .MissingAuthSigningFactor)
-		builder = builder.setAuthenticationSigningFactor(new: .sampleDevice)
-		#expect(builder.validate() == .PrimaryRoleMustHaveAtLeastOneFactor)
-		builder = builder.addFactorSourceToPrimaryThreshold(factorSourceId: .sampleDevice)
-			.addFactorSourceToPrimaryThreshold(factorSourceId: .sampleDevice) // did not get added, duplicates are not allowed
-		#expect(builder.primaryRoleThresholdFactors == [.sampleDevice])
-
-		builder = builder.addFactorSourceToPrimaryThreshold(factorSourceId: .sampleDeviceOther) // actually this is added
-		#expect(builder.validate() == .PrimaryCannotHaveMultipleDevices)
-		builder = builder.removeFactorFromPrimary(factorSourceId: .sampleDeviceOther, factorListKind: FactorListKind.threshold)
-
-		#expect(builder.validate() == .RecoveryRoleMustHaveAtLeastOneFactor)
-		builder = builder.removeFactorFromPrimary(factorSourceId: .sampleDeviceOther, factorListKind: FactorListKind.threshold)
-			.addFactorSourceToRecoveryOverride(factorSourceId: .sampleLedger)
-
-		#expect(builder.validate() == .ConfirmationRoleMustHaveAtLeastOneFactor)
-		builder = builder.addFactorSourceToConfirmationOverride(factorSourceId: .sampleArculus)
-			.setAuthenticationSigningFactor(new: .sampleDevice)
-
-		#expect(builder.validate() == nil)
-		#expect((try? builder.build()) != nil)
-	}
-
 	@Test("cannot add forbidden FactorSourceKinds")
 	func preventAddOfForbiddenFactorSourceKinds() throws {
 		let builder = SecurityShieldBuilder()
@@ -147,49 +121,17 @@ struct ShieldTests {
 		#expect(builder.primaryRoleThresholdFactors == [other])
 		#expect(builder.primaryRoleOverrideFactors == [other, factor])
 
-		// But when validated/built is err
-		#expect(builder.validate() != nil)
+		// But when statusd/built is err
+		#expect(builder.status() != nil)
 		#expect((try? builder.build()) == nil)
 	}
 
-	@Test("Primary password never alone")
-	func primaryPasswordNeverAlone() {
-		var builder = SecurityShieldBuilder()
-			.setAuthenticationSigningFactor(new: .sampleDevice)
-			.addFactorSourceToPrimaryOverride(factorSourceId: .samplePassword) // not allowed
-		#expect(builder.primaryRoleOverrideFactors.isEmpty)
-
-		builder = builder.addFactorSourceToPrimaryThreshold(factorSourceId: .samplePassword)
-		#expect(builder.validate() == .PrimaryRoleWithPasswordInThresholdListMustHaveAnotherFactor)
-		builder = builder.setThreshold(threshold: Threshold.all)
-
-		builder = builder.setThreshold(threshold: Threshold.specific(1))
-		#expect(builder.validate() == .PrimaryRoleWithPasswordInThresholdListMustHaveAnotherFactor)
-		builder = builder.addFactorSourceToPrimaryThreshold(factorSourceId: .sampleLedger)
-		#expect(builder.validate() == .PrimaryRoleWithPasswordInThresholdListMustThresholdGreaterThanOne)
-		builder = builder.setThreshold(threshold: Threshold.specific(2))
-
-		builder = builder.addFactorSourceToRecoveryOverride(factorSourceId: .sampleArculus)
-			.addFactorSourceToConfirmationOverride(factorSourceId: .sampleArculusOther)
-
-		builder = builder.setAuthenticationSigningFactor(new: .sampleDevice)
-
-		let shield = try! builder.build()
-
-		#expect(shield.matrixOfFactors.primaryRole.overrideFactors.isEmpty)
-		#expect(shield.matrixOfFactors.primaryRole.threshold == Threshold.specific(2))
-		#expect(shield.matrixOfFactors.primaryRole.thresholdFactors == [.samplePassword, .sampleLedger])
-	}
-
 	@Test("Build")
 	func build() throws {
 		var builder = SecurityShieldBuilder()
 			.setName(name: "S.H.I.E.L.D.")
 			.setTimePeriodUntilAutoConfirm(timePeriod: TimePeriod(days: 42))
-
-		#expect(builder.validate() == .MissingAuthSigningFactor)
-		builder = builder.setAuthenticationSigningFactor(new: .sampleDevice)
-		#expect(builder.validate() == .PrimaryRoleMustHaveAtLeastOneFactor)
+			.setAuthenticationSigningFactor(new: .sampleDevice)
 
 		// Primary
 		#expect(builder.threshold == Threshold.all)
@@ -208,8 +150,8 @@ struct ShieldTests {
 
 		builder = builder.setAuthenticationSigningFactor(new: .sampleDevice)
 
-		// Validate
-		#expect(builder.validate() == nil)
+		// status
+		#expect(builder.status() == SecurityShieldBuilderStatus.strong)
 
 		// Build
 		let shield0 = try builder.build()

diff --git a/crates/app/home-cards/Cargo.toml b/crates/app/home-cards/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "home-cards"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/key-derivation-traits/Cargo.toml b/crates/app/key-derivation-traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "key-derivation-traits"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/radix-connect-models/Cargo.toml b/crates/app/radix-connect-models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "radix-connect-models"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/radix-connect/Cargo.toml b/crates/app/radix-connect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "radix-connect"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 

diff --git a/crates/app/security-center/Cargo.toml b/crates/app/security-center/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "security-center"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/signing-traits/Cargo.toml b/crates/app/signing-traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "signing-traits"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/signing/Cargo.toml b/crates/app/signing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "signing"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 

diff --git a/crates/common/build-info/Cargo.toml b/crates/common/build-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "build-info"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 build = "build.rs"
 

diff --git a/crates/common/bytes/Cargo.toml b/crates/common/bytes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bytes"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/entity-foundation/Cargo.toml b/crates/common/entity-foundation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "entity-foundation"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/host-info/Cargo.toml b/crates/common/host-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "host-info"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/identified-vec-of/Cargo.toml b/crates/common/identified-vec-of/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "identified-vec-of"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/metadata/Cargo.toml b/crates/common/metadata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "metadata"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/network/Cargo.toml b/crates/common/network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "network"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/numeric/Cargo.toml b/crates/common/numeric/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "numeric"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/short-string/Cargo.toml b/crates/common/short-string/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "short-string"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/assert-json/Cargo.toml b/crates/core/assert-json/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "assert-json"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/collections/Cargo.toml b/crates/core/collections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-collections"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/error/Cargo.toml b/crates/core/error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "error"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/error/src/common_error.rs b/crates/core/error/src/common_error.rs
@@ -859,6 +859,11 @@ pub enum CommonError {
 
     #[error("Signing failed due to too many factor sources were neglected.")]
     SigningFailedTooManyFactorSourcesNeglected = 10247,
+
+    #[error(
+        "SecurityStructure already exists in profile, FactorSourceID {bad_value}."
+    )]
+    StructureAlreadyExists { bad_value: String } = 10248,
 }
 
 impl CommonError {

diff --git a/crates/core/has-sample-values/Cargo.toml b/crates/core/has-sample-values/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "has-sample-values"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/misc/Cargo.toml b/crates/core/misc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-misc"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/prelude/Cargo.toml b/crates/core/prelude/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "prelude"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/time-utils/Cargo.toml b/crates/core/time-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "time-utils"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/utils/Cargo.toml b/crates/core/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-utils"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/utils/src/constants.rs b/crates/core/utils/src/constants.rs
@@ -34,9 +34,6 @@ pub const MINUTES_PER_DAY: u32 = 24 * 60;
 /// Number of days per week.
 pub const DAYS_PER_WEEK: u16 = 7;
 
-/// Number of days per year.
-pub const DAYS_PER_YEAR: u16 = 365;
-
 #[cfg(test)]
 mod tests {
     use super::*;

diff --git a/crates/crypto/addresses/Cargo.toml b/crates/crypto/addresses/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "addresses"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/cap26-models/Cargo.toml b/crates/crypto/cap26-models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cap26-models"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/ecc/Cargo.toml b/crates/crypto/ecc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecc"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/encryption/Cargo.toml b/crates/crypto/encryption/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encryption"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/hash/Cargo.toml b/crates/crypto/hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hash"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/hd/Cargo.toml b/crates/crypto/hd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hierarchical-deterministic"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/factors/Cargo.toml b/crates/factors/factors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factors"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/instances-provider/Cargo.toml b/crates/factors/instances-provider/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factor-instances-provider"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/keys-collector/Cargo.toml b/crates/factors/keys-collector/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "keys-collector"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/next-derivation-index-ephemeral/Cargo.toml b/crates/factors/next-derivation-index-ephemeral/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "next-derivation-index-ephemeral"
-version = "1.1.112"
+version = "1.1.113"
 edition = "2021"
 
 [dependencies]