diff --git a/cmd/dobotai/main.go b/cmd/dobotai/main.go index 9a27e0a..13a3040 100644 --- a/cmd/dobotai/main.go +++ b/cmd/dobotai/main.go @@ -11,6 +11,7 @@ import ( "syscall" "time" + "gitea.zheromiku.top/Weknora/dobotai-platform/internal/adminweb" "gitea.zheromiku.top/Weknora/dobotai-platform/internal/agentbinding" "gitea.zheromiku.top/Weknora/dobotai-platform/internal/audit" "gitea.zheromiku.top/Weknora/dobotai-platform/internal/channels/dingtalk" @@ -49,6 +50,10 @@ func main() { log.Fatal(err) } defer store.Close() + settingsRuntime, err := buildSettingsRuntime(storeCtx, store, os.Getenv("DOBOTAI_TENANT_KEY")) + if err != nil { + log.Fatal(err) + } client, err := weknora.NewClient(os.Getenv("WEKNORA_BASE_URL"), os.Getenv("WEKNORA_API_KEY"), 120*time.Second) if err != nil { log.Fatal(err) @@ -95,8 +100,8 @@ func main() { } dingCfg := dingtalk.StreamConfig{ - ClientID: os.Getenv("DINGTALK_CLIENT_ID"), - ClientSecret: os.Getenv("DINGTALK_CLIENT_SECRET"), + ClientID: settingsRuntime.clientID, + ClientSecret: settingsRuntime.secret, TenantKey: os.Getenv("DOBOTAI_TENANT_KEY"), } if err := dingCfg.Validate(); err != nil { @@ -236,6 +241,8 @@ func main() { CardSender: cardSender, Directory: directoryResolver, OutboundRewriter: outboundRewriter, + SettingsRouter: &dingTalkSettingsRouter{controller: settingsRuntime.controller}, + LanguageResolver: settingsRuntime.repository, }, ) if err != nil { @@ -251,7 +258,12 @@ func main() { defer streamClient.Close() log.Printf("DingTalk Stream ingress started for tenant %s", dingCfg.TenantKey) } - server := &http.Server{Addr: address, Handler: api.Handler(), ReadHeaderTimeout: 5 * time.Second, ReadTimeout: 15 * time.Second, WriteTimeout: 130 * time.Second, IdleTimeout: 60 * time.Second} + rootHandler := http.NewServeMux() + rootHandler.Handle("/", api.Handler()) + if strings.TrimSpace(os.Getenv("DOBOTAI_ADMIN_TOKEN")) != "" { + rootHandler.Handle("/admin/", adminweb.New(settingsRuntime.admin, os.Getenv("DOBOTAI_ADMIN_TOKEN"))) + } + server := &http.Server{Addr: address, Handler: rootHandler, ReadHeaderTimeout: 5 * time.Second, ReadTimeout: 15 * time.Second, WriteTimeout: 130 * time.Second, IdleTimeout: 60 * time.Second} go func() { log.Printf("DobotAI ingress listening on %s", address) if err := server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { diff --git a/cmd/dobotai/settings_wiring.go b/cmd/dobotai/settings_wiring.go index 0769af1..a26b035 100644 --- a/cmd/dobotai/settings_wiring.go +++ b/cmd/dobotai/settings_wiring.go @@ -2,10 +2,17 @@ package main import ( "context" + "errors" + "os" + "path/filepath" "strings" + "gitea.zheromiku.top/Weknora/dobotai-platform/internal/adminweb" "gitea.zheromiku.top/Weknora/dobotai-platform/internal/channels/dingtalk" + "gitea.zheromiku.top/Weknora/dobotai-platform/internal/dingtalkconfig" + "gitea.zheromiku.top/Weknora/dobotai-platform/internal/secretstore" "gitea.zheromiku.top/Weknora/dobotai-platform/internal/settings" + "gitea.zheromiku.top/Weknora/dobotai-platform/internal/store/postgres" ) type dingTalkSettingsRouter struct{ controller *settings.Controller } @@ -20,3 +27,61 @@ func (r *dingTalkSettingsRouter) Handle(ctx context.Context, m dingtalk.Settings out, err := r.controller.Handle(ctx, settings.SettingInput{TenantKey: m.TenantKey, Channel: m.Channel, StaffID: m.StaffID, UnionID: m.UnionID, DisplayName: m.DisplayName, Department: m.Department, Text: m.Text, ConversationType: m.ConversationType, ConversationID: m.ConversationID, ConversationTitle: m.ConversationTitle}) return true, strings.TrimSpace(out), err } + +type settingsRuntime struct { + repository *postgres.SettingsRepository + controller *settings.Controller + admin *adminweb.ControlService + clientID string + secret string +} + +func buildSettingsRuntime(ctx context.Context, store *postgres.Store, tenantKey string) (*settingsRuntime, error) { + tenantKey = strings.TrimSpace(tenantKey) + if tenantKey == "" { + return nil, errors.New("DOBOTAI_TENANT_KEY is required") + } + repo, err := postgres.NewSettingsRepository(store) + if err != nil { + return nil, err + } + root := strings.TrimSpace(os.Getenv("DOBOTAI_SECRET_DIR")) + if root == "" { + home, homeErr := os.UserHomeDir() + if homeErr != nil { + return nil, homeErr + } + root = filepath.Join(home, ".config", "dobotai", "secrets") + } + secrets, err := secretstore.New(root) + if err != nil { + return nil, err + } + clientID, secretRef, _, err := repo.ActiveDingTalkConfig(ctx, tenantKey) + if err != nil { + return nil, err + } + var secret string + if secretRef != "" { + secret, err = secrets.Get(secretRef) + if err != nil { + return nil, errors.New("active DingTalk secret is unavailable") + } + } + if clientID == "" && strings.TrimSpace(os.Getenv("DINGTALK_CLIENT_ID")) != "" && strings.TrimSpace(os.Getenv("DINGTALK_CLIENT_SECRET")) != "" { + clientID, secret = strings.TrimSpace(os.Getenv("DINGTALK_CLIENT_ID")), strings.TrimSpace(os.Getenv("DINGTALK_CLIENT_SECRET")) + secretRef, err = secrets.Put("dingtalk", secret) + if err != nil { + return nil, err + } + if err = repo.SaveDingTalkConfig(ctx, tenantKey, clientID, secretRef, true); err != nil { + _ = secrets.Delete(secretRef) + return nil, err + } + } + control, err := adminweb.NewControlService(tenantKey, repo, secrets, dingtalkconfig.NewVerifier("https://oapi.dingtalk.com/gettoken", nil)) + if err != nil { + return nil, err + } + return &settingsRuntime{repository: repo, controller: settings.NewController(repo), admin: control, clientID: clientID, secret: secret}, nil +} diff --git a/internal/adminweb/server.go b/internal/adminweb/server.go index 0cd329a..0e7e535 100644 --- a/internal/adminweb/server.go +++ b/internal/adminweb/server.go @@ -26,6 +26,10 @@ type Service interface { SaveCredentials(context.Context, string, string) error VerifyCredentials(context.Context, string, string) Verification } +type BootstrapService interface { + CreateBootstrap(context.Context, string) error + ConfirmBootstrap(context.Context) error +} type server struct { service Service token string @@ -33,25 +37,35 @@ type server struct { page *template.Template } +const settingsPage = `
新凭据会先在线验证,成功后保存;服务重启后加载新应用。