Merge branch 'bundled-proxy-shadowsocks'

3 files changed, 20 insertions, 1 deletions

diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml
index 0fb2f35639..fc05bc8d4b 100755
--- a/gui/packages/desktop/electron-builder.yml
+++ b/gui/packages/desktop/electron-builder.yml
@@ -51,6 +51,8 @@ mac:
       to: .
     - from: ../../../dist-assets/uninstall_macos.sh
       to: ./uninstall.sh
+    - from: ../../../dist-assets/binaries/macos/sslocal
+      to: .
 
 pkg:
   allowAnywhere: false
@@ -93,6 +95,8 @@ win:
       to: .
     - from: ../../../dist-assets/binaries/windows/openvpn.exe
       to: .
+    - from: ../../../dist-assets/binaries/windows/sslocal.exe
+      to: .
 
 linux:
   target:
@@ -113,6 +117,8 @@ linux:
       to: .
     - from: ../../../dist-assets/linux/mullvad-daemon.service
       to: .
+    - from: ../../../dist-assets/linux/sslocal
+      to: .
 
 deb:
   fpm: ["--before-install", "../../../dist-assets/linux/before-install.sh",
diff --git a/gui/packages/desktop/src/main/daemon-rpc.ts b/gui/packages/desktop/src/main/daemon-rpc.ts
index 390e301756..69ed725d52 100644
--- a/gui/packages/desktop/src/main/daemon-rpc.ts
+++ b/gui/packages/desktop/src/main/daemon-rpc.ts
@@ -162,6 +162,13 @@ const openVpnProxySchema = maybe(
         ),
       }),
     }),
+    object({
+      shadowsocks: partialObject({
+        peer: string,
+        password: string,
+        cipher: string,
+      }),
+    }),
   ),
 );
 
diff --git a/gui/packages/desktop/src/shared/daemon-rpc-types.ts b/gui/packages/desktop/src/shared/daemon-rpc-types.ts
index bc6d6e048c..c4e2f6e53f 100644
--- a/gui/packages/desktop/src/shared/daemon-rpc-types.ts
+++ b/gui/packages/desktop/src/shared/daemon-rpc-types.ts
@@ -170,7 +170,7 @@ export interface ITunnelOptions {
   };
 }
 
-export type ProxySettings = ILocalProxySettings | IRemoteProxySettings;
+export type ProxySettings = ILocalProxySettings | IRemoteProxySettings | IShadowsocksProxySettings;
 
 export interface ILocalProxySettings {
   port: number;
@@ -187,6 +187,12 @@ export interface IRemoteProxyAuth {
   password: string;
 }
 
+export interface IShadowsocksProxySettings {
+  peer: string;
+  password: string;
+  cipher: string;
+}
+
 export interface IAppVersionInfo {
   currentIsSupported: boolean;
   latest: {