pro/im_manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fallback workbench admin secret

Browse Source
This commit is contained in:
richjohnrambo
2026-09-16 14:28:42 +08:00
parent e159f9a88e
commit 3e40554229
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/library/imworkbench/client.go
+24 -7
View File
@@ -47,13 +47,14 @@ func DefaultClient(ctx context.Context) *Client {
if timeout <= 0 {
timeout = 5 * time.Second
}
secret := g.Cfg().MustGet(ctx, "imWorkbenchApi.serviceSecret").String()
if strings.HasPrefix(secret, "${") && strings.HasSuffix(secret, "}") {
secret = os.Getenv(strings.TrimSuffix(strings.TrimPrefix(secret, "${"), "}"))
}
if secret == "" {
secret = os.Getenv("IM_WORKBENCH_API_SECRET")
}
secret := firstSecret(
g.Cfg().MustGet(ctx, "imWorkbenchApi.serviceSecret").String(),
os.Getenv("IM_WORKBENCH_API_SECRET"),
g.Cfg().MustGet(ctx, "imInternalApi.serviceSecret").String(),
os.Getenv("IM_INTERNAL_API_SECRET"),
g.Cfg().MustGet(ctx, "imAdminApi.serviceSecret").String(),
os.Getenv("IM_ADMIN_API_SECRET"),
)
conf := Config{
BaseURL: g.Cfg().MustGet(ctx, "imWorkbenchApi.baseUrl").String(),
ServiceName: g.Cfg().MustGet(ctx, "imWorkbenchApi.serviceName", "hotgo-admin").String(),
@@ -180,3 +181,19 @@ func randomNonce() (string, error) {
}
return hex.EncodeToString(b[:]), nil
}
func firstSecret(values ...string) string {
for _, value := range values {
value = strings.TrimSpace(value)
if value == "" {
continue
}
if strings.HasPrefix(value, "${") && strings.HasSuffix(value, "}") {
value = strings.TrimSpace(os.Getenv(strings.TrimSuffix(strings.TrimPrefix(value, "${"), "}")))
}
if value != "" {
return value
}
}
return ""
}