ANDROID: Added range checking for the web services port

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2021-04-02 (12.21)
+	ANDROID: Added range checking for the web services port
+
 2021-03-28 (12.21)
 	COMMON: Fix CIRCLE command to ensure radius uses the WINDOW coordinate system
 	COMMON: Fix to ensure the default VIEW is maintained during resizing

src/platform/android/app/src/main/assets/main.bas

@@ -160,9 +160,12 @@ sub do_setup()
   cls
   print boldOn + "Setup web service port number."
   print boldOff
-  print "Enter a port number to allow web browser or desktop IDE access. ";
-  print "Enter -1 to disable this feature, or press <enter> to leave ";
-  print "this screen without making any changes."
+  print "Enter a port number to allow web browser or desktop IDE access. "
+  print
+  print "Values outside the range [1024-65535] will disable this feature."
+  print
+  print "Press <enter> to leave this screen without making any changes."
+  print
   print "The current setting is: " + env("serverSocket")
   print
   color colText, colBkGnd
@@ -211,7 +214,7 @@ sub server_info()
   local serverSocket = env("serverSocket")
   local ipAddr = env("IP_ADDR")
 
-  if (len(serverSocket) > 0 && int(serverSocket) > 0 && len(ipAddr)) then
+  if (len(serverSocket) > 0 && int(serverSocket) > 1023 && int(serverSocket) < 65536 && len(ipAddr)) then
     serverSocket = ipAddr + ":" + serverSocket
     print boldOff + "Web Service: " + boldOn + serverSocket
     print boldOff + "Access token: " + boldOn + env("serverToken")

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -198,7 +198,7 @@ public void browseFile(final byte[] pathBytes) {
       Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
       startActivity(browserIntent);
     } catch (Exception e) {
-      Log.i(TAG, "browseFile failed: " + e.toString());
+      Log.i(TAG, "browseFile failed: ", e);
     }
   }
 
@@ -443,7 +443,7 @@ public void run() {
           _mediaPlayer.start();
         }
         catch (IOException e) {
-          Log.i(TAG, "Failed: ", e);
+          Log.i(TAG, "playAudio failed: ", e);
         }
       }
     }).start();
@@ -920,7 +920,7 @@ private void processSettings() {
       p.load(getApplication().openFileInput("settings.txt"));
       int socket = Integer.parseInt(p.getProperty("serverSocket", "-1"));
       String token = p.getProperty("serverToken", new Date().toString());
-      if (socket != -1) {
+      if (socket > 1023 && socket < 65536) {
         startServer(socket, token);
       } else {
         Log.i(TAG, "Web service disabled");
@@ -941,9 +941,9 @@ private String readBuffer(File inputFile) {
       }
       input.close();
     } catch (FileNotFoundException e) {
-      Log.i(TAG, "Failed: " + e.toString());
+      Log.i(TAG, "readBuffer failed: ", e);
     } catch (IOException e) {
-      Log.i(TAG, "Failed: " + e.toString());
+      Log.i(TAG, "readBuffer failed: ", e);
     }
     return result.toString();
   }
@@ -960,10 +960,17 @@ private String readLine(DataInputStream inputReader) throws IOException {
   }
 
   private void runServer(final int socketNum, final String token) throws IOException {
-    ServerSocket serverSocket = new ServerSocket(socketNum);
     Log.i(TAG, "Listening :" + socketNum);
     Log.i(TAG, "Token :" + token);
-    while (true) {
+    ServerSocket serverSocket;
+    try {
+      serverSocket = new ServerSocket(socketNum);
+    }
+    catch (IllegalArgumentException e) {
+      Log.i(TAG, "Failed to start server: ", e);
+      serverSocket = null;
+    }
+    while (serverSocket != null) {
       Socket socket = null;
       DataInputStream inputStream = null;
       try {
@@ -1002,7 +1009,8 @@ private void runServer(final int socketNum, final String token) throws IOExcepti
         }
       }
       catch (IOException e) {
-        Log.i(TAG, "Failed: " + e.toString());
+        Log.i(TAG, "Server failed: ", e);
+        break;
       }
       finally {
         Log.i(TAG, "socket cleanup");
@@ -1014,6 +1022,7 @@ private void runServer(final int socketNum, final String token) throws IOExcepti
         }
       }
     }
+    Log.i(TAG, "server stopped");
   }
 
   private void sendResponse(Socket socket, String content) throws IOException {
@@ -1053,7 +1062,7 @@ public void run() {
           runServer(socketNum, token);
         }
         catch (IOException e) {
-          Log.i(TAG, "Failed: " + e.toString());
+          Log.i(TAG, "startServer failed: ", e);
         }
       }
     });