moony/blinksocks
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config: fix new URL() default port issue

Browse Source
This commit is contained in:
Micooz 2018-06-13 22:34:22 +08:00
parent b7798e1e60
commit ad934bf6c6
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/constants.js
View File

@ -11,3 +11,13 @@ export const CONNECTED_TO_REMOTE = 'CONNECTED_TO_REMOTE';
export const MUX_NEW_CONN = 'MUX_NEW_CONN';
export const MUX_DATA_FRAME = 'MUX_DATA_FRAME';
export const MUX_CLOSE_CONN = 'MUX_CLOSE_CONN';
// https://url.spec.whatwg.org/#url-miscellaneous
export const PROTOCOL_DEFAULT_PORTS = {
'ftp:': 21,
'gopher:': 70,
'http:': 80,
'https:': 443,
'ws:': 80,
'wss:': 443,
};

19
src/core/config.js
View File

@ -8,6 +8,7 @@ import winston from 'winston';
import WinstonDailyRotateFile from 'winston-daily-rotate-file';
import isPlainObject from 'lodash.isplainobject';
import { ACL } from './acl';
import { PROTOCOL_DEFAULT_PORTS } from '../constants';
import { getPresetClassByName } from '../presets';
import { IPresetAddressing } from '../presets/defs';
import { DNSCache, isValidHostname, isValidPort, logger, DNS_DEFAULT_EXPIRE } from '../utils';
@ -76,7 +77,7 @@ export class Config {
this.local_password = password;
this.local_search_params = searchParams;
this.local_host = hostname;
this.local_port = +port;
this.local_port = +port || +PROTOCOL_DEFAULT_PORTS[protocol];
this.local_pathname = pathname;
// server
@ -137,7 +138,7 @@ export class Config {
const { protocol, hostname, port, pathname } = new URL(server.service);
this.server_protocol = protocol.slice(0, -1);
this.server_host = hostname;
this.server_port = +port;
this.server_port = +port || +PROTOCOL_DEFAULT_PORTS[protocol];
this.server_pathname = pathname;
// preload tls_cert or tls_key
@ -254,7 +255,7 @@ export class Config {
throw Error('"service" must be provided as "<protocol>://<host>:<port>[?params]"');
}
const { protocol, hostname, port, searchParams } = new URL(json.service);
const { protocol, hostname, port: _port, searchParams } = new URL(json.service);
// service.protocol
if (typeof protocol !== 'string') {
@ -275,6 +276,7 @@ export class Config {
}
// service.port
const port = _port || PROTOCOL_DEFAULT_PORTS[protocol] || '';
if (!isValidPort(+port)) {
throw Error('service.port is invalid');
}
@ -359,23 +361,23 @@ export class Config {
throw Error('"service" must be provided as "<protocol>://<host>:<port>[?params]"');
}
const { protocol: _protocol, hostname, port } = new URL(server.service);
const { protocol, hostname, port: _port } = new URL(server.service);
// service.protocol
if (typeof _protocol !== 'string') {
if (typeof protocol !== 'string') {
throw Error('service.protocol is invalid');
}
const protocol = _protocol.slice(0, -1);
const proto = protocol.slice(0, -1);
const available_server_protocols = [
'tcp', 'ws', 'wss', 'tls',
];
if (!available_server_protocols.includes(protocol)) {
if (!available_server_protocols.includes(proto)) {
throw Error(`service.protocol must be: ${available_server_protocols.join(', ')}`);
}
// tls_cert, tls_key
if (protocol === 'tls' || protocol === 'wss') {
if (proto === 'tls' || proto === 'wss') {
if (from_client && server.tls_cert_self_signed) {
if (typeof server.tls_cert !== 'string' || server.tls_cert === '') {
throw Error('"tls_cert" must be provided when "tls_cert_self_signed" is set');
@ -398,6 +400,7 @@ export class Config {
}
// service.port
const port = _port || PROTOCOL_DEFAULT_PORTS[protocol] || '';
if (!isValidPort(+port)) {
throw Error('service.port is invalid');
}