This commit is contained in:
1 parent
3c455186b7
commit
e8e14236db
7 files changed
+212
-24
No files matched your search
@@ -0,0 +1,91 @@
|
||||
package res_init
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/config"
|
||||
)
|
||||
|
||||
func TestDirInitUsesRuntimeRoot(t *testing.T) {
|
||||
root, working := t.TempDir(), t.TempDir()
|
||||
t.Chdir(working)
|
||||
previous := config.ROOT_PATH
|
||||
config.ROOT_PATH = root
|
||||
t.Cleanup(func() { config.ROOT_PATH = previous })
|
||||
|
||||
for i := 0; i < 2; i++ {
|
||||
if err := dirInit(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, name := range []string{"config", "config/dkim", "config/ssl"} {
|
||||
info, err := os.Stat(filepath.Join(root, name))
|
||||
if err != nil || !info.IsDir() {
|
||||
t.Fatalf("运行目录未创建: %s", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(working, "config")); !os.IsNotExist(err) {
|
||||
t.Fatal("初始化不应在工作目录创建另一份配置")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDirInitPreservesExistingFiles(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
previous := config.ROOT_PATH
|
||||
config.ROOT_PATH = root
|
||||
t.Cleanup(func() { config.ROOT_PATH = previous })
|
||||
if err := dirInit(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
files := []string{"config/config.json", "config/smail.db", "config/credential.key", "config/dkim/dkim.priv", "config/ssl/private.key"}
|
||||
data := []byte("existing-runtime-fixture")
|
||||
for _, name := range files {
|
||||
if err := os.WriteFile(filepath.Join(root, name), data, 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if err := dirInit(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, name := range files {
|
||||
actual, err := os.ReadFile(filepath.Join(root, name))
|
||||
if err != nil || !bytes.Equal(actual, data) {
|
||||
t.Fatalf("初始化改变了已有运行文件: %s", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDirInitRejectsFileAsDirectory(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
previous := config.ROOT_PATH
|
||||
config.ROOT_PATH = root
|
||||
t.Cleanup(func() { config.ROOT_PATH = previous })
|
||||
if err := os.Mkdir(filepath.Join(root, "config"), 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "config", "dkim"), []byte("blocked"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := dirInit(); err == nil {
|
||||
t.Fatal("普通文件不能冒充运行目录")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDirInitRejectsSymlink(t *testing.T) {
|
||||
root, outside := t.TempDir(), t.TempDir()
|
||||
previous := config.ROOT_PATH
|
||||
config.ROOT_PATH = root
|
||||
t.Cleanup(func() { config.ROOT_PATH = previous })
|
||||
if err := os.Symlink(outside, filepath.Join(root, "config")); err != nil {
|
||||
t.Skipf("当前环境无法创建符号链接: %v", err)
|
||||
}
|
||||
if err := dirInit(); err == nil {
|
||||
t.Fatal("运行配置目录不能通过符号链接逃逸")
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(outside, "dkim")); !os.IsNotExist(err) {
|
||||
t.Fatal("拒绝符号链接前不应写入外部目录")
|
||||
}
|
||||
}
|
||||
@@ -32,7 +32,6 @@ import (
|
||||
"git.pcux.cn/xuans/Smail/session"
|
||||
"git.pcux.cn/xuans/Smail/signal"
|
||||
"git.pcux.cn/xuans/Smail/utils/credential"
|
||||
"git.pcux.cn/xuans/Smail/utils/file"
|
||||
log "github.com/sirupsen/logrus"
|
||||
// 导入 HTTP 客户端,用于等待服务启动。
|
||||
"net/http"
|
||||
@@ -453,24 +452,18 @@ func stopAdminResetControl() {
|
||||
}
|
||||
|
||||
func dirInit() error {
|
||||
if !file.PathExist("./config") {
|
||||
err := os.MkdirAll("./config", 0700)
|
||||
if err != nil {
|
||||
return fmt.Errorf("create config directory: %w", err)
|
||||
// 初始化与配置读写使用同一个运行根目录,不依赖启动时的工作目录。
|
||||
root := filepath.Join(config.ROOT_PATH, "config")
|
||||
for _, directory := range []string{root, filepath.Join(root, "dkim"), filepath.Join(root, "ssl")} {
|
||||
if err := os.MkdirAll(directory, 0700); err != nil {
|
||||
return fmt.Errorf("创建运行配置目录失败: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if !file.PathExist("./config/dkim") {
|
||||
err := os.MkdirAll("./config/dkim", 0700)
|
||||
info, err := os.Lstat(directory)
|
||||
if err != nil {
|
||||
return fmt.Errorf("create DKIM directory: %w", err)
|
||||
return fmt.Errorf("检查运行配置目录失败: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if !file.PathExist("./config/ssl") {
|
||||
err := os.MkdirAll("./config/ssl", 0700)
|
||||
if err != nil {
|
||||
return fmt.Errorf("create SSL directory: %w", err)
|
||||
if info.Mode()&os.ModeSymlink != 0 || !info.IsDir() {
|
||||
return fmt.Errorf("运行配置目录不能是符号链接或普通文件")
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in new issue
Block a user