检查点:保存监听时序与中文目录修复,继续处理协调请求恢复
This commit is contained in:
1 parent
2c0d0e8eda
commit
76b4d94ca0
9 files changed
+310
-6
No files matched your search
@@ -222,7 +222,7 @@ func (c Coordinator) withSession(ctx context.Context, operation func(*os.Root, M
|
||||
if c.Proxy == nil || c.Upstream == nil {
|
||||
return errors.New("管理证书协调器尚未配置")
|
||||
}
|
||||
if err := validateDirectory(c.Directory); err != nil {
|
||||
if err := validatePrivateDirectory(c.Directory); err != nil {
|
||||
return err
|
||||
}
|
||||
lockPath := filepath.Join(c.Directory, ".coordination.lock")
|
||||
|
||||
@@ -148,6 +148,23 @@ func TestCoordinatorCommitsOverLocalIPC(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestCoordinatorUsesLocalizedStateDirectory(t *testing.T) {
|
||||
f := newCoordinatorFixture(t)
|
||||
f.coordinator.Directory = filepath.Join(f.coordinator.Directory, "管理证书 状态")
|
||||
if err := os.Mkdir(f.coordinator.Directory, 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := f.coordinator.Ready(t.Context()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := f.coordinator.Activate(t.Context(), f.candidate.CertificateFiles); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if record := f.record(t); record.Phase != "committed" {
|
||||
t.Fatal("中文状态目录中的协调未提交", record.Phase)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCoordinatorRecoversLostResponses(t *testing.T) {
|
||||
for _, operation := range []string{"stage", "commit"} {
|
||||
t.Run(operation, func(t *testing.T) {
|
||||
|
||||
@@ -102,15 +102,19 @@ func newID() (string, error) {
|
||||
}
|
||||
|
||||
func validateDirectory(directory string) error {
|
||||
if !filepath.IsAbs(directory) || filepath.Clean(directory) != directory || directory == string(filepath.Separator) {
|
||||
return errors.New("Nginx 激活目录必须是独立的绝对目录")
|
||||
}
|
||||
// 目录来自本地部署策略,仍拒绝可改变 Nginx 指令语义的字符。
|
||||
for _, char := range directory {
|
||||
if !(char >= 'a' && char <= 'z' || char >= 'A' && char <= 'Z' || char >= '0' && char <= '9' || char == '/' || char == '-' || char == '_' || char == '.') {
|
||||
return errors.New("Nginx 激活目录包含不允许的字符")
|
||||
}
|
||||
}
|
||||
return validatePrivateDirectory(directory)
|
||||
}
|
||||
|
||||
func validatePrivateDirectory(directory string) error {
|
||||
if !filepath.IsAbs(directory) || filepath.Clean(directory) != directory || directory == string(filepath.Separator) {
|
||||
return errors.New("激活状态目录必须是独立的规范绝对目录")
|
||||
}
|
||||
for path := directory; ; path = filepath.Dir(path) {
|
||||
info, err := os.Lstat(path)
|
||||
if err != nil {
|
||||
|
||||
@@ -51,6 +51,45 @@ func TestActivationDirectoryTrust(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrivateDirectoryKeepsTrustWithoutNginxSyntax(t *testing.T) {
|
||||
base := t.TempDir()
|
||||
for _, name := range []string{"管理证书", "application data", "literal;directory"} {
|
||||
directory := filepath.Join(base, name)
|
||||
if err := os.Mkdir(directory, 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := validatePrivateDirectory(directory); err != nil {
|
||||
t.Fatalf("应用私有状态目录不应套用 Nginx 指令字符限制:%v", err)
|
||||
}
|
||||
if err := validateDirectory(directory); err == nil {
|
||||
t.Fatal("实际写入 Nginx 配置的目录仍须限制字符")
|
||||
}
|
||||
if err := os.Chmod(directory, 0o750); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := validatePrivateDirectory(directory); err == nil {
|
||||
t.Fatal("应用状态目录仍须保持私有权限")
|
||||
}
|
||||
}
|
||||
parent := filepath.Join(base, "parent")
|
||||
child := filepath.Join(parent, "child")
|
||||
if err := os.MkdirAll(child, 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Chmod(parent, 0o777); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
link := filepath.Join(base, "link")
|
||||
if err := os.Symlink(child, link); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, directory := range []string{child, link, "relative", "/", base + "/../escape"} {
|
||||
if err := validatePrivateDirectory(directory); err == nil {
|
||||
t.Fatalf("不应接受不可信应用状态目录:%q", directory)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestActivationFilesRejectLinksAndSpecialFiles(t *testing.T) {
|
||||
base := t.TempDir()
|
||||
root, err := os.OpenRoot(base)
|
||||
|
||||
Reference in new issue
Block a user