diff --git a/server/clamav.go b/server/clamav.go index e16a28c..a754a95 100644 --- a/server/clamav.go +++ b/server/clamav.go @@ -57,6 +57,7 @@ func (s *Server) scanHandler(w http.ResponseWriter, r *http.Request) { c := clamd.NewClamd(s.ClamAVDaemonHost) abort := make(chan bool) + defer close(abort) response, err := c.ScanStream(reader, abort) if err != nil { s.logger.Printf("%s", err.Error()) @@ -70,6 +71,4 @@ func (s *Server) scanHandler(w http.ResponseWriter, r *http.Request) { case <-time.After(time.Second * 60): abort <- true } - - close(abort) } diff --git a/server/handlers.go b/server/handlers.go index 6d33e5d..807ca05 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -37,7 +37,6 @@ import ( "encoding/json" "errors" "fmt" - blackfriday "github.com/russross/blackfriday/v2" "html" html_template "html/template" "io" @@ -54,9 +53,12 @@ import ( text_template "text/template" "time" + blackfriday "github.com/russross/blackfriday/v2" + "net" "encoding/base64" + web "github.com/dutchcoders/transfer.sh-web" "github.com/gorilla/mux" "github.com/microcosm-cc/bluemonday" @@ -286,7 +288,7 @@ func (s *Server) notFoundHandler(w http.ResponseWriter, r *http.Request) { } func sanitize(fileName string) string { - return path.Clean(path.Base(fileName)) + return path.Base(fileName) } func (s *Server) postHandler(w http.ResponseWriter, r *http.Request) {