-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c7eca68
commit 6897520
Showing
9 changed files
with
293 additions
and
2 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Foundation | ||
| import Common | ||
| import MozillaAppServices | ||
| import Shared | ||
| import SwiftyJSON | ||
|
|
||
| public let FxAClientErrorDomain = "org.mozilla.fxa.error" | ||
| public let FxAClientUnknownError = NSError( | ||
| domain: FxAClientErrorDomain, | ||
| code: 999, | ||
| userInfo: [NSLocalizedDescriptionKey: "Invalid server response"]) | ||
|
|
||
| public struct FxAccountRemoteError { | ||
| static let AttemptToOperateOnAnUnverifiedAccount: Int32 = 104 | ||
| static let InvalidAuthenticationToken: Int32 = 110 | ||
| static let EndpointIsNoLongerSupported: Int32 = 116 | ||
| static let IncorrectLoginMethodForThisAccount: Int32 = 117 | ||
| static let IncorrectKeyRetrievalMethodForThisAccount: Int32 = 118 | ||
| static let IncorrectAPIVersionForThisAccount: Int32 = 119 | ||
| static let UnknownDevice: Int32 = 123 | ||
| static let DeviceSessionConflict: Int32 = 124 | ||
| static let UnknownError: Int32 = 999 | ||
| } | ||
|
|
||
| public enum FxAClientError: Error, CustomStringConvertible { | ||
| case remote(RemoteError) | ||
| case local(NSError) | ||
|
|
||
| public var description: String { | ||
| switch self { | ||
| case .remote(let err): return "FxA remote error: \(err)" | ||
| case .local(let err): return "FxA local error: \(err)" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public struct RemoteError { | ||
| let code: Int32 | ||
| let errno: Int32 | ||
| let error: String? | ||
| let message: String? | ||
| let info: String? | ||
|
|
||
| var isUpgradeRequired: Bool { | ||
| return errno == FxAccountRemoteError.EndpointIsNoLongerSupported | ||
| || errno == FxAccountRemoteError.IncorrectLoginMethodForThisAccount | ||
| || errno == FxAccountRemoteError.IncorrectKeyRetrievalMethodForThisAccount | ||
| || errno == FxAccountRemoteError.IncorrectAPIVersionForThisAccount | ||
| } | ||
|
|
||
| var isInvalidAuthentication: Bool { | ||
| return code == 401 | ||
| } | ||
|
|
||
| var isUnverified: Bool { | ||
| return errno == FxAccountRemoteError.AttemptToOperateOnAnUnverifiedAccount | ||
| } | ||
| } | ||
|
|
||
| private let CurrentSyncAuthStateCacheVersion = 1 | ||
|
|
||
| public struct SyncAuthStateCache { | ||
| let token: TokenServerToken | ||
| let forKey: Data | ||
| let expiresAt: Timestamp | ||
| } | ||
|
|
||
| public protocol SyncAuthState { | ||
| func invalidate() | ||
| func token(_ now: Timestamp, canBeExpired: Bool) -> Deferred<Maybe<(token: TokenServerToken, forKey: Data)>> | ||
| var enginesEnablements: [String: Bool]? { get set } | ||
| var clientName: String? { get set } | ||
| } | ||
|
|
||
| public func syncAuthStateCachefromJSON(_ json: JSON) -> SyncAuthStateCache? { | ||
| if let version = json["version"].int { | ||
| if version != CurrentSyncAuthStateCacheVersion { | ||
| DefaultLogger.shared.log("Sync Auth State Cache is wrong version; dropping.", | ||
| level: .warning, | ||
| category: .sync) | ||
| return nil | ||
| } | ||
| if let token = TokenServerToken.fromJSON(json["token"]), | ||
| let forKey = json["forKey"].string?.hexDecodedData, | ||
| let expiresAt = json["expiresAt"].int64 { | ||
| return SyncAuthStateCache(token: token, forKey: forKey, expiresAt: Timestamp(expiresAt)) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| extension SyncAuthStateCache: JSONLiteralConvertible { | ||
| public func asJSON() -> JSON { | ||
| return JSON([ | ||
| "version": CurrentSyncAuthStateCacheVersion, | ||
| "token": token.asJSON(), | ||
| "forKey": forKey.hexEncodedString, | ||
| "expiresAt": NSNumber(value: expiresAt), | ||
| ] as NSDictionary) | ||
| } | ||
| } | ||
|
|
||
| open class FirefoxAccountSyncAuthState: SyncAuthState { | ||
| private var logger: Logger | ||
| fileprivate let cache: KeychainCache<SyncAuthStateCache> | ||
| public var enginesEnablements: [String: Bool]? | ||
| public var clientName: String? | ||
|
|
||
| init(cache: KeychainCache<SyncAuthStateCache>, | ||
| logger: Logger = DefaultLogger.shared) { | ||
| self.cache = cache | ||
| self.logger = logger | ||
| } | ||
|
|
||
| // If a token gives you a 401, invalidate it and request a new one. | ||
| open func invalidate() { | ||
| logger.log("Invalidating cached token server token.", | ||
| level: .info, | ||
| category: .sync) | ||
| self.cache.value = nil | ||
| } | ||
|
|
||
| open func token(_ now: Timestamp, canBeExpired: Bool) -> Deferred<Maybe<(token: TokenServerToken, forKey: Data)>> { | ||
| if let value = cache.value { | ||
| // Give ourselves some room to do work. | ||
| let isExpired = value.expiresAt < now + 5 * OneMinuteInMilliseconds | ||
| if canBeExpired { | ||
| if isExpired { | ||
| logger.log("Returning cached expired token.", | ||
| level: .info, | ||
| category: .sync) | ||
| } else { | ||
| logger.log("Returning cached token, which should be valid.", | ||
| level: .info, | ||
| category: .sync) | ||
| } | ||
| return deferMaybe((token: value.token, forKey: value.forKey)) | ||
| } | ||
|
|
||
| if !isExpired { | ||
| logger.log("Returning cached token, which should be valid.", | ||
| level: .info, | ||
| category: .sync) | ||
| return deferMaybe((token: value.token, forKey: value.forKey)) | ||
| } | ||
| } | ||
|
|
||
| let deferred = Deferred<Maybe<(token: TokenServerToken, forKey: Data)>>() | ||
|
|
||
| RustFirefoxAccounts.shared.accountManager.uponQueue(.main) { accountManager in | ||
| accountManager.getTokenServerEndpointURL { result in | ||
| guard case .success(let tokenServerEndpointURL) = result else { | ||
| deferred.fill(Maybe(failure: FxAClientError.local(NSError()))) | ||
| return | ||
| } | ||
|
|
||
| let client = TokenServerClient(url: tokenServerEndpointURL) | ||
| accountManager.getAccessToken(scope: OAuthScope.oldSync) { res in | ||
| switch res { | ||
| case .failure(let err): | ||
| deferred.fill(Maybe(failure: err as MaybeErrorType)) | ||
| case .success(let accessToken): | ||
| self.logger.log("Fetching token server token.", | ||
| level: .debug, | ||
| category: .sync) | ||
| client.token(token: accessToken.token, kid: accessToken.key!.kid).upon { result in | ||
| guard let token = result.successValue else { | ||
| deferred.fill(Maybe(failure: result.failureValue!)) | ||
| return | ||
| } | ||
| let kSync = Bytes.base64urlSafeDecodedData(accessToken.key!.k)! | ||
| let newCache = SyncAuthStateCache(token: token, forKey: kSync, expiresAt: now + 1000 * token.durationInSeconds) | ||
| self.logger.log("Fetched token server token! Token expires at \(newCache.expiresAt).", | ||
| level: .debug, | ||
| category: .sync) | ||
| self.cache.value = newCache | ||
| deferred.fill(Maybe(success: (token: token, forKey: kSync))) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return deferred | ||
| } | ||
| } |
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
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
18 changes: 18 additions & 0 deletions
18
Client/Frontend/Settings/Main/Debug/ForgetSyncAuthStateDebugSetting.swift
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Foundation | ||
|
|
||
| class ForgetSyncAuthStateDebugSetting: HiddenSetting { | ||
| override var title: NSAttributedString? { | ||
| return NSAttributedString( | ||
| string: "Forget Sync auth state", | ||
| attributes: [NSAttributedString.Key.foregroundColor: theme.colors.textPrimary]) | ||
| } | ||
|
|
||
| override func onClick(_ navigationController: UINavigationController?) { | ||
| settings.profile.rustFxA.syncAuthState.invalidate() | ||
| settings.tableView.reloadData() | ||
| } | ||
| } |
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
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
Oops, something went wrong.