2 Commits

Author SHA1 Message Date
59c401b1dc Stop setting content-type twice 2021-06-18 14:59:25 +02:00
0cce8aecc6 Set server version in correct place 2021-06-18 14:56:23 +02:00
2 changed files with 2 additions and 3 deletions

View File

@@ -5,7 +5,7 @@ import (
"runtime"
)
var Version = "v0.1.4"
var Version = "v0.1.6"
var Build string
func FullVersion() string {

View File

@@ -84,12 +84,12 @@ func NewServer(cfg config.FrontendConfig, hs *honeypot.HoneypotServer, store sto
r.Use(middleware.RealIP)
r.Use(middleware.RequestID)
r.Use(s.LoggingMiddleware)
r.Use(middleware.SetHeader("Server", apiary.FullVersion()))
r.Route("/", func(r chi.Router) {
r.Get("/*", s.IndexHandler("web/vue-frontend/dist"))
r.Get("/stream", s.HandlerAttemptStream)
r.Route("/api", func(r chi.Router) {
r.Use(middleware.SetHeader("Content-Type", "application/json"))
r.Get("/stats", s.HandlerStats)
r.Get("/stream", s.HandlerAttemptStream)
r.Get("/query", s.HandlerQuery)
@@ -152,7 +152,6 @@ func (s *Server) HandlerAttemptStream(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "no-cache")
w.Header().Set("Connection", "keep-alive")
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Server", apiary.FullVersion())
id, ch := s.addAttemptListener()
defer s.closeAttemptListener(id)
w.WriteHeader(http.StatusOK)