From 7b86bac6ee4af29277764993cfc55789ee466858 Mon Sep 17 00:00:00 2001
From: Denis Kirillov <d.kirillov@yadro.com>
Date: Wed, 21 Feb 2024 17:32:58 +0300
Subject: [PATCH] [#318] Log unmatched requests

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
---
 api/middleware/policy.go | 6 +++---
 api/router.go            | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/middleware/policy.go b/api/middleware/policy.go
index db0ff7f..8b618a4 100644
--- a/api/middleware/policy.go
+++ b/api/middleware/policy.go
@@ -293,7 +293,7 @@ func determineBucketOperation(r *http.Request) string {
 		}
 	}
 
-	return ""
+	return "UnmatchedBucketOperation"
 }
 
 func determineObjectOperation(r *http.Request) string {
@@ -357,12 +357,12 @@ func determineObjectOperation(r *http.Request) string {
 		}
 	}
 
-	return ""
+	return "UnmatchedObjectOperation"
 }
 
 func determineGeneralOperation(r *http.Request) string {
 	if r.Method == http.MethodGet {
 		return ListBucketsOperation
 	}
-	return ""
+	return "UnmatchedOperation"
 }
diff --git a/api/router.go b/api/router.go
index 398f773..0c79f96 100644
--- a/api/router.go
+++ b/api/router.go
@@ -148,6 +148,7 @@ func NewRouter(cfg Config) *chi.Mux {
 	defaultRouter := chi.NewRouter()
 	defaultRouter.Mount(fmt.Sprintf("/{%s}", s3middleware.BucketURLPrm), bucketRouter(cfg.Handler, cfg.Log))
 	defaultRouter.Get("/", named("ListBuckets", cfg.Handler.ListBucketsHandler))
+	attachErrorHandler(defaultRouter)
 
 	hr := NewHostBucketRouter("bucket")
 	hr.Default(defaultRouter)
@@ -182,7 +183,7 @@ func errorResponseHandler(w http.ResponseWriter, r *http.Request) {
 	})
 
 	if log := s3middleware.GetReqLog(ctx); log != nil {
-		log.Error(logs.RequestUnmatched, zap.String("method", reqInfo.API))
+		log.Error(logs.RequestUnmatched, zap.String("method", reqInfo.API), zap.String("http method", r.Method), zap.String("url", r.RequestURI))
 	}
 }