summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/main/daemon-rpc.ts64
-rw-r--r--gui/src/main/index.ts10
-rw-r--r--gui/src/renderer/app.tsx6
-rw-r--r--gui/src/renderer/components/ConnectionPanel.tsx4
-rw-r--r--gui/src/renderer/redux/settings/actions.ts20
-rw-r--r--gui/src/renderer/redux/settings/reducers.ts15
-rw-r--r--gui/src/shared/daemon-rpc-types.ts20
-rw-r--r--gui/src/shared/ipc-schema.ts2
8 files changed, 134 insertions, 7 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 310a9a5c83..646a09a9c7 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -17,6 +17,7 @@ import {
DaemonEvent,
DeviceEvent,
DeviceState,
+ EndpointObfuscationType,
ErrorStateCause,
FirewallPolicyError,
IAccountData,
@@ -40,6 +41,7 @@ import {
IWireguardConstraints,
LoggedInDeviceState,
LoggedOutDeviceState,
+ ObfuscationSettings,
ObfuscationType,
Ownership,
ProxySettings,
@@ -378,6 +380,42 @@ export class DaemonRpc {
);
}
+ public async setObfuscationSettings(obfuscationSettings: ObfuscationSettings): Promise<void> {
+ const grpcObfuscationSettings = new grpcTypes.ObfuscationSettings();
+ switch (obfuscationSettings.selectedObfuscation) {
+ case ObfuscationType.auto:
+ grpcObfuscationSettings.setSelectedObfuscation(
+ grpcTypes.ObfuscationSettings.SelectedObfuscation.AUTO,
+ );
+ break;
+ case ObfuscationType.off:
+ grpcObfuscationSettings.setSelectedObfuscation(
+ grpcTypes.ObfuscationSettings.SelectedObfuscation.OFF,
+ );
+ break;
+ case ObfuscationType.udp2tcp:
+ grpcObfuscationSettings.setSelectedObfuscation(
+ grpcTypes.ObfuscationSettings.SelectedObfuscation.UDP2TCP,
+ );
+ break;
+ }
+
+ if (obfuscationSettings.udp2tcpSettings) {
+ const grpcUdp2tcpSettings = new grpcTypes.Udp2TcpObfuscationSettings();
+ grpcUdp2tcpSettings.setPort(
+ obfuscationSettings.udp2tcpSettings.port === 'any'
+ ? 0
+ : obfuscationSettings.udp2tcpSettings.port.only,
+ );
+ grpcObfuscationSettings.setUdp2tcp(grpcUdp2tcpSettings);
+ }
+
+ await this.call<grpcTypes.ObfuscationSettings, Empty>(
+ this.client.setObfuscationSettings,
+ grpcObfuscationSettings,
+ );
+ }
+
public async setOpenVpnMssfix(mssfix?: number): Promise<void> {
await this.callNumber(this.client.setOpenvpnMssfix, mssfix);
}
@@ -922,7 +960,7 @@ function convertFromProxyEndpoint(proxyEndpoint: grpcTypes.ProxyEndpoint.AsObjec
function convertFromObfuscationEndpoint(
obfuscationEndpoint: grpcTypes.ObfuscationEndpoint.AsObject,
): IObfuscationEndpoint {
- const obfuscationTypes: Record<grpcTypes.ObfuscationType, ObfuscationType> = {
+ const obfuscationTypes: Record<grpcTypes.ObfuscationType, EndpointObfuscationType> = {
[grpcTypes.ObfuscationType.UDP2TCP]: 'udp2tcp',
};
@@ -947,6 +985,7 @@ function convertFromSettings(settings: grpcTypes.Settings): ISettings | undefine
const bridgeSettings = convertFromBridgeSettings(settingsObject.bridgeSettings!);
const tunnelOptions = convertFromTunnelOptions(settingsObject.tunnelOptions!);
const splitTunnel = settingsObject.splitTunnel ?? { enableExclusions: false, appsList: [] };
+ const obfuscationSettings = convertFromObfuscationSettings(settingsObject.obfuscationSettings);
return {
...settings.toObject(),
bridgeState,
@@ -954,6 +993,7 @@ function convertFromSettings(settings: grpcTypes.Settings): ISettings | undefine
bridgeSettings,
tunnelOptions,
splitTunnel,
+ obfuscationSettings,
};
}
@@ -1150,6 +1190,28 @@ function convertFromTunnelOptions(tunnelOptions: grpcTypes.TunnelOptions.AsObjec
};
}
+function convertFromObfuscationSettings(
+ obfuscationSettings?: grpcTypes.ObfuscationSettings.AsObject,
+): ObfuscationSettings {
+ let selectedObfuscationType = ObfuscationType.auto;
+ switch (obfuscationSettings?.selectedObfuscation) {
+ case grpcTypes.ObfuscationSettings.SelectedObfuscation.OFF:
+ selectedObfuscationType = ObfuscationType.off;
+ break;
+ case grpcTypes.ObfuscationSettings.SelectedObfuscation.UDP2TCP:
+ selectedObfuscationType = ObfuscationType.udp2tcp;
+ break;
+ }
+
+ return {
+ selectedObfuscation: selectedObfuscationType,
+ udp2tcpSettings:
+ obfuscationSettings?.udp2tcp && obfuscationSettings.udp2tcp.port !== 0
+ ? { port: { only: obfuscationSettings.udp2tcp.port } }
+ : { port: 'any' },
+ };
+}
+
function convertFromDaemonEvent(data: grpcTypes.DaemonEvent): DaemonEvent {
const tunnelState = data.getTunnelState();
if (tunnelState !== undefined) {
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 461cac3214..669f406c19 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -36,6 +36,7 @@ import {
IRelayList,
ISettings,
liftConstraint,
+ ObfuscationType,
Ownership,
RelaySettings,
RelaySettingsUpdate,
@@ -212,6 +213,12 @@ class ApplicationMain {
},
},
},
+ obfuscationSettings: {
+ selectedObfuscation: ObfuscationType.auto,
+ udp2tcpSettings: {
+ port: 'any',
+ },
+ },
};
private deviceState?: DeviceState;
private guiSettings = new GuiSettings();
@@ -1340,6 +1347,9 @@ class ApplicationMain {
IpcMainEventChannel.autoStart.handleSet((autoStart: boolean) => {
return this.setAutoStart(autoStart);
});
+ IpcMainEventChannel.settings.handleSetObfuscationSettings((obfuscationSettings) => {
+ return this.daemonRpc.setObfuscationSettings(obfuscationSettings);
+ });
IpcMainEventChannel.location.handleGet(() => this.daemonRpc.getLocation());
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index ec69b5d8a7..f8d1796fc1 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -17,6 +17,7 @@ import {
ILocation,
ISettings,
liftConstraint,
+ ObfuscationSettings,
RelaySettings,
RelaySettingsUpdate,
TunnelState,
@@ -518,6 +519,10 @@ export default class AppRenderer {
);
}
+ public setObfuscationSettings(obfuscationSettings: ObfuscationSettings) {
+ return IpcRendererEventChannel.settings.setObfuscationSettings(obfuscationSettings);
+ }
+
public collectProblemReport(toRedact?: string): Promise<string> {
return IpcRendererEventChannel.problemReport.collectLogs(toRedact);
}
@@ -812,6 +817,7 @@ export default class AppRenderer {
reduxSettings.updateBridgeState(newSettings.bridgeState);
reduxSettings.updateDnsOptions(newSettings.tunnelOptions.dns);
reduxSettings.updateSplitTunnelingState(newSettings.splitTunnel.enableExclusions);
+ reduxSettings.updateObfuscationSettings(newSettings.obfuscationSettings);
this.setRelaySettings(newSettings.relaySettings);
this.setBridgeSettings(newSettings.bridgeSettings);
diff --git a/gui/src/renderer/components/ConnectionPanel.tsx b/gui/src/renderer/components/ConnectionPanel.tsx
index 7f4c28286b..552a9e3187 100644
--- a/gui/src/renderer/components/ConnectionPanel.tsx
+++ b/gui/src/renderer/components/ConnectionPanel.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
import { colors } from '../../config.json';
import {
- ObfuscationType,
+ EndpointObfuscationType,
ProxyType,
proxyTypeToString,
RelayProtocol,
@@ -31,7 +31,7 @@ export interface IBridgeData extends IEndpoint {
}
export interface IObfuscationData extends IEndpoint {
- obfuscationType: ObfuscationType;
+ obfuscationType: EndpointObfuscationType;
}
export interface IOutAddress {
diff --git a/gui/src/renderer/redux/settings/actions.ts b/gui/src/renderer/redux/settings/actions.ts
index 9e12df542d..8126f30205 100644
--- a/gui/src/renderer/redux/settings/actions.ts
+++ b/gui/src/renderer/redux/settings/actions.ts
@@ -1,5 +1,5 @@
import { IWindowsApplication } from '../../../shared/application-types';
-import { BridgeState, IDnsOptions } from '../../../shared/daemon-rpc-types';
+import { BridgeState, IDnsOptions, ObfuscationSettings } from '../../../shared/daemon-rpc-types';
import { IGuiSettingsState } from '../../../shared/gui-settings-state';
import { BridgeSettingsRedux, IRelayLocationRedux, RelaySettingsRedux } from './reducers';
@@ -83,6 +83,11 @@ export interface ISetSplitTunnelingApplicationsAction {
applications: IWindowsApplication[];
}
+export interface ISetObfuscationSettings {
+ type: 'SET_OBFUSCATION_SETTINGS';
+ obfuscationSettings: ObfuscationSettings;
+}
+
export type SettingsAction =
| IUpdateGuiSettingsAction
| IUpdateRelayAction
@@ -99,7 +104,8 @@ export type SettingsAction =
| IUpdateAutoStartAction
| IUpdateDnsOptionsAction
| IUpdateSplitTunnelingStateAction
- | ISetSplitTunnelingApplicationsAction;
+ | ISetSplitTunnelingApplicationsAction
+ | ISetObfuscationSettings;
function updateGuiSettings(guiSettings: IGuiSettingsState): IUpdateGuiSettingsAction {
return {
@@ -219,6 +225,15 @@ function setSplitTunnelingApplications(
};
}
+function updateObfuscationSettings(
+ obfuscationSettings: ObfuscationSettings,
+): ISetObfuscationSettings {
+ return {
+ type: 'SET_OBFUSCATION_SETTINGS',
+ obfuscationSettings,
+ };
+}
+
export default {
updateGuiSettings,
updateRelay,
@@ -236,4 +251,5 @@ export default {
updateDnsOptions,
updateSplitTunnelingState,
setSplitTunnelingApplications,
+ updateObfuscationSettings,
};
diff --git a/gui/src/renderer/redux/settings/reducers.ts b/gui/src/renderer/redux/settings/reducers.ts
index 8e4c922192..ee9d81e37f 100644
--- a/gui/src/renderer/redux/settings/reducers.ts
+++ b/gui/src/renderer/redux/settings/reducers.ts
@@ -4,6 +4,8 @@ import {
IDnsOptions,
IpVersion,
LiftedConstraint,
+ ObfuscationSettings,
+ ObfuscationType,
Ownership,
ProxySettings,
RelayLocation,
@@ -95,6 +97,7 @@ export interface ISettingsReduxState {
dns: IDnsOptions;
splitTunneling: boolean;
splitTunnelingApplications: IWindowsApplication[];
+ obfuscationSettings: ObfuscationSettings;
}
const initialState: ISettingsReduxState = {
@@ -151,6 +154,12 @@ const initialState: ISettingsReduxState = {
},
splitTunneling: false,
splitTunnelingApplications: [],
+ obfuscationSettings: {
+ selectedObfuscation: ObfuscationType.auto,
+ udp2tcpSettings: {
+ port: 'any',
+ },
+ },
};
export default function (
@@ -260,6 +269,12 @@ export default function (
splitTunnelingApplications: action.applications,
};
+ case 'SET_OBFUSCATION_SETTINGS':
+ return {
+ ...state,
+ obfuscationSettings: action.obfuscationSettings,
+ };
+
default:
return state;
}
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index d0507cab98..5893e4def6 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -61,7 +61,7 @@ export function tunnelTypeToString(tunnel: TunnelType): string {
}
export type RelayProtocol = 'tcp' | 'udp';
-export type ObfuscationType = 'udp2tcp';
+export type EndpointObfuscationType = 'udp2tcp';
export type Constraint<T> = 'any' | { only: T };
export type LiftedConstraint<T> = 'any' | T;
@@ -107,7 +107,7 @@ export interface IObfuscationEndpoint {
address: string;
port: number;
protocol: RelayProtocol;
- obfuscationType: ObfuscationType;
+ obfuscationType: EndpointObfuscationType;
}
export interface IProxyEndpoint {
@@ -347,6 +347,7 @@ export interface ISettings {
bridgeSettings: BridgeSettings;
bridgeState: BridgeState;
splitTunnel: SplitTunnelSettings;
+ obfuscationSettings: ObfuscationSettings;
}
export type BridgeState = 'auto' | 'on' | 'off';
@@ -356,6 +357,21 @@ export type SplitTunnelSettings = {
appsList: string[];
};
+export type Udp2TcpObfuscationSettings = {
+ port: Constraint<number>;
+};
+
+export enum ObfuscationType {
+ auto,
+ off,
+ udp2tcp,
+}
+
+export type ObfuscationSettings = {
+ selectedObfuscation: ObfuscationType;
+ udp2tcpSettings: Udp2TcpObfuscationSettings;
+};
+
export interface IBridgeConstraints {
location: Constraint<RelayLocation>;
providers: string[];
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 8dece5168d..33ac82180e 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -15,6 +15,7 @@ import {
ILocation,
IRelayList,
ISettings,
+ ObfuscationSettings,
RelaySettingsUpdate,
TunnelState,
VoucherResponse,
@@ -170,6 +171,7 @@ export const ipcSchema = {
updateRelaySettings: invoke<RelaySettingsUpdate, void>(),
updateBridgeSettings: invoke<BridgeSettings, void>(),
setDnsOptions: invoke<IDnsOptions, void>(),
+ setObfuscationSettings: invoke<ObfuscationSettings, void>(),
},
guiSettings: {
'': notifyRenderer<IGuiSettingsState>(),
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.