修复全量测试竞态并更新审查夹具,保存证书覆盖调整前基线
This commit is contained in:
1 parent
78dfcde5e1
commit
2aac6dd9be
15 files changed
+146
-158
No files matched your search
@@ -5,7 +5,6 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/config"
|
||||
"git.pcux.cn/xuans/Smail/signal"
|
||||
@@ -23,16 +22,15 @@ func (transport *auditHTTPTransport) RoundTrip(request *http.Request) (*http.Res
|
||||
// 代理检查和就绪探测只使用隔离配置,传输层替身阻止访问真实服务。
|
||||
func TestAuditProxyMaintenanceSkipsNetwork(t *testing.T) {
|
||||
previousRoot, previousSnapshot := config.ROOT_PATH, config.CurrentConfig()
|
||||
previousTransport, previousExpiry, previousRestart := http.DefaultTransport, expiredTime, signal.RestartChan
|
||||
previousTransport, previousRestart := http.DefaultTransport, signal.RestartChan
|
||||
config.ROOT_PATH = t.TempDir()
|
||||
transport := &auditHTTPTransport{}
|
||||
http.DefaultTransport = transport
|
||||
signal.RestartChan = make(chan bool, 1)
|
||||
expiredTime = time.Time{}
|
||||
t.Cleanup(func() {
|
||||
config.ROOT_PATH = previousRoot
|
||||
config.PublishConfigSnapshot(previousSnapshot)
|
||||
http.DefaultTransport, expiredTime, signal.RestartChan = previousTransport, previousExpiry, previousRestart
|
||||
http.DefaultTransport, signal.RestartChan = previousTransport, previousRestart
|
||||
})
|
||||
for _, sslType := range []string{config.SSLTypeAutoHTTP, config.SSLTypeAutoDNS, config.SSLTypeUser} {
|
||||
config.PublishConfigSnapshot(&config.Config{TLSMode: config.HTTPSTLSModeProxy, SSLType: sslType, SetupState: config.SetupStateReady})
|
||||
@@ -45,7 +43,7 @@ func TestAuditProxyMaintenanceSkipsNetwork(t *testing.T) {
|
||||
t.Fatal("反代模式触发了网络请求或无证书重启")
|
||||
}
|
||||
// 切回直接 HTTPS 后,每轮读取最新策略,而非沿用启动时的分支。
|
||||
config.PublishConfigSnapshot(&config.Config{TLSMode: config.HTTPSTLSModeDirect, SSLType: config.SSLTypeAutoHTTP, SetupState: config.SetupStateReady})
|
||||
config.PublishConfigSnapshot(&config.Config{TLSMode: config.HTTPSTLSModeDirect, SSLType: config.SSLTypeAutoHTTP, SetupState: config.SetupStateReady, HttpPort: 8001})
|
||||
if !waitHTTPReady() || transport.calls != 1 {
|
||||
t.Fatal("直接 HTTPS 的 HTTP 就绪探测未恢复")
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user