tests: add tests for resources controller

internal/controller/oidc_controller_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http/httptest"
 	"net/url"
+	"os"
 	"strings"
 	"testing"
 
@@ -457,4 +458,16 @@ func TestOIDCController(t *testing.T) {
 			test.run(t, router, recorder)
 		})
 	}
+
+	err = db.Close()
+	assert.NoError(t, err)
+
+	err = os.Remove("/tmp/tinyauth_test.db")
+	assert.NoError(t, err)
+
+	err = os.Remove(oidcServiceCfg.PrivateKeyPath)
+	assert.NoError(t, err)
+
+	err = os.Remove(oidcServiceCfg.PublicKeyPath)
+	assert.NoError(t, err)
 }

internal/controller/resources_controller_test.go

@@ -5,55 +5,84 @@ import (
 	"os"
 	"testing"
 
-	"github.com/steveiliop56/tinyauth/internal/controller"
-
 	"github.com/gin-gonic/gin"
-	"gotest.tools/v3/assert"
+	"github.com/steveiliop56/tinyauth/internal/controller"
+	"github.com/stretchr/testify/assert"
 )
 
-func TestResourcesHandler(t *testing.T) {
+func TestResourcesController(t *testing.T) {
-	// Setup
+	resourcesControllerCfg := controller.ResourcesControllerConfig{
-	gin.SetMode(gin.TestMode)
+		Path:    "/tmp/testfiles",
-	router := gin.New()
-	group := router.Group("/")
-
-	ctrl := controller.NewResourcesController(controller.ResourcesControllerConfig{
-		Path:    "/tmp/tinyauth",
 		Enabled: true,
-	}, group)
+	}
-	ctrl.SetupRoutes()
 
-	// Create test data
+	type testCase struct {
-	err := os.Mkdir("/tmp/tinyauth", 0755)
+		description string
-	assert.NilError(t, err)
+		run         func(t *testing.T, router *gin.Engine, recorder *httptest.ResponseRecorder)
-	defer os.RemoveAll("/tmp/tinyauth")
+	}
 
-	file, err := os.Create("/tmp/tinyauth/test.txt")
+	tests := []testCase{
-	assert.NilError(t, err)
+		{
-
+			description: "Ensure resources endpoint returns 200 OK for existing file",
-	_, err = file.WriteString("This is a test file.")
+			run: func(t *testing.T, router *gin.Engine, recorder *httptest.ResponseRecorder) {
-	assert.NilError(t, err)
+				req := httptest.NewRequest("GET", "/resources/testfile.txt", nil)
-	file.Close()
-
-	// Test existing file
-	req := httptest.NewRequest("GET", "/resources/test.txt", nil)
-	recorder := httptest.NewRecorder()
 				router.ServeHTTP(recorder, req)
 
 				assert.Equal(t, 200, recorder.Code)
 				assert.Equal(t, "This is a test file.", recorder.Body.String())
-
+			},
-	// Test non-existing file
+		},
-	req = httptest.NewRequest("GET", "/resources/nonexistent.txt", nil)
+		{
-	recorder = httptest.NewRecorder()
+			description: "Ensure resources endpoint returns 404 Not Found for non-existing file",
+			run: func(t *testing.T, router *gin.Engine, recorder *httptest.ResponseRecorder) {
+				req := httptest.NewRequest("GET", "/resources/nonexistent.txt", nil)
 				router.ServeHTTP(recorder, req)
 
 				assert.Equal(t, 404, recorder.Code)
-
+			},
-	// Test directory traversal attack
+		},
-	req = httptest.NewRequest("GET", "/resources/../etc/passwd", nil)
+		{
-	recorder = httptest.NewRecorder()
+			description: "Ensure resources controller denies path traversal",
+			run: func(t *testing.T, router *gin.Engine, recorder *httptest.ResponseRecorder) {
+				req := httptest.NewRequest("GET", "/resources/../somefile.txt", nil)
 				router.ServeHTTP(recorder, req)
 
 				assert.Equal(t, 404, recorder.Code)
+			},
+		},
+	}
+
+	err := os.MkdirAll(resourcesControllerCfg.Path, 0777)
+	assert.NoError(t, err)
+
+	testFilePath := resourcesControllerCfg.Path + "/testfile.txt"
+	err = os.WriteFile(testFilePath, []byte("This is a test file."), 0777)
+	assert.NoError(t, err)
+
+	testFilePathParent := resourcesControllerCfg.Path + "/../somefile.txt"
+	err = os.WriteFile(testFilePathParent, []byte("This file should not be accessible."), 0777)
+	assert.NoError(t, err)
+
+	for _, test := range tests {
+		t.Run(test.description, func(t *testing.T) {
+			router := gin.Default()
+			group := router.Group("/")
+			gin.SetMode(gin.TestMode)
+
+			resourcesController := controller.NewResourcesController(resourcesControllerCfg, group)
+			resourcesController.SetupRoutes()
+
+			recorder := httptest.NewRecorder()
+			test.run(t, router, recorder)
+		})
+	}
+
+	err = os.Remove(testFilePath)
+	assert.NoError(t, err)
+
+	err = os.Remove(testFilePathParent)
+	assert.NoError(t, err)
+
+	err = os.Remove(resourcesControllerCfg.Path)
+	assert.NoError(t, err)
 }

internal/controller/user_controller_test.go

@@ -3,6 +3,7 @@ package controller_test
 import (
 	"encoding/json"
 	"net/http/httptest"
+	"os"
 	"slices"
 	"strings"
 	"testing"
@@ -344,4 +345,10 @@ func TestUserController(t *testing.T) {
 			test.run(t, router, recorder)
 		})
 	}
+
+	err = db.Close()
+	assert.NoError(t, err)
+
+	err = os.Remove("/tmp/tinyauth_test.db")
+	assert.NoError(t, err)
 }