OpenWrt/kenzok8-package
1
0
Fork 0
mirror of https://github.com/kenzok8/small-package synced 2025-01-07 07:06:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2023-10-03 19:47:45

Browse Source
This commit is contained in:
github-actions[bot] 2023-10-03 19:47:45 +08:00
parent ec26767cad
commit 81d2c37a84
12 changed files with 541 additions and 607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
View File

@ -162,7 +162,7 @@ return view.extend({
o.value('223.5.5.5', _('Aliyun Public DNS (223.5.5.5)'));
o.value('119.29.29.29', _('Tencent Public DNS (119.29.29.29)'));
o.value('114.114.114.114', _('Xinfeng Public DNS (114.114.114.114)'));
o.default = '208.67.222.222';
o.default = '8.8.8.8';
o.rmempty = false;
o.depends({'routing_mode': 'custom', '!reverse': true});
o.validate = function(section_id, value) {

8
homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js
View File

@ -615,14 +615,6 @@ return view.extend({
so.datatype = 'port';
so.depends('type', 'direct');
so = ss.option(form.ListValue, 'proxy_protocol', _('Proxy protocol'),
_('Write Proxy Protocol in the connection header.'));
so.value('', _('Disable'));
so.value('1');
so.value('2');
so.depends('type', 'direct');
so.modalonly = true;
/* Hysteria (2) config start */
so = ss.option(form.ListValue, 'hysteria_protocol', _('Protocol'));
so.value('udp');

12
homeproxy/htdocs/luci-static/resources/view/homeproxy/server.js
View File

@ -682,18 +682,6 @@ return view.extend({
o.value(i, hp.dns_strategy[i])
o.modalonly = true;
o = s.option(form.Flag, 'proxy_protocol', _('Proxy protocol'),
_('Parse Proxy Protocol in the connection header.'));
o.default = o.disabled;
o.depends({'network': 'udp', '!reverse': true});
o.modalonly = true;
o = s.option(form.Flag, 'proxy_protocol_accept_no_header', _('Accept no header'),
_('Accept connections without Proxy Protocol header.'));
o.default = o.disabled;
o.depends('proxy_protocol', '1');
o.modalonly = true;
o = s.option(form.ListValue, 'network', _('Network'));
o.value('tcp', _('TCP'));
o.value('udp', _('UDP'));

450
homeproxy/po/templates/homeproxy.pot
View File

File diff suppressed because it is too large Load Diff

450
homeproxy/po/zh_Hans/homeproxy.po
View File

File diff suppressed because it is too large Load Diff

2
homeproxy/root/etc/config/homeproxy
View File

@ -18,7 +18,7 @@ config homeproxy 'infra'
config homeproxy 'config'
option main_node 'nil'
option main_udp_node 'same'
option dns_server '208.67.222.222'
option dns_server '8.8.8.8'
option routing_mode 'bypass_mainland_china'
option routing_port 'common'
option proxy_mode 'redirect_tproxy'

1
homeproxy/root/etc/homeproxy/scripts/generate_client.uc
View File

@ -132,7 +132,6 @@ function generate_outbound(node) {
/* Direct */
override_address: node.override_address,
override_port: strToInt(node.override_port),
proxy_protocol: strToInt(node.proxy_protocol),
/* Hysteria (2) */
up_mbps: strToInt(node.hysteria_down_mbps),
down_mbps: strToInt(node.hysteria_down_mbps),

2
homeproxy/root/etc/homeproxy/scripts/generate_server.uc
View File

@ -52,8 +52,6 @@ uci.foreach(uciconfig, uciserver, (cfg) => {
sniff: true,
sniff_override_destination: (cfg.sniff_override === '1'),
domain_strategy: cfg.domain_strategy,
proxy_protocol: strToBool(cfg.proxy_protocol),
proxy_protocol_accept_no_header: strToBool(cfg.proxy_protocol_accept_no_header),
network: cfg.network,
/* Hysteria */

2
homeproxy/root/etc/homeproxy/scripts/homeproxy.uc
View File

@ -78,7 +78,7 @@ export function wGET(url) {
if (!url || type(url) !== 'string')
return null;
const output = executeCommand(`/usr/bin/wget -qO- --user-agent 'Wget/1.21 (HomeProxy)' --timeout=10 ${shellQuote(url)}`) || {};
const output = executeCommand(`/usr/bin/wget -qO- --user-agent 'Wget/1.21 (HomeProxy, like v2rayN)' --timeout=10 ${shellQuote(url)}`) || {};
return trim(output.stdout);
};
/* Utilities end */

213
homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc
View File

@ -80,7 +80,7 @@ function log(...args) {
}
function parse_uri(uri) {
let config;
let config, url, params;
if (type(uri) === 'object') {
if (uri.nodetype === 'sip008') {
@ -102,26 +102,26 @@ function parse_uri(uri) {
switch (uri[0]) {
case 'http':
case 'https':
const http_url = parseURL('http://' + uri[1]);
url = parseURL('http://' + uri[1]);
config = {
label: http_url.hash ? urldecode(http_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'http',
address: http_url.hostname,
port: http_url.port,
username: http_url.username ? urldecode(http_url.username) : null,
password: http_url.password ? urldecode(http_url.password) : null,
address: url.hostname,
port: url.port,
username: url.username ? urldecode(url.username) : null,
password: url.password ? urldecode(url.password) : null,
tls: (uri[0] === 'https') ? '1' : '0'
};
break;
case 'hysteria':
/* https://github.com/HyNetwork/hysteria/wiki/URI-Scheme */
const hysteria_url = parseURL('http://' + uri[1]),
hysteria_params = hysteria_url.searchParams;
url = parseURL('http://' + uri[1]);
params = url.searchParams;
if (!sing_features.with_quic || (hysteria_params.protocol && hysteria_params.protocol !== 'udp')) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria', urldecode(hysteria_url.hash) || hysteria_url.hostname));
if (!sing_features.with_quic || (params.protocol && params.protocol !== 'udp')) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria', urldecode(url.hash) || url.hostname));
if (!sing_features.with_quic)
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
@ -129,31 +129,32 @@ function parse_uri(uri) {
}
config = {
label: hysteria_url.hash ? urldecode(hysteria_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'hysteria',
address: hysteria_url.hostname,
port: hysteria_url.port,
hysteria_protocol: hysteria_params.protocol || 'udp',
hysteria_auth_type: hysteria_params.auth ? 'string' : null,
hysteria_auth_payload: hysteria_params.auth,
hysteria_obfs_password: hysteria_params.obfsParam,
hysteria_down_mbps: hysteria_params.downmbps,
hysteria_up_mbps: hysteria_params.upmbps,
address: url.hostname,
port: url.port,
hysteria_protocol: params.protocol || 'udp',
hysteria_auth_type: params.auth ? 'string' : null,
hysteria_auth_payload: params.auth,
hysteria_obfs_password: params.obfsParam,
hysteria_down_mbps: params.downmbps,
hysteria_up_mbps: params.upmbps,
tls: '1',
tls_insecure: (hysteria_params.insecure in ['true', '1']) ? '1' : '0',
tls_sni: hysteria_params.peer,
tls_alpn: hysteria_params.alpn
tls_insecure: (params.insecure in ['true', '1']) ? '1' : '0',
tls_sni: params.peer,
tls_alpn: params.alpn
};
break;
case 'hysteria2':
case 'hy2':
/* https://v2.hysteria.network/docs/developers/URI-Scheme/ */
const hysteria2_url = parseURL('http://' + uri[1]),
hysteria2_params = hysteria2_url.searchParams;
url = parseURL('http://' + uri[1]);
params = url.searchParams;
if (!sing_features.with_quic || (hysteria2_params.password)) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria2', urldecode(hysteria2_url.hash) || hysteria2_url.hostname));
/* userpass auth is not supported by sing-box */
if (!sing_features.with_quic || (params.password)) {
log(sprintf('Skipping unsupported %s node: %s.', 'hysteria2', urldecode(url.hash) || url.hostname));
if (!sing_features.with_quic)
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
@ -161,16 +162,16 @@ function parse_uri(uri) {
}
config = {
label: hysteria2_url.hash ? urldecode(hysteria2_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'hysteria2',
address: hysteria2_url.hostname,
port: hysteria2_url.port,
password: hysteria2_url.password ? urldecode(hysteria2_url.password) : null,
hysteria_obfs_type: hysteria2_params.obfs,
hysteria_obfs_password: hysteria2_params['obfs-password'],
address: url.hostname,
port: url.port,
password: url.password ? urldecode(url.password) : null,
hysteria_obfs_type: params.obfs,
hysteria_obfs_password: params['obfs-password'],
tls: '1',
tls_insecure: hysteria2_params.insecure ? '1' : '0',
tls_sni: hysteria2_params.sni
tls_insecure: params.insecure ? '1' : '0',
tls_sni: params.sni
};
break;
@ -179,15 +180,15 @@ function parse_uri(uri) {
case 'socks4a':
case 'socsk5':
case 'socks5h':
const socks_url = parseURL('http://' + uri[1]);
url = parseURL('http://' + uri[1]);
config = {
label: socks_url.hash ? urldecode(socks_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'socks',
address: socks_url.hostname,
port: socks_url.port,
username: socks_url.username ? urldecode(socks_url.username) : null,
password: socks_url.password ? urldecode(socks_url.password) : null,
address: url.hostname,
port: url.port,
username: url.username ? urldecode(url.username) : null,
password: url.password ? urldecode(url.password) : null,
socks_version: (match(uri[0], /4/)) ? '4' : '5'
};
@ -207,19 +208,19 @@ function parse_uri(uri) {
/* https://github.com/shadowsocks/shadowsocks-org/commit/78ca46cd6859a4e9475953ed34a2d301454f579e */
/* SIP002 format https://shadowsocks.org/guide/sip002.html */
const ss_url = parseURL('http://' + uri[1]);
url = parseURL('http://' + uri[1]);
let ss_userinfo = {};
if (ss_url.username && ss_url.password)
if (url.username && url.password)
/* User info encoded with URIComponent */
ss_userinfo = [ss_url.username, urldecode(ss_url.password)];
else if (ss_url.username)
ss_userinfo = [url.username, urldecode(url.password)];
else if (url.username)
/* User info encoded with base64 */
ss_userinfo = split(decodeBase64Str(urldecode(ss_url.username)), ':');
ss_userinfo = split(decodeBase64Str(urldecode(url.username)), ':');
let ss_plugin, ss_plugin_opts;
if (ss_url.search && ss_url.searchParams.plugin) {
const ss_plugin_info = split(ss_url.searchParams.plugin, ';');
if (url.search && url.searchParams.plugin) {
const ss_plugin_info = split(url.searchParams.plugin, ';');
ss_plugin = ss_plugin_info[0];
if (ss_plugin === 'simple-obfs')
/* Fix non-standard plugin name */
@ -228,10 +229,10 @@ function parse_uri(uri) {
}
config = {
label: ss_url.hash ? urldecode(ss_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'shadowsocks',
address: ss_url.hostname,
port: ss_url.port,
address: url.hostname,
port: url.port,
shadowsocks_encrypt_method: ss_userinfo[0],
password: ss_userinfo[1],
shadowsocks_plugin: ss_plugin,
@ -246,53 +247,53 @@ function parse_uri(uri) {
return null;
const userinfo = split(uri[0], ':'),
ssr_params = urldecode_params(uri[1]);
params = urldecode_params(uri[1]);
if (!sing_features.with_shadowsocksr) {
log(sprintf('Skipping unsupported %s node: %s.', 'ShadowsocksR', decodeBase64Str(ssr_params.remarks) || userinfo[1]));
log(sprintf('Skipping unsupported %s node: %s.', 'ShadowsocksR', decodeBase64Str(params.remarks) || userinfo[1]));
log(sprintf('Please rebuild sing-box with %s support!', 'ShadowsocksR'));
return null;
}
config = {
label: decodeBase64Str(ssr_params.remarks),
label: decodeBase64Str(params.remarks),
type: 'shadowsocksr',
address: userinfo[0],
port: userinfo[1],
shadowsocksr_encrypt_method: userinfo[3],
password: decodeBase64Str(userinfo[5]),
shadowsocksr_protocol: userinfo[2],
shadowsocksr_protocol_param: decodeBase64Str(ssr_params.protoparam),
shadowsocksr_protocol_param: decodeBase64Str(params.protoparam),
shadowsocksr_obfs: userinfo[4],
shadowsocksr_obfs_param: decodeBase64Str(ssr_params.obfsparam)
shadowsocksr_obfs_param: decodeBase64Str(params.obfsparam)
};
break;
case 'trojan':
/* https://p4gefau1t.github.io/trojan-go/developer/url/ */
const trojan_url = parseURL('http://' + uri[1]),
trojan_params = trojan_url.searchParams || {};
url = parseURL('http://' + uri[1]);
params = url.searchParams || {};
config = {
label: trojan_url.hash ? urldecode(trojan_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'trojan',
address: trojan_url.hostname,
port: trojan_url.port,
password: urldecode(trojan_url.username),
transport: (trojan_params.type !== 'tcp') ? trojan_params.type : null,
address: url.hostname,
port: url.port,
password: urldecode(url.username),
transport: (params.type !== 'tcp') ? params.type : null,
tls: '1',
tls_sni: trojan_params.sni
tls_sni: params.sni
};
switch(trojan_params.type) {
switch(params.type) {
case 'grpc':
config.grpc_servicename = trojan_params.serviceName;
config.grpc_servicename = params.serviceName;
break;
case 'ws':
/* We don't parse "host" param when TLS is enabled, as some providers are abusing it (host vs sni)
* config.ws_host = trojan_params.host ? urldecode(trojan_params.host) : null;
* config.ws_host = params.host ? urldecode(params.host) : null;
*/
config.ws_path = trojan_params.path ? urldecode(trojan_params.path) : null;
config.ws_path = params.path ? urldecode(params.path) : null;
if (config.ws_path && match(config.ws_path, /\?ed=/)) {
config.websocket_early_data_header = 'Sec-WebSocket-Protocol';
config.websocket_early_data = split(config.ws_path, '?ed=')[1];
@ -304,42 +305,42 @@ function parse_uri(uri) {
break;
case 'tuic':
/* https://github.com/daeuniverse/dae/discussions/182 */
const tuic_url = parseURL('http://' + uri[1]),
tuic_params = tuic_url.searchParams || {};
url = parseURL('http://' + uri[1]);
params = url.searchParams || {};
if (!sing_features.with_quic) {
log(sprintf('Skipping unsupported %s node: %s.', 'tuic', urldecode(tuic_url.hash) || tuic_url.hostname));
log(sprintf('Skipping unsupported %s node: %s.', 'tuic', urldecode(url.hash) || url.hostname));
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
return null;
}
config = {
label: tuic_url.hash ? urldecode(tuic_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'tuic',
address: tuic_url.hostname,
port: tuic_url.port,
uuid: tuic_url.username,
password: tuic_url.password ? urldecode(tuic_url.password) : null,
tuic_congestion_control: tuic_params.congestion_control,
tuic_udp_relay_mode: tuic_params.udp_relay_mode,
address: url.hostname,
port: url.port,
uuid: url.username,
password: url.password ? urldecode(url.password) : null,
tuic_congestion_control: params.congestion_control,
tuic_udp_relay_mode: params.udp_relay_mode,
tls: '1',
tls_sni: tuic_params.sni,
tls_alpn: tuic_params.alpn ? split(urldecode(tuic_params.alpn), ',') : null,
tls_sni: params.sni,
tls_alpn: params.alpn ? split(urldecode(params.alpn), ',') : null,
};
break;
case 'vless':
/* https://github.com/XTLS/Xray-core/discussions/716 */
const vless_url = parseURL('http://' + uri[1]),
vless_params = vless_url.searchParams;
url = parseURL('http://' + uri[1]);
params = url.searchParams;
/* Unsupported protocol */
if (vless_params.type === 'kcp') {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(vless_url.hash) || vless_url.hostname));
if (params.type === 'kcp') {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(url.hash) || url.hostname));
return null;
} else if (vless_params.type === 'quic' && (vless_params.quicSecurity && vless_params.quicSecurity !== 'none' || !sing_features.with_quic)) {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(vless_url.hash) || vless_url.hostname));
} else if (params.type === 'quic' && (params.quicSecurity && params.quicSecurity !== 'none' || !sing_features.with_quic)) {
log(sprintf('Skipping sunsupported %s node: %s.', 'VLESS', urldecode(url.hash) || url.hostname));
if (!sing_features.with_quic)
log(sprintf('Please rebuild sing-box with %s support!', 'QUIC'));
@ -347,36 +348,36 @@ function parse_uri(uri) {
}
config = {
label: vless_url.hash ? urldecode(vless_url.hash) : null,
label: url.hash ? urldecode(url.hash) : null,
type: 'vless',
address: vless_url.hostname,
port: vless_url.port,
uuid: vless_url.username,
transport: (vless_params.type !== 'tcp') ? vless_params.type : null,
tls: (vless_params.security in ['tls', 'xtls', 'reality']) ? '1' : '0',
tls_sni: vless_params.sni,
tls_alpn: vless_params.alpn ? split(urldecode(vless_params.alpn), ',') : null,
tls_reality: (vless_params.security === 'reality') ? '1' : '0',
tls_reality_public_key: vless_params.pbk ? urldecode(vless_params.pbk) : null,
tls_reality_short_id: vless_params.sid,
tls_utls: sing_features.with_utls ? vless_params.fp : null,
vless_flow: (vless_params.security in ['tls', 'reality']) ? vless_params.flow : null
address: url.hostname,
port: url.port,
uuid: url.username,
transport: (params.type !== 'tcp') ? params.type : null,
tls: (params.security in ['tls', 'xtls', 'reality']) ? '1' : '0',
tls_sni: params.sni,
tls_alpn: params.alpn ? split(urldecode(params.alpn), ',') : null,
tls_reality: (params.security === 'reality') ? '1' : '0',
tls_reality_public_key: params.pbk ? urldecode(params.pbk) : null,
tls_reality_short_id: params.sid,
tls_utls: sing_features.with_utls ? params.fp : null,
vless_flow: (params.security in ['tls', 'reality']) ? params.flow : null
};
switch(vless_params.type) {
switch(params.type) {
case 'grpc':
config.grpc_servicename = vless_params.serviceName;
config.grpc_servicename = params.serviceName;
break;
case 'http':
case 'tcp':
if (config.transport === 'http' || vless_params.headerType === 'http') {
config.http_host = vless_params.host ? split(urldecode(vless_params.host), ',') : null;
config.http_path = vless_params.path ? urldecode(vless_params.path) : null;
if (config.transport === 'http' || params.headerType === 'http') {
config.http_host = params.host ? split(urldecode(params.host), ',') : null;
config.http_path = params.path ? urldecode(params.path) : null;
}
break;
case 'ws':
/* We don't parse "host" param when TLS is enabled, as some providers are abusing it (host vs sni) */
config.ws_host = (config.tls !== '1' && vless_params.host) ? urldecode(vless_params.host) : null;
config.ws_path = vless_params.path ? urldecode(vless_params.path) : null;
config.ws_host = (config.tls !== '1' && params.host) ? urldecode(params.host) : null;
config.ws_path = params.path ? urldecode(params.path) : null;
if (config.ws_path && match(config.ws_path, /\?ed=/)) {
config.websocket_early_data_header = 'Sec-WebSocket-Protocol';
config.websocket_early_data = split(config.ws_path, '?ed=')[1];

2
homeproxy/root/usr/share/rpcd/ucode/luci.homeproxy
View File

@ -158,7 +158,7 @@ const methods = {
if (fd) {
for (let line = fd.read('line'); length(line); line = fd.read('line')) {
if (match(trim(line), /Environment: (go[0-9\.]+)/))
features['has_mptcp'] = (index(line, 'go1.19') === -1) ? true : false;
features['has_mptcp'] = (index(line, 'go1.20') === -1) ? true : false;
let tags = match(trim(line), /Tags: (.*)/);
if (!tags)

4
sing-box/Makefile
View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sing-box
PKG_VERSION:=1.6.0-alpha.1
PKG_VERSION:=1.6.0-alpha.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=34a43268e19e185e363952a0fe1ae4f711017984c39fa89c7e16f1c457a3bd72
PKG_HASH:=1e8046ba343246fe77ab6ec711e6fd5dd525da35b312439f9277b9855e1cb8f4
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE