ssh: add execution timeout option

Author: mwarning

app/src/main/java/app/trigger/SshDoorSetup.java

@@ -34,6 +34,8 @@ public class SshDoorSetup implements Setup {
     public String register_url;
     public String ssids;
 
+    public int timeout; // milliseconds
+
     public SshDoorSetup(int id, String name) {
         this.id = id;
         this.name = name;
@@ -55,6 +57,7 @@ public SshDoorSetup(int id, String name) {
         this.disabled_image = null;
         this.register_url = "";
         this.ssids = "";
+        this.timeout = 5000;
     }
 
     @Override

app/src/main/java/app/trigger/ssh/SshRequestHandler.java

@@ -155,7 +155,7 @@ public void run() {
             session.execCommand(command);
 
             // read stdout (drop stderr)
-            int bytes_read = read(session, buffer, 0, buffer.length);
+            int bytes_read = read(session, buffer, 0, buffer.length, setup.timeout);
             String output = new String(buffer, 0, bytes_read);
 
             Integer ret = session.getExitStatus();
@@ -217,7 +217,7 @@ public void connectionLost(Throwable reason) {
         Log.d(TAG, "connectionLost");
     }
 
-    private static int read(Session session, byte[] buffer, int start, int len) throws IOException {
+    private static int read(Session session, byte[] buffer, int start, int len, int timeout_ms) throws IOException {
         int bytesRead = 0;
 
         if (session == null)
@@ -226,7 +226,7 @@ private static int read(Session session, byte[] buffer, int start, int len) thro
         InputStream stdout = session.getStdout();
         InputStream stderr = session.getStderr();
 
-        int newConditions = session.waitForCondition(conditions, 5000);
+        int newConditions = session.waitForCondition(conditions, timeout_ms);
 
         if ((newConditions & ChannelCondition.STDOUT_DATA) != 0) {
             bytesRead = stdout.read(buffer, start, len);

app/src/main/res/xml/setup.xml

@@ -212,6 +212,13 @@
             android:persistent="false"
             android:inputType="textNoSuggestions" />
 
+        <EditTextPreference
+            android:key="timeout"
+            android:title="Command Timeout (ms)"
+            android:persistent="false"
+            android:inputType="textNoSuggestions"
+            android:digits="0123456789" />
+
         <EditTextPreference
             android:key="ssids"
             android:title="@string/setup_ssids"