aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-07-12 02:02:34 -0700
committerGitHub <noreply@github.com>2017-07-12 02:02:34 -0700
commitdf946d7d1c4551b3c8e87183012e3a48efbbfe76 (patch)
tree49d4f72fe9e62f16f0e97b7537fef1a3b7878809 /plumbing
parentec0f30691de82d5e48827ba275acfad585d60963 (diff)
parentbd6acd02c98e93855b2781f7e1fb167804ce62b1 (diff)
downloadgo-git-df946d7d1c4551b3c8e87183012e3a48efbbfe76.tar.gz
Merge pull request #475 from mcuadros/fix-ack
plumbing: protocol, fix handling multiple ACK on upload-pack and test…
Diffstat (limited to 'plumbing')
-rw-r--r--plumbing/protocol/packp/srvresp.go40
-rw-r--r--plumbing/protocol/packp/srvresp_test.go25
2 files changed, 42 insertions, 23 deletions
diff --git a/plumbing/protocol/packp/srvresp.go b/plumbing/protocol/packp/srvresp.go
index a5bec9c..b214341 100644
--- a/plumbing/protocol/packp/srvresp.go
+++ b/plumbing/protocol/packp/srvresp.go
@@ -38,12 +38,12 @@ func (r *ServerResponse) Decode(reader *bufio.Reader, isMultiACK bool) error {
// we need to detect when the end of a response header and the begining
// of a packfile header happend, some requests to the git daemon
// produces a duplicate ACK header even when multi_ack is not supported.
- isEnd, err := r.endReached(reader)
+ stop, err := r.stopReading(reader)
if err != nil {
return err
}
- if isEnd {
+ if stop {
break
}
}
@@ -51,38 +51,38 @@ func (r *ServerResponse) Decode(reader *bufio.Reader, isMultiACK bool) error {
return s.Err()
}
-func (r *ServerResponse) endReached(reader *bufio.Reader) (bool, error) {
- isPack, err := r.isPACKHeader(reader)
+// stopReading detects when a valid command such as ACK or NAK is found to be
+// read in the buffer without moving the read pointer.
+func (r *ServerResponse) stopReading(reader *bufio.Reader) (bool, error) {
+ ahead, err := reader.Peek(7)
if err == io.EOF {
return true, nil
}
- return isPack, err
-
-}
-
-// isPACKHeader detects when a header of a packfile is found, with this goal
-// the function is reading from the reader without moving the read pointer.
-func (r *ServerResponse) isPACKHeader(reader *bufio.Reader) (bool, error) {
- ahead, err := reader.Peek(9)
if err != nil {
return false, err
}
- if len(ahead) == 0 {
- return true, nil
- }
-
- if len(ahead) > 4 && string(ahead[0:4]) == "PACK" {
- return true, nil
+ if len(ahead) > 4 && r.isValidCommand(ahead[0:3]) {
+ return false, nil
}
- if len(ahead) == 9 && string(ahead[5:]) == "PACK" {
- return true, nil
+ if len(ahead) == 7 && r.isValidCommand(ahead[4:]) {
+ return false, nil
}
return true, nil
+}
+
+func (r *ServerResponse) isValidCommand(b []byte) bool {
+ commands := [][]byte{ack, nak}
+ for _, c := range commands {
+ if bytes.Compare(b, c) == 0 {
+ return true
+ }
+ }
+ return false
}
func (r *ServerResponse) decodeLine(line []byte) error {
diff --git a/plumbing/protocol/packp/srvresp_test.go b/plumbing/protocol/packp/srvresp_test.go
index a873b45..c8ef520 100644
--- a/plumbing/protocol/packp/srvresp_test.go
+++ b/plumbing/protocol/packp/srvresp_test.go
@@ -35,14 +35,33 @@ func (s *ServerResponseSuite) TestDecodeACK(c *C) {
}
func (s *ServerResponseSuite) TestDecodeMultipleACK(c *C) {
- raw := "0031ACK 6ecf0ef2c2dffb796033e5a02219af86ec6584e5\n0031ACK 6ecf0ef2c2dffb796033e5a02219af86ec6584e5\n"
+ raw := "" +
+ "0031ACK 1111111111111111111111111111111111111111\n" +
+ "0031ACK 6ecf0ef2c2dffb796033e5a02219af86ec6584e5\n" +
+ "00080PACK\n"
sr := &ServerResponse{}
err := sr.Decode(bufio.NewReader(bytes.NewBufferString(raw)), false)
c.Assert(err, IsNil)
- c.Assert(sr.ACKs, HasLen, 1)
- c.Assert(sr.ACKs[0], Equals, plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5"))
+ c.Assert(sr.ACKs, HasLen, 2)
+ c.Assert(sr.ACKs[0], Equals, plumbing.NewHash("1111111111111111111111111111111111111111"))
+ c.Assert(sr.ACKs[1], Equals, plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5"))
+}
+
+func (s *ServerResponseSuite) TestDecodeMultipleACKWithSideband(c *C) {
+ raw := "" +
+ "0031ACK 1111111111111111111111111111111111111111\n" +
+ "0031ACK 6ecf0ef2c2dffb796033e5a02219af86ec6584e5\n" +
+ "00080aaaa\n"
+
+ sr := &ServerResponse{}
+ err := sr.Decode(bufio.NewReader(bytes.NewBufferString(raw)), false)
+ c.Assert(err, IsNil)
+
+ c.Assert(sr.ACKs, HasLen, 2)
+ c.Assert(sr.ACKs[0], Equals, plumbing.NewHash("1111111111111111111111111111111111111111"))
+ c.Assert(sr.ACKs[1], Equals, plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5"))
}
func (s *ServerResponseSuite) TestDecodeMalformed(c *C) {