oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #105 from loki-project/security 

Fix Profile Picture Issues
This commit is contained in:
gmbnt 2020-02-17 10:47:47 +11:00 committed by GitHub
parent 0c18e82524 6def911dbc
commit 251a93e529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/Signal-Info.plist
View File

@ -5,7 +5,7 @@
<key>BuildDetails</key>
<dict>
<key>CarthageVersion</key>
<string>0.33.0</string>
<string>0.34.0</string>
<key>OSXVersion</key>
<string>10.15.3</string>
<key>WebRTCCommit</key>

2
Signal/src/Loki/View Controllers/DisplayNameVC.swift
View File

@ -155,7 +155,7 @@ final class DisplayNameVC : UIViewController {
return showError(title: NSLocalizedString("Please pick a shorter display name", comment: ""))
}
TSAccountManager.sharedInstance().didRegister()
OWSProfileManager.shared().updateLocalProfileName(displayName, avatarImage: nil, success: { }, failure: { }) // Try to save the user name but ignore the result
OWSProfileManager.shared().updateLocalProfileName(displayName, avatarImage: nil, success: { }, failure: { _ in }) // Try to save the user name but ignore the result
let homeVC = HomeVC()
navigationController!.setViewControllers([ homeVC ], animated: true)
}

10
Signal/src/Loki/View Controllers/SettingsVC.swift
View File

@ -274,10 +274,16 @@ final class SettingsVC : UIViewController, AvatarViewHelperDelegate {
self.displayNameToBeUploaded = nil
}
}
}, failure: {
}, failure: { error in
DispatchQueue.main.async {
modalActivityIndicator.dismiss {
let alert = UIAlertController(title: NSLocalizedString("Couldn't Update Profile", comment: ""), message: NSLocalizedString("Please check your internet connection and try again", comment: ""), preferredStyle: .alert)
var isMaxFileSizeExceeded = false
if let error = error as? LokiDotNetAPI.LokiDotNetAPIError {
isMaxFileSizeExceeded = (error == .maxFileSizeExceeded)
}
let title = isMaxFileSizeExceeded ? "Maximum File Size Exceeded" : NSLocalizedString("Couldn't Update Profile", comment: "")
let message = isMaxFileSizeExceeded ? "Please select a smaller photo and try again" : NSLocalizedString("Please check your internet connection and try again", comment: "")
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
self?.present(alert, animated: true, completion: nil)
}

2
Signal/src/ViewControllers/ProfileViewController.m
View File

@ -419,7 +419,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
}];
});
}
failure:^{
failure:^(NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[modalActivityIndicator dismissWithCompletion:^{
[OWSAlerts showErrorAlertWithMessage:NSLocalizedString(

2
Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift
View File

@ -170,7 +170,7 @@ public class OnboardingProfileViewController: OnboardingBaseViewController {
self.onboardingController.profileDidComplete(fromView: self)
})
}
}, failure: {
}, failure: { _ in
DispatchQueue.main.async {
modal.dismiss(completion: {
OWSAlerts.showErrorAlert(message: NSLocalizedString("PROFILE_VIEW_ERROR_UPDATE_FAILED",

2
Signal/src/util/Backup/OWSBackupImportJob.m
View File

@ -336,7 +336,7 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
success:^{
resolve(@(1));
}
failure:^{
failure:^(NSError *error) {
// Ignore errors related to local profile.
resolve(@(1));
}];

2
SignalMessaging/profiles/OWSProfileManager.h
View File

@ -50,7 +50,7 @@ extern const NSUInteger kOWSProfileManager_MaxAvatarDiameter;
- (void)updateLocalProfileName:(nullable NSString *)profileName
avatarImage:(nullable UIImage *)avatarImage
success:(void (^)(void))successBlock
failure:(void (^)(void))failureBlock;
failure:(void (^)(NSError *))failureBlock;
- (BOOL)isProfileNameTooLong:(nullable NSString *)profileName;

14
SignalMessaging/profiles/OWSProfileManager.m
View File

@ -229,13 +229,13 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
- (void)updateLocalProfileName:(nullable NSString *)profileName
avatarImage:(nullable UIImage *)avatarImage
success:(void (^)(void))successBlockParameter
failure:(void (^)(void))failureBlockParameter
failure:(void (^)(NSError *))failureBlockParameter
{
OWSAssertDebug(successBlockParameter);
OWSAssertDebug(failureBlockParameter);
// Ensure that the success and failure blocks are called on the main thread.
void (^failureBlock)(void) = ^{
void (^failureBlock)(NSError *) = ^(NSError *error) {
OWSLogError(@"Updating service with profile failed.");
// We use a "self-only" contact sync to indicate to desktop
@ -247,7 +247,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
[[self.syncManager syncLocalContact] retainUntilComplete];
dispatch_async(dispatch_get_main_queue(), ^{
failureBlockParameter();
failureBlockParameter(error);
});
};
void (^successBlock)(void) = ^{
@ -288,7 +288,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
}];
}
failure:^(NSError *error) {
failureBlock();
failureBlock(error);
}];
};
@ -319,11 +319,11 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
tryToUpdateService(avatarUrlPath, fileName);
}
failure:^(NSError *error) {
failureBlock();
failureBlock(error);
}];
}
failure:^(NSError *error) {
failureBlock();
failureBlock(error);
}];
}
} else if (userProfile.avatarUrlPath) {
@ -333,7 +333,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
tryToUpdateService(nil, nil);
}
failure:^(NSError *error) {
failureBlock();
failureBlock(error);
}];
} else {
OWSLogVerbose(@"Updating local profile on service with no avatar.");

6
SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift
View File

@ -100,10 +100,10 @@ public class LokiDotNetAPI : NSObject {
return seal.reject(error)
}
// Send the request
func parseResponse(_ response: Any) {
func parseResponse(_ responseObject: Any) {
// Parse the server ID & download URL
guard let json = response as? JSON, let data = json["data"] as? JSON, let serverID = data["id"] as? UInt64, let downloadURL = data["url"] as? String else {
print("[Loki] Couldn't parse attachment from: \(response).")
guard let json = responseObject as? JSON, let data = json["data"] as? JSON, let serverID = data["id"] as? UInt64, let downloadURL = data["url"] as? String else {
print("[Loki] Couldn't parse attachment from: \(responseObject).")
return seal.reject(LokiDotNetAPIError.parsingFailed)
}
// Update the attachment

20
SignalServiceKit/src/Loki/API/LokiFileServerAPI.swift
View File

@ -138,6 +138,9 @@ public final class LokiFileServerAPI : LokiDotNetAPI {
// MARK: Profile Pictures (Public API)
public static func setProfilePicture(_ profilePicture: Data) -> Promise<String> {
return Promise<String>() { seal in
guard profilePicture.count < maxFileSize else {
return seal.reject(LokiDotNetAPIError.maxFileSizeExceeded)
}
getAuthToken(for: server).done { token in
let url = "\(server)/users/me/avatar"
let parameters: JSON = [ "type" : attachmentType, "Content-Type" : "application/binary" ]
@ -150,24 +153,15 @@ public final class LokiFileServerAPI : LokiDotNetAPI {
print("[Loki] Couldn't upload profile picture due to error: \(error).")
throw error
}
let task = AFURLSessionManager(sessionConfiguration: .default).uploadTask(withStreamedRequest: request as URLRequest, progress: nil, completionHandler: { response, responseObject, error in
if let error = error {
print("[Loki] Couldn't upload profile picture due to error: \(error).")
return seal.reject(error)
}
let statusCode = (response as! HTTPURLResponse).statusCode
let isSuccessful = (200...299) ~= statusCode
guard isSuccessful else {
print("[Loki] Couldn't upload profile picture.")
return seal.reject(LokiDotNetAPIError.generic)
}
let _ = LokiFileServerProxy(for: server).performLokiFileServerNSURLRequest(request as NSURLRequest).done { responseObject in
guard let json = responseObject as? JSON, let data = json["data"] as? JSON, let profilePicture = data["avatar_image"] as? JSON, let downloadURL = profilePicture["url"] as? String else {
print("[Loki] Couldn't parse profile picture from: \(responseObject).")
return seal.reject(LokiDotNetAPIError.parsingFailed)
}
return seal.fulfill(downloadURL)
})
task.resume()
}.catch { error in
seal.reject(error)
}
}.catch { error in
print("[Loki] Couldn't upload profile picture due to error: \(error).")
seal.reject(error)

2
SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift
View File

@ -106,7 +106,7 @@ internal class LokiFileServerProxy : LokiHTTPClient {
print("[Loki] Received an invalid response.")
throw Error.proxyResponseParsingFailed
}
let isSuccess = (200..<300).contains(statusCode)
let isSuccess = (200...299) ~= statusCode
guard isSuccess else { throw HTTPError.networkError(code: statusCode, response: nil, underlyingError: Error.fileServerHTTPError(code: statusCode, message: nil)) }
let uncheckedJSONAsData = try DiffieHellman.decrypt(cipherText, using: symmetricKey)
if uncheckedJSONAsData.isEmpty { return () }