adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-19 05:32:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): basic auth only for modules' routes

Browse Source
This commit is contained in:
Julien Neuhart
2024-06-21 20:21:17 +02:00
parent d6fe895f6e
commit 3956763825
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/modules/api/api.go
View File

@@ -411,13 +411,6 @@ func (a *Api) Start() error {
loggerMiddleware(a.logger, disableLoggingForPaths), loggerMiddleware(a.logger, disableLoggingForPaths),
) )
// Basic auth?
if a.basicAuthUsername != "" {
a.srv.Pre(
basicAuthMiddleware(a.basicAuthUsername, a.basicAuthPassword),
)
}
// Add the modules' middlewares in their respective stacks. // Add the modules' middlewares in their respective stacks.
var externalMultipartMiddlewares []Middleware var externalMultipartMiddlewares []Middleware
for _, externalMiddleware := range a.externalMiddlewares { for _, externalMiddleware := range a.externalMiddlewares {
@@ -437,6 +430,11 @@ func (a *Api) Start() error {
for _, route := range a.routes { for _, route := range a.routes {
var middlewares []echo.MiddlewareFunc var middlewares []echo.MiddlewareFunc
// Basic auth?
if a.basicAuthUsername != "" {
middlewares = append(middlewares, basicAuthMiddleware(a.basicAuthUsername, a.basicAuthPassword))
}
if route.IsMultipart { if route.IsMultipart {
middlewares = append(middlewares, contextMiddleware(a.fs, a.timeout)) middlewares = append(middlewares, contextMiddleware(a.fs, a.timeout))

2
pkg/modules/api/api_test.go
View File

@@ -842,7 +842,6 @@ func TestApi_Start(t *testing.T) {
// health request. // health request.
recorder := httptest.NewRecorder() recorder := httptest.NewRecorder()
healthRequest := httptest.NewRequest(http.MethodGet, "/health", nil) healthRequest := httptest.NewRequest(http.MethodGet, "/health", nil)
healthRequest.SetBasicAuth(mod.basicAuthUsername, mod.basicAuthPassword)
mod.srv.ServeHTTP(recorder, healthRequest) mod.srv.ServeHTTP(recorder, healthRequest)
if recorder.Code != http.StatusOK { if recorder.Code != http.StatusOK {
@@ -851,7 +850,6 @@ func TestApi_Start(t *testing.T) {
// version request. // version request.
versionRequest := httptest.NewRequest(http.MethodGet, "/version", nil) versionRequest := httptest.NewRequest(http.MethodGet, "/version", nil)
versionRequest.SetBasicAuth(mod.basicAuthUsername, mod.basicAuthPassword)
mod.srv.ServeHTTP(recorder, versionRequest) mod.srv.ServeHTTP(recorder, versionRequest)
if recorder.Code != http.StatusOK { if recorder.Code != http.StatusOK {