better authentication error handling

Author: joemcbride

app/src/Outlander/Server/AuthenticationServer.swift

@@ -110,7 +110,8 @@ class AuthenticationServer {
                 return
             }
 
-            _socket?.writeAndRead("G\t\(_authInfo!.game)", tag: AuthSocketState.game.rawValue)
+            let upperGame = _authInfo!.game.uppercased()
+            _socket?.writeAndRead("G\t\(upperGame)", tag: AuthSocketState.game.rawValue)
 
         case .game:
             _socket?.writeAndRead("C", tag: AuthSocketState.characterlist.rawValue)
@@ -147,7 +148,16 @@ class AuthenticationServer {
                 return
             }
 
-            let info = getConnection(str)
+            if str.contains("PROBLEM") || !str.contains("GAMECODE") {
+                disconnectWithError("unable to connect, check connection options")
+                return
+            }
+
+            guard let info = getConnection(str) else {
+                disconnectWithError("unable to connect, check connection options")
+                return
+            }
+
             _socket?.disconnect()
             _callback?(.success(info))
         }
@@ -181,17 +191,30 @@ class AuthenticationServer {
         return Data(hexString: hexHash)
     }
 
-    func getConnection(_ input: String) -> GameConnectionInfo {
+    func getConnection(_ input: String) -> GameConnectionInfo? {
         let game = getData(input, pattern: "GAMECODE=(\\S+)")
         let key = getData(input, pattern: "KEY=(\\w+)")
         let host = getData(input, pattern: "GAMEHOST=(\\S+)")
         let port = getData(input, pattern: "GAMEPORT=(\\d+)")
-        let portNumber = UInt16(port)!
-        return GameConnectionInfo(game: game, key: key, host: host, port: portNumber)
+        let portNumber = UInt16(port ?? "")
+
+        if game == nil || key == nil || host == nil || port == nil || portNumber == nil {
+            return nil
+        }
+        
+        return GameConnectionInfo(game: game ?? "", key: key ?? "", host: host ?? "", port: portNumber ?? 0)
     }
 
-    func getData(_ input: String, pattern: String) -> String {
-        let range = try! Regex(pattern).matches(input)[1]
-        return String(input[range])
+    func getData(_ input: String, pattern: String) -> String? {
+        do {
+            let matches = try Regex(pattern).matches(input)
+            guard matches.count > 1 else {
+                return nil
+            }
+            let range = matches[1]
+            return String(input[range])
+        } catch {
+            return nil
+        }
     }
 }

app/src/OutlanderTests/GameStreamTests.swift

@@ -8,7 +8,25 @@
 
 import XCTest
 
+class TestStreamHandler: StreamHandler {
+    var dataList: [String] = []
+    
+    func stream(_ data: String, with context: GameContext) {
+        guard !data.isEmpty else {
+            return
+        }
+
+        dataList.append(data)
+    }
+
+    func reset() {
+        dataList.removeAll()
+    }
+}
+
 class GameStreamTests: XCTestCase {
+    var testStreamHandler: TestStreamHandler = TestStreamHandler()
+
     func streamCommands(_ lines: [String], context: GameContext = GameContext(), monsterIgnoreList: String = "") -> [StreamCommand] {
         var commands: [StreamCommand] = []
         let context = context
@@ -19,6 +37,9 @@ class GameStreamTests: XCTestCase {
         stream.monsterCountIgnoreList = monsterIgnoreList
 
         stream.reset(true)
+        testStreamHandler.reset()
+
+        stream.addHandler(testStreamHandler)
 
         for line in lines {
             stream.stream(line)
@@ -278,6 +299,10 @@ class GameStreamTests: XCTestCase {
         ])
         XCTAssertEqual(commands.count, 4)
 
+        XCTAssertEqual(testStreamHandler.dataList.count, 2)
+        XCTAssertEqual(testStreamHandler.dataList[0], "[General][Someone] \"something to say\"")
+        XCTAssertEqual(testStreamHandler.dataList[1], "R>")
+
         switch commands[3] {
         case let .text(tags):
             XCTAssertEqual(tags.count, 2)