Merge commit '1209539d403a691172d8be0e7dd2ebbcb215db2d' into HEAD

main.go

@@ -131,12 +131,17 @@ func UploadHandler(w http.ResponseWriter, r *http.Request, pipes []pipelines.IPi
 	logrus.Info("Pipeline routes registered successfully")
 }
 
-func RegisterRoutes(r *mux.Router, pipelines []pipelines.IPipeline, storageProvider storage.IStorageProvider) {
-	r.HandleFunc("/", IndexHandler).Methods("GET")
-	r.HandleFunc("/upload", func(w http.ResponseWriter, r *http.Request) {
+func RegisterRoutes(r *mux.Router, appSettings settings.Settings, pipelines []pipelines.IPipeline, storageProvider storage.IStorageProvider) {
+	index := r.Methods(http.MethodGet).Subrouter()
+	index.HandleFunc("/", IndexHandler)
+
+	upload := r.Methods(http.MethodPost).Subrouter()
+	upload.HandleFunc("/upload", func(w http.ResponseWriter, r *http.Request) {
 		UploadHandler(w, r, pipelines, storageProvider)
-	}).Methods("POST")
-	r.HandleFunc("/pipelines/{pipeline}", func(w http.ResponseWriter, r *http.Request) {
+	})
+
+	pipeline := r.Methods(http.MethodGet).Subrouter()
+	pipeline.HandleFunc("/pipelines/{pipeline}", func(w http.ResponseWriter, r *http.Request) {
 		for _, pipeline := range pipelines {
 			if pipeline.GetSlug() == mux.Vars(r)["pipeline"] {
 				PipelineHandler(pipeline, storageProvider, w, r)
@@ -145,7 +150,14 @@ func RegisterRoutes(r *mux.Router, pipelines []pipelines.IPipeline, storageProvi
 		}
 
 		w.WriteHeader(404)
-	}).Methods("GET")
+	})
+
+	if appSettings.Authentication.Enabled {
+		authMiddleware := middlewares.CreateAuthenticationMiddleware(appSettings.Authentication.Token)
+
+		upload.Use(authMiddleware.Middleware)
+		pipeline.Use(authMiddleware.Middleware)
+	}
 }
 
 func main() {
@@ -178,12 +190,6 @@ func main() {
 
 	r := mux.NewRouter()
 
-	if appSettings.Authentication.Enabled {
-		authMiddleware := middlewares.CreateAuthenticationMiddleware(appSettings.Authentication.Token)
-
-		r.Use(authMiddleware.Middleware)
-	}
-
 	if appSettings.RateLimiter.Enabled {
 		rateLimiterMiddleware, err := middlewares.CreateRateLimiterMiddleware(appSettings.RateLimiter.RequestsPerMinute, appSettings.RateLimiter.AllowedBurst)
 		if err != nil {
@@ -193,9 +199,7 @@ func main() {
 		r.Use(rateLimiterMiddleware.Middleware)
 	}
 
-	r.HandleFunc("/", IndexHandler)
-
-	RegisterRoutes(r, pipes, storageProvider)
+	RegisterRoutes(r, appSettings, pipes, storageProvider)
 
 	logrus.Info("Lithium started, listening for requests...")
 

main_test.go

@@ -10,8 +10,10 @@ import (
 
 	"github.com/bxcodec/faker/v3"
 	"github.com/geplauder/lithium/pipelines"
+	"github.com/geplauder/lithium/settings"
 	"github.com/geplauder/lithium/storage"
 	"github.com/gorilla/mux"
+	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -35,8 +37,9 @@ func TestEndpointRoute(t *testing.T) {
 	t.Run("Registered pipelines are valid routes", func(t *testing.T) {
 		router := mux.NewRouter()
 		fs := storage.GetMemoryStorageProvider()
+		appSettings, _ := settings.LoadSettings(afero.NewMemMapFs())
 
-		RegisterRoutes(router, []pipelines.IPipeline{data}, fs)
+		RegisterRoutes(router, appSettings, []pipelines.IPipeline{data}, fs)
 
 		request, _ := http.NewRequest("GET", "/pipelines/"+data.Slug, nil)
 		responseRecorder := httptest.NewRecorder()
@@ -64,8 +67,9 @@ func TestUploadRoute(t *testing.T) {
 	t.Run("Test uploads missing multipart boundary", func(t *testing.T) {
 		router := mux.NewRouter()
 		fs := storage.GetMemoryStorageProvider()
+		appSettings, _ := settings.LoadSettings(afero.NewMemMapFs())
 
-		RegisterRoutes(router, []pipelines.IPipeline{pipelines.Pipeline{
+		RegisterRoutes(router, appSettings, []pipelines.IPipeline{pipelines.Pipeline{
 			Name:           "",
 			Slug:           "",
 			Type:           0,
@@ -92,8 +96,9 @@ func TestUploadRoute(t *testing.T) {
 	t.Run("Test uploads missing multipart boundary", func(t *testing.T) {
 		router := mux.NewRouter()
 		fs := storage.GetMemoryStorageProvider()
+		appSettings, _ := settings.LoadSettings(afero.NewMemMapFs())
 
-		RegisterRoutes(router, []pipelines.IPipeline{pipelines.Pipeline{
+		RegisterRoutes(router, appSettings, []pipelines.IPipeline{pipelines.Pipeline{
 			Name:           "",
 			Slug:           "",
 			Type:           0,

settings/settings.go

@@ -63,7 +63,7 @@ func LoadSettings(fileSystem afero.Fs) (Settings, error) {
 	defaultSettings := Settings{
 		Endpoint: "127.0.0.1:8000",
 		Authentication: AuthenticationSettings{
-			Enabled: true,
+			Enabled: false,
 			Token:   "changeme",
 		},
 		RateLimiter: RateLimiterSettings{