Fix test

Author: lunny

modules/setting/ssh.go

@@ -4,6 +4,7 @@
 package setting
 
 import (
+	"os"
 	"path/filepath"
 	"strings"
 	"text/template"
@@ -60,6 +61,7 @@ var SSH = struct {
 	MinimumKeySizeCheck:           true,
 	MinimumKeySizes:               map[string]int{"ed25519": 256, "ed25519-sk": 256, "ecdsa": 256, "ecdsa-sk": 256, "rsa": 3071},
 	ServerHostKeys:                []string{"ssh/gitea.rsa", "ssh/gogs.rsa"},
+	KeyTestPath:                   "ssh_key_test",
 	AuthorizedKeysCommandTemplate: "{{.AppPath}} --config={{.CustomConf}} serv key-{{.Key.ID}}",
 	PerWriteTimeout:               PerWriteTimeout,
 	PerWritePerKbTimeout:          PerWritePerKbTimeout,
@@ -122,10 +124,6 @@ func loadSSHFrom(rootCfg ConfigProvider) {
 	if len(serverMACs) > 0 {
 		SSH.ServerMACs = serverMACs
 	}
-	SSH.KeyTestPath = sec.Key("SSH_KEY_TEST_PATH").MustString("ssh_key_test")
-	if !filepath.IsAbs(SSH.KeyTestPath) {
-		SSH.KeyTestPath = filepath.Join(TempPath, SSH.KeyTestPath)
-	}
 	if err = sec.MapTo(&SSH); err != nil {
 		log.Fatal("Failed to map SSH settings: %v", err)
 	}
@@ -135,6 +133,15 @@ func loadSSHFrom(rootCfg ConfigProvider) {
 		}
 	}
 
+	SSH.KeyTestPath = sec.Key("SSH_KEY_TEST_PATH").MustString("ssh_key_test")
+	if !filepath.IsAbs(SSH.KeyTestPath) {
+		SSH.KeyTestPath = filepath.Join(TempPath, SSH.KeyTestPath)
+	}
+	// FIXME: why 0o644 for a directory .....
+	if err := os.MkdirAll(SSH.KeyTestPath, 0o644); err != nil {
+		log.Fatal("failed to create directory %q for ssh key test: %w", SSH.KeyTestPath, err)
+	}
+
 	SSH.KeygenPath = sec.Key("SSH_KEYGEN_PATH").String()
 	SSH.Port = sec.Key("SSH_PORT").MustInt(22)
 	SSH.ListenPort = sec.Key("SSH_LISTEN_PORT").MustInt(SSH.Port)

modules/ssh/init.go

@@ -32,11 +32,6 @@ func Init() error {
 
 	builtinUnused()
 
-	// FIXME: why 0o644 for a directory .....
-	if err := os.MkdirAll(setting.SSH.KeyTestPath, 0o644); err != nil {
-		return fmt.Errorf("failed to create directory %q for ssh key test: %w", setting.SSH.KeyTestPath, err)
-	}
-
 	if len(setting.SSH.TrustedUserCAKeys) > 0 && setting.SSH.AuthorizedPrincipalsEnabled {
 		caKeysFileName := setting.SSH.TrustedUserCAKeysFile
 		caKeysFileDir := filepath.Dir(caKeysFileName)