Implemented PSG-680 - Sessions overview security recommendations

- 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

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? {