收口超级管理员本机重置入口
关闭历史命令行参数入口,更新 Windows 安装器、Linux 运维说明和整改清单,保持密码重置仅通过本机受保护终端执行。
This commit is contained in:
1 parent
55c500c1a8
commit
b95262f6c0
5 files changed
+22
-89
No files matched your search
@@ -1,67 +1,4 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/admin"
|
||||
"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 legacyMain() {
|
||||
baseDir := flag.String("base-dir", "", "Windows 默认安装根目录")
|
||||
configPath := flag.String("config", "", "配置文件路径")
|
||||
codeOutput := flag.String("code-output", "", "一次性校验码文件路径")
|
||||
flag.Parse()
|
||||
path := *configPath
|
||||
if path == "" {
|
||||
path = filepath.Join(config.DefaultPaths(*baseDir).Config, "scert.json")
|
||||
}
|
||||
cfg, err := config.LoadWithEnv(path)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "读取配置失败:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
controller := admin.NewWithCodePath(cfg, *codeOutput)
|
||||
session, err := controller.Start()
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "启用密码重置入口失败:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
writeSessionInfo(os.Stdout, session)
|
||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||
defer stop()
|
||||
ticker := time.NewTicker(admin.RefreshInterval)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
if err := controller.Stop(); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "关闭密码重置入口失败:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
fmt.Println("Scert-admin 已关闭密码重置入口。")
|
||||
return
|
||||
case <-ticker.C:
|
||||
if err := controller.Refresh(); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "续期密码重置入口租约失败:", err)
|
||||
_ = controller.Stop()
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 旧版参数入口保留文件以兼容历史构建路径,实际程序入口位于 entry.go。
|
||||
// Scert-admin 只允许无参数的本机受保护终端,不再保留公网重置租约和校验码文件流程。
|
||||
@@ -1,27 +1,19 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/admin"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/adminconsole"
|
||||
)
|
||||
|
||||
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("命令行输出不得包含一次性校验码")
|
||||
func TestAdminRejectsLegacyArguments(t *testing.T) {
|
||||
err := adminconsole.Run(context.Background(), []string{"--config", "scert.json"})
|
||||
if err == nil {
|
||||
t.Fatal("Scert-admin 不得接受历史命令行参数")
|
||||
}
|
||||
if !strings.Contains(output.String(), "/run/scert-admin/reset-code") {
|
||||
t.Fatal("命令行输出必须提示受保护校验码文件路径")
|
||||
if !strings.Contains(err.Error(), "不接受参数") {
|
||||
t.Fatalf("错误信息未说明参数入口已关闭:%v", err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user