From a9746be5d0d8ccbac7ada118b3a85c5a7d3e674b Mon Sep 17 00:00:00 2001 From: jyyi1 Date: Fri, 6 Dec 2024 17:44:51 -0500 Subject: [PATCH] Resolve code review comment round 1 --- client/electron/debian/after_install.sh | 2 ++ client/electron/vpn_service.ts | 4 ++-- client/go/outline/{device_windows.go => device_others.go} | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) rename client/go/outline/{device_windows.go => device_others.go} (97%) diff --git a/client/electron/debian/after_install.sh b/client/electron/debian/after_install.sh index 1e01a37ade..eca685a976 100644 --- a/client/electron/debian/after_install.sh +++ b/client/electron/debian/after_install.sh @@ -34,4 +34,6 @@ set -eux # > The SUID sandbox helper binary was found, but is not configured correctly. # > Rather than run without sandboxing I'm aborting now. You need to make sure # > that /opt/Outline/chrome-sandbox is owned by root and has mode 4755. +# +# https://github.com/electron/electron/issues/42510 /usr/bin/chmod 4755 /opt/Outline/chrome-sandbox diff --git a/client/electron/vpn_service.ts b/client/electron/vpn_service.ts index 9d6c60d111..df5570da43 100644 --- a/client/electron/vpn_service.ts +++ b/client/electron/vpn_service.ts @@ -19,7 +19,7 @@ import { } from '../src/www/app/outline_server_repository/vpn'; // TODO: Separate this config into LinuxVpnConfig and WindowsVpnConfig. Some fields may share. -interface VpnConfig { +interface EstablishVpnConfig { id: string; interfaceName: string; connectionName: string; @@ -37,7 +37,7 @@ export async function establishVpn(request: StartRequestJson) { currentRequestId = request.id; statusCb?.(currentRequestId, TunnelStatus.RECONNECTING); - const config: VpnConfig = { + const config: EstablishVpnConfig = { id: currentRequestId, // TUN device name, compatible with old code: diff --git a/client/go/outline/device_windows.go b/client/go/outline/device_others.go similarity index 97% rename from client/go/outline/device_windows.go rename to client/go/outline/device_others.go index 3db706ef83..0b84ceb7e4 100644 --- a/client/go/outline/device_windows.go +++ b/client/go/outline/device_others.go @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !linux + package outline import "errors"