Corrected port number validation range

frontend/server/src/main/java/org/pytorch/serve/util/Connector.java

@@ -105,7 +105,7 @@ public static Connector parse(String binding, boolean management) {
         } else {
             port = Integer.parseInt(listeningPort);
         }
-        if (port >= Short.MAX_VALUE) {
+        if (port >= Short.MAX_VALUE * 2 + 1) {
             throw new IllegalArgumentException("Invalid port number: " + binding);
         }
         return new Connector(port, false, host, String.valueOf(port), ssl, management);

frontend/server/src/test/java/org/pytorch/serve/ModelServerTest.java

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.pytorch.serve.http.DescribeModelResponse;
 import org.pytorch.serve.http.ErrorResponse;
@@ -94,7 +95,8 @@ public void afterSuite() {
     @Test
     public void test()
             throws InterruptedException, HttpPostRequestEncoder.ErrorDataEncoderException,
-                    IOException, NoSuchFieldException, IllegalAccessException {
+                    IOException, NoSuchFieldException, IllegalAccessException,
+                    GeneralSecurityException, InvalidSnapshotException {
         Channel channel = null;
         Channel managementChannel = null;
         for (int i = 0; i < 5; ++i) {
@@ -189,6 +191,8 @@ public void test()
         testUnregisterModelFailure("noopversioned", "1.2.1");
 
         testTS();
+        testTSValidPort();
+        testTSInvalidPort();
     }
 
     public void testTS()
@@ -1244,4 +1248,65 @@ private void testMetricManager() throws JsonParseException, InterruptedException
             }
         }
     }
+
+    private void testTSValidPort()
+            throws InterruptedException, GeneralSecurityException, InvalidSnapshotException,
+                    IOException {
+        //  test case for verifying port range refer https://github.com/pytorch/serve/issues/291
+        server.stop();
+        System.setProperty("tsConfigFile", "src/test/resources/config_port.properties");
+        FileUtils.deleteQuietly(new File(System.getProperty("LOG_LOCATION"), "config"));
+        ConfigManager.init(new ConfigManager.Arguments());
+        configManager = ConfigManager.getInstance();
+        PluginsManager.getInstance().initialize();
+
+        InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE);
+        server = new ModelServer(configManager);
+        server.start();
+
+        Channel channel = null;
+        Channel managementChannel = null;
+        for (int i = 0; i < 5; ++i) {
+            channel = TestUtils.connect(false, configManager);
+            if (channel != null) {
+                break;
+            }
+            Thread.sleep(100);
+        }
+
+        for (int i = 0; i < 5; ++i) {
+            managementChannel = TestUtils.connect(true, configManager);
+            if (managementChannel != null) {
+                break;
+            }
+            Thread.sleep(100);
+        }
+
+        Assert.assertNotNull(channel, "Failed to connect to inference port.");
+        Assert.assertNotNull(managementChannel, "Failed to connect to management port.");
+
+        testPing(channel);
+    }
+
+    private void testTSInvalidPort()
+            throws InterruptedException, GeneralSecurityException, InvalidSnapshotException,
+                    IOException {
+        //  test case for verifying port range refer https://github.com/pytorch/serve/issues/291
+        //  invalid port test
+        server.stop();
+        System.setProperty("tsConfigFile", "src/test/resources/config_invalid_port.properties");
+        FileUtils.deleteQuietly(new File(System.getProperty("LOG_LOCATION"), "config"));
+        ConfigManager.init(new ConfigManager.Arguments());
+        configManager = ConfigManager.getInstance();
+        PluginsManager.getInstance().initialize();
+
+        InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE);
+        server = new ModelServer(configManager);
+        try {
+            server.start();
+        } catch (Exception e) {
+            Assert.assertEquals(e.getClass(), IllegalArgumentException.class);
+            Assert.assertEquals(e.getMessage(), "Invalid port number: https://127.0.0.1:65536");
+        }
+    }
 }

frontend/server/src/test/resources/config.properties

@@ -25,7 +25,6 @@ certificate_file=src/test/resources/certs.pem
 # max_response_size=6553500
 max_request_size=10485760
 # blacklist_env_vars=.*USERNAME.*|.*PASSWORD.*
-# enable_env_vars_config=false
 # decode_input_request=true
 enable_envvars_config=true
 # default_service_handler=/path/to/service.py:handle

frontend/server/src/test/resources/config_invalid_port.properties

@@ -0,0 +1,5 @@
+inference_address=https://127.0.0.1:65536
+management_address=unix:/tmp/management.sock
+# model_server_home=../..
+model_store=../modelarchive/src/test/resources/models
+enable_envvars_config=true

frontend/server/src/test/resources/config_port.properties

@@ -0,0 +1,4 @@
+inference_address=https://127.0.0.1:42523
+management_address=unix:/tmp/management.sock
+model_store=../modelarchive/src/test/resources/models
+enable_envvars_config=true

frontend/server/src/test/resources/config_test_env.properties

@@ -24,6 +24,5 @@ certificate_file=src/test/resources/certs.pem
 # max_response_size=6553500
 max_request_size=10485760
 # blacklist_env_vars=.*USERNAME.*|.*PASSWORD.*
-# enable_env_vars_config=false
-# decode_input_request=true
 # enable_envvars_config=false
+# decode_input_request=true