fix(distribution): 修复分销后台域名登录被拦截
This commit is contained in:
@@ -27,6 +27,7 @@ type Config struct {
|
||||
PrimaryDomain string
|
||||
TenantJieyouDomain string
|
||||
OpsDomain string
|
||||
DistributionAdminDomain string
|
||||
Storage StorageConfig
|
||||
StorageMirror StorageConfig
|
||||
SMS SMSConfig
|
||||
@@ -110,6 +111,11 @@ func Load() Config {
|
||||
PrimaryDomain: primaryDomain,
|
||||
TenantJieyouDomain: strings.TrimSpace(getEnv("TENANT_JIEYOU_DOMAIN", "")),
|
||||
OpsDomain: opsDomain(appEnv, getEnv("OPS_DOMAIN", ""), primaryDomain),
|
||||
DistributionAdminDomain: distributionAdminDomain(
|
||||
appEnv,
|
||||
getEnv("DISTRIBUTION_ADMIN_DOMAIN", ""),
|
||||
primaryDomain,
|
||||
),
|
||||
Storage: StorageConfig{
|
||||
Endpoint: getEnv("STORAGE_ENDPOINT", "http://localhost:19090"),
|
||||
Bucket: getEnv("STORAGE_BUCKET", "hfb-sys"),
|
||||
@@ -176,6 +182,19 @@ func opsDomain(appEnv string, value string, primaryDomain string) string {
|
||||
return "ops.localhost"
|
||||
}
|
||||
|
||||
func distributionAdminDomain(appEnv string, value string, primaryDomain string) string {
|
||||
if domain := strings.TrimSpace(value); domain != "" {
|
||||
return domain
|
||||
}
|
||||
if strings.EqualFold(strings.TrimSpace(appEnv), "production") {
|
||||
if primary := strings.TrimSpace(primaryDomain); primary != "" {
|
||||
return "distribution." + primary
|
||||
}
|
||||
return ""
|
||||
}
|
||||
return "distribution.localhost"
|
||||
}
|
||||
|
||||
func (c Config) ValidateProductionSecurity() error {
|
||||
if !IsProductionEnv(c.AppEnv) {
|
||||
return nil
|
||||
|
||||
@@ -48,6 +48,34 @@ func TestOpsDomain(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestDistributionAdminDomain(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
appEnv string
|
||||
value string
|
||||
primary string
|
||||
expected string
|
||||
}{
|
||||
{name: "开发默认", appEnv: "development", expected: "distribution.localhost"},
|
||||
{name: "生产按主域推导", appEnv: "production", primary: "hao858.com", expected: "distribution.hao858.com"},
|
||||
{
|
||||
name: "显式覆盖",
|
||||
appEnv: "production",
|
||||
value: "dist-admin.example.com",
|
||||
primary: "hao858.com",
|
||||
expected: "dist-admin.example.com",
|
||||
},
|
||||
{name: "生产无主域", appEnv: "production", expected: ""},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
if got := distributionAdminDomain(tc.appEnv, tc.value, tc.primary); got != tc.expected {
|
||||
t.Fatalf("distributionAdminDomain() = %q, want %q", got, tc.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadDatabaseConfigFromEnvironment(t *testing.T) {
|
||||
t.Setenv("DATABASE_MAX_OPEN_CONNS", "80")
|
||||
t.Setenv("DATABASE_MAX_IDLE_CONNS", "16")
|
||||
|
||||
Reference in New Issue
Block a user