Merge pull request #77 from RealFax/dev

merge. add jetbrains logo to docs

README.md

@@ -142,3 +142,7 @@ admin = "123456"
 - google uuid [(BSD-3-Clause License)](https://github.com/google/uuid/blob/master/LICENSE)
 - grpc [(Apache License 2.0)](https://github.com/grpc/grpc-go/blob/master/LICENSE)
 - protobuf [(BSD-3-Clause License)](https://github.com/protocolbuffers/protobuf-go/blob/master/LICENSE)
+
+## Acknowledgments
+
+<a href="https://jb.gg/OpenSourceSupport"><img width="100px" src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png"/></a>

README_zh.md

@@ -142,3 +142,7 @@ admin = "123456"
 - google uuid [(BSD-3-Clause License)](https://github.com/google/uuid/blob/master/LICENSE)
 - grpc [(Apache License 2.0)](https://github.com/grpc/grpc-go/blob/master/LICENSE)
 - protobuf [(BSD-3-Clause License)](https://github.com/protocolbuffers/protobuf-go/blob/master/LICENSE)
+
+## 致谢
+
+<a href="https://jb.gg/OpenSourceSupport"><img width="100px" src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png"/></a>

internal/rqd/server.go

@@ -7,6 +7,7 @@ import (
 	"crypto/x509/pkix"
 	"github.com/RealFax/RedQueen/internal/rqd/config"
 	"github.com/RealFax/RedQueen/internal/rqd/store"
+	"github.com/RealFax/RedQueen/internal/version"
 	"github.com/RealFax/RedQueen/pkg/dlocker"
 	"github.com/RealFax/RedQueen/pkg/expr"
 	"github.com/RealFax/RedQueen/pkg/grpcutil"
@@ -173,7 +174,7 @@ func (s *Server) registerHttpServer() {
 	router.NotFound = httputil.WrapE(func(w http.ResponseWriter, r *http.Request) error {
 		return httputil.NewStatus(http.StatusNotFound, 0, "Not Found")
 	})
-	router.PanicHandler = func(w http.ResponseWriter, _ *http.Request, _ interface{}) {
+	router.PanicHandler = func(w http.ResponseWriter, _ *http.Request, _ any) {
 		httputil.Any(http.StatusServiceUnavailable, 0).Message("Service Unavailable").Ok(w)
 	}
 
@@ -190,7 +191,10 @@ func (s *Server) registerHttpServer() {
 	router.Handler(http.MethodGet, "/action/:bucket/scan", httputil.WrapE(httpHandlers.PrefixScan))
 	router.Handler(http.MethodPut, "/action/:bucket/try", httputil.WrapE(httpHandlers.TrySet))
 
-	s.httpServer.Handler = router
+	s.httpServer.Handler = httputil.UseMiddleware(router, func(w http.ResponseWriter, r *http.Request) bool {
+		w.Header().Add("Server", version.String())
+		return true
+	})
 
 	if s.cfg.BasicAuth != nil && len(s.cfg.BasicAuth) != 0 {
 		// use basic-auth

pkg/httputil/handler.go

@@ -26,6 +26,24 @@ func WrapE(fc func(w http.ResponseWriter, r *http.Request) error) http.HandlerFu
 	}
 }
 
+type Middleware struct {
+	handler http.Handler
+	fc      func(w http.ResponseWriter, r *http.Request) bool
+}
+
+func (m Middleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	if m.fc(w, r) {
+		m.handler.ServeHTTP(w, r)
+	}
+}
+
+func UseMiddleware(next http.Handler, fc func(w http.ResponseWriter, r *http.Request) bool) http.Handler {
+	return &Middleware{
+		handler: next,
+		fc:      fc,
+	}
+}
+
 type BasicAuthFunc func(username, password string) bool
 type basicAuth struct {
 	next   http.Handler