mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-06 00:48:36 +00:00
Merge pull request #4950 from bestony/worktree/rapid-cloud-510e
feat(setup): add explicit setup bypass
This commit is contained in:
2 files changed
+113
No files matched your search
@@ -19,6 +19,7 @@ import (
|
|||||||
|
|
||||||
_ "github.com/lib/pq"
|
_ "github.com/lib/pq"
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/redis/go-redis/v9"
|
||||||
|
"go.uber.org/zap"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -147,9 +148,23 @@ func decideAdminBootstrap(totalUsers, adminUsers int64) adminBootstrapDecision {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func skipSetupEnabled() bool {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(os.Getenv("SKIP_SETUP"))) {
|
||||||
|
case "true", "1", "yes":
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// NeedsSetup checks if the system needs initial setup
|
// NeedsSetup checks if the system needs initial setup
|
||||||
// Uses multiple checks to prevent attackers from forcing re-setup by deleting config
|
// Uses multiple checks to prevent attackers from forcing re-setup by deleting config
|
||||||
func NeedsSetup() bool {
|
func NeedsSetup() bool {
|
||||||
|
if skipSetupEnabled() {
|
||||||
|
logger.L().Debug("setup.needs_setup_bypassed", zap.String("reason", "skip_setup_enabled"))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// Check 1: Config file must not exist
|
// Check 1: Config file must not exist
|
||||||
if _, err := os.Stat(GetConfigFilePath()); !os.IsNotExist(err) {
|
if _, err := os.Stat(GetConfigFilePath()); !os.IsNotExist(err) {
|
||||||
return false // Config exists, no setup needed
|
return false // Config exists, no setup needed
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package setup
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@@ -71,6 +72,103 @@ func TestSetupDefaultAdminConcurrency(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestNeedsSetupSkipsWhenSkipSetupIsEnabled(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
value string
|
||||||
|
}{
|
||||||
|
{name: "true", value: "true"},
|
||||||
|
{name: "one", value: "1"},
|
||||||
|
{name: "yes", value: "yes"},
|
||||||
|
{name: "trimmed mixed case true", value: " TrUe "},
|
||||||
|
{name: "trimmed mixed case yes", value: " YeS "},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
t.Setenv("DATA_DIR", t.TempDir())
|
||||||
|
t.Setenv("SKIP_SETUP", tc.value)
|
||||||
|
|
||||||
|
if NeedsSetup() {
|
||||||
|
t.Fatalf("NeedsSetup() = true, want false when SKIP_SETUP is enabled")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNeedsSetupFallsBackToFileDetectionWhenSkipSetupIsDisabled(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
skipSetupSet bool
|
||||||
|
skipSetup string
|
||||||
|
markerFile string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "unset without installation files",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "false without installation files",
|
||||||
|
skipSetupSet: true,
|
||||||
|
skipSetup: " false ",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid value without installation files",
|
||||||
|
skipSetupSet: true,
|
||||||
|
skipSetup: "enabled",
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "config file exists",
|
||||||
|
skipSetupSet: true,
|
||||||
|
skipSetup: "false",
|
||||||
|
markerFile: ConfigFileName,
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "install lock file exists",
|
||||||
|
skipSetupSet: true,
|
||||||
|
skipSetup: "invalid",
|
||||||
|
markerFile: InstallLockFile,
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
dataDir := t.TempDir()
|
||||||
|
t.Setenv("DATA_DIR", dataDir)
|
||||||
|
if tc.skipSetupSet {
|
||||||
|
t.Setenv("SKIP_SETUP", tc.skipSetup)
|
||||||
|
} else {
|
||||||
|
originalValue, wasSet := os.LookupEnv("SKIP_SETUP")
|
||||||
|
if err := os.Unsetenv("SKIP_SETUP"); err != nil {
|
||||||
|
t.Fatalf("Unsetenv(SKIP_SETUP) error = %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() {
|
||||||
|
if wasSet {
|
||||||
|
_ = os.Setenv("SKIP_SETUP", originalValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_ = os.Unsetenv("SKIP_SETUP")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
if tc.markerFile != "" {
|
||||||
|
if err := os.WriteFile(filepath.Join(dataDir, tc.markerFile), nil, 0o600); err != nil {
|
||||||
|
t.Fatalf("WriteFile(%s) error = %v", tc.markerFile, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := NeedsSetup(); got != tc.want {
|
||||||
|
t.Fatalf("NeedsSetup() = %v, want %v", got, tc.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestSetupMigrationTimeout(t *testing.T) {
|
func TestSetupMigrationTimeout(t *testing.T) {
|
||||||
t.Run("uses default timeout when unset", func(t *testing.T) {
|
t.Run("uses default timeout when unset", func(t *testing.T) {
|
||||||
cfg := &SetupConfig{}
|
cfg := &SetupConfig{}
|
||||||
|
|||||||
Reference in new issue
Block a user