felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 15:38:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implemented PSG-680 - Sessions overview security recommendations

Browse Source 
- remove uppercased strings from localizables
- moved inactivity computation to the service
This commit is contained in:
Stefan Ceriu
2022-09-27 16:51:13 +03:00
committed by Stefan Ceriu
parent 6585aaf523
commit 7eee1cceab
20 changed files with 369 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsOverviewService.swift
View File

@@ -18,6 +18,9 @@ import Foundation
import MatrixSDK
class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
/// Delay after which session is considered inactive, 90 days
static private let inactiveSessionDurationTreshold: TimeInterval = 90 * 86400
private let mxSession: MXSession
private(set) var overviewData: UserSessionsOverviewData
@@ -52,7 +55,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
return overviewData.currentSession
}
return overviewData.otherSessions.first(where: { $0.sessionId == sessionId })
return overviewData.otherSessions.first(where: { $0.id == sessionId })
}
// MARK: - Private
@@ -85,7 +88,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
var otherSessions: [UserSessionInfo] = []
for session in allSessions {
if session.isCurrentSession {
if session.isCurrent {
currentSession = session
} else {
otherSessions.append(session)
@@ -94,7 +97,7 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
unverifiedSessions.append(session)
}
if session.isSessionActive == false {
if session.isActive == false {
inactiveSessions.append(session)
}
}
@@ -114,13 +117,20 @@ class UserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
lastSeenTs = TimeInterval(device.lastSeenTs / 1000)
}
return UserSessionInfo(sessionId: device.deviceId,
sessionName: device.displayName,
var isSessionActive = true
if let lastSeenTimestamp = lastSeenTs {
let elapsedTime = Date().timeIntervalSince1970 - lastSeenTimestamp
isSessionActive = elapsedTime < Self.inactiveSessionDurationTreshold
}
return UserSessionInfo(id: device.deviceId,
name: device.displayName,
deviceType: .unknown,
isVerified: isSessionVerified,
lastSeenIP: device.lastSeenIp,
lastSeenTimestamp: lastSeenTs,
isCurrentSession: isCurrentSession)
isActive: isSessionActive,
isCurrent: isCurrentSession)
}
private func deviceInfo(for deviceId: String) -> MXDeviceInfo? {

54
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
View File

@@ -28,21 +28,49 @@ class MockUserSessionsOverviewService: UserSessionsOverviewServiceProtocol {
}
init() {
let currentSessionInfo = UserSessionInfo(sessionId: "alice", sessionName: "iOS", deviceType: .mobile, isVerified: false, lastSeenIP: "10.0.0.10", lastSeenTimestamp: nil, isCurrentSession: true)
let currentSession = UserSessionInfo(id: "alice",
name: "iOS",
deviceType: .mobile,
isVerified: false,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: nil,
isActive: true,
isCurrent: true)
let unverifiedSessionsInfo: [UserSessionInfo] = []
let inactiveSessionsInfo: [UserSessionInfo] = []
let otherSessionsInfo: [UserSessionInfo] = [
UserSessionInfo(sessionId: "1", sessionName: "macOS", deviceType: .desktop, isVerified: true, lastSeenIP: "1.0.0.1", lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000, isCurrentSession: false),
UserSessionInfo(sessionId: "2", sessionName: "Firefox on Windows", deviceType: .web, isVerified: true, lastSeenIP: "2.0.0.2", lastSeenTimestamp: Date().timeIntervalSince1970 - 100, isCurrentSession: false),
UserSessionInfo(sessionId: "3", sessionName: "Android", deviceType: .mobile, isVerified: false, lastSeenIP: "3.0.0.3", lastSeenTimestamp: Date().timeIntervalSince1970 - 10, isCurrentSession: false)
let otherSessions: [UserSessionInfo] = [
UserSessionInfo(id: "1",
name: "macOS",
deviceType: .desktop,
isVerified: true,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 130_000,
isActive: false,
isCurrent: false),
UserSessionInfo(id: "2",
name: "Firefox on Windows",
deviceType: .web,
isVerified: true,
lastSeenIP: "2.0.0.2",
lastSeenTimestamp: Date().timeIntervalSince1970 - 100,
isActive: true,
isCurrent: false),
UserSessionInfo(id: "3",
name: "Android",
deviceType: .mobile,
isVerified: false,
lastSeenIP: "3.0.0.3",
lastSeenTimestamp: Date().timeIntervalSince1970 - 10,
isActive: true,
isCurrent: false)
]
overviewData = UserSessionsOverviewData(currentSession: currentSessionInfo,
unverifiedSessions: unverifiedSessionsInfo,
inactiveSessions: inactiveSessionsInfo,
otherSessions: otherSessionsInfo)
let unverifiedSessions: [UserSessionInfo] = otherSessions.filter { !$0.isVerified }
let inactiveSessions: [UserSessionInfo] = otherSessions.filter { !$0.isActive }
overviewData = UserSessionsOverviewData(currentSession: currentSession,
unverifiedSessions: unverifiedSessions,
inactiveSessions: inactiveSessions,
otherSessions: otherSessions)
}
}