gfwleak/tsg-tsg-diagnose
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: Add shaping site in shaping domain.

Browse Source
This commit is contained in:
fumingwei
2024-06-11 18:48:02 +08:00
parent 0e9a9fe83b
commit 8b70f1f19c
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
images_build/client/dign_client/bin/client.py
View File

@@ -1579,7 +1579,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_NoRateLimit_HTTP", "name": "Shaping_NoRateLimit_HTTP",
"protocol_type": "http", "protocol_type": "http",
"test_function": ShapingCaseRunner.no_rate_limit_protocol_http, "test_function": ShapingCaseRunner.no_rate_limit_protocol_http,
"request_content": "http://testing-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M", "request_content": "http://testing-shaping-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12, "conn_timeout": 12,
"max_recv_speed": None "max_recv_speed": None
}, },
@@ -1587,7 +1587,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_NoRateLimit_HTTPS", "name": "Shaping_NoRateLimit_HTTPS",
"protocol_type": "https", "protocol_type": "https",
"test_function": ShapingCaseRunner.no_rate_limit_protocol_https, "test_function": ShapingCaseRunner.no_rate_limit_protocol_https,
"request_content": "https://testing-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M", "request_content": "https://testing-shaping-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12, "conn_timeout": 12,
"max_recv_speed": None "max_recv_speed": None
}, },
@@ -1595,7 +1595,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit0bps_HTTP", "name": "Shaping_RateLimit0bps_HTTP",
"protocol_type": "http", "protocol_type": "http",
"test_function": ShapingCaseRunner.rate_limit_0bps_protocol_http, "test_function": ShapingCaseRunner.rate_limit_0bps_protocol_http,
"request_content": "http://testing-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M", "request_content": "http://testing-shaping-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12, "conn_timeout": 12,
"max_recv_speed": 6553600 "max_recv_speed": 6553600
}, },
@@ -1603,7 +1603,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit0bps_HTTPS", "name": "Shaping_RateLimit0bps_HTTPS",
"protocol_type": "https", "protocol_type": "https",
"test_function": ShapingCaseRunner.rate_limit_0bps_protocol_https, "test_function": ShapingCaseRunner.rate_limit_0bps_protocol_https,
"request_content": "https://testing-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M", "request_content": "https://testing-shaping-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12, "conn_timeout": 12,
"max_recv_speed": 6553600 "max_recv_speed": 6553600
}, },
@@ -1611,7 +1611,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit1000gbps_HTTP", "name": "Shaping_RateLimit1000gbps_HTTP",
"protocol_type": "http", "protocol_type": "http",
"test_function": ShapingCaseRunner.rate_limit_1000gbps_protocol_http, "test_function": ShapingCaseRunner.rate_limit_1000gbps_protocol_http,
"request_content": "http://testing-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M", "request_content": "http://testing-shaping-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12, "conn_timeout": 12,
"max_recv_speed": 6553600 "max_recv_speed": 6553600
}, },
@@ -1619,7 +1619,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit1000gbps_HTTPS", "name": "Shaping_RateLimit1000gbps_HTTPS",
"protocol_type": "https", "protocol_type": "https",
"test_function": ShapingCaseRunner.rate_limit_1000gbps_protocol_https, "test_function": ShapingCaseRunner.rate_limit_1000gbps_protocol_https,
"request_content": "https://testing-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M", "request_content": "https://testing-shaping-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12, "conn_timeout": 12,
"max_recv_speed": 6553600 "max_recv_speed": 6553600
} }

8
images_build/server_web/domains/misc/badssl.com/index.html
View File

@@ -203,10 +203,10 @@
</div> </div>
<div class="group"> <div class="group">
<h2 id="testing-rate-limit"><span class="emoji">🛞</span>Testing expand</h2> <h2 id="testing-rate-limit"><span class="emoji">🛞</span>Testing expand</h2>
<a href="http://testing-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 0 bps</a> <a href="http://testing-shaping-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 0 bps</a>
<a href="https://testing-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 0 bps</a> <a href="https://testing-shaping-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 0 bps</a>
<a href="http://testing-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 1000 Gbps</a> <a href="http://testing-shaping-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 1000 Gbps</a>
<a href="https://testing-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 1000 Gbps</a> <a href="https://testing-shaping-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 1000 Gbps</a>
</div> </div>
<div id="preload" style="width: 0; height: 0;"> <div id="preload" style="width: 0; height: 0;">
<!-- <link rel=preload> results in warnings in Chrome: https://crbug.com/661055 --> <!-- <link rel=preload> results in warnings in Chrome: https://crbug.com/661055 -->

4
images_build/server_web/domains/testing-rate-limit/no-rate-limit.conf
View File

@@ -2,14 +2,14 @@
--- ---
server { server {
listen 80; listen 80;
server_name testing-no-rate-limit.{{ site.domain }}; server_name testing-shaping-no-rate-limit.{{ site.domain }};
include {{ site.serving-path }}/common/common.conf; include {{ site.serving-path }}/common/common.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root; root {{ site.serving-path }}/domains/testing-rate-limit/root;
} }
server { server {
listen 443; listen 443;
server_name testing-no-rate-limit.{{ site.domain }}; server_name testing-shaping-no-rate-limit.{{ site.domain }};
include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf; include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf;
include {{ site.serving-path }}/nginx-includes/tls-defaults.conf; include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root; root {{ site.serving-path }}/domains/testing-rate-limit/root;

4
images_build/server_web/domains/testing-rate-limit/rate-limit-0bps.conf
View File

@@ -2,14 +2,14 @@
--- ---
server { server {
listen 80; listen 80;
server_name testing-rate-limit-0bps.{{ site.domain }}; server_name testing-shaping-rate-limit-0bps.{{ site.domain }};
include {{ site.serving-path }}/common/common.conf; include {{ site.serving-path }}/common/common.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root; root {{ site.serving-path }}/domains/testing-rate-limit/root;
} }
server { server {
listen 443; listen 443;
server_name testing-rate-limit-0bps.{{ site.domain }}; server_name testing-shaping-rate-limit-0bps.{{ site.domain }};
include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf; include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf;
include {{ site.serving-path }}/nginx-includes/tls-defaults.conf; include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root; root {{ site.serving-path }}/domains/testing-rate-limit/root;

4
images_build/server_web/domains/testing-rate-limit/rate-limit-1000gbps.conf
View File

@@ -2,7 +2,7 @@
--- ---
server { server {
listen 80; listen 80;
server_name testing-rate-limit-1000gbps.{{ site.domain }}; server_name testing-shaping-rate-limit-1000gbps.{{ site.domain }};
include {{ site.serving-path }}/common/common.conf; include {{ site.serving-path }}/common/common.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root; root {{ site.serving-path }}/domains/testing-rate-limit/root;
@@ -10,7 +10,7 @@ server {
server { server {
listen 443; listen 443;
server_name testing-rate-limit-1000gbps.{{ site.domain }}; server_name testing-shaping-rate-limit-1000gbps.{{ site.domain }};
include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf; include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf;
include {{ site.serving-path }}/nginx-includes/tls-defaults.conf; include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;