Fixing content length when user requests more than the length to the …

…end of the file.
MG-RAST · Jul 27, 2015 · 24a4dcf · 24a4dcf
1 parent e446e35
commit 24a4dcf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/shock-server/controller/node/single.go b/shock-server/controller/node/single.go
@@ -114,6 +114,9 @@ func (cr *NodeController) Read(id string, ctx context.Context) error {
 				if err != nil {
 					return responder.RespondWithError(ctx, http.StatusBadRequest, "length must be an integer value")
 				}
+				if length > n.File.Size {
+					length = n.File.Size
+				}
 			} else if !length_ok {
 				seek_str := query.Get("seek")
 				seek, err = strconv.ParseInt(seek_str, 10, 0)
@@ -132,6 +135,9 @@ func (cr *NodeController) Read(id string, ctx context.Context) error {
 				if err != nil {
 					return responder.RespondWithError(ctx, http.StatusBadRequest, "length must be an integer value")
 				}
+				if length > n.File.Size-seek {
+					length = n.File.Size - seek
+				}
 			}
 			r, err := n.FileReader()
 			defer r.Close()