Skip to content

Update CORS to use a library #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xinchaochen8 wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Update CORS to use a library #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eee4c79
update agent to use cors library
xinchaochen8 Feb 12, 2025
1c520c0
update manager api to use cors package
xinchaochen8 Feb 13, 2025
19dcff5
Update server.go
xinchaochen8 Apr 8, 2025
f054e19
Update master-build.yaml
xinchaochen8 Apr 8, 2025
8bd51b8
update agent to use cors library
xinchaochen8 Feb 12, 2025
3b92a2b
Reverted unnecessary changes and fixed typos.
xinchaochen8 Apr 19, 2025
0e8a999
Update go.mod
Alan-Cha Jun 3, 2025
25b9483
Revert quickstart server statefulset
Alan-Cha Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions api/agent/crd_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import (
"io"
"net/http"
"strings"

"google.golang.org/protobuf/encoding/protojson"

crdmanager "github.com/spiffe/tornjak/pkg/agent/spirecrd"
trustdomain "github.com/spiffe/spire-api-sdk/proto/spire/api/server/trustdomain/v1"
crdmanager "github.com/spiffe/tornjak/pkg/agent/spirecrd"
)

func (s *Server) CRDFederationList(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -49,7 +50,8 @@ func (s *Server) CRDFederationList(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")

je := json.NewEncoder(w)
err = je.Encode(ret) //nolint:govet //Ignoring mutex (not being used) - sync.Mutex by value is unused for linter govet
if err != nil {
Expand Down Expand Up @@ -98,7 +100,8 @@ func (s *Server) CRDFederationCreate(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")

je := json.NewEncoder(w)
err = je.Encode(ret) //nolint:govet //Ignoring mutex (not being used) - sync.Mutex by value is unused for linter govet

Expand Down
54 changes: 27 additions & 27 deletions api/agent/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (s *Server) healthcheck(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)

err = je.Encode(ret)
Expand All @@ -62,7 +62,7 @@ func (s *Server) debugServer(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)

err = je.Encode(ret)
Expand Down Expand Up @@ -103,7 +103,7 @@ func (s *Server) agentList(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)

err = je.Encode(ret)
Expand Down Expand Up @@ -147,7 +147,7 @@ func (s *Server) agentBan(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
_, err = w.Write([]byte("SUCCESS"))

if err != nil {
Expand Down Expand Up @@ -192,7 +192,7 @@ func (s *Server) agentDelete(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
_, err = w.Write([]byte("SUCCESS"))

if err != nil {
Expand Down Expand Up @@ -233,7 +233,7 @@ func (s *Server) agentCreateJoinToken(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -274,7 +274,7 @@ func (s *Server) entryList(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -315,7 +315,7 @@ func (s *Server) entryCreate(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -356,7 +356,7 @@ func (s *Server) entryDelete(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -397,7 +397,7 @@ func (s *Server) bundleGet(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -437,7 +437,7 @@ func (s *Server) federatedBundleList(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -477,7 +477,7 @@ func (s *Server) federatedBundleCreate(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -517,7 +517,7 @@ func (s *Server) federatedBundleUpdate(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -557,7 +557,7 @@ func (s *Server) federatedBundleDelete(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -598,7 +598,7 @@ func (s *Server) federationList(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -641,7 +641,7 @@ func (s *Server) federationCreate(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -684,7 +684,7 @@ func (s *Server) federationUpdate(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -724,7 +724,7 @@ func (s *Server) federationDelete(w http.ResponseWriter, r *http.Request) {
return
}

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand All @@ -738,7 +738,7 @@ func (s *Server) federationDelete(w http.ResponseWriter, r *http.Request) {
func (s *Server) home(w http.ResponseWriter, r *http.Request) {
var ret = "Welcome to the Tornjak Backend!"

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)

var err = je.Encode(ret)
Expand All @@ -751,7 +751,7 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
func (s *Server) health(w http.ResponseWriter, r *http.Request) {
var ret = "Endpoint is healthy."

cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)

var err = je.Encode(ret)
Expand Down Expand Up @@ -787,7 +787,7 @@ func (s *Server) tornjakSelectorsList(w http.ResponseWriter, r *http.Request) {
retError(w, emsg, http.StatusBadRequest)
return
}
cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -823,7 +823,7 @@ func (s *Server) tornjakPluginDefine(w http.ResponseWriter, r *http.Request) {
retError(w, emsg, http.StatusBadRequest)
return
}
cors(w, r)
w.Header().Set("Content-Type", "application/json")
_, err = w.Write([]byte("SUCCESS"))
if err != nil {
emsg := fmt.Sprintf("Error: %v", err.Error())
Expand Down Expand Up @@ -858,7 +858,7 @@ func (s *Server) tornjakAgentsList(w http.ResponseWriter, r *http.Request) {
retError(w, emsg, http.StatusBadRequest)
return
}
cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -899,7 +899,7 @@ func (s *Server) clusterList(w http.ResponseWriter, r *http.Request) {
retError(w, emsg, http.StatusBadRequest)
return
}
cors(w, r)
w.Header().Set("Content-Type", "application/json")
je := json.NewEncoder(w)
err = je.Encode(ret)
if err != nil {
Expand Down Expand Up @@ -935,7 +935,7 @@ func (s *Server) clusterCreate(w http.ResponseWriter, r *http.Request) {
retError(w, emsg, http.StatusBadRequest)
return
}
cors(w, r)
w.Header().Set("Content-Type", "application/json")
_, err = w.Write([]byte("SUCCESS"))
if err != nil {
emsg := fmt.Sprintf("Error: %v", err.Error())
Expand Down Expand Up @@ -970,7 +970,7 @@ func (s *Server) clusterEdit(w http.ResponseWriter, r *http.Request) {
retError(w, emsg, http.StatusBadRequest)
return
}
cors(w, r)
w.Header().Set("Content-Type", "application/json")
_, err = w.Write([]byte("SUCCESS"))
if err != nil {
emsg := fmt.Sprintf("Error: %v", err.Error())
Expand Down Expand Up @@ -1005,7 +1005,7 @@ func (s *Server) clusterDelete(w http.ResponseWriter, r *http.Request) {
retError(w, emsg, http.StatusBadRequest)
return
}
cors(w, r)
w.Header().Set("Content-Type", "application/json")
_, err = w.Write([]byte("SUCCESS"))
if err != nil {
emsg := fmt.Sprintf("Error: %v", err.Error())
Expand Down
Loading