Skip to content

Commit

Permalink
new: add quic support for splithttp and panel
Browse files Browse the repository at this point in the history
  • Loading branch information
@hiddify-com
hiddify-com committed Jul 26, 2024
1 parent ba9abd3 commit f45f5d1
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply:
export HIDDIFY_PANLE_SOURCE_DIR="$(PWD)/hiddify-panel/src/" &&\
(cd /opt/hiddify-manager/hiddify-panel && bash install.sh && bash ../common/replace_variables.sh);
fi

.PHONY: apply
build: apply

(cd /opt/hiddify-manager/ && bash install.sh --no-gui);
Expand Down
74 changes: 60 additions & 14 deletions haproxy/common.cfg.pj2
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
global
limited-quic
{%if hconfigs['log_level']!="CRITICAL"%}
# # Access logs
# #log-format %ci:%cp\ [%t]\ %ft\ %b/%s\ %Tcc\ %Tw/%Tc/%Tr/%Ta\ %ST\ %B\ %CC\ %CS\ %tsc\ %ac/%fc/%bc/%sc/%rc\ %sq/%bq\ %hr\ %hs\ %{+Q}r
Expand Down Expand Up @@ -32,15 +33,15 @@ defaults
listen stats
# accessible at http://192.168.1.100/haproxy?stats
bind 127.0.0.1:8181

mode http
option httplog
stats enable
stats admin if TRUE
stats refresh 5m

frontend https-in
bind :443,:::443 v4v6 tfo
{% for port in hconfigs['tls_ports'].split(",")%}

{% for port in (["443"] + hconfigs['tls_ports'].split(',')) | unique %}
bind :{{port}},:::{{port}} v4v6 tfo
{%endfor%}
# option tcplog
Expand All @@ -50,7 +51,7 @@ frontend https-in
acl tls1_2 req.ssl_ver 3.3
acl tls1_3 req.ssl_ver 3.4

acl alpnh2 req.ssl_alpn h2
#acl alpnh2 req.ssl_alpn h2


acl is_cdn src -f /opt/hiddify-manager/haproxy/cloudflare.lst -f /opt/hiddify-manager/haproxy/arvan.lst -f /opt/hiddify-manager/haproxy/cloudfront.lst
Expand Down Expand Up @@ -116,25 +117,38 @@ frontend onlypanel_in
backend to_panel_only
server to_panel_only abns@onlypanel_in send-proxy-v2

frontend quic-in
{% for port in (["443"] + hconfigs['tls_ports'].split(',')) | unique %}
bind quic4@:{{port}},quic6@:{{port}} v4v6 tfo ssl crt /opt/hiddify-manager/ssl/ alpn h3
{%endfor%}
mode http
{% include '/opt/hiddify-manager/haproxy/common_h1h2rules4http.lst.pj2' %}
{%if hconfigs['splithttp_enable']%}
use_backend vmesshs_http_h2 if { path_beg /{{ hconfigs['path_vmess'] }}{{ hconfigs['path_splithttp'] }} }
use_backend vlesshs_http_h2 if { path_beg /{{ hconfigs['path_vless'] }}{{ hconfigs['path_splithttp'] }} }
#use_backend v2rayhs_http_h2 if { path_beg /{{ hconfigs['path_ss'] }}{{ hconfigs['path_splithttp'] }} }
use_backend trojanhs_http_h2 if { path_beg /{{ hconfigs['path_trojan'] }}{{ hconfigs['path_splithttp'] }} }
{%endif%}


default_backend nginx_dispatcher_http_h2

frontend http-https-in
bind :80,:::80 v4v6 tfo #proto h2
{% for port in hconfigs['http_ports'].split(",")%}
{% for port in (["80"] + hconfigs['http_ports'].split(',')) | unique%}
bind :{{port}},:::{{port}} v4v6 tfo
{%endfor%}
bind abns@https_in_ssl tfo accept-proxy ssl crt /opt/hiddify-manager/ssl/ alpn h2,http/1.1,h3 allow-0rtt
acl h2 ssl_fc_alpn -i h2
#acl h2 ssl_fc_npn -i h2


#bind quic4@abns@https_in_ssl accept-proxy ssl crt /opt/hiddify-manager/ssl/ alpn h3
# http-response set-header alt-svc "h3=\":443\";ma=900;"

http-response set-header alt-svc "h3=\":443\";ma=900;"
tcp-request inspect-delay 5s
tcp-request content accept if HTTP


{% include '/opt/hiddify-manager/haproxy/common_h1h2rules.lst.pj2' %}
{% include '/opt/hiddify-manager/haproxy/common_h1h2rules4http.lst.pj2' %}

{%if hconfigs['tcp_enable']%}
use_backend vmesst if { path_beg /{{ hconfigs['path_vmess'] }}{{ hconfigs['path_tcp'] }} }
Expand All @@ -159,10 +173,10 @@ frontend http-https-in
{%endif%}

{%if hconfigs['splithttp_enable']%}
use_backend vmesshs if { path_beg /{{ hconfigs['path_vmess'] }}{{ hconfigs['path_splithttp'] }}1 }
use_backend vlesshs if { path_beg /{{ hconfigs['path_vless'] }}{{ hconfigs['path_splithttp'] }}1 }
#use_backend v2rayhs if { path_beg /{{ hconfigs['path_ss'] }}{{ hconfigs['path_splithttp'] }}1 }
use_backend trojanhs if { path_beg /{{ hconfigs['path_trojan'] }}{{ hconfigs['path_splithttp'] }}1 }
use_backend vmesshs if { path_beg /{{ hconfigs['path_vmess'] }}{{ hconfigs['path_splithttp'] }} }
use_backend vlesshs if { path_beg /{{ hconfigs['path_vless'] }}{{ hconfigs['path_splithttp'] }} }
#use_backend v2rayhs if { path_beg /{{ hconfigs['path_ss'] }}{{ hconfigs['path_splithttp'] }} }
use_backend trojanhs if { path_beg /{{ hconfigs['path_trojan'] }}{{ hconfigs['path_splithttp'] }} }
{%endif%}

use_backend nginx_dispatcher_h2 if h2
Expand All @@ -187,6 +201,9 @@ backend nginx_dispatcher_http
mode http
server nginx unix@/opt/hiddify-manager/nginx/run/h1.sock send-proxy-v2 tfo

backend nginx_dispatcher_http_h2
mode http
server nginx unix@/opt/hiddify-manager/nginx/run/h2.sock send-proxy-v2 tfo proto h2



Expand All @@ -203,7 +220,7 @@ backend tgdecoy
server tgdecoy {{hconfigs['telegram_fakedomain']}}

backend tgdecoy_http

mode http
server tgdecoy_http {{hconfigs['telegram_fakedomain']}}

backend telegram
Expand Down Expand Up @@ -280,3 +297,32 @@ backend v2rayw_h2
server v2rayw 127.0.0.1:1020 tfo



backend vmesshs
#mode http
# server vmesshs abns@vmess-splithttp send-proxy-v2
server vmesshs 127.0.0.1:1035

backend vlesshs
#mode http
#server vlesshs abns@vless-splithttp send-proxy-v2
server vlesshs 127.0.0.1:1025
backend trojanhs
#mode http
# server trojanhs abns@trojan-splithttp send-proxy-v2
server trojanhs 127.0.0.1:1015


backend vmesshs_http_h2
mode http
# server vmesshs abns@vmess-splithttp send-proxy-v2
server vmesshs 127.0.0.1:1035 proto h2

backend vlesshs_http_h2
mode http
#server vlesshs abns@vless-splithttp send-proxy-v2
server vlesshs 127.0.0.1:1025 proto h2
backend trojanhs_http_h2
mode http
# server trojanhs abns@trojan-splithttp send-proxy-v2
server trojanhs 127.0.0.1:1015 proto h2
0 haproxy/common_h1h2rules.lst.pj2 → haproxy/common_h1h2rules4http.lst.pj2
View file
File renamed without changes.
8 changes: 0 additions & 8 deletions haproxy/singbox.cfg.pj2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,3 @@ backend vlesshs
backend trojanhs
server trojanhs abns@trojan-splithttp send-proxy-v2

backend vmesshs_h2
server vmesshs abns@vmess-splithttp-h2 send-proxy-v2

backend vlesshs_h2
server vlesshs abns@vless-splithttp-h2 send-proxy-v2

backend trojanhs_h2
server trojanhs abns@trojan-splithttp-h2 send-proxy-v2
15 changes: 0 additions & 15 deletions haproxy/xray.cfg.pj2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,18 +159,3 @@ backend trojanhu
server trojanw abns@trojan-httpu send-proxy-v2


backend vmesshs
#mode http
# server vmesshs abns@vmess-splithttp send-proxy-v2
server vmesshs 127.0.0.1:1035

backend vlesshs
#mode http
#server vlesshs abns@vless-splithttp send-proxy-v2
server vlesshs 127.0.0.1:1025
backend trojanhs
#mode http
# server trojanhs abns@trojan-splithttp send-proxy-v2
server trojanhs 127.0.0.1:1015


2 changes: 1 addition & 1 deletion hiddify-panel/src
Submodule src updated from 37ae76 to 3586dc
2 changes: 2 additions & 0 deletions nginx/parts/proxy_path.conf.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
include /opt/hiddify-manager/nginx/parts/splithttp.conf;
proxy_pass http://127.0.0.1:1015;
}


{%endif%}


Expand Down
2 changes: 1 addition & 1 deletion xray/configs/05_inbounds_10_trojan_splithttp.json.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"security": "none",
"splithttpSettings": {
{# "acceptProxyProtocol": true, #}
"path":"/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_splithttp'] }}1",
"path":"/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_splithttp'] }}",
}
},
"sniffing": {
Expand Down
2 changes: 1 addition & 1 deletion xray/configs/05_inbounds_10_vless_splithttp.json.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"security": "none",
"splithttpSettings": {
{# "acceptProxyProtocol": true,#}
"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_splithttp'] }}1",
"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_splithttp'] }}",
}
},
"sniffing": {
Expand Down
2 changes: 1 addition & 1 deletion xray/configs/05_inbounds_10_vmess_splithttp.json.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"security": "none",
"splithttpSettings": {
{#"acceptProxyProtocol": true,#}
"path": "/{{ hconfigs['path_vmess'] }}{{ hconfigs['path_splithttp'] }}1",
"path": "/{{ hconfigs['path_vmess'] }}{{ hconfigs['path_splithttp'] }}",
}
},
"sniffing": {
Expand Down

0 comments on commit f45f5d1

Please sign in to comment.