Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Redact authentication secrets from request logs

Neeraj Guptafe94ae216496
diff --git a/server/pkg/middleware/event_test.go b/server/pkg/middleware/event_test.go
index 6eaa4c7e76..af8934999b 100644
--- a/server/pkg/middleware/event_test.go
+++ b/server/pkg/middleware/event_test.go
@@ -34,6 +34,12 @@ func TestAccountRecoveryTokensAreNotLogged(t *testing.T) {
require.False(t, shouldSkipBodyLog(http.MethodGet, "/users/recover-account"))
}
+func TestAuthenticationSecretsAreNotLogged(t *testing.T) {
+ require.True(t, shouldSkipBodyLog(http.MethodPost, "/users/verify-email"))
+ require.True(t, shouldSkipBodyLog(http.MethodPost, "/users/change-email"))
+ require.True(t, shouldSkipBodyLog(http.MethodPost, "/users/two-factor/verify"))
+}
+
func TestEventsShareGlobalRateLimitAcrossPublicAndAuthenticatedRoutes(t *testing.T) {
gin.SetMode(gin.TestMode)
rateLimiter := &RateLimitMiddleware{
diff --git a/server/pkg/middleware/request_logger.go b/server/pkg/middleware/request_logger.go
index 103606300c..939974927e 100644
--- a/server/pkg/middleware/request_logger.go
+++ b/server/pkg/middleware/request_logger.go
@@ -44,11 +44,14 @@ func shouldSkipBodyLog(method string, path string) bool {
isReadOnly := method == http.MethodGet || method == http.MethodHead || method == http.MethodOptions
if !isReadOnly {
switch path {
- case "/users/srp/setup",
+ case "/users/change-email",
+ "/users/srp/setup",
+ "/users/two-factor/verify",
"/users/two-factor/remove",
"/users/two-factor/passkeys/begin",
"/users/two-factor/passkeys/finish",
"/users/two-factor/passkeys/configure-recovery",
+ "/users/verify-email",
"/emergency-contacts/init-change-password",
"/legacy-kits/recovery/open",
"/legacy-kits/recovery/session",