EDGECLOUD-3516: iOS Add ValidateAppPorts (#87)

Author: franklin-huang-mobiledgex

IOSMatchingEngineSDK/MobiledgeXiOSLibrary/Classes/MatchingEngine/GetConnection/GetConnectionErrors.swift

@@ -40,12 +40,14 @@ extension MobiledgeXiOSLibrary.MatchingEngine {
         case notValidPort(port: UInt16)
         case portNotInAppPortRange(port: UInt16)
         case unableToValidatePort
+        case unableToValidateAppPort(message: String)
 
         public var errorDescription: String? {
             switch self {
             case .variableConversionError(let message): return message
             case .notValidPort(let port): return "\(port) specified is not a valid port number"
             case .portNotInAppPortRange(let port): return "\(port) specified is not in AppPort range"
+            case .unableToValidateAppPort(let message): return message
             default: return self.localizedDescription
             }
         }

IOSMatchingEngineSDK/MobiledgeXiOSLibrary/Classes/MatchingEngine/GetConnection/GetConnectionUtil.swift

@@ -74,6 +74,10 @@ extension MobiledgeXiOSLibrary.MatchingEngine {
     }
 
     public func createUrl(findCloudletReply: FindCloudletReply, appPort: AppPort, proto: String, desiredPort: Int = 0, path: String = "") throws -> String {
+        
+        if (!validateAppPort(findCloudletReply: findCloudletReply, appPort: appPort)) {
+            throw GetConnectionError.unableToValidateAppPort(message: "AppPort provided does not match any AppPorts in FindCloudletReply")
+        }
         // Convert fqdn_prefix and fqdn to string
         var fqdnPrefix = appPort.fqdn_prefix
         if fqdnPrefix == nil {
@@ -93,6 +97,19 @@ extension MobiledgeXiOSLibrary.MatchingEngine {
         return url
     }
 
+    private func validateAppPort(findCloudletReply: FindCloudletReply, appPort: AppPort) -> Bool {
+        var found = false
+        for ap in findCloudletReply.ports {
+            if (ap.proto != appPort.proto) {
+                continue
+            }
+            if (ap == appPort) {
+                found = true
+            }
+        }
+        return found
+    }
+    
     private func validateDesiredPort(appPort: AppPort, desiredPort: UInt16) throws -> UInt16 {
 
         if (!isValidPort(port: desiredPort)) {

IOSMatchingEngineSDK/MobiledgeXiOSLibrary/Classes/MatchingEngine/MatchingEngineProto.swift

@@ -51,6 +51,31 @@ extension MobiledgeXiOSLibrary.MatchingEngine {
         public var fqdn_prefix: String?
         public var end_port: Int32?
         public var tls: Bool?
+        
+        static func == (ap1: AppPort, ap2: AppPort) -> Bool {
+            if (ap1.proto != ap2.proto) {
+                return false
+            }
+            if (ap1.internal_port != ap2.internal_port) {
+                return false
+            }
+            if (ap1.public_port != ap2.public_port) {
+                return false
+            }
+            if (ap1.path_prefix != ap2.path_prefix) {
+                return false
+            }
+            if (ap1.fqdn_prefix != ap2.fqdn_prefix) {
+                return false
+            }
+            if (ap1.end_port != ap2.end_port) {
+                return false
+            }
+            if (ap1.tls != ap2.tls) {
+                return false
+            }
+            return true
+        }
     }
 
     // Values for AppPort proto field