oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/debug-reregister'

Browse source
This commit is contained in:
Michael Kirk 2017-11-02 16:06:03 -04:00
commit ef80b53ff8
14 changed files with 155 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
View file

@ -6,6 +6,7 @@
#import "Environment.h"
#import "OWSCountryMetadata.h"
#import "OWSTableViewController.h"
#import "RegistrationViewController.h"
#import "Signal-Swift.h"
#import "ThreadUtil.h"
#import <AFNetworking/AFNetworking.h>
@ -21,6 +22,12 @@
NS_ASSUME_NONNULL_BEGIN
@interface TSAccountManager (Debug)
- (void)resetForRegistration;
@end
@implementation DebugUIMisc
#pragma mark - Logging
@ -61,9 +68,38 @@ NS_ASSUME_NONNULL_BEGIN
actionBlock:^{
[DebugUIMisc clearHasDismissedOffers];
}]];
[items addObject:[OWSTableItem
itemWithTitle:@"Re-register"
actionBlock:^{
[OWSAlerts
showConfirmationAlertWithTitle:@"Re-register?"
message:@"If you proceed, you will not lose any of your "
@"current messages, but your account will be "
@"deactivated until you complete re-registration."
proceedTitle:@"Proceed"
proceedAction:^(UIAlertAction *_Nonnull action) {
[self reregister];
}];
}]];
return [OWSTableSection sectionWithTitle:self.name items:items];
}
- (void)reregister
{
DDLogInfo(@"%@ re-registering.", self.tag);
[[TSAccountManager sharedInstance] resetForRegistration];
RegistrationViewController *viewController = [RegistrationViewController new];
OWSNavigationController *navigationController =
[[OWSNavigationController alloc] initWithRootViewController:viewController];
navigationController.navigationBarHidden = YES;
[UIApplication sharedApplication].delegate.window.rootViewController = navigationController;
}
+ (void)setManualCensorshipCircumventionEnabled:(BOOL)isEnabled
{
OWSCountryMetadata *countryMetadata = nil;

2
Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift
View file

@ -74,7 +74,7 @@ class SafetyNumberConfirmationAlert: NSObject {
}
actionSheetController.addAction(showSafetyNumberAction)
actionSheetController.addAction(OWSAlerts.cancelAction())
actionSheetController.addAction(OWSAlerts.cancelAction)
UIApplication.shared.frontmostViewController?.present(actionSheetController, animated: true)
return true

16
Signal/src/views/OWSAlerts.swift
View file

@ -33,14 +33,26 @@ import Foundation
public class func showAlert(withTitle title: String, message: String? = nil, buttonTitle: String? = nil) {
assert(title.characters.count > 0)
let actionTitle = (buttonTitle != nil ? buttonTitle : NSLocalizedString("OK", comment: ""))
let actionTitle = buttonTitle ?? NSLocalizedString("OK", comment: "")
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: actionTitle, style: .default, handler: nil))
UIApplication.shared.frontmostViewController?.present(alert, animated: true, completion: nil)
}
public class func cancelAction() -> UIAlertAction {
public class func showConfirmationAlert(withTitle title: String, message: String? = nil, proceedTitle: String? = nil, proceedAction: @escaping (UIAlertAction) -> Void) {
assert(title.characters.count > 0)
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction(self.cancelAction)
let actionTitle = proceedTitle ?? NSLocalizedString("OK", comment: "")
alert.addAction(UIAlertAction(title: actionTitle, style: .default, handler: proceedAction))
UIApplication.shared.frontmostViewController?.present(alert, animated: true, completion: nil)
}
public class var cancelAction: UIAlertAction {
let action = UIAlertAction(title: CommonStrings.cancelButton, style: .cancel) { _ in
Logger.debug("Cancel item")
// Do nothing.

16
SignalServiceKit/src/Account/TSAccountManager.h
View file

@ -42,6 +42,22 @@ extern NSString *const kNSNotificationName_LocalNumberDidChange;
+ (nullable NSString *)localNumber;
- (nullable NSString *)localNumber;
/**
* Symmetric key that's used to encrypt message payloads from the server,
*
* @return signaling key
*/
+ (nullable NSString *)signalingKey;
- (nullable NSString *)signalingKey;
/**
* The server auth token allows the Signal client to connect to the Signal server
*
* @return server authentication token
*/
+ (nullable NSString *)serverAuthToken;
- (nullable NSString *)serverAuthToken;
/**
* The registration ID is unique to an installation of TextSecure, it allows to know if the app was reinstalled
*

85
SignalServiceKit/src/Account/TSAccountManager.m
View file

@ -12,7 +12,8 @@
#import "TSNetworkManager.h"
#import "TSPreKeyManager.h"
#import "TSSocketManager.h"
#import "TSStorageManager+keyingMaterial.h"
#import "TSStorageManager+SessionStore.h"
#import "YapDatabaseConnection+OWS.h"
NS_ASSUME_NONNULL_BEGIN
@ -24,6 +25,10 @@ NSString *const kNSNotificationName_LocalNumberDidChange = @"kNSNotificationName
NSString *const TSAccountManager_RegisteredNumberKey = @"TSStorageRegisteredNumberKey";
NSString *const TSAccountManager_LocalRegistrationIdKey = @"TSStorageLocalRegistrationId";
NSString *const TSAccountManager_UserAccountCollection = @"TSStorageUserAccountCollection";
NSString *const TSAccountManager_ServerAuthToken = @"TSStorageServerAuthToken";
NSString *const TSAccountManager_ServerSignalingKey = @"TSStorageServerSignalingKey";
@interface TSAccountManager ()
@property (nonatomic, readonly) BOOL isRegistered;
@ -76,6 +81,20 @@ NSString *const TSAccountManager_LocalRegistrationIdKey = @"TSStorageLocalRegist
userInfo:nil];
}
- (void)resetForRegistration
{
@synchronized(self)
{
_isRegistered = NO;
_cachedLocalNumber = nil;
_phoneNumberAwaitingVerification = nil;
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[transaction removeAllObjectsInCollection:TSAccountManager_UserAccountCollection];
}];
}
[[TSStorageManager sharedManager] resetSessionStore];
}
+ (BOOL)isRegistered
{
return [[self sharedInstance] isRegistered];
@ -141,7 +160,7 @@ NSString *const TSAccountManager_LocalRegistrationIdKey = @"TSStorageLocalRegist
{
@synchronized (self) {
return [self.dbConnection stringForKey:TSAccountManager_RegisteredNumberKey
inCollection:TSStorageUserAccountCollection];
inCollection:TSAccountManager_UserAccountCollection];
}
}
@ -150,7 +169,7 @@ NSString *const TSAccountManager_LocalRegistrationIdKey = @"TSStorageLocalRegist
@synchronized (self) {
[self.dbConnection setObject:localNumber
forKey:TSAccountManager_RegisteredNumberKey
inCollection:TSStorageUserAccountCollection];
inCollection:TSAccountManager_UserAccountCollection];
}
}
@ -161,19 +180,22 @@ NSString *const TSAccountManager_LocalRegistrationIdKey = @"TSStorageLocalRegist
- (uint32_t)getOrGenerateRegistrationId
{
uint32_t registrationID = [[self.dbConnection objectForKey:TSAccountManager_LocalRegistrationIdKey
inCollection:TSStorageUserAccountCollection] unsignedIntValue];
@synchronized(self)
{
uint32_t registrationID =
[[self.dbConnection objectForKey:TSAccountManager_LocalRegistrationIdKey
inCollection:TSAccountManager_UserAccountCollection] unsignedIntValue];
if (registrationID == 0) {
registrationID = (uint32_t)arc4random_uniform(16380) + 1;
DDLogWarn(@"%@ Generated a new registrationID: %u", self.tag, registrationID);
if (registrationID == 0) {
registrationID = (uint32_t)arc4random_uniform(16380) + 1;
DDLogWarn(@"%@ Generated a new registrationID: %u", self.tag, registrationID);
[self.dbConnection setObject:[NSNumber numberWithUnsignedInteger:registrationID]
forKey:TSAccountManager_LocalRegistrationIdKey
inCollection:TSStorageUserAccountCollection];
[self.dbConnection setObject:[NSNumber numberWithUnsignedInteger:registrationID]
forKey:TSAccountManager_LocalRegistrationIdKey
inCollection:TSAccountManager_UserAccountCollection];
}
return registrationID;
}
return registrationID;
}
- (void)registerForPushNotificationsWithPushToken:(NSString *)pushToken
@ -314,7 +336,7 @@ NSString *const TSAccountManager_LocalRegistrationIdKey = @"TSStorageLocalRegist
case 200:
case 204: {
DDLogInfo(@"%@ Verification code accepted.", self.tag);
[TSStorageManager storeServerToken:authToken signalingKey:signalingKey];
[self storeServerAuthToken:authToken signalingKey:signalingKey];
[TSPreKeyManager registerPreKeysWithMode:RefreshPreKeysMode_SignedAndOneTime
success:successBlock
failure:failureBlock];
@ -367,6 +389,41 @@ NSString *const TSAccountManager_LocalRegistrationIdKey = @"TSStorageLocalRegist
return signalingKeyTokenPrint;
}
+ (nullable NSString *)signalingKey
{
return [[self sharedInstance] signalingKey];
}
- (nullable NSString *)signalingKey
{
return [self.dbConnection stringForKey:TSAccountManager_ServerSignalingKey
inCollection:TSAccountManager_UserAccountCollection];
}
+ (nullable NSString *)serverAuthToken
{
return [[self sharedInstance] serverAuthToken];
}
- (nullable NSString *)serverAuthToken
{
return [self.dbConnection stringForKey:TSAccountManager_ServerAuthToken
inCollection:TSAccountManager_UserAccountCollection];
}
- (void)storeServerAuthToken:(NSString *)authToken signalingKey:(NSString *)signalingKey
{
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[transaction setObject:authToken
forKey:TSAccountManager_ServerAuthToken
inCollection:TSAccountManager_UserAccountCollection];
[transaction setObject:signalingKey
forKey:TSAccountManager_ServerSignalingKey
inCollection:TSAccountManager_UserAccountCollection];
}];
}
+ (void)unregisterTextSecureWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failureBlock
{
[[TSNetworkManager sharedManager] makeRequest:[[TSUnregisterAccountRequest alloc] init]

5
SignalServiceKit/src/Account/TSAttributes.m
View file

@ -4,7 +4,6 @@
#import "TSAttributes.h"
#import "TSAccountManager.h"
#import "TSStorageManager+keyingMaterial.h"
NS_ASSUME_NONNULL_BEGIN
@ -12,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSDictionary *)attributesFromStorageWithManualMessageFetching:(BOOL)isEnabled
{
return [self attributesWithSignalingKey:[TSStorageManager signalingKey]
serverAuthToken:[TSStorageManager serverAuthToken]
return [self attributesWithSignalingKey:TSAccountManager.signalingKey
serverAuthToken:TSAccountManager.serverAuthToken
manualMessageFetching:isEnabled];
}

6
SignalServiceKit/src/Network/API/Requests/TSRequest.m
View file

@ -3,9 +3,8 @@
//
#import "TSRequest.h"
#import "TSAccountManager.h"
#import "TSConstants.h"
#import "TSStorageManager+keyingMaterial.h"
@implementation TSRequest
@ -37,7 +36,8 @@
#pragma clang diagnostic pop
- (void)makeAuthenticatedRequest {
[self.parameters addEntriesFromDictionary:@{ @"Authorization" : [TSStorageManager serverAuthToken] }];
OWSAssert([TSAccountManager serverAuthToken]);
[self.parameters addEntriesFromDictionary:@{ @"Authorization" : [TSAccountManager serverAuthToken] }];
}
@end

3
SignalServiceKit/src/Network/API/TSNetworkManager.m
View file

@ -6,7 +6,6 @@
#import "NSURLSessionDataTask+StatusCode.h"
#import "OWSSignalService.h"
#import "TSAccountManager.h"
#import "TSStorageManager+keyingMaterial.h"
#import "TSVerifyCodeRequest.h"
#import <AFNetworking/AFNetworking.h>
@ -74,7 +73,7 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
if (![request isKindOfClass:[TSRequestVerificationCodeRequest class]]) {
[sessionManager.requestSerializer
setAuthorizationHeaderFieldWithUsername:[TSAccountManager localNumber]
password:[TSStorageManager serverAuthToken]];
password:[TSAccountManager serverAuthToken]];
}
if ([request.HTTPMethod isEqualToString:@"GET"]) {

5
SignalServiceKit/src/Network/WebSockets/TSSocketManager.m
View file

@ -14,7 +14,6 @@
#import "SubProtocol.pb.h"
#import "TSAccountManager.h"
#import "TSConstants.h"
#import "TSStorageManager+keyingMaterial.h"
#import "Threading.h"
static const CGFloat kSocketHeartbeatPeriodSeconds = 30.f;
@ -384,7 +383,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
NSData *decryptedPayload =
[Cryptography decryptAppleMessagePayload:message.body withSignalingKey:TSStorageManager.signalingKey];
[Cryptography decryptAppleMessagePayload:message.body withSignalingKey:TSAccountManager.signalingKey];
if (!decryptedPayload) {
DDLogWarn(@"%@ Failed to decrypt incoming payload or bad HMAC", self.tag);
@ -485,7 +484,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
- (NSString *)webSocketAuthenticationString {
return [NSString stringWithFormat:@"?login=%@&password=%@",
[[TSAccountManager localNumber] stringByReplacingOccurrencesOfString:@"+" withString:@"%2B"],
[TSStorageManager serverAuthToken]];
[TSAccountManager serverAuthToken]];
}
#pragma mark - Socket LifeCycle

1
SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.h
View file

@ -11,6 +11,7 @@
#pragma mark - debug
- (void)resetSessionStore;
- (void)printAllSessions;
@end

8
SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m
View file

@ -189,6 +189,14 @@ void AssertIsOnSessionStoreQueue()
#pragma mark - debug
- (void)resetSessionStore
{
DDLogWarn(@"%@ resetting session store", self.tag);
[self.sessionDBConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[transaction removeAllObjectsInCollection:TSStorageManagerSessionStoreCollection];
}];
}
- (void)printAllSessions
{
AssertIsOnSessionStoreQueue();

7
SignalServiceKit/src/Storage/TSStorageKeys.h
View file

@ -5,13 +5,6 @@
#ifndef TextSecureKit_TSStorageKeys_h
#define TextSecureKit_TSStorageKeys_h
#pragma mark User Account Keys
#define TSStorageUserAccountCollection @"TSStorageUserAccountCollection"
#define TSStorageServerAuthToken @"TSStorageServerAuthToken"
#define TSStorageServerSignalingKey @"TSStorageServerSignalingKey"
/**
* Preferences exposed to the user
*/

29
SignalServiceKit/src/Storage/TSStorageManager+keyingMaterial.h
View file

@ -1,29 +0,0 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "TSStorageManager.h"
@interface TSStorageManager (keyingMaterial)
#pragma mark Server Credentials
/**
* The server signaling key that's used to encrypt push payloads
*
* @return signaling key
*/
+ (NSString *)signalingKey;
/**
* The server auth token allows the TextSecure client to connect to the server
*
* @return server authentication token
*/
+ (NSString *)serverAuthToken;
+ (void)storeServerToken:(NSString *)authToken signalingKey:(NSString *)signalingKey;
@end

41
SignalServiceKit/src/Storage/TSStorageManager+keyingMaterial.m
View file

@ -1,41 +0,0 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "TSStorageManager+keyingMaterial.h"
// TODO merge this category extension's functionality into TSAccountManager
@implementation TSStorageManager (keyingMaterial)
+ (NSString *)signalingKey {
return [[self sharedManager] stringForKey:TSStorageServerSignalingKey inCollection:TSStorageUserAccountCollection];
}
+ (NSString *)serverAuthToken {
return [[self sharedManager] stringForKey:TSStorageServerAuthToken inCollection:TSStorageUserAccountCollection];
}
+ (void)storeServerToken:(NSString *)authToken signalingKey:(NSString *)signalingKey {
TSStorageManager *sharedManager = self.sharedManager;
[sharedManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[transaction setObject:authToken forKey:TSStorageServerAuthToken inCollection:TSStorageUserAccountCollection];
[transaction setObject:signalingKey
forKey:TSStorageServerSignalingKey
inCollection:TSStorageUserAccountCollection];
}];
}
#pragma mark - Logging
+ (NSString *)logTag
{
return [NSString stringWithFormat:@"[%@]", self.class];
}
- (NSString *)logTag
{
return self.class.logTag;
}
@end