ui,tunnel: add HTTP proxy setting to Go backend

Only make the HTTP proxy settings visible on supported Android versions,
i.e. Android 10 (AKA Android Q) and later.

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>

1 files changed, 32 insertions, 1 deletions

diff --git a/tunnel/src/main/java/com/wireguard/config/Interface.java b/tunnel/src/main/java/com/wireguard/config/Interface.java
index bebca2e5..e47e0be3 100644
--- a/tunnel/src/main/java/com/wireguard/config/Interface.java
+++ b/tunnel/src/main/java/com/wireguard/config/Interface.java
@@ -46,6 +46,7 @@ public final class Interface {
     private final KeyPair keyPair;
     private final Optional<Integer> listenPort;
     private final Optional<Integer> mtu;
+    private final Optional<HttpProxy> httpProxy;
 
     private Interface(final Builder builder) {
         // Defensively copy to ensure immutability even if the Builder is reused.
@@ -57,6 +58,7 @@ public final class Interface {
         keyPair = Objects.requireNonNull(builder.keyPair, "Interfaces must have a private key");
         listenPort = builder.listenPort;
         mtu = builder.mtu;
+        httpProxy = builder.httpProxy;
     }
 
     /**
@@ -92,6 +94,9 @@ public final class Interface {
                 case "mtu":
                     builder.parseMtu(attribute.getValue());
                     break;
+                case "httpproxy":
+                    builder.parseHttpProxy(attribute.getValue());
+                    break;
                 case "privatekey":
                     builder.parsePrivateKey(attribute.getValue());
                     break;
@@ -115,7 +120,8 @@ public final class Interface {
                 && includedApplications.equals(other.includedApplications)
                 && keyPair.equals(other.keyPair)
                 && listenPort.equals(other.listenPort)
-                && mtu.equals(other.mtu);
+                && mtu.equals(other.mtu)
+                && httpProxy.equals(other.httpProxy);
     }
 
     /**
@@ -195,6 +201,15 @@ public final class Interface {
         return mtu;
     }
 
+    /**
+     * Returns the HTTP proxy used for the WireGuard interface.
+     *
+     * @return the HTTP proxy, or {@code Optional.empty()} if none is configured
+     */
+    public Optional<HttpProxy> getHttpProxy() {
+        return httpProxy;
+    }
+
     @Override
     public int hashCode() {
         int hash = 1;
@@ -205,6 +220,7 @@ public final class Interface {
         hash = 31 * hash + keyPair.hashCode();
         hash = 31 * hash + listenPort.hashCode();
         hash = 31 * hash + mtu.hashCode();
+        hash = 31 * hash + httpProxy.hashCode();
         return hash;
     }
 
@@ -244,6 +260,7 @@ public final class Interface {
             sb.append("IncludedApplications = ").append(Attribute.join(includedApplications)).append('\n');
         listenPort.ifPresent(lp -> sb.append("ListenPort = ").append(lp).append('\n'));
         mtu.ifPresent(m -> sb.append("MTU = ").append(m).append('\n'));
+        httpProxy.ifPresent(p -> sb.append("HttpProxy = ").append(p).append('\n'));
         sb.append("PrivateKey = ").append(keyPair.getPrivateKey().toBase64()).append('\n');
         return sb.toString();
     }
@@ -279,6 +296,8 @@ public final class Interface {
         private Optional<Integer> listenPort = Optional.empty();
         // Defaults to not present.
         private Optional<Integer> mtu = Optional.empty();
+        // Defaults to not present.
+        private Optional<HttpProxy> httpProxy = Optional.empty();
 
         public Builder addAddress(final InetNetwork address) {
             addresses.add(address);
@@ -391,6 +410,10 @@ public final class Interface {
             }
         }
 
+        public Builder parseHttpProxy(final String httpProxy) throws BadConfigException {
+            return setHttpProxy(HttpProxy.parse(httpProxy));
+        }
+
         public Builder parsePrivateKey(final String privateKey) throws BadConfigException {
             try {
                 return setKeyPair(new KeyPair(Key.fromBase64(privateKey)));
@@ -419,5 +442,13 @@ public final class Interface {
             this.mtu = mtu == 0 ? Optional.empty() : Optional.of(mtu);
             return this;
         }
+
+        public Builder setHttpProxy(final HttpProxy httpProxy) throws BadConfigException {
+            if (httpProxy == null)
+                throw new BadConfigException(Section.INTERFACE, Location.HTTP_PROXY,
+                        Reason.INVALID_VALUE, String.valueOf(httpProxy));
+            this.httpProxy = httpProxy == null ? Optional.empty() : Optional.of(httpProxy);
+            return this;
+        }
     }
 }