allow user to override HTTP User-Agent

Latest LibOpenConnect has two constructors, one of which accepts a User-Agent string.
cernekee · Aug 7, 2018 · 41e740f · 41e740f
1 parent dd3af87
commit 41e740f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/app/src/main/java/app/openconnect/core/OpenConnectManagementThread.java b/app/src/main/java/app/openconnect/core/OpenConnectManagementThread.java
@@ -162,6 +162,14 @@ private void acceptCert(String hash, boolean save) {
     }
 
 	private class AndroidOC extends LibOpenConnect {
+		AndroidOC() {
+			super();
+		}
+
+		AndroidOC(String userAgent) {
+			super(userAgent);
+		}
+
 		private String getPeerCertSHA1() {
 			MessageDigest md;
 			try {
@@ -699,9 +707,14 @@ private boolean runVPN() {
 		mCacheDir = mContext.getCacheDir().getPath();
 		extractBinaries();
 
+		String userAgent = getStringPref("reported_user_agent");
+
 		setState(STATE_CONNECTING);
 		synchronized (mMainloopLock) {
-			mOC = new AndroidOC();
+			if (userAgent.length() > 0)
+				mOC = new AndroidOC(userAgent);
+			else
+				mOC = new AndroidOC();
 		}
 
 		if (setPreferences() == false) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -164,6 +164,8 @@
     <string name="unknown">Unknown</string>
     <string name="batch_mode">Batch mode</string>
     <string name="reported_os">Reported OS</string>
+    <string name="reported_user_agent">Reported User-Agent</string>
+    <string name="reported_user_agent_summary">Override the HTTP User-Agent header.\n\nSome Cisco servers accept &quot;Cisco AnyConnect VPN Agent&quot;; some Juniper servers accept &quot;ncsvc&quot;</string>
     <string name="custom_csd_wrapper">Custom CSD wrapper</string>
     <string name="split_tunnel_mode">Split tunnel mode</string>
     <string name="split_tunnel_networks">Split tunnel networks</string>

diff --git a/app/src/main/res/xml/pref_openconnect.xml b/app/src/main/res/xml/pref_openconnect.xml
@@ -79,6 +79,12 @@
             android:entries="@array/reported_os_entries"
             android:entryValues="@array/reported_os_values"
             android:defaultValue="android" />
+        <EditTextPreference
+            android:key="reported_user_agent"
+            android:title="@string/reported_user_agent"
+            android:dialogTitle="@string/reported_user_agent"
+            android:dialogMessage="@string/reported_user_agent_summary"
+            android:defaultValue="" />
         <app.openconnect.ShowTextPreference
             android:key="custom_csd_wrapper"
             android:title="@string/custom_csd_wrapper"

diff --git a/external/openconnect b/external/openconnect
+1 −1		auth-globalprotect.c
+2 −0		cstp.c
+5 −9		gpst.c
+2 −0		java/src/com/example/LibTest.java
+6 −0		java/src/org/infradead/libopenconnect/LibOpenConnect.java
+10 −0		jni.c
+1 −0		libopenconnect.map.in
+5 −0		library.c
+1 −0		openconnect-internal.h
+2 −0		openconnect.h