-
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 junyi/electron-library-call
- Loading branch information
Showing
17 changed files
with
522 additions
and
462 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
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
67 changes: 0 additions & 67 deletions
67
client/src/www/app/outline_server_repository/access_key.ts
This file was deleted.
Oops, something went wrong.
181 changes: 181 additions & 0 deletions
181
client/src/www/app/outline_server_repository/config.spec.ts
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,181 @@ | ||
| // 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. | ||
|
|
||
| import {makeConfig, SIP002_URI} from 'ShadowsocksConfig'; | ||
|
|
||
| import * as config from './config'; | ||
|
|
||
| describe('getAddressFromTransport', () => { | ||
| it('extracts address', () => { | ||
| expect( | ||
| config.TEST_ONLY.getAddressFromTransportConfig({ | ||
| host: 'example.com', | ||
| port: 443, | ||
| }) | ||
| ).toEqual({host: 'example.com', port: 443}); | ||
| expect( | ||
| config.TEST_ONLY.getAddressFromTransportConfig({ | ||
| host: '1:2::3', | ||
| port: 443, | ||
| }) | ||
| ).toEqual({host: '1:2::3', port: 443}); | ||
| expect( | ||
| config.TEST_ONLY.getAddressFromTransportConfig({host: 'example.com'}) | ||
| ).toEqual({host: 'example.com', port: undefined}); | ||
| expect( | ||
| config.TEST_ONLY.getAddressFromTransportConfig({host: '1:2::3'}) | ||
| ).toEqual({host: '1:2::3', port: undefined}); | ||
| }); | ||
|
|
||
| it('fails on invalid config', () => { | ||
| expect(config.TEST_ONLY.getAddressFromTransportConfig({})).toBeUndefined(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('setTransportHost', () => { | ||
| it('sets host', () => { | ||
| expect( | ||
| JSON.stringify( | ||
| config.setTransportConfigHost( | ||
| {host: 'example.com', port: 443}, | ||
| '1.2.3.4' | ||
| ) | ||
| ) | ||
| ).toEqual('{"host":"1.2.3.4","port":443}'); | ||
| expect( | ||
| JSON.stringify( | ||
| config.setTransportConfigHost( | ||
| {host: 'example.com', port: 443}, | ||
| '1:2::3' | ||
| ) | ||
| ) | ||
| ).toEqual('{"host":"1:2::3","port":443}'); | ||
| expect( | ||
| JSON.stringify( | ||
| config.setTransportConfigHost({host: '1.2.3.4', port: 443}, '1:2::3') | ||
| ) | ||
| ).toEqual('{"host":"1:2::3","port":443}'); | ||
| }); | ||
|
|
||
| it('fails on invalid config', () => { | ||
| expect(config.setTransportConfigHost({}, '1:2::3')).toBeUndefined(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('parseTunnelConfig', () => { | ||
| it('parses correctly', () => { | ||
| expect( | ||
| config.parseTunnelConfig( | ||
| '{"server": "example.com", "server_port": 443, "method": "METHOD", "password": "PASSWORD"}' | ||
| ) | ||
| ).toEqual({ | ||
| firstHop: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| }, | ||
| transport: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| method: 'METHOD', | ||
| password: 'PASSWORD', | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('parses prefix', () => { | ||
| expect( | ||
| config.parseTunnelConfig( | ||
| '{"server": "example.com", "server_port": 443, "method": "METHOD", "password": "PASSWORD", "prefix": "POST "}' | ||
| ) | ||
| ).toEqual({ | ||
| firstHop: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| }, | ||
| transport: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| method: 'METHOD', | ||
| password: 'PASSWORD', | ||
| prefix: 'POST ', | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('parses URL', () => { | ||
| const ssUrl = SIP002_URI.stringify( | ||
| makeConfig({ | ||
| host: 'example.com', | ||
| port: 443, | ||
| method: 'chacha20-ietf-poly1305', | ||
| password: 'PASSWORD', | ||
| }) | ||
| ); | ||
| expect(config.parseTunnelConfig(ssUrl)).toEqual({ | ||
| firstHop: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| }, | ||
| transport: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| method: 'chacha20-ietf-poly1305', | ||
| password: 'PASSWORD', | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('parses URL with blanks', () => { | ||
| const ssUrl = SIP002_URI.stringify( | ||
| makeConfig({ | ||
| host: 'example.com', | ||
| port: 443, | ||
| method: 'chacha20-ietf-poly1305', | ||
| password: 'PASSWORD', | ||
| }) | ||
| ); | ||
| expect(config.parseTunnelConfig(` ${ssUrl} \n\n\n`)).toEqual({ | ||
| firstHop: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| }, | ||
| transport: { | ||
| host: 'example.com', | ||
| port: 443, | ||
| method: 'chacha20-ietf-poly1305', | ||
| password: 'PASSWORD', | ||
| }, | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('serviceNameFromAccessKey', () => { | ||
| it('extracts name from ss:// key', () => { | ||
| expect( | ||
| config.TEST_ONLY.serviceNameFromAccessKey('ss://anything#My%20Server') | ||
| ).toEqual('My Server'); | ||
| }); | ||
| it('extracts name from ssconf:// key', () => { | ||
| expect( | ||
| config.TEST_ONLY.serviceNameFromAccessKey('ssconf://anything#My%20Server') | ||
| ).toEqual('My Server'); | ||
| }); | ||
| it('ignores parameters', () => { | ||
| expect( | ||
| config.TEST_ONLY.serviceNameFromAccessKey( | ||
| 'ss://anything#foo=bar&My%20Server&baz=boo' | ||
| ) | ||
| ).toEqual('My Server'); | ||
| }); | ||
| }); |
Oops, something went wrong.