完善初始化向导、通知配置与证书流程
This commit is contained in:
1 parent
b2833b761d
commit
f85ef10527
41 files changed
+3645
-1697
No files matched your search
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
@@ -14,9 +15,17 @@ import (
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/config"
|
||||
)
|
||||
|
||||
func writeSessionInfo(writer io.Writer, session admin.Session) {
|
||||
fmt.Fprintln(writer, "Scert-admin 已启用临时密码重置入口,不监听独立网络端口。")
|
||||
fmt.Fprintln(writer, "重置地址:", session.State.ResetURL)
|
||||
fmt.Fprintln(writer, "一次性校验码已写入受保护的临时文件:", session.State.CodePath)
|
||||
fmt.Fprintln(writer, "请使用 root 或 Scert 用户读取该文件;密码重置完成后文件会自动销毁。")
|
||||
fmt.Fprintln(writer, "停止 Scert-admin 后入口将立即关闭;异常退出时入口会在租约过期后自动关闭。")
|
||||
}
|
||||
func main() {
|
||||
baseDir := flag.String("base-dir", "", "Windows 默认安装根目录")
|
||||
configPath := flag.String("config", "", "配置文件路径")
|
||||
codeOutput := flag.String("code-output", "", "一次性校验码文件路径")
|
||||
flag.Parse()
|
||||
path := *configPath
|
||||
if path == "" {
|
||||
@@ -27,16 +36,13 @@ func main() {
|
||||
fmt.Fprintln(os.Stderr, "读取配置失败:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
controller := admin.New(cfg)
|
||||
controller := admin.NewWithCodePath(cfg, *codeOutput)
|
||||
session, err := controller.Start()
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "启用密码重置入口失败:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
fmt.Println("Scert-admin 已启用临时密码重置入口,不监听独立网络端口。")
|
||||
fmt.Println("重置地址:", session.State.ResetURL)
|
||||
fmt.Println("一次性校验码:", session.Code)
|
||||
fmt.Println("停止 Scert-admin 后入口将立即关闭;异常退出时入口会在租约过期后自动关闭。")
|
||||
writeSessionInfo(os.Stdout, session)
|
||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||
defer stop()
|
||||
ticker := time.NewTicker(admin.RefreshInterval)
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/admin"
|
||||
)
|
||||
|
||||
func TestSessionInfoDoesNotExposeResetCode(t *testing.T) {
|
||||
const secretCode = "ABCDE-12345-FGHIJ"
|
||||
var output bytes.Buffer
|
||||
writeSessionInfo(&output, admin.Session{
|
||||
State: admin.State{
|
||||
ResetURL: "https://scert.example.test/reset",
|
||||
CodePath: "/run/scert-admin/reset-code",
|
||||
},
|
||||
Code: secretCode,
|
||||
})
|
||||
if strings.Contains(output.String(), secretCode) {
|
||||
t.Fatal("命令行输出不得包含一次性校验码")
|
||||
}
|
||||
if !strings.Contains(output.String(), "/run/scert-admin/reset-code") {
|
||||
t.Fatal("命令行输出必须提示受保护校验码文件路径")
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user