walk and log chi routes (#3610)

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jan 24, 2023 · 0cde0a3 · 0cde0a3
1 parent fae9753
commit 0cde0a3
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 5 deletions.
diff --git a/changelog/unreleased/walk-and-log-chi-routes.md b/changelog/unreleased/walk-and-log-chi-routes.md
@@ -0,0 +1,5 @@
+Enhancement: Walk and log chi routes
+
+On startup we now log all routes handled by chi
+
+https://github.com/cs3org/reva/pull/3610
diff --git a/internal/http/services/appprovider/appprovider.go b/internal/http/services/appprovider/appprovider.go
@@ -99,6 +99,11 @@ func New(m map[string]interface{}, log *zerolog.Logger) (global.Service, error)
 		return nil, err
 	}
 
+	_ = chi.Walk(s.router, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
+		log.Debug().Str("service", "approvider").Str("method", method).Str("route", route).Int("middlewares", len(middlewares)).Msg("serving endpoint")
+		return nil
+	})
+
 	return s, nil
 }
 

diff --git a/internal/http/services/owncloud/ocs/ocs.go b/internal/http/services/owncloud/ocs/ocs.go
@@ -63,7 +63,7 @@ func New(m map[string]interface{}, log *zerolog.Logger) (global.Service, error)
 		router: r,
 	}
 
-	if err := s.routerInit(); err != nil {
+	if err := s.routerInit(log); err != nil {
 		return nil, err
 	}
 
@@ -94,7 +94,7 @@ func (s *svc) Unprotected() []string {
 	}
 }
 
-func (s *svc) routerInit() error {
+func (s *svc) routerInit(log *zerolog.Logger) error {
 	capabilitiesHandler := new(capabilities.Handler)
 	userHandler := new(user.Handler)
 	usersHandler := new(users.Handler)
@@ -151,6 +151,12 @@ func (s *svc) routerInit() error {
 			})
 		})
 	})
+
+	_ = chi.Walk(s.router, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
+		log.Debug().Str("service", "ocs").Str("method", method).Str("route", route).Int("middlewares", len(middlewares)).Msg("serving endpoint")
+		return nil
+	})
+
 	return nil
 }
 

diff --git a/internal/http/services/preferences/preferences.go b/internal/http/services/preferences/preferences.go
@@ -70,16 +70,22 @@ func New(m map[string]interface{}, log *zerolog.Logger) (global.Service, error)
 		router: r,
 	}
 
-	if err := s.routerInit(); err != nil {
+	if err := s.routerInit(log); err != nil {
 		return nil, err
 	}
 
 	return s, nil
 }
 
-func (s *svc) routerInit() error {
+func (s *svc) routerInit(log *zerolog.Logger) error {
 	s.router.Get("/", s.handleGet)
 	s.router.Post("/", s.handlePost)
+
+	_ = chi.Walk(s.router, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
+		log.Debug().Str("service", "preferences").Str("method", method).Str("route", route).Int("middlewares", len(middlewares)).Msg("serving endpoint")
+		return nil
+	})
+
 	return nil
 }
 

diff --git a/internal/http/services/reverseproxy/reverseproxy.go b/internal/http/services/reverseproxy/reverseproxy.go
@@ -94,6 +94,11 @@ func New(m map[string]interface{}, log *zerolog.Logger) (global.Service, error)
 		r.Mount(rule.Endpoint, handler)
 	}
 
+	_ = chi.Walk(r, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
+		log.Debug().Str("service", "reverseproxy").Str("method", method).Str("route", route).Int("middlewares", len(middlewares)).Msg("serving endpoint")
+		return nil
+	})
+
 	return &svc{router: r}, nil
 }
 

diff --git a/pkg/auth/manager/publicshares/publicshares.go b/pkg/auth/manager/publicshares/publicshares.go
@@ -129,7 +129,7 @@ func (m *manager) Authenticate(ctx context.Context, token, secret string) (*user
 
 	var owner *user.User
 	// FIXME use new user type SPACE_OWNER
-	if publicShareResponse.GetShare().GetOwner().Type == 8 {
+	if publicShareResponse.GetShare().GetOwner().GetType() == 8 {
 		owner = &user.User{Id: publicShareResponse.GetShare().GetOwner(), DisplayName: "Public", Username: "public"}
 	} else {
 		getUserResponse, err := gwConn.GetUser(ctx, &userprovider.GetUserRequest{

diff --git a/pkg/micro/ocdav/service.go b/pkg/micro/ocdav/service.go
@@ -96,6 +96,11 @@ func Service(opts ...Option) (micro.Service, error) {
 	// back to using `chi.RegisterMethod`.
 	r.MethodNotAllowed(http.HandlerFunc(revaService.Handler().ServeHTTP))
 
+	_ = chi.Walk(r, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
+		sopts.Logger.Debug().Str("service", "ocdav").Str("method", method).Str("route", route).Int("middlewares", len(middlewares)).Msg("serving endpoint")
+		return nil
+	})
+
 	hd := srv.NewHandler(r)
 	if err := srv.Handle(hd); err != nil {
 		return nil, err