transport: UploadRequest validation

Author: mcuadros

plumbing/protocol/packp/uppackreq.go

@@ -35,7 +35,8 @@ func NewUploadPackRequestFromCapabilities(adv *capability.List) *UploadPackReque
 	}
 }
 
-// IsEmpty returns true if the request wants is equal to zero
+// IsEmpty a request if empty if Haves are contained in the Wants, or if Wants
+// length is zero
 func (r *UploadPackRequest) IsEmpty() bool {
 	return isSubset(r.Wants, r.Haves)
 }

plumbing/transport/http/fetch_pack.go

@@ -79,6 +79,10 @@ func (s *fetchPackSession) FetchPack(r *packp.UploadPackRequest) (io.ReadCloser,
 		return nil, transport.ErrEmptyUploadPackRequest
 	}
 
+	if err := r.Validate(); err != nil {
+		return nil, err
+	}
+
 	url := fmt.Sprintf(
 		"%s/%s",
 		s.endpoint.String(), transport.UploadPackServiceName,

plumbing/transport/internal/common/common.go

@@ -173,6 +173,10 @@ func (s *session) FetchPack(req *packp.UploadPackRequest) (io.ReadCloser, error)
 		return nil, transport.ErrEmptyUploadPackRequest
 	}
 
+	if err := req.Validate(); err != nil {
+		return nil, err
+	}
+
 	if !s.advRefsRun {
 		if _, err := s.AdvertisedReferences(); err != nil {
 			return nil, err

plumbing/transport/test/common.go

@@ -122,6 +122,20 @@ func (s *FetchPackSuite) TestFetchPack(c *C) {
 	s.checkObjectNumber(c, reader, 28)
 }
 
+func (s *FetchPackSuite) TestFetchPackInvalidReq(c *C) {
+	r, err := s.Client.NewFetchPackSession(s.Endpoint)
+	c.Assert(err, IsNil)
+	defer func() { c.Assert(r.Close(), IsNil) }()
+
+	req := packp.NewUploadPackRequest()
+	req.Wants = append(req.Wants, plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5"))
+	req.Capabilities.Set(capability.Sideband)
+	req.Capabilities.Set(capability.Sideband64k)
+
+	_, err = r.FetchPack(req)
+	c.Assert(err, NotNil)
+}
+
 func (s *FetchPackSuite) TestFetchPackNoChanges(c *C) {
 	r, err := s.Client.NewFetchPackSession(s.Endpoint)
 	c.Assert(err, IsNil)