comparison mercurial/dispatch.py @ 35170:c9740b69b9b7 stable

dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options

If this feature is enabled, early options are parsed using the global options
table. As the parser stops processing options when non/unknown option is
encountered, it won't mistakenly take an option value as a new early option.
Still "--" can be injected to terminate the parsing (e.g. "hg -R -- log"), I
think it's unlikely to lead to an RCE.

To minimize a risk of this change, new fancyopts.earlygetopt() path is enabled
only when +strictflags is set. Also the strict parser doesn't support '--repo',
a short for '--repository' yet. This limitation will be removed later.

As this feature is backward incompatible, I decided to add a new opt-in
mechanism to HGPLAIN. I'm not pretty sure if this is the right choice, but
I'm thinking of adding +feature/-feature syntax to HGPLAIN. Alternatively,
we could add a new environment variable. Any bikeshedding is welcome.

Note that HGPLAIN=+strictflags doesn't work correctly in chg session since
command arguments are pre-processed in C. This wouldn't be easily fixed.

35169:898c6f812a51

        ferr = util.stderr

    try:
        if not req.ui:
            req.ui = uimod.ui.load()
        if _earlyreqoptbool(req, 'traceback', ['--traceback']):
            req.ui.setconfig('ui', 'traceback', 'on', '--traceback')

        # set ui streams from the request
        if req.fin:

        except (IndexError, ValueError):
            raise error.Abort(_('malformed --config option: %r '
                               '(use --config section.name=value)') % cfg)

    return configs

def _earlygetopt(aliases, args, strip=True):
    """Return list of values for an option (or aliases).

    The values are listed in the order they appear in args.

            pos += 1
    return values

def _earlyreqopt(req, name, aliases):
    """Peek a list option without using a full options table"""
    values = _earlygetopt(aliases, req.args, strip=False)
    req.earlyoptions[name] = values
    return values

def _earlyreqoptstr(req, name, aliases):
    """Peek a string option without using a full options table"""
    value = (_earlygetopt(aliases, req.args, strip=False) or [''])[-1]
    req.earlyoptions[name] = value
    return value

def _earlyreqoptbool(req, name, aliases):
    """Peek a boolean option without using a full options table

    >>> req = request([b'x', b'--debugger'])
    >>> _earlyreqoptbool(req, b'debugger', [b'--debugger'])
    True

    >>> req = request([b'x', b'--', b'--debugger'])
    >>> _earlyreqoptbool(req, b'debugger', [b'--debugger'])
    """
    try:
        argcount = req.args.index("--")
    except ValueError:
        argcount = len(req.args)
    value = None

35170:c9740b69b9b7

        ferr = util.stderr

    try:
        if not req.ui:
            req.ui = uimod.ui.load()
        if req.ui.plain('strictflags'):
            req.earlyoptions.update(_earlyparseopts(req.args))
        if _earlyreqoptbool(req, 'traceback', ['--traceback']):
            req.ui.setconfig('ui', 'traceback', 'on', '--traceback')

        # set ui streams from the request
        if req.fin:

        except (IndexError, ValueError):
            raise error.Abort(_('malformed --config option: %r '
                               '(use --config section.name=value)') % cfg)

    return configs

def _earlyparseopts(args):
    options = {}
    fancyopts.fancyopts(args, commands.globalopts, options,
                        gnu=False, early=True)
    return options

def _earlygetopt(aliases, args, strip=True):
    """Return list of values for an option (or aliases).

    The values are listed in the order they appear in args.

            pos += 1
    return values

def _earlyreqopt(req, name, aliases):
    """Peek a list option without using a full options table"""
    if req.ui.plain('strictflags'):
        return req.earlyoptions[name]
    values = _earlygetopt(aliases, req.args, strip=False)
    req.earlyoptions[name] = values
    return values

def _earlyreqoptstr(req, name, aliases):
    """Peek a string option without using a full options table"""
    if req.ui.plain('strictflags'):
        return req.earlyoptions[name]
    value = (_earlygetopt(aliases, req.args, strip=False) or [''])[-1]
    req.earlyoptions[name] = value
    return value

def _earlyreqoptbool(req, name, aliases):
    """Peek a boolean option without using a full options table

    >>> req = request([b'x', b'--debugger'], uimod.ui())
    >>> _earlyreqoptbool(req, b'debugger', [b'--debugger'])
    True

    >>> req = request([b'x', b'--', b'--debugger'], uimod.ui())
    >>> _earlyreqoptbool(req, b'debugger', [b'--debugger'])
    """
    if req.ui.plain('strictflags'):
        return req.earlyoptions[name]
    try:
        argcount = req.args.index("--")
    except ValueError:
        argcount = len(req.args)
    value = None