Crypto user and device identity #1531
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Anderas
requested review from
a team and
SBiOSoftWhare
and removed request for
a team
Anderas
force-pushed
the
andy/3_user_identity
branch
4 times, most recently
from
03fe387
to
e6b761c
Compare
Codecov Report
@@ Coverage Diff @@
## develop #1531 +/- ##
========================================
Coverage 45.27% 45.27%
========================================
Files 522 520 -2
Lines 84856 84763 -93
Branches 37532 37507 -25
========================================
- Hits 38416 38374 -42
+ Misses 45342 45290 -52
- Partials 1098 1099 +1
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
SBiOSoftWhare
approved these changes
Jul 19, 2022
| { | ||
| _userId = userIdentity.userId; | ||
| NSMutableDictionary *keys = [NSMutableDictionary dictionary]; | ||
| if (userIdentity.masterKeys) { |
There was a problem hiding this comment.
Small remark: We are usually making carriage return here in ObjC in this SDK:
if (userIdentity.masterKeys)
{
keys[MXCrossSigningKeyType.master] = userIdentity.masterKeys;
}
| @@ -194,3 +194,40 @@ private var logger: SwiftyBeaver.Type = { | |||
| return "\(message) - \(details)" | |||
| } | |||
| } | |||
|
|
|||
| /// Convenience wrapper around `MXLog` which formats all logs as "[Name] function: <message>" | |||
| struct MXNamedLog { | |||
There was a problem hiding this comment.
Interesting! If we want global usage of same log naming we can also make a MXLogModule like:
public enum LogModule: String {
case webService
case parsing
case database
case geolocation
}
extension LogModule {
// MARK: Public
func debug(_ message: String, function: String = #function) {
MXLog.debug(formattedMessage(message, function: function))
}
// MARK: Private
private func formattedMessage(_ message: String, function: String) -> String {
return "[\(self.rawValue))] \(function): \(message)"
}
}
And then use it like: MXLogModule.geolocation.debug("Test")
There was a problem hiding this comment.
Yea that sounds good, thought perhaps yet another use case, as it assumes a smaller number of stable areas, as your examples above. In my case the context equals any given class, which would be too many areas to keep a track of in an enum. I think both these use cases are complimentary
Comment on lines
359
to
365
| func bootstrapCrossSigning(authParams: [AnyHashable: Any]) async throws { | ||
| let result = try machine.bootstrapCrossSigning() | ||
| try await requests.uploadSigningKeys(request: result.uploadSigningKeysRequest, authParams: authParams) | ||
| try await requests.uploadSignatures(request: result.signatureRequest) | ||
| } |
There was a problem hiding this comment.
You can parallelize if possible:
async let uploadSigningKeys = requests.uploadSigningKeys(request: result.uploadSigningKeysRequest, authParams: authParams)
async let uploadSignatures = requests.uploadSignatures(request: result.signatureRequest)
await (uploadSigningKeys, uploadSignatures)
Anderas
force-pushed
the
andy/3_user_identity
branch
from
e6b761c
to
c66166f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add mechanisms to acquire
MXDeviceInfo,MXCrossSigningInfoand other related objects usingMatrixSDKCryptoand bootstrap cross-signing keys.This is another pre-requisite for having all of the required pieces to implement device verification.
The (interrelated) changes in this PR:
MatrixSDKobjects fromMatrixSDKCryptodefinitionsMXDeviceInfoandMXCrossSIgningInfofrom swift code even if some of the API is not exposed to swift, but is in_Private.hheader filesMXCrossSigningV2(a subclass ofMXCrossSigning) which overrides all functionality, similar toMXCryptoV2MXNamedLogto avoid verbose and repeating logs, this log will always print logs in the "[Name] function: message" formatRun iOS tests instead of macos tests, to run unit tests containingLeaving tests on macos target, will try to recompile MatrixSDKCrypto for all platforms asapMatrixSDKCryptoobjects (currently only compiled for iOS), and without loosing anything mac-os specific