diff --git a/scripts/coverage/g3proxy/0001_base_http_proxy/g3proxy.yaml b/scripts/coverage/g3proxy/0001_base_http_proxy/g3proxy.yaml index b22bd37f5..21d5c742c 100644 --- a/scripts/coverage/g3proxy/0001_base_http_proxy/g3proxy.yaml +++ b/scripts/coverage/g3proxy/0001_base_http_proxy/g3proxy.yaml @@ -21,7 +21,11 @@ server: type: http_proxy listen: 127.0.0.1:8080 escaper: default - - name: tls + - name: tcp + type: plain_tcp_port + listen: '[::1]:8080' + server: http + - name: tls1 type: native_tls_port listen: 127.0.0.1:8443 server: http @@ -29,6 +33,14 @@ server: cert_pairs: certificate: ../g3proxy.local.pem private-key: ../g3proxy.local-key.pem + - name: tls2 + type: plain_tls_port + listen: 127.0.0.1:8444 + server: http + tls_server: + cert_pairs: + certificate: ../g3proxy.local.pem + private-key: ../g3proxy.local-key.pem - name: https type: http_proxy listen: 127.0.0.1:9443 diff --git a/scripts/coverage/g3proxy/0001_base_http_proxy/testcases.sh b/scripts/coverage/g3proxy/0001_base_http_proxy/testcases.sh index 7bb3cd519..d9ff382d5 100644 --- a/scripts/coverage/g3proxy/0001_base_http_proxy/testcases.sh +++ b/scripts/coverage/g3proxy/0001_base_http_proxy/testcases.sh @@ -4,8 +4,10 @@ test_http_proxy_http_forward() { python3 "${PROJECT_DIR}/g3proxy/ci/python3+curl/test_httpbin.py" -x ${HTTP_PROXY} -T http://httpbin.local + python3 "${PROJECT_DIR}/g3proxy/ci/python3+curl/test_httpbin.py" -x ${HTTP_PROXY} -T http://127.0.0.1 python3 "${PROJECT_DIR}/g3proxy/ci/python3+requests/test_httpbin.py" -x ${HTTP_PROXY} -T http://httpbin.local + python3 "${PROJECT_DIR}/g3proxy/ci/python3+requests/test_httpbin.py" -x ${HTTP_PROXY} -T http://127.0.0.1 } @@ -34,11 +36,13 @@ test_http_proxy_http_forward test_http_proxy_ftp_over_http -HTTPS_PROXY="https://g3proxy.local:8443" -test_https_proxy_http_forward -test_https_proxy_ftp_over_http +HTTP_PROXY="http://[::1]:8080" +test_http_proxy_http_forward -HTTPS_PROXY="https://g3proxy.local:9443" -test_https_proxy_http_forward -test_https_proxy_ftp_over_http +for port in 8443 8444 9443 +do + HTTPS_PROXY="https://g3proxy.local:${port}" + test_https_proxy_http_forward + test_https_proxy_ftp_over_http +done diff --git a/scripts/coverage/g3proxy/0007_chain_socks_proxy/g3proxy.yaml b/scripts/coverage/g3proxy/0007_chain_socks_proxy/g3proxy.yaml index 20a1b1add..cf217414e 100644 --- a/scripts/coverage/g3proxy/0007_chain_socks_proxy/g3proxy.yaml +++ b/scripts/coverage/g3proxy/0007_chain_socks_proxy/g3proxy.yaml @@ -58,6 +58,15 @@ server: - name: socks2 type: socks_proxy listen: 127.0.0.1:1081 + escaper: chained_socks5 + use_udp_associate: true + - name: socks3 + type: socks_proxy + listen: 127.0.0.1:1082 + escaper: chained_socks5s + - name: socks4 + type: socks_proxy + listen: 127.0.0.1:1083 escaper: chained_socks5s use_udp_associate: true - name: http diff --git a/scripts/coverage/g3proxy/0007_chain_socks_proxy/testcases.sh b/scripts/coverage/g3proxy/0007_chain_socks_proxy/testcases.sh index df4079f52..fa56e8e9b 100644 --- a/scripts/coverage/g3proxy/0007_chain_socks_proxy/testcases.sh +++ b/scripts/coverage/g3proxy/0007_chain_socks_proxy/testcases.sh @@ -7,19 +7,13 @@ test_http_proxy_http_forward #test_http_proxy_ftp_over_http -SOCKS5_PROXY="socks5h://127.0.0.1:1080" -test_socks5_proxy_http -test_socks5_proxy_dns +for port in 1080 1081 1082 1083 +do + SOCKS5_PROXY="socks5h://127.0.0.1:${port}" + test_socks5_proxy_http + test_socks5_proxy_dns -SOCKS4_PROXY="socks4a://127.0.0.1:1080" -test_socks4_proxy_http - - -SOCKS5_PROXY="socks5h://127.0.0.1:1081" -test_socks5_proxy_http -test_socks5_proxy_dns - - -SOCKS4_PROXY="socks4a://127.0.0.1:1081" -test_socks4_proxy_http + SOCKS4_PROXY="socks4a://127.0.0.1:${port}" + test_socks4_proxy_http +done diff --git a/scripts/coverage/g3proxy/g3proxy.yaml b/scripts/coverage/g3proxy/g3proxy.yaml index 032f442d4..7c3d1673f 100644 --- a/scripts/coverage/g3proxy/g3proxy.yaml +++ b/scripts/coverage/g3proxy/g3proxy.yaml @@ -173,24 +173,11 @@ server: type: socks_proxy listen: 127.0.0.1:11080 escaper: direct - - name: socks11081 - type: socks_proxy - listen: 127.0.0.1:11081 - escaper: direct - enable_udp_associate: true - name: socks11082 type: socks_proxy listen: 127.0.0.1:11082 escaper: direct user-group: default - - name: http20080 - type: http_proxy - listen: 127.0.0.1:20080 - escaper: proxy10080 - - name: http20081 - type: http_proxy - listen: 127.0.0.1:20081 - escaper: proxy11080 - name: http20082 type: http_proxy listen: 127.0.0.1:20082 @@ -203,56 +190,10 @@ server: type: http_proxy listen: 127.0.0.1:20084 escaper: float11080 - - name: http20443 - type: http_proxy - listen: 127.0.0.1:20443 - escaper: proxy10443 - - name: socks21080 - type: socks_proxy - listen: 127.0.0.1:21080 - escaper: proxy11080 - - name: socks21081 - type: socks_proxy - listen: 127.0.0.1:21081 - escaper: proxy11080 - enable_udp_associate: true - - name: socks21082 - type: socks_proxy - listen: 127.0.0.1:21082 - escaper: proxy10080 - name: socks21083 type: socks_proxy listen: 127.0.0.1:21083 escaper: float11080 - - name: httpbin8080 - escaper: direct - type: http_rproxy - listen: 127.0.0.1:8080 - hosts: - - exact_match: g3proxy.local - upstream: 127.0.0.1:9443 - tls_client: - ca_certificate: rootCA.pem - tls_name: httpbin.local - - name: httpbin8443 - escaper: direct - type: http_rproxy - listen: 127.0.0.1:8443 - enable_tls_server: true - hosts: - - exact_match: g3proxy.local - tls_server: - certificate: g3proxy.local.pem - private_key: g3proxy.local-key.pem - upstream: 127.0.0.1:9443 - tls_client: - ca_certificate: rootCA.pem - tls_name: httpbin.local - - name: tcp9080 - escaper: direct - type: tcp_stream - listen: 127.0.0.1:9080 - upstream: 127.0.0.1:80 - name: tls9443 escaper: direct type: tls_stream @@ -261,25 +202,6 @@ server: certificate: httpbin.local.pem private-key: httpbin.local-key.pem upstream: 127.0.0.1:80 - - name: sni9443 - escaper: direct - type: sni_proxy - listen: "[::1]:9443" - - name: sni8080 - escaper: direct - type: sni_proxy - listen: "[::1]:8080" - - name: tcpport9001 - type: plain_tcp_port - listen: 127.0.0.1:9001 - server: http10080 - - name: tlsport9002 - type: plain_tls_port - listen: 127.0.0.1:9002 - server: http10080 - tls_server: - certificate: g3proxy.local.pem - private_key: g3proxy.local-key.pem - name: ppdpport9003 type: ppdp_tcp_port listen: 127.0.0.1:9003 diff --git a/scripts/coverage/g3proxy/testcases.sh b/scripts/coverage/g3proxy/testcases.sh index d42b8c1a6..544ab1194 100644 --- a/scripts/coverage/g3proxy/testcases.sh +++ b/scripts/coverage/g3proxy/testcases.sh @@ -1,8 +1,8 @@ #!/bin/sh -all_http_proxies="http://127.0.0.1:10080 http://t1:toor@127.0.0.1:10082 http://t2:toor@127.0.0.1:10082 http://127.0.0.1:20080 http://127.0.0.1:20443 http://127.0.0.1:9001 http://127.0.0.1:9003" -all_socks_proxies="socks5h://127.0.0.1:11080 socks5h://127.0.0.1:11081 socks5h://t1:toor@127.0.0.1:11082 socks5h://127.0.0.1:21080 socks5h://127.0.0.1:21081 socks5h://127.0.0.1:9003" -partial_proxies="http://127.0.0.1:13128 http://127.0.0.1:10081 http://t3:toor@127.0.0.1:10082 http://127.0.0.1:20081 http://127.0.0.1:20082 http://127.0.0.1:20083 http://127.0.0.1:20084 socks5h://127.0.0.1:21082 socks5h://127.0.0.1:21083" +all_http_proxies="http://127.0.0.1:10080 http://t1:toor@127.0.0.1:10082 http://t2:toor@127.0.0.1:10082 http://127.0.0.1:9003" +all_socks_proxies="socks5h://127.0.0.1:11080 socks5h://t1:toor@127.0.0.1:11082 socks5h://127.0.0.1:9003" +partial_proxies="http://127.0.0.1:13128 http://127.0.0.1:10081 http://t3:toor@127.0.0.1:10082 http://127.0.0.1:20082 http://127.0.0.1:20083 http://127.0.0.1:20084 socks5h://127.0.0.1:21083" all_proxies="${all_http_proxies} ${all_socks_proxies} ${partial_proxies}" ## @@ -12,11 +12,6 @@ echo "==== Update dynamic escapers" ./target/debug/g3proxy-ctl -G ${TEST_NAME} -p $PROXY_PID escaper float11080 publish '{"type":"socks5","addr":"127.0.0.1:11080"}' ./target/debug/g3proxy-ctl -G ${TEST_NAME} -p $PROXY_PID escaper direct_lazy publish "{\"ipv4\": \"127.0.0.1\"}" -## https proxy -echo "==== Https Proxy" -curl -x https://g3proxy.local:10443 http://httpbin.local/get --proxy-cacert "${SCRIPTS_DIR}/g3proxy/rootCA.pem" -curl -x https://g3proxy.local:9002 http://httpbin.local/get --proxy-cacert "${SCRIPTS_DIR}/g3proxy/rootCA.pem" - ## httpbin echo "==== httpbin" for proxy in $all_proxies