felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-09 01:17:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7449 from vector-im/release/1.10.7/release

Browse Source 
Release 1.10.7
This commit is contained in:
Anderas
2023-03-22 21:29:29 +00:00
committed by GitHub
parent 43319a7f85 20ab38153c
commit 72e1cc36cc
19 changed files with 72 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.md
+7
View File
@@ -1,3 +1,10 @@
## Changes in 1.10.7 (2023-03-22)
🙌 Improvements
- Upgrade MatrixSDK version ([v0.26.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.4)).
## Changes in 1.10.6 (2023-03-21)
🙌 Improvements
Config/AppVersion.xcconfig
+2 -2
View File
@@ -15,5 +15,5 @@
//
// Version
MARKETING_VERSION = 1.10.6
CURRENT_PROJECT_VERSION = 1.10.6
MARKETING_VERSION = 1.10.7
CURRENT_PROJECT_VERSION = 1.10.7
Podfile
+1 -1
View File
@@ -16,7 +16,7 @@ use_frameworks!
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
#
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
$matrixSDKVersion = '= 0.26.2'
$matrixSDKVersion = '= 0.26.4'
# $matrixSDKVersion = :local
# $matrixSDKVersion = { :branch => 'develop'}
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
Riot/Categories/MXRoom+Riot.m
+25 -5
View File
@@ -20,7 +20,7 @@
#import "AvatarGenerator.h"
#import "MatrixKit.h"
#import "GeneratedInterface-Swift.h"
#import <objc/runtime.h>
@implementation MXRoom (Riot)
@@ -331,10 +331,30 @@
{
[self.mxSession.crypto trustLevelSummaryForUserIds:@[userId] forceDownload:NO success:^(MXUsersTrustLevelSummary *usersTrustLevelSummary) {
MXCrossSigningInfo *crossSigningInfo = [self.mxSession.crypto.crossSigning crossSigningKeysForUser:userId];
EncryptionTrustLevel *encryption = [[EncryptionTrustLevel alloc] init];
UserEncryptionTrustLevel userEncryptionTrustLevel = [encryption userTrustLevelWithCrossSigning:crossSigningInfo
devicesTrust:usersTrustLevelSummary.devicesTrust];
UserEncryptionTrustLevel userEncryptionTrustLevel;
double trustedDevicesPercentage = usersTrustLevelSummary.trustedDevicesProgress.fractionCompleted;
if (trustedDevicesPercentage >= 1.0)
{
userEncryptionTrustLevel = UserEncryptionTrustLevelTrusted;
}
else if (trustedDevicesPercentage == 0.0)
{
// Verify if the user has the user has cross-signing enabled
if ([self.mxSession.crypto.crossSigning crossSigningKeysForUser:userId])
{
userEncryptionTrustLevel = UserEncryptionTrustLevelNotVerified;
}
else
{
userEncryptionTrustLevel = UserEncryptionTrustLevelNoCrossSigning;
}
}
else
{
userEncryptionTrustLevel = UserEncryptionTrustLevelWarning;
}
onComplete(userEncryptionTrustLevel);
} failure:^(NSError *error) {
Riot/Categories/MXRoomSummary+Riot.h
+11 -1
View File
@@ -15,7 +15,17 @@
*/
#import "MatrixKit.h"
#import "RoomEncryptionTrustLevel.h"
/**
RoomEncryptionTrustLevel represents the trust level in an encrypted room.
*/
typedef NS_ENUM(NSUInteger, RoomEncryptionTrustLevel) {
RoomEncryptionTrustLevelTrusted,
RoomEncryptionTrustLevelWarning,
RoomEncryptionTrustLevelNormal,
RoomEncryptionTrustLevelUnknown
};
/**
Define a `MXRoomSummary` category at Riot level.
Riot/Categories/MXRoomSummary+Riot.m
+23 -6
View File
@@ -33,15 +33,32 @@
- (RoomEncryptionTrustLevel)roomEncryptionTrustLevel
{
MXUsersTrustLevelSummary *trust = self.trust;
if (!trust)
RoomEncryptionTrustLevel roomEncryptionTrustLevel = RoomEncryptionTrustLevelUnknown;
if (self.trust)
{
MXLogError(@"[MXRoomSummary] roomEncryptionTrustLevel: trust is missing");
return RoomEncryptionTrustLevelUnknown;
double trustedUsersPercentage = self.trust.trustedUsersProgress.fractionCompleted;
double trustedDevicesPercentage = self.trust.trustedDevicesProgress.fractionCompleted;
if (trustedUsersPercentage >= 1.0)
{
if (trustedDevicesPercentage >= 1.0)
{
roomEncryptionTrustLevel = RoomEncryptionTrustLevelTrusted;
}
else
{
roomEncryptionTrustLevel = RoomEncryptionTrustLevelWarning;
}
}
else
{
roomEncryptionTrustLevel = RoomEncryptionTrustLevelNormal;
}
roomEncryptionTrustLevel = roomEncryptionTrustLevel;
}
EncryptionTrustLevel *encryption = [[EncryptionTrustLevel alloc] init];
return [encryption roomTrustLevelWithSummary:trust];
return roomEncryptionTrustLevel;
}
- (BOOL)isJoined
Riot/Modules/Encryption/EncryptionTrustLevel.swift
-49
View File
@@ -1,49 +0,0 @@
//
// Copyright 2023 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Foundation
/// Object responsible for calculating user and room trust level
@objc class EncryptionTrustLevel: NSObject {
/// Calculate trust level for a single user given their cross-signing info
@objc func userTrustLevel(
crossSigning: MXCrossSigningInfo?,
devicesTrust: MXTrustSummary
) -> UserEncryptionTrustLevel {
// If we could cross-sign but we haven't, the user is simply not verified
if let crossSigning, !crossSigning.isVerified {
return .notVerified
// If we cannot cross-sign the user (legacy behaviour) and have not signed
// any devices manually, the user is not verified
} else if crossSigning == nil && devicesTrust.trustedCount == 0 {
return .notVerified
}
// In all other cases we check devices for trust level
return devicesTrust.areAllTrusted ? .trusted : .warning
}
/// Calculate trust level for a room given trust level of users and their devices
@objc func roomTrustLevel(summary: MXUsersTrustLevelSummary) -> RoomEncryptionTrustLevel {
guard summary.usersTrust.totalCount > 0 && summary.usersTrust.areAllTrusted else {
return .normal
}
return summary.devicesTrust.areAllTrusted ? .trusted : .warning
}
}
Riot/Modules/Encryption/RoomEncryptionTrustLevel.h
-25
View File
@@ -1,25 +0,0 @@
//
// Copyright 2023 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
/**
RoomEncryptionTrustLevel represents the trust level in an encrypted room.
*/
typedef NS_ENUM(NSUInteger, RoomEncryptionTrustLevel) {
RoomEncryptionTrustLevelTrusted,
RoomEncryptionTrustLevelWarning,
RoomEncryptionTrustLevelNormal,
RoomEncryptionTrustLevelUnknown
};
Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.h → Riot/Modules/EncryptionInfo/EncryptionInfoView.h
View File
Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.m → Riot/Modules/EncryptionInfo/EncryptionInfoView.m
View File
Riot/Modules/Encryption/EncryptionInfo/EncryptionInfoView.xib → Riot/Modules/EncryptionInfo/EncryptionInfoView.xib
View File
Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.m
+2 -2
View File
@@ -206,10 +206,10 @@
// Only show a warning badge if there are trust issues.
if (event.sender)
{
BOOL isUserVerified = [session.crypto isUserVerified:event.sender];
MXUserTrustLevel *userTrustLevel = [session.crypto trustLevelForUser:event.sender];
MXDeviceInfo *deviceInfo = [session.crypto eventDeviceInfo:event];
if (isUserVerified && !deviceInfo.trustLevel.isVerified)
if (userTrustLevel.isVerified && !deviceInfo.trustLevel.isVerified)
{
return EventEncryptionDecorationUntrustedDevice;
}
Riot/Modules/Encryption/UserEncryptionTrustLevel.h → Riot/Modules/Room/Members/Detail/UserEncryptionTrustLevel.h
View File
Riot/SupportingFiles/Riot-Bridging-Header.h
-1
View File
@@ -18,7 +18,6 @@
#import "RoomBubbleCellData.h"
#import "MXKRoomBubbleTableViewCell+Riot.h"
#import "UserEncryptionTrustLevel.h"
#import "RoomEncryptionTrustLevel.h"
#import "RoomReactionsViewSizer.h"
#import "RoomEncryptedDataBubbleCell.h"
#import "LegacyAppDelegate.h"
Riot/Modules/Encryption/EncryptionTrustLevelBadgeImageHelper.swift → Riot/Utils/EncryptionTrustLevelBadgeImageHelper.swift
View File
RiotShareExtension/SupportingFiles/RiotShareExtension-Bridging-Header.h
-2
View File
@@ -6,8 +6,6 @@
#import "AvatarGenerator.h"
#import "BuildInfo.h"
#import "ShareItemSender.h"
#import "UserEncryptionTrustLevel.h"
#import "RoomEncryptionTrustLevel.h"
// MatrixKit imports
#import "MatrixKit-Bridging-Header.h"
RiotShareExtension/target.yml
-1
View File
@@ -87,4 +87,3 @@ targets:
- "**/*.md" # excludes all files with the .md extension
- path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
- path: ../Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/MatrixSDK
- path: ../Riot/Modules/Encryption/EncryptionTrustLevel.swift
RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift
+1 -1
View File
@@ -327,7 +327,7 @@ class QRLoginService: NSObject, QRLoginServiceProtocol {
MXLog.debug("[QRLoginService] Marking the received master key as trusted")
let mskVerificationResult = await withCheckedContinuation { (continuation: CheckedContinuation<Bool, Never>) in
session.crypto.setUserVerificationForUserId(session.myUserId) {
session.crypto.setUserVerification(true, forUser: session.myUserId) {
MXLog.debug("[QRLoginService] Successfully marked the received master key as trusted")
continuation.resume(returning: true)
} failure: { error in
RiotTests/Modules/Encryption/EncryptionTrustLevelTests.swift
-171
View File
@@ -1,171 +0,0 @@
//
// Copyright 2023 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Foundation
import XCTest
@testable import Element
@testable import MatrixSDK
class EncryptionTrustLevelTests: XCTestCase {
var encryption: EncryptionTrustLevel!
override func setUp() {
encryption = EncryptionTrustLevel()
}
// MARK: - Helpers
func makeCrossSigning(isVerified: Bool) -> MXCrossSigningInfo {
return .init(
userIdentity: .init(
identity: .other(
userId: "Bob",
masterKey: "MSK",
selfSigningKey: "SSK"
),
isVerified: isVerified
)
)
}
func makeSummary(trusted: Int, total: Int) -> MXTrustSummary {
MXTrustSummary(trustedCount: trusted, totalCount: total)
}
// MARK: - Users
func test_userTrustLevel_whenCrossSigningDisabled() {
let devicesToTrustLevel: [(MXTrustSummary, UserEncryptionTrustLevel)] = [
(makeSummary(trusted: 0, total: 0), .notVerified),
(makeSummary(trusted: 0, total: 2), .notVerified),
(makeSummary(trusted: 1, total: 2), .warning),
(makeSummary(trusted: 3, total: 4), .warning),
(makeSummary(trusted: 5, total: 5), .trusted)
]
for (devices, expected) in devicesToTrustLevel {
let trustLevel = encryption.userTrustLevel(
crossSigning: nil,
devicesTrust: devices
)
XCTAssertEqual(trustLevel, expected, "\(devices.trustedCount) trusted device(s) out of \(devices.totalCount)")
}
}
func test_userTrustLevel_whenCrossSigningNotVerified() {
let devicesToTrustLevel: [(MXTrustSummary, UserEncryptionTrustLevel)] = [
(makeSummary(trusted: 0, total: 0), .notVerified),
(makeSummary(trusted: 0, total: 2), .notVerified),
(makeSummary(trusted: 1, total: 2), .notVerified),
(makeSummary(trusted: 3, total: 4), .notVerified),
(makeSummary(trusted: 5, total: 5), .notVerified)
]
for (devices, expected) in devicesToTrustLevel {
let trustLevel = encryption.userTrustLevel(
crossSigning: makeCrossSigning(isVerified: false),
devicesTrust: devices
)
XCTAssertEqual(trustLevel, expected, "\(devices.trustedCount) trusted device(s) out of \(devices.totalCount)")
}
}
func test_userTrustLevel_whenCrossSigningVerified() {
let devicesToTrustLevel: [(MXTrustSummary, UserEncryptionTrustLevel)] = [
(makeSummary(trusted: 0, total: 0), .trusted),
(makeSummary(trusted: 0, total: 2), .warning),
(makeSummary(trusted: 1, total: 2), .warning),
(makeSummary(trusted: 3, total: 4), .warning),
(makeSummary(trusted: 5, total: 5), .trusted)
]
for (devices, expected) in devicesToTrustLevel {
let trustLevel = encryption.userTrustLevel(
crossSigning: makeCrossSigning(isVerified: true),
devicesTrust: devices
)
XCTAssertEqual(trustLevel, expected, "\(devices.trustedCount) trusted device(s) out of \(devices.totalCount)")
}
}
// MARK: - Rooms
func test_roomTrustLevel() {
let usersDevicesToTrustLevel: [(MXTrustSummary, MXTrustSummary, RoomEncryptionTrustLevel)] = [
// No users verified
(makeSummary(trusted: 0, total: 0), makeSummary(trusted: 0, total: 0), .normal),
// Only some users verified
(makeSummary(trusted: 0, total: 1), makeSummary(trusted: 0, total: 1), .normal),
(makeSummary(trusted: 3, total: 4), makeSummary(trusted: 5, total: 5), .normal),
(makeSummary(trusted: 3, total: 4), makeSummary(trusted: 5, total: 5), .normal),
// All users verified
(makeSummary(trusted: 2, total: 2), makeSummary(trusted: 0, total: 0), .trusted),
(makeSummary(trusted: 3, total: 3), makeSummary(trusted: 0, total: 1), .warning),
(makeSummary(trusted: 3, total: 3), makeSummary(trusted: 3, total: 4), .warning),
(makeSummary(trusted: 4, total: 4), makeSummary(trusted: 5, total: 5), .trusted),
]
for (users, devices, expected) in usersDevicesToTrustLevel {
let trustLevel = encryption.roomTrustLevel(
summary: MXUsersTrustLevelSummary(
usersTrust: users,
devicesTrust: devices
)
)
XCTAssertEqual(trustLevel, expected, "\(users.trustedCount)/\(users.totalCount) trusted users(s), \(devices.trustedCount)/\(devices.totalCount) trusted device(s)")
}
}
}
extension UserEncryptionTrustLevel: CustomStringConvertible {
public var description: String {
switch self {
case .trusted:
return "trusted"
case .warning:
return "warning"
case .notVerified:
return "notVerified"
case .noCrossSigning:
return "noCrossSigning"
case .none:
return "none"
case .unknown:
return "unknown"
@unknown default:
return "unknown"
}
}
}
extension RoomEncryptionTrustLevel: CustomStringConvertible {
public var description: String {
switch self {
case .trusted:
return "trusted"
case .warning:
return "warning"
case .normal:
return "normal"
case .unknown:
return "unknown"
@unknown default:
return "unknown"
}
}
}