Merge branch 'development'

aaronjwood · Feb 24, 2020 · 01ae163 · 01ae163
2 parents 1f5e71a + 9825fd0
commit 01ae163
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,9 @@
 <a href="https://play.google.com/store/apps/details?id=com.aaronjwood.portauthority.free"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="60"></a>
 
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/74a6e90f803d46a1a39b34daabeb8af1)](https://www.codacy.com/app/aaronjwood/PortAuthority)
-[![Build Status](https://travis-ci.org/aaronjwood/PortAuthority.svg?branch=master)](https://travis-ci.org/aaronjwood/PortAuthority)
+[![Build Status](https://travis-ci.org/aaronjwood/PortAuthority.svg)](https://travis-ci.org/aaronjwood/PortAuthority)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/8687/badge.svg)](https://scan.coverity.com/projects/aaronjwood-portauthority)
+[![Known Vulnerabilities](https://snyk.io/test/github/aaronjwood/PortAuthority/badge.svg)](https://snyk.io/test/github/aaronjwood/PortAuthority)
 
 ## Overview
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -21,8 +21,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 57
-        versionName "2.2.12"
+        versionCode 58
+        versionName "2.2.13"
         applicationId "com.aaronjwood.portauthority"
         setProperty("archivesBaseName", "PortAuthority-$versionName")
     }
@@ -35,12 +35,13 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            useProguard false
         }
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.pro'
+            proguardFiles getDefaultProguardFile(
+                    'proguard-android-optimize.txt'),
+                    'proguard-rules.pro'
         }
     }
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -0,0 +1 @@
+-keep class org.xbill.** { *; }
diff --git a/app/proguard.pro b/app/proguard.pro
diff --git a/app/src/main/java/com/aaronjwood/portauthority/activity/HostActivity.java b/app/src/main/java/com/aaronjwood/portauthority/activity/HostActivity.java
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 public abstract class HostActivity extends AppCompatActivity implements HostAsyncResponse {

diff --git a/app/src/main/java/com/aaronjwood/portauthority/async/ScanHostsAsyncTask.java b/app/src/main/java/com/aaronjwood/portauthority/async/ScanHostsAsyncTask.java
@@ -18,7 +18,6 @@
 import java.lang.ref.WeakReference;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -149,7 +148,7 @@ protected final void onProgressUpdate(Void... params) {
                     throw new Exception("Unable to access ARP entries");
                 }
 
-                reader = new BufferedReader(new InputStreamReader(ipProc.getInputStream()));
+                reader = new BufferedReader(new InputStreamReader(ipProc.getInputStream(), "UTF-8"));
                 String line;
                 while ((line = reader.readLine()) != null) {
                     String[] neighborLine = line.split("\\s+");
@@ -175,7 +174,7 @@ protected final void onProgressUpdate(Void... params) {
                     }
                 }
             } else {
-                reader = new BufferedReader(new InputStreamReader(new FileInputStream(ARP_TABLE), StandardCharsets.UTF_8));
+                reader = new BufferedReader(new InputStreamReader(new FileInputStream(ARP_TABLE), "UTF-8"));
                 reader.readLine(); // Skip header.
                 String line;
 

diff --git a/app/src/main/java/com/aaronjwood/portauthority/runnable/ScanPortsRunnable.java b/app/src/main/java/com/aaronjwood/portauthority/runnable/ScanPortsRunnable.java
@@ -13,7 +13,6 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.channels.IllegalBlockingModeException;
-import java.nio.charset.StandardCharsets;
 
 public class ScanPortsRunnable implements Runnable {
     private String ip;
@@ -66,12 +65,12 @@ public void run() {
             SparseArray<String> portData = new SparseArray<>();
             String data = null;
             try {
-                InputStreamReader input = new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8);
+                InputStreamReader input = new InputStreamReader(socket.getInputStream(), "UTF-8");
                 BufferedReader buffered = new BufferedReader(input);
                 if (i == 22) {
                     data = parseSSH(buffered);
                 } else if (i == 80 || i == 443 || i == 8080) {
-                    PrintWriter out = new PrintWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8), true);
+                    PrintWriter out = new PrintWriter(new OutputStreamWriter(socket.getOutputStream(), "UTF-8"), true);
                     data = parseHTTP(buffered, out);
                 }
             } catch (IOException e) {
@@ -115,9 +114,13 @@ private String parseSSH(BufferedReader reader) throws IOException {
     private String parseHTTP(BufferedReader reader, PrintWriter writer) throws IOException {
         writer.println("GET / HTTP/1.1\r\nHost: " + ip + "\r\n");
         char[] buffer = new char[256];
-        reader.read(buffer, 0, buffer.length);
+        int bytesRead = reader.read(buffer, 0, buffer.length);
         writer.close();
         reader.close();
+        if (bytesRead == 0) {
+            return null;
+        }
+
         String data = new String(buffer).toLowerCase();
 
         if (data.contains("apache") || data.contains("httpd")) {
@@ -132,6 +135,18 @@ private String parseHTTP(BufferedReader reader, PrintWriter writer) throws IOExc
             return "NGINX";
         }
 
+        if (data.contains("node")) {
+            return "Node.js";
+        }
+
+        if (data.contains("tomcat")) {
+            return "Tomcat";
+        }
+
+        if (data.contains("litespeed")) {
+            return "LiteSpeed";
+        }
+
         return null;
     }
 }