Start p2p server on app start.

Handle more cases in the p2p server.
5 years ago · 748b7eff12
parent efa303abeb
commit 748b7eff12
2 changed files with 86 additions and 4 deletions
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@ -66,6 +66,12 @@ static NSTimeInterval launchStartedAt;

@end

+@interface AppDelegate ()
+
+@property (nonatomic) LokiP2PServer *lokiP2PServer;
+
+@end
+
 #pragma mark -

@implementation AppDelegate
@ -187,6 +193,10 @@ static NSTimeInterval launchStartedAt;
    OWSLogInfo(@"applicationWillTerminate.");

    [DDLog flushLog];
+    
+    if (_lokiP2PServer) {
+        [_lokiP2PServer stop];
+    }
 }

 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
@ -307,7 +317,15 @@ static NSTimeInterval launchStartedAt;
    OWSLogInfo(@"application: didFinishLaunchingWithOptions completed.");

    [OWSAnalytics appLaunchDidBegin];
-
+    
+    // Loki
+    _lokiP2PServer = [LokiP2PServer new];
+    if ([_lokiP2PServer startOnPort:8080]) {
+         OWSLogInfo(@"[Loki P2P Server]: Started server at %@", _lokiP2PServer.serverURL);
+    } else {
+        OWSFailDebug(@"Failed to start loki P2P server");
+    }
+   
    return YES;
 }

--- a/Signal/src/Loki/LokiP2PServer.swift
+++ b/Signal/src/Loki/LokiP2PServer.swift
@ -1,14 +1,78 @@
 import GCDWebServer

+// Convenience functions
+fileprivate extension GCDWebServerDataRequest {
+    var truncatedContentType: String? {
+        guard let contentType = contentType else { return nil }
+        guard let substring = contentType.split(separator: ";").first else { return contentType }
+        return String(substring)
+    }
+    
+    // GCDWebServerDataRequest already provides this implementation
+    // However it will abort when running in DEBUG, we don't want that so we just override it with a version which doesn't abort
+    var jsonObject: [String: Any]? {
+        let acceptedMimeTypes = ["application/json", "text/json", "text/javascript"]
+        guard let mimeType = truncatedContentType, acceptedMimeTypes.contains(mimeType) else { return nil }
+        
+        do {
+            let object = try JSONSerialization.jsonObject(with: data, options: .allowFragments)
+            return object as? [String: Any]
+        } catch let error {
+            Logger.debug("[Loki P2P Server] Failed to serialize json: \(error)")
+        }
+        
+        return nil
+    }
+}
+
@objc class LokiP2PServer : NSObject {
+    
+    private enum StatusCode: Int {
+        case ok = 200
+        case badRequest = 400
+        case notFound = 404
+        case methodNotAllowed = 405
+        case internalServerError = 500
+    }
+    
    private lazy var webServer: GCDWebServer = {
        let webServer = GCDWebServer()
        
-        webServer.addHandler(forMethod: "POST", path: "/v1/storage_rpc", request: GCDWebServerRequest.self) { (request, completionBlock) in
-            let response = GCDWebServerDataResponse(html: "<html><body><p>Hello World</p></body></html>")
-            completionBlock(response)
+         // Don't allow specific methods
+        let invalidMethodProcessBlock: (GCDWebServerRequest) -> GCDWebServerResponse? = { _ in
+            return GCDWebServerResponse(statusCode: StatusCode.methodNotAllowed.rawValue)
+        }
+        
+        let invalidMethods = ["GET", "PUT", "DELETE"]
+        for method in invalidMethods {
+            webServer.addDefaultHandler(forMethod: method, request: GCDWebServerRequest.self, processBlock: invalidMethodProcessBlock)
        }
        
+        // By default send 404 for any path
+        webServer.addDefaultHandler(forMethod: "POST", request: GCDWebServerRequest.self, processBlock: { _ in
+            return GCDWebServerResponse(statusCode: StatusCode.notFound.rawValue)
+        })
+        
+        // Handle our specific storage path
+        webServer.addHandler(forMethod: "POST", path: "/v1/storage_rpc", request: GCDWebServerDataRequest.self, asyncProcessBlock: { (request, completionBlock) in
+            // Make sure we were sent a good request
+            guard let dataRequest = request as? GCDWebServerDataRequest, let json = dataRequest.jsonObject else {
+                completionBlock(GCDWebServerResponse(statusCode: StatusCode.badRequest.rawValue))
+                return
+            }
+            
+            // Only allow the store method
+            guard let method = json["method"] as? String, method == "store" else {
+                completionBlock(GCDWebServerResponse(statusCode: StatusCode.notFound.rawValue))
+                return
+            }
+            
+            // TODO: Decrypt message here
+            
+            let response = GCDWebServerResponse(statusCode: StatusCode.ok.rawValue)
+            completionBlock(response)
+        })
+        
        return webServer
    }()