Make minio work with curl and browsers again

master
Frederick F. Kautz IV 10 years ago
parent 73de05feb6
commit 82a16b8848
  1. 3
      pkg/api/api_generic_handlers.go
  2. 6
      pkg/api/contenttype.go

@ -72,6 +72,8 @@ func (h timeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
// Verify if date headers are set, if not reject the request // Verify if date headers are set, if not reject the request
if r.Header.Get("Authorization") != "" {
if r.Header.Get("x-amz-date") == "" && r.Header.Get("Date") == "" { if r.Header.Get("x-amz-date") == "" && r.Header.Get("Date") == "" {
// there is no way to knowing if this is a valid request, could be a attack reject such clients // there is no way to knowing if this is a valid request, could be a attack reject such clients
writeErrorResponse(w, r, RequestTimeTooSkewed, acceptsContentType, r.URL.Path) writeErrorResponse(w, r, RequestTimeTooSkewed, acceptsContentType, r.URL.Path)
@ -89,6 +91,7 @@ func (h timeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
writeErrorResponse(w, r, RequestTimeTooSkewed, acceptsContentType, r.URL.Path) writeErrorResponse(w, r, RequestTimeTooSkewed, acceptsContentType, r.URL.Path)
return return
} }
}
h.handler.ServeHTTP(w, r) h.handler.ServeHTTP(w, r)
} }

@ -32,12 +32,6 @@ func getContentType(req *http.Request) contentType {
switch { switch {
case acceptHeader == "application/json": case acceptHeader == "application/json":
return jsonContentType return jsonContentType
case acceptHeader == "application/xml":
return xmlContentType
case acceptHeader == "*/*":
return xmlContentType
case acceptHeader != "":
return unknownContentType
default: default:
return xmlContentType return xmlContentType
} }

Loading…
Cancel
Save