From 4f2b942f73d08902ce222c00e639c778be1b09ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Thu, 4 Sep 2014 16:47:47 +0200
Subject: [PATCH] Improved parameter validation for `internet.connect`, closes
 #533.

---
 .../li/cil/oc/server/component/InternetCard.scala | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/li/cil/oc/server/component/InternetCard.scala b/src/main/scala/li/cil/oc/server/component/InternetCard.scala
index cd255a29d..74f654ef9 100644
--- a/src/main/scala/li/cil/oc/server/component/InternetCard.scala
+++ b/src/main/scala/li/cil/oc/server/component/InternetCard.scala
@@ -68,7 +68,7 @@ class InternetCard extends component.ManagedComponent {
     if (connections.size >= Settings.get.maxConnections) {
       throw new IOException("too many open connections")
     }
-    val uri = checkUri(address)
+    val uri = checkUri(address, port)
     val handle = newHandle()
     connections += handle -> new InternetCard.Socket(uri, port)
     result(handle)
@@ -173,10 +173,10 @@ class InternetCard extends component.ManagedComponent {
 
   // ----------------------------------------------------------------------- //
 
-  private def checkUri(address: String): URI = {
+  private def checkUri(address: String, port: Int): URI = {
     try {
       val parsed = new URI(address)
-      if (parsed.getHost != null && parsed.getPort != -1) {
+      if (parsed.getHost != null && (parsed.getPort > 0 || port > 0)) {
         return parsed
       }
     }
@@ -185,11 +185,14 @@ class InternetCard extends component.ManagedComponent {
     }
 
     val simple = new URI("oc://" + address)
-    if (simple.getHost != null && simple.getPort != -1) {
-      return simple
+    if (simple.getHost != null) {
+      if (simple.getPort > 0)
+        return simple
+      else if (port > 0)
+        return new URI(simple.toString + ":" + port)
     }
 
-    throw new IllegalArgumentException("address could not be parsed")
+    throw new IllegalArgumentException("address could not be parsed or no valid port given")
   }
 
   private def checkAddress(address: String) = {