chore(api): add option to disable CORS to aid development

Author: philwinder

cmd/serve.go

@@ -161,6 +161,19 @@ func executeServeCommand(appContext cli.AppContext) runEFunc {
 
 		// Create the router
 		r := mux.NewRouter()
+
+		if appContext.Config.DisableCORS {
+			log.Ctx(ctx).Info().Msg("Disabling CORS")
+			r.Use(func(next http.Handler) http.Handler {
+				return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+					w.Header().Set("Access-Control-Allow-Origin", "*")
+					w.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
+					w.Header().Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization")
+					next.ServeHTTP(w, r)
+				})
+			})
+		}
+
 		apiRouter := r.PathPrefix(baseURL + "/").Subrouter()
 
 		// Use our validation middleware to check all requests against the

pkg/api/api.go

@@ -73,7 +73,6 @@ func (a *amplifyAPI) GetV0(w http.ResponseWriter, r *http.Request) {
 		fallthrough
 	case "application/vnd.api+json":
 		w.Header().Set("Content-Type", "application/vnd.api+json")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		err := json.NewEncoder(w).Encode(home)
 		if err != nil {
 			sendError(r.Context(), w, http.StatusInternalServerError, "Could not render JSON", err.Error())
@@ -102,7 +101,6 @@ func (a *amplifyAPI) GetV0Jobs(w http.ResponseWriter, r *http.Request) {
 		fallthrough
 	case "application/vnd.api+json":
 		w.Header().Set("Content-Type", "application/vnd.api+json")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		err := json.NewEncoder(w).Encode(jobs)
 		if err != nil {
 			sendError(r.Context(), w, http.StatusInternalServerError, "Could not render JSON", err.Error())
@@ -135,7 +133,6 @@ func (a *amplifyAPI) GetV0JobsId(w http.ResponseWriter, r *http.Request, id stri
 		fallthrough
 	case "application/vnd.api+json":
 		w.Header().Set("Content-Type", "application/vnd.api+json")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		err := json.NewEncoder(w).Encode(j)
 		if err != nil {
 			sendError(r.Context(), w, http.StatusInternalServerError, "Could not render JSON", err.Error())
@@ -178,7 +175,6 @@ func (a *amplifyAPI) GetV0Queue(w http.ResponseWriter, r *http.Request, params G
 		fallthrough
 	case "application/vnd.api+json":
 		w.Header().Set("Content-Type", "application/vnd.api+json")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		err := json.NewEncoder(w).Encode(executions)
 		if err != nil {
 			sendError(r.Context(), w, http.StatusInternalServerError, "Could not render JSON", err.Error())
@@ -211,7 +207,6 @@ func (a *amplifyAPI) GetV0QueueId(w http.ResponseWriter, r *http.Request, id ope
 		fallthrough
 	case "application/vnd.api+json":
 		w.Header().Set("Content-Type", "application/vnd.api+json")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		err := json.NewEncoder(w).Encode(e)
 		if err != nil {
 			sendError(r.Context(), w, http.StatusInternalServerError, "Could not render JSON", err.Error())
@@ -230,7 +225,6 @@ func (a *amplifyAPI) GetV0QueueId(w http.ResponseWriter, r *http.Request, id ope
 // (PUT /v0/queue/{id})
 func (a *amplifyAPI) PutV0QueueId(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
 	log.Ctx(r.Context()).Trace().Str("id", id.String()).Msg("PutV0QueueId")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
 	var body ExecutionRequest
 	switch r.Header.Get("Content-Type") {
 	case "application/json":
@@ -255,7 +249,6 @@ func (a *amplifyAPI) PutV0QueueId(w http.ResponseWriter, r *http.Request, id ope
 func (a *amplifyAPI) PostV0Queue(w http.ResponseWriter, r *http.Request) {
 	log.Ctx(r.Context()).Trace().Msg("PostV0Queue")
 	var body ExecutionRequest
-	w.Header().Set("Access-Control-Allow-Origin", "*")
 	switch r.Header.Get("Content-Type") {
 	case "application/x-www-form-urlencoded":
 		err := r.ParseForm()
@@ -340,7 +333,6 @@ func (a *amplifyAPI) GetV0Graph(w http.ResponseWriter, r *http.Request) {
 		fallthrough
 	case "application/vnd.api+json":
 		w.Header().Set("Content-Type", "application/vnd.api+json")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		err := json.NewEncoder(w).Encode(outputGraph)
 		if err != nil {
 			sendError(r.Context(), w, http.StatusInternalServerError, "Could not render JSON", err.Error())
@@ -604,7 +596,6 @@ func sendError(ctx context.Context, w http.ResponseWriter, statusCode int, userE
 		Detail: &devErr,
 	}
 	w.Header().Set("Content-Type", "application/vnd.api+json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
 	w.WriteHeader(statusCode)
 	err := json.NewEncoder(w).Encode(&Errors{e})
 	if err != nil {

pkg/config/appConfig.go

@@ -28,6 +28,7 @@ const (
 	NumConcurrentNodesFlag     = "num-concurrent-nodes"
 	NumConcurrentWorkflowsFlag = "num-concurrent-workflows"
 	MaxWaitingWorkflowsFlag    = "max-waiting-workflows"
+	DisableCORSFlag            = "disable-cors"
 )
 
 type AppConfig struct {
@@ -39,6 +40,7 @@ type AppConfig struct {
 	NodeConcurrency     int           `yaml:"concurrency"`
 	WorkflowConcurrency int           `yaml:"workflow-concurrency"`
 	MaxWaitingWorkflows int           `yaml:"max-waiting-workflows"`
+	DisableCORS         bool          `yaml:"disable-cors"`
 }
 
 type Trigger struct {
@@ -80,13 +82,21 @@ func ParseAppConfig(cmd *cobra.Command) *AppConfig {
 		log.Ctx(ctx).Warn().Msgf("Max waiting workflows (%d) is less than workflow concurrency (%d), reducing %s to match", maxWaitingWorkflowsInt, workflowConcurrencyInt, NumConcurrentWorkflowsFlag)
 		workflowConcurrencyInt = maxWaitingWorkflowsInt
 	}
+	disableCORS, err := cmd.Flags().GetBool(DisableCORSFlag)
+	if err != nil {
+		log.Ctx(ctx).Fatal().Err(err).Str("flag", DisableCORSFlag).Msg("Failed to parse")
+	}
+	ipfsSearchEnabled, err := cmd.Flags().GetBool(IPFSSearchEnabledFlag)
+	if err != nil {
+		log.Ctx(ctx).Fatal().Err(err).Str("flag", IPFSSearchEnabledFlag).Msg("Failed to parse")
+	}
 	return &AppConfig{
 		LogLevel:   logLevel,
 		ConfigPath: cmd.Flag(ConfigPathFlag).Value.String(),
 		Port:       port,
 		Trigger: Trigger{
 			IPFSSearch: IPFSSearch{
-				Enabled:  cmd.Flag(IPFSSearchEnabledFlag).Value.String() == "true",
+				Enabled:  ipfsSearchEnabled,
 				QueryURL: cmd.Flag(IPFSSearchQueryURLFlag).Value.String(),
 			},
 		},
@@ -96,6 +106,7 @@ func ParseAppConfig(cmd *cobra.Command) *AppConfig {
 		NodeConcurrency:     nodeConcurrencyInt,
 		WorkflowConcurrency: workflowConcurrencyInt,
 		MaxWaitingWorkflows: maxWaitingWorkflowsInt,
+		DisableCORS:         disableCORS,
 	}
 }
 
@@ -110,6 +121,7 @@ func AddGlobalFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().Int(NumConcurrentNodesFlag, 10, "Number of concurrent nodes to run at one time")
 	cmd.PersistentFlags().Int(NumConcurrentWorkflowsFlag, 10, "Number of concurrent workflows to run at one time")
 	cmd.PersistentFlags().Int(MaxWaitingWorkflowsFlag, 100, "Maximum number of workflows to queue up before rejecting new workflows")
+	cmd.PersistentFlags().Bool(DisableCORSFlag, false, "Disable CORS")
 }
 
 func InitViper(cmd *cobra.Command) (*viper.Viper, error) {