-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into use-native-process-kill
- Loading branch information
Showing
34 changed files
with
1,068 additions
and
551 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright 2024 The Outline Authors | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # Dependencies: | ||
| # - libcap2-bin: setcap | ||
|
|
||
| set -eux | ||
|
|
||
| # Grant specific capabilities so Outline can run without root permisssion | ||
| # - cap_net_admin: configure network interfaces, set up routing tables, etc. | ||
| # - cap_dac_override: modify network configuration files owned by root | ||
| /usr/sbin/setcap cap_net_admin,cap_dac_override+eip /opt/Outline/Outline |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // Copyright 2024 The Outline Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| /** | ||
| * @file Contains helper functions implemented in Go. | ||
| * This file provides a communication channel between TypeScript and Go, | ||
| * allowing users to call Go functions from TypeScript. | ||
| */ | ||
|
|
||
| import {pathToEmbeddedTun2socksBinary} from './app_paths'; | ||
| import {ChildProcessHelper} from './process'; | ||
| import {TransportConfigJson} from '../src/www/app/outline_server_repository/config'; | ||
|
|
||
| /** | ||
| * Verifies the UDP connectivity of the server specified in `config`. | ||
| * Checks whether proxy server is reachable, whether the network and proxy support UDP forwarding | ||
| * and validates the proxy credentials. | ||
| * | ||
| * @param config The transport configuration in JSON. | ||
| * @param debugMode Optional. Whether to forward logs to stdout. Defaults to false. | ||
| * @returns A boolean indicating whether UDP forwarding is supported. | ||
| * @throws Error if TCP connection cannot be established. | ||
| * @throws ProcessTerminatedExitCodeError if tun2socks failed to run. | ||
| */ | ||
| export async function checkUDPConnectivity( | ||
| config: TransportConfigJson, | ||
| debugMode: boolean = false | ||
| ): Promise<boolean> { | ||
| const tun2socks = new ChildProcessHelper(pathToEmbeddedTun2socksBinary()); | ||
| tun2socks.isDebugModeEnabled = debugMode; | ||
|
|
||
| console.debug('[tun2socks] - checking connectivity ...'); | ||
| const output = await tun2socks.launch([ | ||
| '-transport', | ||
| JSON.stringify(config), | ||
| '-checkConnectivity', | ||
| ]); | ||
|
|
||
| // Only parse the first line, because sometimes Windows Crypto API adds warnings to stdout. | ||
| const outObj = JSON.parse(output.split('\n')[0]); | ||
| if (outObj.tcp) { | ||
| throw new Error(outObj.tcp); | ||
| } | ||
| if (outObj.udp) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Fetches a resource from the given URL. | ||
| * | ||
| * @param url The URL of the resource to fetch. | ||
| * @param debugMode Optional. Whether to forward logs to stdout. Defaults to false. | ||
| * @returns A Promise that resolves to the fetched content as a string. | ||
| * @throws ProcessTerminatedExitCodeError if tun2socks failed to run. | ||
| */ | ||
| export function fetchResource( | ||
| url: string, | ||
| debugMode: boolean = false | ||
| ): Promise<string> { | ||
| const tun2socks = new ChildProcessHelper(pathToEmbeddedTun2socksBinary()); | ||
| tun2socks.isDebugModeEnabled = debugMode; | ||
|
|
||
| console.debug('[tun2socks] - fetching resource ...'); | ||
| return tun2socks.launch(['-fetchUrl', url]); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.