Merge pull request #1022 from replicatedhq/middlewares

Middlewares

kotsadm/api/kustomize/overlays/dev/deployment.yaml

@@ -48,6 +48,7 @@ spec:
           volumeMounts:
             - name: kubelet-client-cert
               mountPath: /etc/kubernetes/pki/kubelet
+          readinessProbe: ~
       volumes:
         - name: kubelet-client-cert
           secret:

kotsadm/pkg/handlers/airgap.go

@@ -25,15 +25,6 @@ type UpdateAppFromAirgapResponse struct {
 }
 
 func GetAirgapInstallStatus(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	status, err := store.GetStore().GetAirgapInstallStatus()
 	if err != nil {
 		logger.Error(err)
@@ -45,15 +36,6 @@ func GetAirgapInstallStatus(w http.ResponseWriter, r *http.Request) {
 }
 
 func ResetAirgapInstallStatus(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	appID, err := store.GetStore().GetAppIDFromSlug(mux.Vars(r)["appSlug"])
 	if err != nil {
 		logger.Error(err)
@@ -72,15 +54,6 @@ func ResetAirgapInstallStatus(w http.ResponseWriter, r *http.Request) {
 }
 
 func UploadAirgapBundle(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	if r.Method == "POST" {
 		createAppFromAirgap(w, r)
 		return

kotsadm/pkg/handlers/app.go

@@ -74,15 +74,6 @@ type ResponseCluster struct {
 }
 
 func ListApps(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	apps, err := store.GetStore().ListInstalledApps()
 	if err != nil {
 		logger.Error(err)
@@ -109,15 +100,6 @@ func ListApps(w http.ResponseWriter, r *http.Request) {
 }
 
 func GetApp(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	appSlug := mux.Vars(r)["appSlug"]
 	a, err := store.GetStore().GetAppFromSlug(appSlug)
 	if err != nil {
@@ -273,15 +255,6 @@ type GetAppVersionsResponse struct {
 }
 
 func GetAppVersionHistory(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	appSlug := mux.Vars(r)["appSlug"]
 
 	foundApp, err := store.GetStore().GetAppFromSlug(appSlug)

kotsadm/pkg/handlers/appstatus.go

@@ -13,10 +13,6 @@ import (
 
 // NOTE: this uses special cluster authorization
 func SetAppStatus(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
 	auth, err := parseClusterAuthorization(r.Header.Get("Authorization"))
 	if err != nil {
 		logger.Error(err)

kotsadm/pkg/handlers/backup.go

@@ -20,15 +20,6 @@ type CreateBackupResponse struct {
 }
 
 func CreateBackup(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	createBackupResponse := CreateBackupResponse{
 		Success: false,
 	}
@@ -60,15 +51,6 @@ type ListBackupsResponse struct {
 }
 
 func ListBackups(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	listBackupsResponse := ListBackupsResponse{}
 
 	foundApp, err := store.GetStore().GetAppFromSlug(mux.Vars(r)["appSlug"])
@@ -110,15 +92,6 @@ type ListKotsadmBackupsResponse struct {
 }
 
 func ListKotsadmBackups(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	listBackupsResponse := ListKotsadmBackupsResponse{}
 
 	backups, err := snapshot.ListKotsadmBackups()
@@ -140,15 +113,6 @@ type GetKotsadmBackupResponse struct {
 }
 
 func GetKotsadmBackup(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	getBackupResponse := GetKotsadmBackupResponse{}
 
 	backup, err := snapshot.GetKotsadmBackupDetail(context.TODO(), mux.Vars(r)["snapshotName"])
@@ -171,15 +135,6 @@ type DeleteKotsadmBackupResponse struct {
 }
 
 func DeleteKotsadmBackup(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	deleteBackupResponse := DeleteKotsadmBackupResponse{}
 
 	if err := snapshot.DeleteBackup(mux.Vars(r)["snapshotName"]); err != nil {

kotsadm/pkg/handlers/config.go

@@ -61,15 +61,6 @@ type CurrentAppConfigResponse struct {
 }
 
 func UpdateAppConfig(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	updateAppConfigResponse := UpdateAppConfigResponse{
 		Success: false,
 	}
@@ -146,15 +137,6 @@ func UpdateAppConfig(w http.ResponseWriter, r *http.Request) {
 }
 
 func LiveAppConfig(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	liveAppConfigResponse := LiveAppConfigResponse{
 		Success: false,
 	}
@@ -229,15 +211,6 @@ func LiveAppConfig(w http.ResponseWriter, r *http.Request) {
 }
 
 func CurrentAppConfig(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	currentAppConfigResponse := CurrentAppConfigResponse{
 		Success: false,
 	}

kotsadm/pkg/handlers/contents.go

@@ -18,15 +18,6 @@ type GetAppContentsResponse struct {
 }
 
 func GetAppContents(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	appSlug := mux.Vars(r)["appSlug"]
 	sequence, err := strconv.Atoi(mux.Vars(r)["sequence"])
 	if err != nil {

kotsadm/pkg/handlers/cors.go

@@ -5,6 +5,7 @@ import (
 )
 
 func CORS(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS, DELETE, PUT")
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	w.Header().Set("Access-Control-Allow-Headers", "content-type, origin, accept, authorization")
 }

kotsadm/pkg/handlers/dashboard.go

@@ -20,15 +20,6 @@ type GetAppDashboardResponse struct {
 }
 
 func GetAppDashboard(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	appSlug := mux.Vars(r)["appSlug"]
 	clusterID := mux.Vars(r)["clusterId"]
 

kotsadm/pkg/handlers/deploy.go

@@ -19,15 +19,6 @@ import (
 )
 
 func DeployAppVersion(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	appSlug := mux.Vars(r)["appSlug"]
 	sequence, err := strconv.Atoi(mux.Vars(r)["sequence"])
 	if err != nil {
@@ -54,10 +45,6 @@ func DeployAppVersion(w http.ResponseWriter, r *http.Request) {
 
 // NOTE: this uses special cluster authorization
 func UpdateDeployResult(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
 	auth, err := parseClusterAuthorization(r.Header.Get("Authorization"))
 	if err != nil {
 		logger.Error(err)
@@ -113,10 +100,6 @@ func UpdateDeployResult(w http.ResponseWriter, r *http.Request) {
 
 // NOTE: this uses special cluster authorization
 func UpdateUndeployResult(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
 	auth, err := parseClusterAuthorization(r.Header.Get("Authorization"))
 	if err != nil {
 		logger.Error(err)

kotsadm/pkg/handlers/downstream.go

@@ -11,15 +11,6 @@ import (
 )
 
 func GetDownstreamOutput(w http.ResponseWriter, r *http.Request) {
-	if handleOptionsRequest(w, r) {
-		return
-	}
-
-	if err := requireValidSession(w, r); err != nil {
-		logger.Error(err)
-		return
-	}
-
 	appSlug := mux.Vars(r)["appSlug"]
 	clusterID := mux.Vars(r)["clusterId"]
 	sequence, err := strconv.Atoi(mux.Vars(r)["sequence"])