修复Linux启动就绪通知并隔离命令行测试目录
通过本机Unix套接字报告HTTPS监听状态,同步服务配置与安装模板,保持初始化业务就绪隔离。补充生命周期回归并修复旧CLI测试误用正式目录的问题。更新Linux原生测试证据,明确新候选尚未部署、生产验收未放行。
This commit is contained in:
1 parent
b6b964203d
commit
0b74886c45
24 files changed
+647
-21
No files matched your search
@@ -22,6 +22,7 @@ import (
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/dnsprovider"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/firewall"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/secretstore"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/serviceready"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/setup"
|
||||
)
|
||||
|
||||
@@ -103,7 +104,13 @@ func Run(ctx context.Context, options ServerOptions) (bool, error) {
|
||||
fmt.Fprintln(options.Output, "初始化防火墙采用 external 模式:不检查或修改主机规则及云安全组,请管理员预先放行所需端口。")
|
||||
}
|
||||
}
|
||||
return serveTemporaryHTTPS(ctx, listener, material, handler, router.Completed())
|
||||
readyListener := &serviceready.Listener{Listener: listener, Notify: func() error {
|
||||
if ctx.Err() != nil {
|
||||
return nil
|
||||
}
|
||||
return serviceready.Ready("初始化 HTTPS 服务已监听,等待完成配置;业务尚未就绪")
|
||||
}}
|
||||
return serveTemporaryHTTPS(ctx, readyListener, material, handler, router.Completed())
|
||||
}
|
||||
|
||||
func writeBootstrapNotice(output io.Writer, port int, path string, material TLSMaterial) {
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestRunNotify(t *testing.T) {
|
||||
for _, mode := range []string{"listening", "missing-socket"} {
|
||||
t.Run(mode, func(t *testing.T) {
|
||||
fixture := newCompletionFixture(t, "authorized.example.test")
|
||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
fixture.base.Server.Host = "127.0.0.1"
|
||||
fixture.base.Server.Port = listener.Addr().(*net.TCPAddr).Port
|
||||
listener.Close()
|
||||
path := filepath.Join(t.TempDir(), "notify")
|
||||
t.Setenv("NOTIFY_SOCKET", path)
|
||||
var socket *net.UnixConn
|
||||
if mode == "listening" {
|
||||
socket, err = net.ListenUnixgram("unixgram", &net.UnixAddr{Name: path, Net: "unixgram"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer socket.Close()
|
||||
}
|
||||
ctx, cancel := context.WithCancel(t.Context())
|
||||
defer cancel()
|
||||
result := make(chan error, 1)
|
||||
go func() {
|
||||
complete, err := Run(ctx, ServerOptions{
|
||||
Config: fixture.base, ConfigPath: fixture.configPath,
|
||||
PublicIP: "127.0.0.1", URLPath: fixture.urlPath, FirewallMode: "external",
|
||||
})
|
||||
if complete {
|
||||
t.Error("启动通知被当作初始化完成")
|
||||
}
|
||||
result <- err
|
||||
}()
|
||||
if socket != nil {
|
||||
if err := socket.SetReadDeadline(time.Now().Add(5 * time.Second)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
buffer := make([]byte, 1024)
|
||||
n, _, err := socket.ReadFromUnix(buffer)
|
||||
if err != nil || !strings.HasPrefix(string(buffer[:n]), "READY=1\nSTATUS=") || !strings.Contains(string(buffer[:n]), "业务尚未就绪") {
|
||||
t.Fatalf("实际初始化入口未报告等待配置状态:%v", err)
|
||||
}
|
||||
cancel()
|
||||
}
|
||||
select {
|
||||
case err := <-result:
|
||||
if mode == "missing-socket" && err == nil {
|
||||
t.Fatal("通知地址失效时初始化入口静默降级")
|
||||
}
|
||||
if mode == "listening" && err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
case <-time.After(5 * time.Second):
|
||||
t.Fatal("初始化入口在通知失败或取消后没有退出")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"errors"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/config"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/serviceready"
|
||||
)
|
||||
|
||||
func TestBootstrapListeningIsNotBusinessReady(t *testing.T) {
|
||||
for _, fail := range []bool{false, true} {
|
||||
name := "listening"
|
||||
if fail {
|
||||
name = "notify-failure"
|
||||
}
|
||||
t.Run(name, func(t *testing.T) {
|
||||
material, err := NewTemporaryTLSMaterial("127.0.0.1")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer listener.Close()
|
||||
cfg := config.Default(t.TempDir())
|
||||
handler, closeFiles := bootstrapHandler(nil, cfg)
|
||||
defer closeFiles()
|
||||
expected := errors.New("本机通知失败")
|
||||
notified := make(chan struct{})
|
||||
wrapped := &serviceready.Listener{Listener: listener, Notify: func() error {
|
||||
close(notified)
|
||||
if fail {
|
||||
return expected
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
ctx, cancel := context.WithCancel(t.Context())
|
||||
defer cancel()
|
||||
result := make(chan error, 1)
|
||||
go func() {
|
||||
complete, err := serveTemporaryHTTPS(ctx, wrapped, material, handler, make(chan struct{}))
|
||||
if complete {
|
||||
t.Error("监听成功被当作初始化完成")
|
||||
}
|
||||
result <- err
|
||||
}()
|
||||
select {
|
||||
case <-notified:
|
||||
case <-time.After(3 * time.Second):
|
||||
t.Fatal("初始化接收循环未发出通知")
|
||||
}
|
||||
if !fail {
|
||||
roots := x509.NewCertPool()
|
||||
roots.AddCert(material.Leaf)
|
||||
transport := &http.Transport{TLSClientConfig: &tls.Config{MinVersion: tls.VersionTLS12, RootCAs: roots}}
|
||||
defer transport.CloseIdleConnections()
|
||||
client := &http.Client{Transport: transport, Timeout: 3 * time.Second}
|
||||
response, err := client.Get("https://" + listener.Addr().String() + "/readyz")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
body, err := io.ReadAll(response.Body)
|
||||
response.Body.Close()
|
||||
if err != nil || response.StatusCode != http.StatusServiceUnavailable || !strings.Contains(string(body), "setup_incomplete") {
|
||||
t.Fatal("监听通知改变了初始化业务就绪边界")
|
||||
}
|
||||
cancel()
|
||||
}
|
||||
select {
|
||||
case err := <-result:
|
||||
if fail && !errors.Is(err, expected) {
|
||||
t.Fatalf("未保留通知失败原因:%v", err)
|
||||
}
|
||||
if !fail && err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
case <-time.After(5 * time.Second):
|
||||
t.Fatal("初始化服务未按生命周期退出")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user