|
@@ -1585,7 +1585,6 @@
|
|
}];
|
|
}];
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
#pragma mark ===== Server =====
|
|
#pragma mark ===== Server =====
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
@@ -1667,6 +1666,48 @@
|
|
}];
|
|
}];
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+#pragma --------------------------------------------------------------------------------------------
|
|
|
|
+#pragma mark ===== End-to-End Encryption =====
|
|
|
|
+#pragma --------------------------------------------------------------------------------------------
|
|
|
|
+
|
|
|
|
+- (void)getEndToEndPrivateKey
|
|
|
|
+{
|
|
|
|
+ OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
|
|
|
|
+
|
|
|
|
+ [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
|
|
|
|
+ [communication setUserAgent:[CCUtility getUserAgent]];
|
|
|
|
+
|
|
|
|
+ [communication getEndToEndPrivateKey:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
|
|
|
|
+
|
|
|
|
+ // 200 ok: body contain the private key
|
|
|
|
+
|
|
|
|
+ if ([self.delegate respondsToSelector:@selector(getEndToEndPrivateKeySuccess:)])
|
|
|
|
+ [self.delegate getEndToEndPrivateKeySuccess:_metadataNet];
|
|
|
|
+
|
|
|
|
+ [self complete];
|
|
|
|
+
|
|
|
|
+ } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
|
|
|
|
+
|
|
|
|
+ // 409 forbidden: if the user can't access the private key
|
|
|
|
+ // 404 not found: if the private key doesn't exists
|
|
|
|
+ // 400 bad request: unpredictable internal error
|
|
|
|
+
|
|
|
|
+ NSInteger errorCode = response.statusCode;
|
|
|
|
+ if (errorCode == 0)
|
|
|
|
+ errorCode = error.code;
|
|
|
|
+
|
|
|
|
+ // Error
|
|
|
|
+ if ([self.delegate respondsToSelector:@selector(getEndToEndPrivateKeyFailure:message:errorCode:)])
|
|
|
|
+ [self.delegate getEndToEndPrivateKeyFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
|
|
|
|
+
|
|
|
|
+ // Request trusted certificated
|
|
|
|
+ if ([error code] == NSURLErrorServerCertificateUntrusted)
|
|
|
|
+ [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
|
|
|
|
+
|
|
|
|
+ [self complete];
|
|
|
|
+ }];
|
|
|
|
+}
|
|
|
|
+
|
|
@end
|
|
@end
|
|
|
|
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
#pragma --------------------------------------------------------------------------------------------
|