mirror of https://github.com/oxen-io/session-ios
gmbnt
6 years ago
committed by
GitHub
commit
f28d77ed4e
@ -1 +1 @@
|
||||
Subproject commit 3a470c921a599097807df0cdbff4b2f238c91f37
|
||||
Subproject commit e831f1b29d2aa8be3335ef66f061d2635b4615a7
|
||||
@ -0,0 +1,51 @@
|
||||
import PromiseKit
|
||||
|
||||
internal class LokiHttpClient {
|
||||
enum HttpError: LocalizedError {
|
||||
case networkError(code: Int, response: Any?, underlyingError: Error?)
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
case .networkError(let code, let body, let underlingError): return underlingError?.localizedDescription ?? "Failed network request with code: \(code) \(body ?? "")"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func perform(_ request: TSRequest, withCompletionQueue queue: DispatchQueue = DispatchQueue.main) -> Promise<Any> {
|
||||
return TSNetworkManager.shared().perform(request, withCompletionQueue: queue).map { $0.responseObject }.recover { error -> Promise<Any> in
|
||||
throw HttpError.from(error: error) ?? error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension LokiHttpClient.HttpError {
|
||||
static func from(error: Error) -> LokiHttpClient.HttpError? {
|
||||
if let error = error as? NetworkManagerError {
|
||||
if case NetworkManagerError.taskError(_, let underlyingError) = error, let nsError = underlyingError as? NSError {
|
||||
var response = nsError.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey]
|
||||
// Deserialize response if needed
|
||||
if let data = response as? Data, let json = try? JSONSerialization.jsonObject(with: data, options: []) as? JSON {
|
||||
response = json
|
||||
}
|
||||
return LokiHttpClient.HttpError.networkError(code: error.statusCode, response: response, underlyingError: underlyingError)
|
||||
}
|
||||
return LokiHttpClient.HttpError.networkError(code: error.statusCode, response: nil, underlyingError: error)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var isNetworkError: Bool {
|
||||
switch self {
|
||||
case .networkError(_, _, let underlyingError):
|
||||
return underlyingError != nil && IsNSErrorNetworkFailure(underlyingError)
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
var statusCode: Int {
|
||||
switch self {
|
||||
case .networkError(let code, _, _):
|
||||
return code
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,147 @@
|
||||
import PromiseKit
|
||||
|
||||
internal class LokiSnodeProxy: LokiHttpClient {
|
||||
internal let target: LokiAPITarget
|
||||
private let keyPair: ECKeyPair
|
||||
|
||||
internal enum Error : LocalizedError {
|
||||
case invalidPublicKeys
|
||||
case failedToEncryptRequest
|
||||
case failedToParseProxyResponse
|
||||
case targetNodeHttpError(code: Int, message: Any?)
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
case .invalidPublicKeys: return "Invalid target public key"
|
||||
case .failedToEncryptRequest: return "Failed to encrypt request"
|
||||
case .failedToParseProxyResponse: return "Failed to parse proxy response"
|
||||
case .targetNodeHttpError(let code, let message): return "Target node returned error \(code) - \(message ?? "No message provided")"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Http
|
||||
private var sessionManager: AFHTTPSessionManager = {
|
||||
let manager = AFHTTPSessionManager(sessionConfiguration: URLSessionConfiguration.ephemeral)
|
||||
let securityPolicy = AFSecurityPolicy.default()
|
||||
securityPolicy.allowInvalidCertificates = true
|
||||
securityPolicy.validatesDomainName = false
|
||||
manager.securityPolicy = securityPolicy
|
||||
manager.responseSerializer = AFHTTPResponseSerializer()
|
||||
return manager
|
||||
}()
|
||||
|
||||
|
||||
// MARK: - Class functions
|
||||
|
||||
init(target: LokiAPITarget) {
|
||||
self.target = target
|
||||
keyPair = Curve25519.generateKeyPair()
|
||||
super.init()
|
||||
}
|
||||
|
||||
override func perform(_ request: TSRequest, withCompletionQueue queue: DispatchQueue = DispatchQueue.main) -> Promise<Any> {
|
||||
guard let targetHexEncodedPublicKeys = target.publicKeySet else {
|
||||
return Promise(error: Error.invalidPublicKeys)
|
||||
}
|
||||
|
||||
guard let symmetricKey = try? Curve25519.generateSharedSecret(fromPublicKey: Data(hex: targetHexEncodedPublicKeys.encryptionKey), privateKey: keyPair.privateKey) else {
|
||||
return Promise(error: Error.failedToEncryptRequest)
|
||||
}
|
||||
|
||||
return LokiAPI.getRandomSnode().then { snode -> Promise<Any> in
|
||||
let url = "\(snode.address):\(snode.port)/proxy"
|
||||
print("[Loki][Snode proxy] Proxy request to \(self.target) via \(snode).")
|
||||
let requestParams = try JSONSerialization.data(withJSONObject: request.parameters, options: [])
|
||||
let params: [String : Any] = [
|
||||
"method" : request.httpMethod,
|
||||
"body" : String(bytes: requestParams, encoding: .utf8),
|
||||
"headers" : self.getHeaders(request: request)
|
||||
]
|
||||
let proxyParams = try JSONSerialization.data(withJSONObject: params, options: [])
|
||||
let ivAndCipherText = try DiffieHellman.encrypt(proxyParams, using: symmetricKey)
|
||||
let headers = [
|
||||
"X-Sender-Public-Key" : self.keyPair.publicKey.hexadecimalString,
|
||||
"X-Target-Snode-Key" : targetHexEncodedPublicKeys.idKey
|
||||
]
|
||||
return self.post(url: url, body: ivAndCipherText, headers: headers, timeoutInterval: request.timeoutInterval)
|
||||
}.map { response in
|
||||
guard response is Data, let cipherText = Data(base64Encoded: response as! Data) else {
|
||||
print("[Loki][Snode proxy] Received non-string response")
|
||||
return response
|
||||
}
|
||||
|
||||
let decrypted = try DiffieHellman.decrypt(cipherText, using: symmetricKey)
|
||||
|
||||
// Unwrap and handle errors if needed
|
||||
guard let json = try? JSONSerialization.jsonObject(with: decrypted, options: .allowFragments) as? [String: Any], let code = json["status"] as? Int else {
|
||||
throw HttpError.networkError(code: -1, response: nil, underlyingError: Error.failedToParseProxyResponse)
|
||||
}
|
||||
|
||||
let success = (200..<300).contains(code)
|
||||
var body: Any? = nil
|
||||
if let string = json["body"] as? String {
|
||||
body = string
|
||||
if let jsonBody = try? JSONSerialization.jsonObject(with: string.data(using: .utf8)!, options: .allowFragments) as? [String: Any] {
|
||||
body = jsonBody
|
||||
}
|
||||
}
|
||||
|
||||
if (!success) {
|
||||
throw HttpError.networkError(code: code, response: body, underlyingError: Error.targetNodeHttpError(code: code, message: body))
|
||||
}
|
||||
|
||||
return body
|
||||
}.recover { error -> Promise<Any> in
|
||||
print("[Loki][Snode proxy] Failed proxy request. \(error.localizedDescription)")
|
||||
throw HttpError.from(error: error) ?? error
|
||||
}
|
||||
}
|
||||
|
||||
// MARK:- Private functions
|
||||
|
||||
private func getHeaders(request: TSRequest) -> [String: Any] {
|
||||
guard let headers = request.allHTTPHeaderFields else {
|
||||
return [:]
|
||||
}
|
||||
var newHeaders: [String: Any] = [:]
|
||||
for header in headers {
|
||||
var value: Any = header.value
|
||||
// We need to convert any string boolean values to actual boolean values
|
||||
if (header.value.lowercased() == "true" || header.value.lowercased() == "false") {
|
||||
value = NSString(string: header.value).boolValue
|
||||
}
|
||||
newHeaders[header.key] = value
|
||||
}
|
||||
return newHeaders
|
||||
}
|
||||
|
||||
private func post(url: String, body: Data?, headers: [String: String]?, timeoutInterval: TimeInterval) -> Promise<Any> {
|
||||
let (promise, resolver) = Promise<Any>.pending()
|
||||
let request = AFHTTPRequestSerializer().request(withMethod: "POST", urlString: url, parameters: nil, error: nil)
|
||||
request.allHTTPHeaderFields = headers
|
||||
request.httpBody = body
|
||||
request.timeoutInterval = timeoutInterval
|
||||
|
||||
var task: URLSessionDataTask? = nil
|
||||
|
||||
task = sessionManager.dataTask(with: request as URLRequest) { (response, result, error) in
|
||||
if let error = error {
|
||||
if let task = task {
|
||||
let nmError = NetworkManagerError.taskError(task: task, underlyingError: error)
|
||||
let nsError: NSError = nmError as NSError
|
||||
nsError.isRetryable = false
|
||||
resolver.reject(nsError)
|
||||
} else {
|
||||
resolver.reject(error)
|
||||
}
|
||||
} else {
|
||||
OutageDetection.shared.reportConnectionSuccess()
|
||||
resolver.fulfill(result)
|
||||
}
|
||||
}
|
||||
|
||||
task?.resume()
|
||||
return promise
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue