tcjlj/Xboard
1
0
Fork 0
mirror of https://github.com/cedar2025/Xboard.git synced 2025-01-22 10:38:14 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Compare commits

base: tcjlj:e6c06bf53469b6e0b59dcb744c6935046d74aa9f
Branches Tags
tcjlj:dev
tcjlj:master
tcjlj:compose
tcjlj:docker-compose
tcjlj:v0.1.9
tcjlj:v0.1.8
tcjlj:v0.1.7
tcjlj:v0.1.6
tcjlj:v0.1.5
tcjlj:v0.1.4
tcjlj:v0.1.3
...
compare: tcjlj:157e525026c8117509b9169c7c1d09640b7bb03c
Branches Tags
tcjlj:dev
tcjlj:master
tcjlj:compose
tcjlj:docker-compose
tcjlj:v0.1.9
tcjlj:v0.1.8
tcjlj:v0.1.7
tcjlj:v0.1.6
tcjlj:v0.1.5
tcjlj:v0.1.4
tcjlj:v0.1.3

5 Commits
e6c06bf534 ... 157e525026

Author SHA1 Message Date
Roc
157e525026
Merge 2fdffab3c6 into d743296392 2025-01-17 07:00:11 +08:00
Xboard
d743296392
Merge pull request #325 from rebecca554owen/patch-1
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details 
Sync
 2025-01-16 23:01:32 +08:00
rebecca554owen
024a9dfb54
fix update.sh 2025-01-16 22:44:10 +08:00
Cp0204
2fdffab3c6
Merge branch 'cedar2025:dev' into adapted-allowInsecure 2024-12-16 22:44:19 +08:00
Cp0204
603b240733
feat: 适配 allowInsecure 字段 2024-05-29 13:01:48 +08:00
9 changed files with 27 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
app/Protocols/General.php
View File

@ -74,6 +74,8 @@ class General
$tlsSettings = $server['tlsSettings']; $tlsSettings = $server['tlsSettings'];
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
$config['sni'] = $tlsSettings['serverName']; $config['sni'] = $tlsSettings['serverName'];
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
$config['allowInsecure'] = $tlsSettings['allowInsecure'];
} }
} }
if ((string)$server['network'] === 'tcp') { if ((string)$server['network'] === 'tcp') {
@ -122,6 +124,8 @@ class General
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name']))
$config['sni'] = $tlsSettings['server_name']; $config['sni'] = $tlsSettings['server_name'];
$config['security'] = "tls"; $config['security'] = "tls";
if (isset($tlsSettings['allow_insecure']) && !empty($tlsSettings['allow_insecure']))
$config['allowInsecure'] = $tlsSettings['allow_insecure'];
} }
break; break;
case 2: //reality case 2: //reality

4
app/Protocols/Passwall.php
View File

@ -72,6 +72,8 @@ class Passwall
$tlsSettings = $server['tlsSettings']; $tlsSettings = $server['tlsSettings'];
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
$config['sni'] = $tlsSettings['serverName']; $config['sni'] = $tlsSettings['serverName'];
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
$config['allowInsecure'] = $tlsSettings['allowInsecure'];
} }
} }
if ((string)$server['network'] === 'tcp') { if ((string)$server['network'] === 'tcp') {
@ -120,6 +122,8 @@ class Passwall
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name']))
$config['sni'] = $tlsSettings['server_name']; $config['sni'] = $tlsSettings['server_name'];
$config['security'] = "tls"; $config['security'] = "tls";
if (isset($tlsSettings['allow_insecure']) && !empty($tlsSettings['allow_insecure']))
$config['allowInsecure'] = $tlsSettings['allow_insecure'];
} }
break; break;
case 2: //reality case 2: //reality

4
app/Protocols/SSRPlus.php
View File

@ -72,6 +72,8 @@ class SSRPlus
$tlsSettings = $server['tlsSettings']; $tlsSettings = $server['tlsSettings'];
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
$config['sni'] = $tlsSettings['serverName']; $config['sni'] = $tlsSettings['serverName'];
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
$config['allowInsecure'] = $tlsSettings['allowInsecure'];
} }
} }
if ((string)$server['network'] === 'ws') { if ((string)$server['network'] === 'ws') {
@ -108,6 +110,8 @@ class SSRPlus
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name']))
$config['sni'] = $tlsSettings['server_name']; $config['sni'] = $tlsSettings['server_name'];
$config['security'] = "tls"; $config['security'] = "tls";
if (isset($tlsSettings['allow_insecure']) && !empty($tlsSettings['allow_insecure']))
$config['allowInsecure'] = $tlsSettings['allow_insecure'];
} }
break; break;
case 2: //reality case 2: //reality

2
app/Protocols/SagerNet.php
View File

@ -70,6 +70,8 @@ class SagerNet
$tlsSettings = $server['tlsSettings']; $tlsSettings = $server['tlsSettings'];
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
$config['sni'] = urlencode($tlsSettings['serverName']); $config['sni'] = urlencode($tlsSettings['serverName']);
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
$config['allowInsecure'] = $tlsSettings['allowInsecure'];
} }
} }
if ((string)$server['network'] === 'tcp') { if ((string)$server['network'] === 'tcp') {

4
app/Protocols/Shadowrocket.php
View File

@ -150,8 +150,8 @@ class Shadowrocket
$config['tls'] = 1; $config['tls'] = 1;
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure'])) if (isset($tlsSettings['allow_insecure']) && !empty($tlsSettings['allow_insecure']))
$config['allowInsecure'] = (int)$tlsSettings['allowInsecure']; $config['allowInsecure'] = (int)$tlsSettings['allow_insecure'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name']))
$config['peer'] = $tlsSettings['server_name']; $config['peer'] = $tlsSettings['server_name'];
} }

2
app/Protocols/Stash.php
View File

@ -189,6 +189,8 @@ class Stash
case 1: case 1:
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['allow_insecure']) && !empty($tlsSettings['allow_insecure']))
$array['skip-cert-verify'] = ($tlsSettings['allow_insecure'] ? true : false);
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name']))
$array['servername'] = $tlsSettings['server_name']; $array['servername'] = $tlsSettings['server_name'];
} }

4
app/Protocols/V2rayN.php
View File

@ -75,6 +75,8 @@ class V2rayN
$tlsSettings = $server['tlsSettings']; $tlsSettings = $server['tlsSettings'];
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
$config['sni'] = $tlsSettings['serverName']; $config['sni'] = $tlsSettings['serverName'];
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
$config['allowInsecure'] = $tlsSettings['allowInsecure'];
} }
} }
if ((string)$server['network'] === 'tcp') { if ((string)$server['network'] === 'tcp') {
@ -123,6 +125,8 @@ class V2rayN
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name']))
$config['sni'] = $tlsSettings['server_name']; $config['sni'] = $tlsSettings['server_name'];
$config['security'] = "tls"; $config['security'] = "tls";
if (isset($tlsSettings['allow_insecure']) && !empty($tlsSettings['allow_insecure']))
$config['allowInsecure'] = $tlsSettings['allow_insecure'];
} }
break; break;
case 2: //reality case 2: //reality

4
app/Protocols/V2rayNG.php
View File

@ -76,6 +76,8 @@ class V2rayNG
$tlsSettings = $server['tlsSettings']; $tlsSettings = $server['tlsSettings'];
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
$config['sni'] = $tlsSettings['serverName']; $config['sni'] = $tlsSettings['serverName'];
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
$config['allowInsecure'] = $tlsSettings['allowInsecure'];
} }
} }
if ((string)$server['network'] === 'tcp') { if ((string)$server['network'] === 'tcp') {
@ -124,6 +126,8 @@ class V2rayNG
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name']))
$config['sni'] = $tlsSettings['server_name']; $config['sni'] = $tlsSettings['server_name'];
$config['security'] = "tls"; $config['security'] = "tls";
if (isset($tlsSettings['allow_insecure']) && !empty($tlsSettings['allow_insecure']))
$config['allowInsecure'] = $tlsSettings['allow_insecure'];
} }
break; break;
case 2: //reality case 2: //reality

2
update.sh
View File

@ -11,7 +11,7 @@ if ! command -v git &> /dev/null; then
fi fi
git config --global --add safe.directory $(pwd) git config --global --add safe.directory $(pwd)
git fetch --all && git reset --hard origin/dev && git pull origin dev git fetch --all && git reset --hard origin/legacy && git pull origin legacy
rm -rf composer.lock composer.phar rm -rf composer.lock composer.phar
wget https://github.com/composer/composer/releases/latest/download/composer.phar -O composer.phar wget https://github.com/composer/composer/releases/latest/download/composer.phar -O composer.phar
php composer.phar update -vvv php composer.phar update -vvv