wireproto: correctly escape batched args and responses (issue4739)
This issue appears to be as old as wireproto batching itself: I can
reproduce the failure as far back as 08ef6b5f3715 trivially by
rebasing the test changes in this patch, which was back in the 1.9
era. I didn't test before that change, because prior to that the
testfile has a different name and I'm lazy.
Note that the test thought it was checking this case, but it actually
wasn't: it put a literal ; in the arg and response for its greet
command, but the mangle/unmangle step defined in the test meant that
instead of "Fo, =;o" going over the wire, "Gp-!><p" went instead,
which doesn't contain any special characters (those being [.=;]) and
thus not exercising the escaping. The test has been updated to use
pre-unmangled special characters, so the request is now "Fo+<:o",
which mangles to "Gp,=;p". I have confirmed that the test fails
without the adjustment to the escaping rules in wireproto.py.
No existing clients of RPC batching were depending on the old behavior
in any way. The only *actual* users of batchable RPCs in core were:
1) largefiles, wherein it batches up many statlfile calls. It sends
hexlified hashes over the wire and gets a 0, 1, or 2 back as a
response. No risk of special characters.
2) setdiscovery, which was using heads() and known(), both of which
communicate via hexlified nodes. Again, no risk of special characters.
Since the escaping functionality has been completely broken since it
was introduced, we know that it has no users. As such, we can change
the escaping mechanism without having to worry about backwards
compatibility issues.
For the curious, this was detected by chance: it happens that the
lz4-compressed text of a test file for remotefilelog compressed to
something containing a ;, which then caused the failure when I moved
remotefilelog to using batching for file content fetching.
SVN-fs-dump-format-version: 2
UUID: a9c3b03d-cffa-4248-8023-ecf4b2bdf5d5
Revision-number: 0
Prop-content-length: 56
Content-length: 56
K 8
svn:date
V 27
2009-04-29T19:26:51.708679Z
PROPS-END
Revision-number: 1
Prop-content-length: 112
Content-length: 112
K 7
svn:log
V 10
init projA
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:52.115023Z
PROPS-END
Node-path: branches
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10
PROPS-END
Node-path: tags
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10
PROPS-END
Node-path: trunk
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10
PROPS-END
Node-path: unrelated
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10
PROPS-END
Revision-number: 2
Prop-content-length: 105
Content-length: 105
K 7
svn:log
V 4
adda
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:53.109819Z
PROPS-END
Node-path: trunk/a
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 2
Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
Content-length: 12
PROPS-END
a
Revision-number: 3
Prop-content-length: 108
Content-length: 108
K 7
svn:log
V 7
changea
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:54.073017Z
PROPS-END
Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 4
Text-content-md5: 0d227f1abf8c2932d342e9b99cc957eb
Text-content-sha1: d7c8127a20a396cff08af086a1c695b0636f0c29
Content-length: 4
a
a
Revision-number: 4
Prop-content-length: 109
Content-length: 109
K 7
svn:log
V 8
changea2
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:55.076032Z
PROPS-END
Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 6
Text-content-md5: 7d4ebf8f298d22fc349a91725b00af1c
Text-content-sha1: 92f31bc48f52339253fce6cad9f2f0c95b302f7e
Content-length: 6
a
a
a
Revision-number: 5
Prop-content-length: 117
Content-length: 117
K 7
svn:log
V 15
unrelatedchange
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:56.095784Z
PROPS-END
Node-path: unrelated/dummy
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 2
Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
Content-length: 12
PROPS-END
a
Revision-number: 6
Prop-content-length: 131
Content-length: 131
K 7
svn:log
V 29
tagging trunk.v1 trunk.badtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:00.074864Z
PROPS-END
Node-path: tags/trunk.badtag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 5
Node-copyfrom-path: trunk
Node-path: tags/trunk.v1
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 5
Node-copyfrom-path: trunk
Revision-number: 7
Prop-content-length: 109
Content-length: 109
K 7
svn:log
V 8
changea3
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:01.073910Z
PROPS-END
Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 8
Text-content-md5: d12178e74d8774e34361e0a08d1fd2b7
Text-content-sha1: cce0b2a263066e26610df9082b7b3c810f71262e
Content-length: 8
a
a
a
a
Revision-number: 8
Prop-content-length: 118
Content-length: 118
K 7
svn:log
V 16
fix trunk.badtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:04.073542Z
PROPS-END
Node-path: tags/trunk.goodtag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 7
Node-copyfrom-path: tags/trunk.badtag
Node-path: tags/trunk.badtag
Node-action: delete
Revision-number: 9
Prop-content-length: 108
Content-length: 108
K 7
svn:log
V 7
changea
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:05.095204Z
PROPS-END
Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 10
Text-content-md5: 3f65cbdca1b64c2f8f574fccae24f3a4
Text-content-sha1: 5c077263421de2abff9dbe867921bc6810811aa2
Content-length: 10
a
a
a
a
a
Revision-number: 10
Prop-content-length: 115
Content-length: 115
K 7
svn:log
V 13
removegoodtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:06.089193Z
PROPS-END
Node-path: tags/trunk.goodtag
Node-action: delete
Revision-number: 11
Prop-content-length: 117
Content-length: 117
K 7
svn:log
V 15
recreategoodtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:09.070471Z
PROPS-END
Node-path: tags/trunk.goodtag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 10
Node-copyfrom-path: trunk