ANDROID: implemented IP based authentication for the web portal

Author: chrisws

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

@@ -772,8 +772,12 @@ private void installSamples() {
     }
   }
 
-  private boolean isHostPermitted(String remoteHost) {
-    return (remoteHost != null && permittedHost.get(remoteHost) != null && Boolean.TRUE.equals(permittedHost.get(remoteHost)));
+  private boolean isHostDenied(String remoteHost) {
+    return (remoteHost != null && permittedHost.get(remoteHost) != null && Boolean.FALSE.equals(permittedHost.get(remoteHost)));
+  }
+
+  private boolean isHostNonPermitted(String remoteHost) {
+    return (remoteHost == null || permittedHost.get(remoteHost) == null || !Boolean.TRUE.equals(permittedHost.get(remoteHost)));
   }
 
   private boolean locationPermitted() {
@@ -889,8 +893,8 @@ private void setupStorageEnvironment() {
   }
 
   private void validateAccess(String remoteHost) throws IOException {
-    if (!isHostPermitted(remoteHost)) {
-      throw new IOException("Access denied");
+    if (isHostNonPermitted(remoteHost)) {
+      throw new IOException(getString(R.string.PORTAL_DENIED));
     }
   }
 
@@ -990,8 +994,15 @@ protected void deleteFile(String remoteHost, String fileName) throws IOException
     }
 
     @Override
-    protected void execStream(InputStream inputStream) throws IOException {
-      MainActivity.this.execStream(inputStream);
+    protected void execStream(String remoteHost, InputStream inputStream) throws IOException {
+      if (isHostDenied(remoteHost)) {
+        throw new IOException(getString(R.string.PORTAL_DENIED));
+      }
+      if (isHostNonPermitted(remoteHost)) {
+        requestHostPermission(remoteHost);
+      } else {
+        MainActivity.this.execStream(inputStream);
+      }
     }
 
     @Override
@@ -1002,7 +1013,7 @@ protected Response getFile(String remoteHost, String path, boolean asset) throws
         long length = getFileLength(name);
         log("Opened " + name + " " + length + " bytes");
         result = new Response(getAssets().open(name), length);
-        if ("index.html".equals(path) && !isHostPermitted(remoteHost)) {
+        if ("index.html".equals(path) && isHostNonPermitted(remoteHost)) {
           requestHostPermission(remoteHost);
         }
       } else {

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

@@ -64,7 +64,7 @@ public void run() {
   }
 
   protected abstract void deleteFile(String remoteHost, String fileName) throws IOException;
-  protected abstract void execStream(InputStream inputStream) throws IOException;
+  protected abstract void execStream(String remoteHost, InputStream inputStream) throws IOException;
   protected abstract Response getFile(String remoteHost, String path, boolean asset) throws IOException;
   protected abstract Collection<FileData> getFileData(String remoteHost) throws IOException;
   protected abstract byte[] decodeBase64(String data);
@@ -546,7 +546,7 @@ private Response handleRename(Map<String, FormField> data) throws IOException {
 
     private void handleRun(InputStream inputStream) throws IOException {
       if (tokenKey.equals(requestToken)) {
-        execStream(inputStream);
+        execStream(remoteHost, inputStream);
       } else {
         log("Invalid token");
       }

src/platform/android/app/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">SmallBASIC</string>
+  <string name="PORTAL_DENIED">Access denied</string>
   <string name="PORTAL_PROMPT">Allow Web portal access?</string>
   <string name="PORTAL_QUESTION">Do you wish to allow anyone with IP address [%s] to gain access to the portal?</string>
   <string name="OK">OK</string>

src/platform/android/webui/server/src/main/java/net/sourceforge/smallbasic/Server.java

@@ -37,7 +37,7 @@ protected void deleteFile(String hostName, String fileName) throws IOException {
       }
 
       @Override
-      protected void execStream(InputStream inputStream) {
+      protected void execStream(String remoteHost, InputStream inputStream) {
         try {
           byte[] data = IOUtils.readAllBytes(inputStream);
           log(new String(data));