Implement HTTP User/Password Authentication via UI (closes #861, #856)

1 files changed, 8 insertions, 1 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/core/Connection.java b/main/src/main/java/de/blinkt/openvpn/core/Connection.java
index 88748d1d..5f24ecb4 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/Connection.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/Connection.java
@@ -23,6 +23,10 @@ public class Connection implements Serializable, Cloneable {
     public String mProxyName = "proxy.example.com";
     public String mProxyPort = "8080";
 
+    public boolean mUseProxyAuth;
+    public String mProxyAuthUser = null;
+    public String mProxyAuthPassword = null;
+
     public enum ProxyType {
         NONE,
         HTTP,
@@ -53,13 +57,16 @@ public class Connection implements Serializable, Cloneable {
         if (isOpenVPN3 && mProxyType == ProxyType.HTTP)
         {
             cfg+=String.format(Locale.US,"http-proxy %s %s\n", mProxyName, mProxyPort);
+            if (mUseProxyAuth)
+                cfg+=String.format(Locale.US, "<http-proxy-user-pass>\n%s\n%s\n</http-proxy-user-pass>\n", mProxyAuthUser, mProxyAuthPassword);
         }
 
-
         if (!TextUtils.isEmpty(mCustomConfiguration) && mUseCustomConfig) {
             cfg += mCustomConfiguration;
             cfg += "\n";
         }
+
+
         return cfg;
     }