D3206: wireproto: only expose "getbundle" and "unbundle" to v1 transports

2018-04-11 Thread indygreg (Gregory Szorc) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4a0d58d6faba: wireproto: only expose getbundle 
and unbundle to v1 transports (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3206?vs=7938=7985

REVISION DETAIL
  https://phab.mercurial-scm.org/D3206

AFFECTED FILES
  mercurial/wireproto.py
  tests/test-http-api-httpv2.t
  tests/test-wireproto-command-capabilities.t

CHANGE DETAILS

diff --git a/tests/test-wireproto-command-capabilities.t 
b/tests/test-wireproto-command-capabilities.t
--- a/tests/test-wireproto-command-capabilities.t
+++ b/tests/test-wireproto-command-capabilities.t
@@ -30,11 +30,11 @@
   s> \r\n
   s> *\r\n (glob)
   s> *\x00\x01\x00\x02\x01F (glob)
-  s> 
\xa2Hcommands\xa9Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullHunbundle\xa2Dargs\xa1EheadsFlegacyKpermissions\x81DpushIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullIgetbundle\xa2Dargs\xa1A*FlegacyKpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
+  s> 
\xa2Hcommands\xa7Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
   s> \r\n
   received frame(size=*; request=1; stream=2; streamflags=stream-begin; 
type=bytes-response; flags=eos|cbor) (glob)
   s> 0\r\n
   s> \r\n
-  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'getbundle': {b'args': {b'*': b'legacy'}, b'permissions': [b'pull']}, 
b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, 
b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, 
b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, 
b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': 
{b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': 
b'old'}, b'permissions': [b'push']}, b'unbundle': {b'args': {b'heads': 
b'legacy'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zstd'}, 
{b'name': b'zlib'}]}]
+  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, 
b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, 
b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, 
b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': 
{b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': 
b'old'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zstd'}, 
{b'name': b'zlib'}]}]
 
   $ cat error.log
diff --git a/tests/test-http-api-httpv2.t b/tests/test-http-api-httpv2.t
--- a/tests/test-http-api-httpv2.t
+++ b/tests/test-http-api-httpv2.t
@@ -540,25 +540,25 @@
   > accept: $MEDIATYPE
   > content-type: $MEDIATYPE
   > user-agent: test
-  > frame 1 1 stream-begin command-request new cbor:{b'name': b'unbundle'}
+  > frame 1 1 stream-begin command-request new cbor:{b'name': b'pushkey'}
   > EOF
   using raw connection to peer
   s> POST /api/exp-http-v2-0001/ro/multirequest HTTP/1.1\r\n
   s> Accept-Encoding: identity\r\n
   s> accept: application/mercurial-exp-framing-0003\r\n
   s> content-type: application/mercurial-exp-framing-0003\r\n
   s> user-agent: test\r\n
-  s> content-length: 23\r\n
+  s> content-length: 22\r\n
   s> host: $LOCALIP:$HGPORT\r\n (glob)
   s> \r\n
-  s> \x0f\x00\x00\x01\x00\x01\x01\x11\xa1DnameHunbundle
+  s> \x0e\x00\x00\x01\x00\x01\x01\x11\xa1DnameGpushkey
   s> makefile('rb', None)
   s> HTTP/1.1 403 Forbidden\r\n
   s> Server: testing stub value\r\n
   s> Date: $HTTP_DATE$\r\n
   s> Content-Type: text/plain\r\n
-  s> Content-Length: 53\r\n
+  s> Content-Length: 52\r\n
   s> \r\n
-  s> insufficient permissions to execute command: unbundle
+  s> insufficient permissions to execute command: pushkey
 
   $ cat error.log
diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -1019,7 +1019,8 @@
 continue
 return None

D3206: wireproto: only expose "getbundle" and "unbundle" to v1 transports

2018-04-10 Thread indygreg (Gregory Szorc) 
indygreg updated this revision to Diff 7938.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3206?vs=7910=7938

REVISION DETAIL
  https://phab.mercurial-scm.org/D3206

AFFECTED FILES
  mercurial/wireproto.py
  tests/test-http-api-httpv2.t
  tests/test-wireproto-command-capabilities.t

CHANGE DETAILS

diff --git a/tests/test-wireproto-command-capabilities.t 
b/tests/test-wireproto-command-capabilities.t
--- a/tests/test-wireproto-command-capabilities.t
+++ b/tests/test-wireproto-command-capabilities.t
@@ -30,11 +30,11 @@
   s> \r\n
   s> *\r\n (glob)
   s> *\x00\x01\x00\x02\x01F (glob)
-  s> 
\xa2Hcommands\xa9Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullHunbundle\xa2Dargs\xa1EheadsFlegacyKpermissions\x81DpushIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullIgetbundle\xa2Dargs\xa1A*FlegacyKpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
+  s> 
\xa2Hcommands\xa7Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
   s> \r\n
   received frame(size=*; request=1; stream=2; streamflags=stream-begin; 
type=bytes-response; flags=eos|cbor) (glob)
   s> 0\r\n
   s> \r\n
-  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'getbundle': {b'args': {b'*': b'legacy'}, b'permissions': [b'pull']}, 
b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, 
b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, 
b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, 
b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': 
{b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': 
b'old'}, b'permissions': [b'push']}, b'unbundle': {b'args': {b'heads': 
b'legacy'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zstd'}, 
{b'name': b'zlib'}]}]
+  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, 
b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, 
b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, 
b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': 
{b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': 
b'old'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zstd'}, 
{b'name': b'zlib'}]}]
 
   $ cat error.log
diff --git a/tests/test-http-api-httpv2.t b/tests/test-http-api-httpv2.t
--- a/tests/test-http-api-httpv2.t
+++ b/tests/test-http-api-httpv2.t
@@ -540,25 +540,25 @@
   > accept: $MEDIATYPE
   > content-type: $MEDIATYPE
   > user-agent: test
-  > frame 1 1 stream-begin command-request new cbor:{b'name': b'unbundle'}
+  > frame 1 1 stream-begin command-request new cbor:{b'name': b'pushkey'}
   > EOF
   using raw connection to peer
   s> POST /api/exp-http-v2-0001/ro/multirequest HTTP/1.1\r\n
   s> Accept-Encoding: identity\r\n
   s> accept: application/mercurial-exp-framing-0003\r\n
   s> content-type: application/mercurial-exp-framing-0003\r\n
   s> user-agent: test\r\n
-  s> content-length: 23\r\n
+  s> content-length: 22\r\n
   s> host: $LOCALIP:$HGPORT\r\n (glob)
   s> \r\n
-  s> \x0f\x00\x00\x01\x00\x01\x01\x11\xa1DnameHunbundle
+  s> \x0e\x00\x00\x01\x00\x01\x01\x11\xa1DnameGpushkey
   s> makefile('rb', None)
   s> HTTP/1.1 403 Forbidden\r\n
   s> Server: testing stub value\r\n
   s> Date: $HTTP_DATE$\r\n
   s> Content-Type: text/plain\r\n
-  s> Content-Length: 53\r\n
+  s> Content-Length: 52\r\n
   s> \r\n
-  s> insufficient permissions to execute command: unbundle
+  s> insufficient permissions to execute command: pushkey
 
   $ cat error.log
diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -1019,7 +1019,8 @@
 continue
 return None
 
-@wireprotocommand('getbundle', '*', permission='pull')
+@wireprotocommand('getbundle', '*', permission='pull',
+  transportpolicy=POLICY_V1_ONLY)
 def getbundle(repo, proto,

D3206: wireproto: only expose "getbundle" and "unbundle" to v1 transports

2018-04-09 Thread indygreg (Gregory Szorc) 
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  These are the most complicated wire protocol commands. I don't want
  to deal with porting them just yet. Let's disable both of them on
  version 2 transports so we drive the final wedge between command
  handlers and start to evolve version 2 command handlers more.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3206

AFFECTED FILES
  mercurial/wireproto.py
  tests/test-http-api-httpv2.t
  tests/test-wireproto-command-capabilities.t

CHANGE DETAILS

diff --git a/tests/test-wireproto-command-capabilities.t 
b/tests/test-wireproto-command-capabilities.t
--- a/tests/test-wireproto-command-capabilities.t
+++ b/tests/test-wireproto-command-capabilities.t
@@ -30,11 +30,11 @@
   s> \r\n
   s> *\r\n (glob)
   s> *\x00\x01\x00\x02\x01F (glob)
-  s> 
\xa2Hcommands\xa9Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullHunbundle\xa2Dargs\xa1EheadsFlegacyKpermissions\x81DpushIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullIgetbundle\xa2Dargs\xa1A*FlegacyKpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
+  s> 
\xa2Hcommands\xa7Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
   s> \r\n
   received frame(size=*; request=1; stream=2; streamflags=stream-begin; 
type=bytes-response; flags=eos|cbor) (glob)
   s> 0\r\n
   s> \r\n
-  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'getbundle': {b'args': {b'*': b'legacy'}, b'permissions': [b'pull']}, 
b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, 
b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, 
b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, 
b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': 
{b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': 
b'old'}, b'permissions': [b'push']}, b'unbundle': {b'args': {b'heads': 
b'legacy'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zstd'}, 
{b'name': b'zlib'}]}]
+  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, 
b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, 
b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, 
b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': 
{b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': 
b'old'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zstd'}, 
{b'name': b'zlib'}]}]
 
   $ cat error.log
diff --git a/tests/test-http-api-httpv2.t b/tests/test-http-api-httpv2.t
--- a/tests/test-http-api-httpv2.t
+++ b/tests/test-http-api-httpv2.t
@@ -540,25 +540,25 @@
   > accept: $MEDIATYPE
   > content-type: $MEDIATYPE
   > user-agent: test
-  > frame 1 1 stream-begin command-request new cbor:{b'name': b'unbundle'}
+  > frame 1 1 stream-begin command-request new cbor:{b'name': b'pushkey'}
   > EOF
   using raw connection to peer
   s> POST /api/exp-http-v2-0001/ro/multirequest HTTP/1.1\r\n
   s> Accept-Encoding: identity\r\n
   s> accept: application/mercurial-exp-framing-0003\r\n
   s> content-type: application/mercurial-exp-framing-0003\r\n
   s> user-agent: test\r\n
-  s> content-length: 23\r\n
+  s> content-length: 22\r\n
   s> host: $LOCALIP:$HGPORT\r\n (glob)
   s> \r\n
-  s> \x0f\x00\x00\x01\x00\x01\x01\x11\xa1DnameHunbundle
+  s> \x0e\x00\x00\x01\x00\x01\x01\x11\xa1DnameGpushkey
   s> makefile('rb', None)
   s> HTTP/1.1 403 Forbidden\r\n
   s> Server: testing stub value\r\n
   s> Date: $HTTP_DATE$\r\n
   s> Content-Type: text/plain\r\n
-  s> Content-Length: 53\r\n
+  s> Content-Length: 52\r\n
   s> \r\n
-  s> insufficient permissions to execute command: unbundle
+  s> insufficient permissions to execute command: pushkey
 
   $ cat error.log
diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++