From 301d8d4e00ff0992150309d896cbb00831ebc4c7 Mon Sep 17 00:00:00 2001 From: tanfarming Date: Mon, 12 Feb 2024 08:25:26 -0500 Subject: [PATCH] word --- ita/internal/handlers.go | 6 ++++-- ita/main.go | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ita/internal/handlers.go b/ita/internal/handlers.go index 13ddcf4a..3af34c83 100644 --- a/ita/internal/handlers.go +++ b/ita/internal/handlers.go @@ -323,9 +323,11 @@ var Restore = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { }) var RewriteAssets = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - err := ret_rewrite_assets(r.URL.Query().Get("old_domain"), r.URL.Query().Get("new_domain")) + err := ret_rewrite_assets( + r.URL.Query().Get("old_domain"), + r.URL.Query().Get("new_domain")) if err != nil { - http.Error(w, "failed", http.StatusInternalServerError) + http.Error(w, err.Error(), http.StatusInternalServerError) return } fmt.Fprintf(w, "done") diff --git a/ita/main.go b/ita/main.go index 253d2856..9eb1504a 100644 --- a/ita/main.go +++ b/ita/main.go @@ -85,6 +85,7 @@ func main() { router.Handle("/api/ita/undeploy", chk_tat_hdr()(internal.Undeploy)) router.Handle("/api/ita/custom-domain", chk_tat_hdr()(internal.CustomDomain)) router.Handle("/api/ita/restore", chk_tat_hdr()(internal.Restore)) + router.Handle("/api/ita/rewrite_assets", chk_tat_hdr()(internal.RewriteAssets)) go internal.StartNewServer(router, 6000, false) internal.StartNewServer(router, 6001, true) @@ -103,7 +104,6 @@ func chk_tat_hdr() func(http.Handler) http.Handler { http.NotFound(w, r) return } - // turkeyauthHost := "http://turkeyauth.turkey-services:9001" turkeyauthHost := "https://auth.myhubs.dev" if strings.HasSuffix(internal.GetCfg().HubDomain, "dev.myhubs.net") { @@ -113,11 +113,13 @@ func chk_tat_hdr() func(http.Handler) http.Handler { resp, err := http.Get(turkeyauthHost + "/chk_token?token=" + token) if err != nil { internal.Logger.Sugar().Debugf("reject -- err@chk_token: %v", err) - internal.Handle_NotFound(w, r) + // internal.Handle_NotFound(w, r) + http.Error(w, "bad token?", http.StatusForbidden) return } else if resp.StatusCode != http.StatusOK { internal.Logger.Sugar().Debugf("reject -- bad resp.StatusCode: %v", resp.StatusCode) - internal.Handle_NotFound(w, r) + // internal.Handle_NotFound(w, r) + http.Error(w, "bad token", http.StatusForbidden) return } email := resp.Header.Get("verified-UserEmail") @@ -125,7 +127,8 @@ func chk_tat_hdr() func(http.Handler) http.Handler { internal.Logger.Sugar().Debugf("verified-UserEmail: %v, rootUserEmail: %v", resp.StatusCode, rootUserEmail) if email != rootUserEmail { internal.Logger.Sugar().Debugf("reject -- bad verified-UserEmail -- has: %v, need: %v", email, rootUserEmail) - internal.Handle_NotFound(w, r) + // internal.Handle_NotFound(w, r) + http.Error(w, "unauthorized user", http.StatusForbidden) return }