cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

swarm/http: check error returned by reader.Size (#3470)

Browse Source
This commit is contained in:
Aron Fischer 2016-12-22 00:35:05 +01:00 committed by Felix Lange
parent 301c0a6303
commit 9a51f5c350
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swarm/api/http/server.go
View File

@ -99,7 +99,7 @@ func handler(w http.ResponseWriter, r *http.Request, a *api.Api) {
"[BZZ] Swarm: Protocol error in request `%s`.", "[BZZ] Swarm: Protocol error in request `%s`.",
uri, uri,
) )
http.Error(w, "BZZ protocol error", http.StatusBadRequest) http.Error(w, "Invalid request URL: need access protocol (bzz:/, bzzr:/, bzzi:/) as first element in path.", http.StatusBadRequest)
return return
} }
} }
@ -187,6 +187,12 @@ func handler(w http.ResponseWriter, r *http.Request, a *api.Api) {
reader := a.Retrieve(key) reader := a.Retrieve(key)
quitC := make(chan bool) quitC := make(chan bool)
size, err := reader.Size(quitC) size, err := reader.Size(quitC)
if err != nil {
glog.V(logger.Debug).Infof("Could not determine size: %v", err.Error())
//An error on call to Size means we don't have the root chunk
http.Error(w, err.Error(), http.StatusNotFound)
return
}
glog.V(logger.Debug).Infof("Reading %d bytes.", size) glog.V(logger.Debug).Infof("Reading %d bytes.", size)
// setting mime type // setting mime type
@ -229,6 +235,12 @@ func handler(w http.ResponseWriter, r *http.Request, a *api.Api) {
} }
quitC := make(chan bool) quitC := make(chan bool)
size, err := reader.Size(quitC) size, err := reader.Size(quitC)
if err != nil {
glog.V(logger.Debug).Infof("Could not determine size: %v", err.Error())
//An error on call to Size means we don't have the root chunk
http.Error(w, err.Error(), http.StatusNotFound)
return
}
glog.V(logger.Debug).Infof("Served '%s' (%d bytes) as '%s' (status code: %v)", uri, size, mimeType, status) glog.V(logger.Debug).Infof("Served '%s' (%d bytes) as '%s' (status code: %v)", uri, size, mimeType, status)
http.ServeContent(w, r, path, forever(), reader) http.ServeContent(w, r, path, forever(), reader)