From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sat, 2 Mar 2019 02:25:24 +0000 (+0000)
Subject: Handbook improvements.
X-Git-Tag: release-1.3.1~1
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=4afcb4f2e0e735fee5dd28105033687355256548;p=acmetensortoys-ctfws-android

Handbook improvements.

Add policy permitting cleartext connection to cmukgb.org and its
subdomains.

Rate-limit resubscriptions to handbook stamp topic, to prevent
busy-looping around errors such as seen prior to the existence of the
above.
---

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 0a91981..b6bf9f5 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
     <application
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_rules"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_shield_1"
         android:label="@string/app_name"
         android:supportsRtl="true"
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java
index bb2260f..dc9001d 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookDownloader.java
@@ -1,6 +1,7 @@
 package com.acmetensortoys.ctfwstimer;
 
 import android.content.Context;
+import android.os.Handler;
 import android.util.Log;
 
 import com.acmetensortoys.ctfwstimer.CheckedAsyncDownloader;
@@ -25,9 +26,12 @@ public class HandbookDownloader implements IMqttMessageListener {
     private final Context mCtx;
     private final Runnable mDLFiniCB;
     private IMqttAsyncClient mMqc;
+    private Handler mHdl;
+    private Runnable nextSubRunnable;
 
-    public HandbookDownloader(Context mCtx, Runnable dlfinicb) {
-        this.mCtx = mCtx;
+    public HandbookDownloader(Context ctx, Handler hdl, Runnable dlfinicb) {
+        this.mCtx = ctx;
+        this.mHdl = hdl;
         this.mDLFiniCB = dlfinicb;
     }
 
@@ -69,17 +73,37 @@ public class HandbookDownloader implements IMqttMessageListener {
         }
 
         private void fini() {
-            if (mqc == mMqc) {
-                try {
-                    subscribe(mqc);
-                } catch (MqttException mqe) {
-                    /*
-                     * Well this stinks.  Presumably it is because something has gone
-                     * wrong somewhere else and we will notice shortly.
-                     */
-                    ;
+            /*
+             * Try to resubscribe in a while.
+             * This is a very crude kind of rate limiting.
+             */
+            synchronized (this) {
+                if (nextSubRunnable != null) {
+                    mHdl.removeCallbacks(nextSubRunnable);
                 }
+                nextSubRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        Log.d(TAG, "Resubscribing to handbook topic");
+                        synchronized (HandbookDownloader.this) {
+                            if (mqc == mMqc) {
+                                try {
+                                    subscribe(mqc);
+                                    nextSubRunnable = null;
+                                } catch (MqttException mqe) {
+                                    /*
+                                     * Well this stinks.  Presumably it is because
+                                     * something has gone wrong somewhere else and
+                                     * we will notice shortly.
+                                     */
+                                }
+                            }
+                        }
+                    }
+                };
+                mHdl.postDelayed(nextSubRunnable, 60000);
             }
+
             HandbookDownloader.this.downloader = null;
             HandbookDownloader.this.download = null;
         }
@@ -173,6 +197,9 @@ public class HandbookDownloader implements IMqttMessageListener {
 
     public void subscribeOn(IMqttAsyncClient mqc) throws MqttException {
         synchronized (this) {
+            if (nextSubRunnable != null) {
+                mHdl.removeCallbacks(nextSubRunnable);
+            }
             mMqc = mqc;
             subscribe(mqc);
         }
@@ -184,6 +211,9 @@ public class HandbookDownloader implements IMqttMessageListener {
 
     public void unsubscribeOn(IMqttAsyncClient mqc) throws MqttException {
         synchronized (this) {
+            if (nextSubRunnable != null) {
+                mHdl.removeCallbacks(nextSubRunnable);
+            }
             unsubscribe(mqc);
             mMqc = null;
         }
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
index 5ad5b46..1d16d95 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -60,6 +61,7 @@ public class MainService extends Service {
 
     // Handbook fetch logic; this is a singleton for the service, even as connections come and go.
     private HandbookDownloader mHandDL = new HandbookDownloader(this,
+            new Handler(Looper.getMainLooper()),
             new Runnable() {
                 @Override
                 public void run() {
diff --git a/mobile/src/main/res/xml/network_security_config.xml b/mobile/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..7f9d952
--- /dev/null
+++ b/mobile/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextHttpTrafficPermitted="true">
+        <domain includeSubdomains="true">cmukgb.org</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file