ErXBout/clamav-rest
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improvements

Browse source
This commit is contained in:
wim.de.jager 2021-06-14 14:24:16 +02:00
parent 07a0607fd9
commit a001a4104e
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
clamrest.go
View file

@ -119,31 +119,30 @@ func scanHandler(w http.ResponseWriter, r *http.Request) {
return
}
for s := range response {
w.Header().Set("Content-Type", "application/json; charset=utf-8")
s := <-response
w.Header().Set("Content-Type", "application/json; charset=utf-8")
respJson, err := json.Marshal(&s)
if err != nil {
writeError(w, http.StatusInternalServerError, "Could not marshal JSON: "+err.Error())
return
}
switch s.Status {
case clamd.RES_OK:
w.WriteHeader(http.StatusOK)
case clamd.RES_FOUND:
w.WriteHeader(http.StatusNotAcceptable)
case clamd.RES_ERROR:
w.WriteHeader(http.StatusBadRequest)
case clamd.RES_PARSE_ERROR:
w.WriteHeader(http.StatusPreconditionFailed)
default:
w.WriteHeader(http.StatusNotImplemented)
}
fmt.Fprint(w, string(respJson))
fmt.Printf(time.Now().Format(time.RFC3339)+" Scan result for: %v, %v\n", part.FileName(), s)
respJson, err := json.Marshal(&s)
if err != nil {
writeError(w, http.StatusInternalServerError, "Could not marshal JSON: "+err.Error())
return
}
switch s.Status {
case clamd.RES_OK:
w.WriteHeader(http.StatusOK)
case clamd.RES_FOUND:
w.WriteHeader(http.StatusNotAcceptable)
case clamd.RES_ERROR:
w.WriteHeader(http.StatusBadRequest)
case clamd.RES_PARSE_ERROR:
w.WriteHeader(http.StatusPreconditionFailed)
default:
w.WriteHeader(http.StatusNotImplemented)
}
fmt.Fprint(w, string(respJson))
fmt.Printf(time.Now().Format(time.RFC3339)+" Scan result for: %v, %v\n", part.FileName(), s)
fmt.Printf(time.Now().Format(time.RFC3339) + " Finished scanning: " + part.FileName() + "\n")
default:
w.WriteHeader(http.StatusMethodNotAllowed)