##// END OF EJS Templates
cborutil: cast bytearray to bytes...
cborutil: cast bytearray to bytes This code didn't like passing in bytearray instances. Let's cast bytearray to bytes so it works. Differential Revision: https://phab.mercurial-scm.org/D4914

File last commit:

r40158:9b19b8ce default
r40160:b638219a default
Show More
wireprotov2server.py
1187 lines | 38.5 KiB | text/x-python | PythonLexer
/ mercurial / wireprotov2server.py
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import contextlib
Gregory Szorc
wireprotov2: support response caching...
r40057 import hashlib
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563
from .i18n import _
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 from .node import (
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 hex,
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 nullid,
)
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 from . import (
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 discovery,
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 encoding,
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 error,
Gregory Szorc
wireprotov2: advertise recognized path filter prefixes...
r39836 narrowspec,
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 pycompat,
wireprotoframing,
wireprototypes,
)
Gregory Szorc
interfaceutil: module to stub out zope.interface...
r37828 from .utils import (
Gregory Szorc
wireprotov2: support response caching...
r40057 cborutil,
Gregory Szorc
interfaceutil: module to stub out zope.interface...
r37828 interfaceutil,
Gregory Szorc
py3: cast exception to bytes...
r39869 stringutil,
Gregory Szorc
interfaceutil: module to stub out zope.interface...
r37828 )
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
r37743 FRAMINGTYPE = b'application/mercurial-exp-framing-0005'
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563
Gregory Szorc
wireproto: rename HTTPV2 so it less like HTTP/2...
r37662 HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 COMMANDS = wireprototypes.commanddict()
Gregory Szorc
wireprotov2: support response caching...
r40057 # Value inserted into cache key computation function. Change the value to
# force new cache keys for every command request. This should be done when
# there is a change to how caching works, etc.
GLOBAL_CACHE_VERSION = 1
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 def handlehttpv2request(rctx, req, res, checkperm, urlparts):
from .hgweb import common as hgwebcommon
# URL space looks like: <permissions>/<command>, where <permission> can
# be ``ro`` or ``rw`` to signal read-only or read-write, respectively.
# Root URL does nothing meaningful... yet.
if not urlparts:
res.status = b'200 OK'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('HTTP version 2 API handler'))
return
if len(urlparts) == 1:
res.status = b'404 Not Found'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('do not know how to process %s\n') %
req.dispatchpath)
return
permission, command = urlparts[0:2]
if permission not in (b'ro', b'rw'):
res.status = b'404 Not Found'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('unknown permission: %s') % permission)
return
if req.method != 'POST':
res.status = b'405 Method Not Allowed'
res.headers[b'Allow'] = b'POST'
res.setbodybytes(_('commands require POST requests'))
return
# At some point we'll want to use our own API instead of recycling the
# behavior of version 1 of the wire protocol...
# TODO return reasonable responses - not responses that overload the
# HTTP status line message for error reporting.
try:
checkperm(rctx, req, 'pull' if permission == b'ro' else 'push')
except hgwebcommon.ErrorResponse as e:
res.status = hgwebcommon.statusmessage(e.code, pycompat.bytestr(e))
for k, v in e.headers:
res.headers[k] = v
res.setbodybytes('permission denied')
return
# We have a special endpoint to reflect the request back at the client.
if command == b'debugreflect':
_processhttpv2reflectrequest(rctx.repo.ui, rctx.repo, req, res)
return
# Extra commands that we handle that aren't really wire protocol
# commands. Think extra hard before making this hackery available to
# extension.
extracommands = {'multirequest'}
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 if command not in COMMANDS and command not in extracommands:
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 res.status = b'404 Not Found'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('unknown wire protocol command: %s\n') % command)
return
repo = rctx.repo
ui = repo.ui
proto = httpv2protocolhandler(req, ui)
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 if (not COMMANDS.commandavailable(command, proto)
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 and command not in extracommands):
res.status = b'404 Not Found'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('invalid wire protocol command: %s') % command)
return
# TODO consider cases where proxies may add additional Accept headers.
if req.headers.get(b'Accept') != FRAMINGTYPE:
res.status = b'406 Not Acceptable'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('client MUST specify Accept header with value: %s\n')
% FRAMINGTYPE)
return
if req.headers.get(b'Content-Type') != FRAMINGTYPE:
res.status = b'415 Unsupported Media Type'
# TODO we should send a response with appropriate media type,
# since client does Accept it.
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('client MUST send Content-Type header with '
'value: %s\n') % FRAMINGTYPE)
return
_processhttpv2request(ui, repo, req, res, permission, command, proto)
def _processhttpv2reflectrequest(ui, repo, req, res):
"""Reads unified frame protocol request and dumps out state to client.
This special endpoint can be used to help debug the wire protocol.
Instead of routing the request through the normal dispatch mechanism,
we instead read all frames, decode them, and feed them into our state
tracker. We then dump the log of all that activity back out to the
client.
"""
import json
# Reflection APIs have a history of being abused, accidentally disclosing
# sensitive data, etc. So we have a config knob.
if not ui.configbool('experimental', 'web.api.debugreflect'):
res.status = b'404 Not Found'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('debugreflect service not available'))
return
# We assume we have a unified framing protocol request body.
reactor = wireprotoframing.serverreactor()
states = []
while True:
frame = wireprotoframing.readframe(req.bodyfh)
if not frame:
states.append(b'received: <no frame>')
break
states.append(b'received: %d %d %d %s' % (frame.typeid, frame.flags,
frame.requestid,
frame.payload))
action, meta = reactor.onframerecv(frame)
states.append(json.dumps((action, meta), sort_keys=True,
separators=(', ', ': ')))
action, meta = reactor.oninputeof()
meta['action'] = action
states.append(json.dumps(meta, sort_keys=True, separators=(', ',': ')))
res.status = b'200 OK'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(b'\n'.join(states))
def _processhttpv2request(ui, repo, req, res, authedperm, reqcommand, proto):
"""Post-validation handler for HTTPv2 requests.
Called when the HTTP request contains unified frame-based protocol
frames for evaluation.
"""
# TODO Some HTTP clients are full duplex and can receive data before
# the entire request is transmitted. Figure out a way to indicate support
# for that so we can opt into full duplex mode.
reactor = wireprotoframing.serverreactor(deferoutput=True)
seencommand = False
outstream = reactor.makeoutputstream()
while True:
frame = wireprotoframing.readframe(req.bodyfh)
if not frame:
break
action, meta = reactor.onframerecv(frame)
if action == 'wantframe':
# Need more data before we can do anything.
continue
elif action == 'runcommand':
sentoutput = _httpv2runcommand(ui, repo, req, res, authedperm,
reqcommand, reactor, outstream,
meta, issubsequent=seencommand)
if sentoutput:
return
seencommand = True
elif action == 'error':
# TODO define proper error mechanism.
res.status = b'200 OK'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(meta['message'] + b'\n')
return
else:
raise error.ProgrammingError(
'unhandled action from frame processor: %s' % action)
action, meta = reactor.oninputeof()
if action == 'sendframes':
# We assume we haven't started sending the response yet. If we're
# wrong, the response type will raise an exception.
res.status = b'200 OK'
res.headers[b'Content-Type'] = FRAMINGTYPE
res.setbodygen(meta['framegen'])
elif action == 'noop':
pass
else:
raise error.ProgrammingError('unhandled action from frame processor: %s'
% action)
def _httpv2runcommand(ui, repo, req, res, authedperm, reqcommand, reactor,
outstream, command, issubsequent):
"""Dispatch a wire protocol command made from HTTPv2 requests.
The authenticated permission (``authedperm``) along with the original
command from the URL (``reqcommand``) are passed in.
"""
# We already validated that the session has permissions to perform the
# actions in ``authedperm``. In the unified frame protocol, the canonical
# command to run is expressed in a frame. However, the URL also requested
# to run a specific command. We need to be careful that the command we
# run doesn't have permissions requirements greater than what was granted
# by ``authedperm``.
#
# Our rule for this is we only allow one command per HTTP request and
# that command must match the command in the URL. However, we make
# an exception for the ``multirequest`` URL. This URL is allowed to
# execute multiple commands. We double check permissions of each command
# as it is invoked to ensure there is no privilege escalation.
# TODO consider allowing multiple commands to regular command URLs
# iff each command is the same.
proto = httpv2protocolhandler(req, ui, args=command['args'])
if reqcommand == b'multirequest':
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 if not COMMANDS.commandavailable(command['command'], proto):
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 # TODO proper error mechanism
res.status = b'200 OK'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('wire protocol command not available: %s') %
command['command'])
return True
# TODO don't use assert here, since it may be elided by -O.
assert authedperm in (b'ro', b'rw')
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 wirecommand = COMMANDS[command['command']]
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 assert wirecommand.permission in ('push', 'pull')
if authedperm == b'ro' and wirecommand.permission != 'pull':
# TODO proper error mechanism
res.status = b'403 Forbidden'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('insufficient permissions to execute '
'command: %s') % command['command'])
return True
# TODO should we also call checkperm() here? Maybe not if we're going
# to overhaul that API. The granted scope from the URL check should
# be good enough.
else:
# Don't allow multiple commands outside of ``multirequest`` URL.
if issubsequent:
# TODO proper error mechanism
res.status = b'200 OK'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('multiple commands cannot be issued to this '
'URL'))
return True
if reqcommand != command['command']:
# TODO define proper error mechanism
res.status = b'200 OK'
res.headers[b'Content-Type'] = b'text/plain'
res.setbodybytes(_('command in frame must match command in URL'))
return True
res.status = b'200 OK'
res.headers[b'Content-Type'] = FRAMINGTYPE
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 try:
Gregory Szorc
wireprotov2: server support for sending content redirects...
r40061 objs = dispatch(repo, proto, command['command'], command['redirect'])
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595
action, meta = reactor.oncommandresponsereadyobjects(
outstream, command['requestid'], objs)
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 except error.WireprotoCommandError as e:
action, meta = reactor.oncommanderror(
outstream, command['requestid'], e.message, e.messageargs)
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 except Exception as e:
Gregory Szorc
wireprotov2: change behavior of error frame...
r37744 action, meta = reactor.onservererror(
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 outstream, command['requestid'],
Gregory Szorc
py3: cast exception to bytes...
r39869 _('exception when invoking command: %s') %
stringutil.forcebytestr(e))
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563
if action == 'sendframes':
res.setbodygen(meta['framegen'])
return True
elif action == 'noop':
return False
else:
raise error.ProgrammingError('unhandled event from reactor: %s' %
action)
Gregory Szorc
wireproto: reimplement dispatch() for version 2 server...
r37800 def getdispatchrepo(repo, proto, command):
return repo.filtered('served')
Gregory Szorc
wireprotov2: server support for sending content redirects...
r40061 def dispatch(repo, proto, command, redirect):
Gregory Szorc
wireprotov2: support response caching...
r40057 """Run a wire protocol command.
Returns an iterable of objects that will be sent to the client.
"""
Gregory Szorc
wireproto: reimplement dispatch() for version 2 server...
r37800 repo = getdispatchrepo(repo, proto, command)
Gregory Szorc
wireprotov2: support response caching...
r40057 entry = COMMANDS[command]
func = entry.func
spec = entry.args
Gregory Szorc
wireproto: reimplement dispatch() for version 2 server...
r37800 args = proto.getargs(spec)
Gregory Szorc
wireprotov2: support response caching...
r40057 # There is some duplicate boilerplate code here for calling the command and
# emitting objects. It is either that or a lot of indented code that looks
# like a pyramid (since there are a lot of code paths that result in not
# using the cacher).
callcommand = lambda: func(repo, proto, **pycompat.strkwargs(args))
# Request is not cacheable. Don't bother instantiating a cacher.
if not entry.cachekeyfn:
for o in callcommand():
yield o
return
Gregory Szorc
wireprotov2: server support for sending content redirects...
r40061 if redirect:
redirecttargets = redirect[b'targets']
redirecthashes = redirect[b'hashes']
else:
redirecttargets = []
redirecthashes = []
Gregory Szorc
wireprotov2: support response caching...
r40057 cacher = makeresponsecacher(repo, proto, command, args,
Gregory Szorc
wireprotov2: server support for sending content redirects...
r40061 cborutil.streamencode,
redirecttargets=redirecttargets,
redirecthashes=redirecthashes)
Gregory Szorc
wireprotov2: support response caching...
r40057
# But we have no cacher. Do default handling.
if not cacher:
for o in callcommand():
yield o
return
with cacher:
cachekey = entry.cachekeyfn(repo, proto, cacher, **args)
# No cache key or the cacher doesn't like it. Do default handling.
if cachekey is None or not cacher.setcachekey(cachekey):
for o in callcommand():
yield o
return
# Serve it from the cache, if possible.
cached = cacher.lookup()
if cached:
for o in cached['objs']:
yield o
return
# Else call the command and feed its output into the cacher, allowing
# the cacher to buffer/mutate objects as it desires.
for o in callcommand():
for o in cacher.onobject(o):
yield o
for o in cacher.onfinished():
yield o
Gregory Szorc
wireproto: reimplement dispatch() for version 2 server...
r37800
Gregory Szorc
interfaceutil: module to stub out zope.interface...
r37828 @interfaceutil.implementer(wireprototypes.baseprotocolhandler)
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 class httpv2protocolhandler(object):
def __init__(self, req, ui, args=None):
self._req = req
self._ui = ui
self._args = args
@property
def name(self):
Gregory Szorc
wireproto: rename HTTPV2 so it less like HTTP/2...
r37662 return HTTP_WIREPROTO_V2
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563
def getargs(self, args):
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 # First look for args that were passed but aren't registered on this
# command.
extra = set(self._args) - set(args)
if extra:
raise error.WireprotoCommandError(
'unsupported argument to command: %s' %
', '.join(sorted(extra)))
# And look for required arguments that are missing.
missing = {a for a in args if args[a]['required']} - set(self._args)
if missing:
raise error.WireprotoCommandError(
'missing required arguments: %s' % ', '.join(sorted(missing)))
# Now derive the arguments to pass to the command, taking into
# account the arguments specified by the client.
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563 data = {}
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 for k, meta in sorted(args.items()):
# This argument wasn't passed by the client.
if k not in self._args:
data[k] = meta['default']()
continue
v = self._args[k]
# Sets may be expressed as lists. Silently normalize.
if meta['type'] == 'set' and isinstance(v, list):
v = set(v)
# TODO consider more/stronger type validation.
data[k] = v
Gregory Szorc
wireproto: extract HTTP version 2 code to own module...
r37563
return data
def getprotocaps(self):
# Protocol capabilities are currently not implemented for HTTP V2.
return set()
def getpayload(self):
raise NotImplementedError
@contextlib.contextmanager
def mayberedirectstdio(self):
raise NotImplementedError
def client(self):
raise NotImplementedError
def addcapabilities(self, repo, caps):
return caps
def checkperm(self, perm):
raise NotImplementedError
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
Gregory Szorc
wireproto: define and implement HTTP handshake to upgrade protocol...
r37575 def httpv2apidescriptor(req, repo):
proto = httpv2protocolhandler(req, repo.ui)
return _capabilitiesv2(repo, proto)
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 def _capabilitiesv2(repo, proto):
"""Obtain the set of capabilities for version 2 transports.
These capabilities are distinct from the capabilities for version 1
transports.
"""
caps = {
'commands': {},
Gregory Szorc
wireproto: add media type to version 2 capabilities response...
r37671 'framingmediatypes': [FRAMINGTYPE],
Gregory Szorc
wireprotov2: advertise recognized path filter prefixes...
r39836 'pathfilterprefixes': set(narrowspec.VALID_PREFIXES),
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 }
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 for command, entry in COMMANDS.items():
Gregory Szorc
wireprotov2: expose rich arguments metadata...
r39837 args = {}
for arg, meta in entry.args.items():
args[arg] = {
# TODO should this be a normalized type using CBOR's
# terminology?
b'type': meta['type'],
b'required': meta['required'],
}
if not meta['required']:
args[arg][b'default'] = meta['default']()
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835
Gregory Szorc
wireprotov2: advertise set of valid values for requestable fields...
r39838 if meta['validvalues']:
args[arg][b'validvalues'] = meta['validvalues']
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 caps['commands'][command] = {
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 'args': args,
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 'permissions': [entry.permission],
}
Gregory Szorc
wireprotov2: always advertise raw repo requirements...
r40085 caps['rawrepoformats'] = sorted(repo.requirements &
repo.supportedformats)
Gregory Szorc
wireproto: expose repository formats via capabilities...
r37675
Gregory Szorc
wireprotov2: advertise redirect targets in capabilities...
r40059 targets = getadvertisedredirecttargets(repo, proto)
if targets:
caps[b'redirect'] = {
b'targets': [],
b'hashes': [b'sha256', b'sha1'],
}
for target in targets:
entry = {
b'name': target['name'],
b'protocol': target['protocol'],
b'uris': target['uris'],
}
for key in ('snirequired', 'tlsversions'):
if key in target:
entry[key] = target[key]
caps[b'redirect'][b'targets'].append(entry)
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 return proto.addcapabilities(repo, caps)
Gregory Szorc
wireprotov2: advertise redirect targets in capabilities...
r40059 def getadvertisedredirecttargets(repo, proto):
"""Obtain a list of content redirect targets.
Returns a list containing potential redirect targets that will be
advertised in capabilities data. Each dict MUST have the following
keys:
name
The name of this redirect target. This is the identifier clients use
to refer to a target. It is transferred as part of every command
request.
protocol
Network protocol used by this target. Typically this is the string
in front of the ``://`` in a URL. e.g. ``https``.
uris
List of representative URIs for this target. Clients can use the
URIs to test parsing for compatibility or for ordering preference
for which target to use.
The following optional keys are recognized:
snirequired
Bool indicating if Server Name Indication (SNI) is required to
connect to this target.
tlsversions
List of bytes indicating which TLS versions are supported by this
target.
By default, clients reflect the target order advertised by servers
and servers will use the first client-advertised target when picking
a redirect target. So targets should be advertised in the order the
server prefers they be used.
"""
return []
Gregory Szorc
wireprotov2: support response caching...
r40057 def wireprotocommand(name, args=None, permission='push', cachekeyfn=None):
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798 """Decorator to declare a wire protocol command.
``name`` is the name of the wire protocol command being provided.
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 ``args`` is a dict defining arguments accepted by the command. Keys are
the argument name. Values are dicts with the following keys:
``type``
The argument data type. Must be one of the following string
literals: ``bytes``, ``int``, ``list``, ``dict``, ``set``,
or ``bool``.
``default``
A callable returning the default value for this argument. If not
specified, ``None`` will be the default value.
``example``
An example value for this argument.
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798
Gregory Szorc
wireprotov2: advertise set of valid values for requestable fields...
r39838 ``validvalues``
Set of recognized values for this argument.
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798 ``permission`` defines the permission type needed to run this command.
Can be ``push`` or ``pull``. These roughly map to read-write and read-only,
respectively. Default is to assume command requires ``push`` permissions
because otherwise commands not declaring their permissions could modify
a repository that is supposed to be read-only.
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595
Gregory Szorc
wireprotov2: support response caching...
r40057 ``cachekeyfn`` defines an optional callable that can derive the
cache key for this request.
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 Wire protocol commands are generators of objects to be serialized and
sent to the client.
If a command raises an uncaught exception, this will be translated into
a command error.
Gregory Szorc
wireprotov2: support response caching...
r40057
All commands can opt in to being cacheable by defining a function
(``cachekeyfn``) that is called to derive a cache key. This function
receives the same arguments as the command itself plus a ``cacher``
argument containing the active cacher for the request and returns a bytes
containing the key in a cache the response to this command may be cached
under.
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798 """
transports = {k for k, v in wireprototypes.TRANSPORTS.items()
if v['version'] == 2}
if permission not in ('push', 'pull'):
raise error.ProgrammingError('invalid wire protocol permission; '
'got %s; expected "push" or "pull"' %
permission)
if args is None:
args = {}
if not isinstance(args, dict):
raise error.ProgrammingError('arguments for version 2 commands '
'must be declared as dicts')
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 for arg, meta in args.items():
if arg == '*':
raise error.ProgrammingError('* argument name not allowed on '
'version 2 commands')
if not isinstance(meta, dict):
raise error.ProgrammingError('arguments for version 2 commands '
'must declare metadata as a dict')
if 'type' not in meta:
raise error.ProgrammingError('%s argument for command %s does not '
'declare type field' % (arg, name))
if meta['type'] not in ('bytes', 'int', 'list', 'dict', 'set', 'bool'):
raise error.ProgrammingError('%s argument for command %s has '
'illegal type: %s' % (arg, name,
meta['type']))
if 'example' not in meta:
raise error.ProgrammingError('%s argument for command %s does not '
'declare example field' % (arg, name))
Gregory Szorc
wireprotov2: derive "required" from presence of default value...
r40031 meta['required'] = 'default' not in meta
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835
meta.setdefault('default', lambda: None)
Gregory Szorc
wireprotov2: advertise set of valid values for requestable fields...
r39838 meta.setdefault('validvalues', None)
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 def register(func):
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 if name in COMMANDS:
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798 raise error.ProgrammingError('%s command already registered '
'for version 2' % name)
Gregory Szorc
wireproto: move version 2 commands dict to wireprotov2server...
r37802 COMMANDS[name] = wireprototypes.commandentry(
Gregory Szorc
wireprotov2: support response caching...
r40057 func, args=args, transports=transports, permission=permission,
cachekeyfn=cachekeyfn)
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798
return func
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
return register
Gregory Szorc
wireprotov2: support response caching...
r40057 def makecommandcachekeyfn(command, localversion=None, allargs=False):
"""Construct a cache key derivation function with common features.
By default, the cache key is a hash of:
* The command name.
* A global cache version number.
* A local cache version number (passed via ``localversion``).
* All the arguments passed to the command.
* The media type used.
* Wire protocol version string.
* The repository path.
"""
if not allargs:
raise error.ProgrammingError('only allargs=True is currently supported')
if localversion is None:
raise error.ProgrammingError('must set localversion argument value')
def cachekeyfn(repo, proto, cacher, **args):
spec = COMMANDS[command]
# Commands that mutate the repo can not be cached.
if spec.permission == 'push':
return None
# TODO config option to disable caching.
# Our key derivation strategy is to construct a data structure
# holding everything that could influence cacheability and to hash
# the CBOR representation of that. Using CBOR seems like it might
# be overkill. However, simpler hashing mechanisms are prone to
# duplicate input issues. e.g. if you just concatenate two values,
# "foo"+"bar" is identical to "fo"+"obar". Using CBOR provides
# "padding" between values and prevents these problems.
# Seed the hash with various data.
state = {
# To invalidate all cache keys.
b'globalversion': GLOBAL_CACHE_VERSION,
# More granular cache key invalidation.
b'localversion': localversion,
# Cache keys are segmented by command.
b'command': pycompat.sysbytes(command),
# Throw in the media type and API version strings so changes
# to exchange semantics invalid cache.
b'mediatype': FRAMINGTYPE,
b'version': HTTP_WIREPROTO_V2,
# So same requests for different repos don't share cache keys.
b'repo': repo.root,
}
# The arguments passed to us will have already been normalized.
# Default values will be set, etc. This is important because it
# means that it doesn't matter if clients send an explicit argument
# or rely on the default value: it will all normalize to the same
# set of arguments on the server and therefore the same cache key.
#
# Arguments by their very nature must support being encoded to CBOR.
# And the CBOR encoder is deterministic. So we hash the arguments
# by feeding the CBOR of their representation into the hasher.
if allargs:
state[b'args'] = pycompat.byteskwargs(args)
cacher.adjustcachekeystate(state)
hasher = hashlib.sha1()
for chunk in cborutil.streamencode(state):
hasher.update(chunk)
return pycompat.sysbytes(hasher.hexdigest())
return cachekeyfn
Gregory Szorc
wireprotov2: server support for sending content redirects...
r40061 def makeresponsecacher(repo, proto, command, args, objencoderfn,
redirecttargets, redirecthashes):
Gregory Szorc
wireprotov2: support response caching...
r40057 """Construct a cacher for a cacheable command.
Returns an ``iwireprotocolcommandcacher`` instance.
Extensions can monkeypatch this function to provide custom caching
backends.
"""
return None
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 @wireprotocommand('branchmap', permission='pull')
def branchmapv2(repo, proto):
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 yield {encoding.fromlocal(k): v
for k, v in repo.branchmap().iteritems()}
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
@wireprotocommand('capabilities', permission='pull')
def capabilitiesv2(repo, proto):
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 yield _capabilitiesv2(repo, proto)
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'changesetdata',
args={
'noderange': {
'type': 'list',
Gregory Szorc
wireprotov2: derive "required" from presence of default value...
r40031 'default': lambda: None,
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 'example': [[b'0123456...'], [b'abcdef...']],
},
'nodes': {
'type': 'list',
Gregory Szorc
wireprotov2: derive "required" from presence of default value...
r40031 'default': lambda: None,
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 'example': [b'0123456...'],
},
Gregory Szorc
wireprotov2: teach changesetdata to fetch ancestors until depth...
r39840 'nodesdepth': {
'type': 'int',
Gregory Szorc
wireprotov2: derive "required" from presence of default value...
r40031 'default': lambda: None,
Gregory Szorc
wireprotov2: teach changesetdata to fetch ancestors until depth...
r39840 'example': 10,
},
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 'fields': {
'type': 'set',
'default': set,
'example': {b'parents', b'revision'},
Gregory Szorc
wireprotov2: advertise set of valid values for requestable fields...
r39838 'validvalues': {b'bookmarks', b'parents', b'phase', b'revision'},
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 },
},
permission='pull')
Gregory Szorc
wireprotov2: teach changesetdata to fetch ancestors until depth...
r39840 def changesetdata(repo, proto, noderange, nodes, nodesdepth, fields):
Gregory Szorc
wireprotov2: add TODOs around extending changesetdata fields...
r39672 # TODO look for unknown fields and abort when they can't be serviced.
Gregory Szorc
wireprotov2: advertise set of valid values for requestable fields...
r39838 # This could probably be validated by dispatcher using validvalues.
Gregory Szorc
wireprotov2: add TODOs around extending changesetdata fields...
r39672
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 if noderange is None and nodes is None:
raise error.WireprotoCommandError(
'noderange or nodes must be defined')
Gregory Szorc
wireprotov2: teach changesetdata to fetch ancestors until depth...
r39840 if nodesdepth is not None and nodes is None:
raise error.WireprotoCommandError(
'nodesdepth requires the nodes argument')
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 if noderange is not None:
if len(noderange) != 2:
raise error.WireprotoCommandError(
'noderange must consist of 2 elements')
if not noderange[1]:
raise error.WireprotoCommandError(
'heads in noderange request cannot be empty')
cl = repo.changelog
hasnode = cl.hasnode
seen = set()
outgoing = []
if nodes is not None:
Gregory Szorc
wireprotov2: teach changesetdata to fetch ancestors until depth...
r39840 outgoing = [n for n in nodes if hasnode(n)]
if nodesdepth:
outgoing = [cl.node(r) for r in
repo.revs(b'ancestors(%ln, %d)', outgoing,
nodesdepth - 1)]
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 seen |= set(outgoing)
if noderange is not None:
if noderange[0]:
common = [n for n in noderange[0] if hasnode(n)]
else:
common = [nullid]
for n in discovery.outgoing(repo, common, noderange[1]).missing:
if n not in seen:
outgoing.append(n)
# Don't need to add to seen here because this is the final
# source of nodes and there should be no duplicates in this
# list.
seen.clear()
Gregory Szorc
wireprotov2: add phases to "changesetdata" command...
r39668 publishing = repo.publishing()
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666
if outgoing:
repo.hook('preoutgoing', throw=True, source='serve')
yield {
b'totalitems': len(outgoing),
}
Gregory Szorc
wireprotov2: add phases to "changesetdata" command...
r39668 # The phases of nodes already transferred to the client may have changed
# since the client last requested data. We send phase-only records
# for these revisions, if requested.
if b'phase' in fields and noderange is not None:
# TODO skip nodes whose phase will be reflected by a node in the
# outgoing set. This is purely an optimization to reduce data
# size.
for node in noderange[0]:
yield {
b'node': node,
b'phase': b'public' if publishing else repo[node].phasestr()
}
Gregory Szorc
wireprotov2: add bookmarks to "changesetdata" command...
r39670 nodebookmarks = {}
for mark, node in repo._bookmarks.items():
nodebookmarks.setdefault(node, set()).add(mark)
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 # It is already topologically sorted by revision number.
for node in outgoing:
d = {
b'node': node,
}
if b'parents' in fields:
d[b'parents'] = cl.parents(node)
Gregory Szorc
wireprotov2: add phases to "changesetdata" command...
r39668 if b'phase' in fields:
if publishing:
d[b'phase'] = b'public'
else:
ctx = repo[node]
d[b'phase'] = ctx.phasestr()
Gregory Szorc
wireprotov2: add bookmarks to "changesetdata" command...
r39670 if b'bookmarks' in fields and node in nodebookmarks:
d[b'bookmarks'] = sorted(nodebookmarks[node])
del nodebookmarks[node]
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 followingmeta = []
followingdata = []
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666
if b'revision' in fields:
revisiondata = cl.revision(node, raw=True)
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 followingmeta.append((b'revision', len(revisiondata)))
followingdata.append(revisiondata)
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666
Gregory Szorc
wireprotov2: add TODOs around extending changesetdata fields...
r39672 # TODO make it possible for extensions to wrap a function or register
# a handler to service custom fields.
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 if followingmeta:
d[b'fieldsfollowing'] = followingmeta
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666 yield d
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 for extra in followingdata:
yield extra
Gregory Szorc
wireprotov2: define and implement "changesetdata" command...
r39666
Gregory Szorc
wireprotov2: add bookmarks to "changesetdata" command...
r39670 # If requested, send bookmarks from nodes that didn't have revision
# data sent so receiver is aware of any bookmark updates.
if b'bookmarks' in fields:
for node, marks in sorted(nodebookmarks.iteritems()):
yield {
b'node': node,
b'bookmarks': sorted(marks),
}
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 class FileAccessError(Exception):
"""Represents an error accessing a specific file."""
def __init__(self, path, msg, args):
self.path = path
self.msg = msg
self.args = args
def getfilestore(repo, proto, path):
"""Obtain a file storage object for use with wire protocol.
Exists as a standalone function so extensions can monkeypatch to add
access control.
"""
# This seems to work even if the file doesn't exist. So catch
# "empty" files and return an error.
fl = repo.file(path)
if not len(fl):
raise FileAccessError(path, 'unknown file: %s', (path,))
return fl
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'filedata',
args={
'haveparents': {
'type': 'bool',
'default': lambda: False,
'example': True,
},
'nodes': {
'type': 'list',
'example': [b'0123456...'],
},
'fields': {
'type': 'set',
'default': set,
'example': {b'parents', b'revision'},
Gregory Szorc
wireprotov2: advertise set of valid values for requestable fields...
r39838 'validvalues': {b'parents', b'revision'},
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 },
'path': {
'type': 'bytes',
'example': b'foo.txt',
}
},
Gregory Szorc
wireprotov2: support response caching...
r40057 permission='pull',
# TODO censoring a file revision won't invalidate the cache.
# Figure out a way to take censoring into account when deriving
# the cache key.
cachekeyfn=makecommandcachekeyfn('filedata', 1, allargs=True))
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 def filedata(repo, proto, haveparents, nodes, fields, path):
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 try:
# Extensions may wish to access the protocol handler.
store = getfilestore(repo, proto, path)
except FileAccessError as e:
raise error.WireprotoCommandError(e.msg, e.args)
# Validate requested nodes.
for node in nodes:
try:
store.rev(node)
except error.LookupError:
raise error.WireprotoCommandError('unknown file node: %s',
(hex(node),))
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 revisions = store.emitrevisions(nodes,
revisiondata=b'revision' in fields,
assumehaveparentrevisions=haveparents)
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675
yield {
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 b'totalitems': len(nodes),
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 }
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 for revision in revisions:
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 d = {
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 b'node': revision.node,
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 }
if b'parents' in fields:
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 d[b'parents'] = [revision.p1node, revision.p2node]
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 followingmeta = []
followingdata = []
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 if b'revision' in fields:
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 if revision.revision is not None:
followingmeta.append((b'revision', len(revision.revision)))
followingdata.append(revision.revision)
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675 else:
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 d[b'deltabasenode'] = revision.basenode
followingmeta.append((b'delta', len(revision.delta)))
followingdata.append(revision.delta)
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839
if followingmeta:
d[b'fieldsfollowing'] = followingmeta
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675
yield d
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 for extra in followingdata:
yield extra
Gregory Szorc
wireprotov2: define and implement "filedata" command...
r39675
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'heads',
args={
'publiconly': {
'type': 'bool',
'default': lambda: False,
'example': False,
},
},
permission='pull')
def headsv2(repo, proto, publiconly):
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 if publiconly:
repo = repo.filtered('immutable')
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 yield repo.heads()
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'known',
args={
'nodes': {
'type': 'list',
'default': list,
'example': [b'deadbeef'],
},
},
permission='pull')
def knownv2(repo, proto, nodes):
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 result = b''.join(b'1' if n else b'0' for n in repo.known(nodes))
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 yield result
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'listkeys',
args={
'namespace': {
'type': 'bytes',
'example': b'ns',
},
},
permission='pull')
def listkeysv2(repo, proto, namespace):
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 keys = repo.listkeys(encoding.tolocal(namespace))
keys = {encoding.fromlocal(k): encoding.fromlocal(v)
for k, v in keys.iteritems()}
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 yield keys
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'lookup',
args={
'key': {
'type': 'bytes',
'example': b'foo',
},
},
permission='pull')
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 def lookupv2(repo, proto, key):
key = encoding.tolocal(key)
# TODO handle exception.
node = repo.lookup(key)
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 yield node
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'manifestdata',
args={
'nodes': {
'type': 'list',
'example': [b'0123456...'],
},
'haveparents': {
'type': 'bool',
'default': lambda: False,
'example': True,
},
'fields': {
'type': 'set',
'default': set,
'example': {b'parents', b'revision'},
Gregory Szorc
wireprotov2: advertise set of valid values for requestable fields...
r39838 'validvalues': {b'parents', b'revision'},
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 },
'tree': {
'type': 'bytes',
'example': b'',
},
},
Gregory Szorc
wireprotov2: support response caching...
r40057 permission='pull',
cachekeyfn=makecommandcachekeyfn('manifestdata', 1, allargs=True))
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 def manifestdata(repo, proto, haveparents, nodes, fields, tree):
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673 store = repo.manifestlog.getstorage(tree)
# Validate the node is known and abort on unknown revisions.
for node in nodes:
try:
store.rev(node)
except error.LookupError:
raise error.WireprotoCommandError(
'unknown node: %s', (node,))
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 revisions = store.emitrevisions(nodes,
revisiondata=b'revision' in fields,
assumehaveparentrevisions=haveparents)
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673
yield {
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 b'totalitems': len(nodes),
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673 }
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 for revision in revisions:
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673 d = {
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 b'node': revision.node,
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673 }
if b'parents' in fields:
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 d[b'parents'] = [revision.p1node, revision.p2node]
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 followingmeta = []
followingdata = []
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673 if b'revision' in fields:
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 if revision.revision is not None:
followingmeta.append((b'revision', len(revision.revision)))
followingdata.append(revision.revision)
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673 else:
Gregory Szorc
wireprotov2server: port to emitrevisions()...
r39900 d[b'deltabasenode'] = revision.basenode
followingmeta.append((b'delta', len(revision.delta)))
followingdata.append(revision.delta)
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839
if followingmeta:
d[b'fieldsfollowing'] = followingmeta
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673
yield d
Gregory Szorc
wireprotov2: allow multiple fields to follow revision maps...
r39839 for extra in followingdata:
yield extra
Gregory Szorc
wireprotov2: define and implement "manifestdata" command...
r39673
Gregory Szorc
wireprotov2: declare command arguments richly...
r39835 @wireprotocommand(
'pushkey',
args={
'namespace': {
'type': 'bytes',
'example': b'ns',
},
'key': {
'type': 'bytes',
'example': b'key',
},
'old': {
'type': 'bytes',
'example': b'old',
},
'new': {
'type': 'bytes',
'example': 'new',
},
},
permission='push')
Gregory Szorc
wireproto: move version 2 command handlers to wireprotov2server...
r37564 def pushkeyv2(repo, proto, namespace, key, old, new):
# TODO handle ui output redirection
Gregory Szorc
wireprotov2: implement commands as a generator of objects...
r39595 yield repo.pushkey(encoding.tolocal(namespace),
encoding.tolocal(key),
encoding.tolocal(old),
encoding.tolocal(new))