dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Some shared-ssh installations assume that 'hg serve --stdio' is a safe command to run for minimally trusted users. Unfortunately, the messy implementation of argument parsing here meant that trying to access a repo named '--debugger' would give the user a pdb prompt, thereby sidestepping any hoped-for sandboxing. Serving repositories over HTTP(S) is unaffected. We're not currently hardening any subcommands other than 'serve'. If your service exposes other commands to users with arbitrary repository names, it is imperative that you defend against repository names of '--debugger' and anything starting with '--config'. The read-only mode of hg-ssh stopped working because it provided its hook configuration to "hg serve --stdio" via --config parameter. This is banned for security reasons now. This patch switches it to directly call ui.setconfig(). If your custom hosting infrastructure relies on passing --config to "hg serve --stdio", you'll need to find a different way to get that configuration into Mercurial, either by using ui.setconfig() as hg-ssh does in this patch, or by placing an hgrc file someplace where Mercurial will read it. mitrandir@fb.com provided some extra fixes for the dispatch code and for hg-ssh in places that I overlooked.

     1

#!/usr/bin/env python

     2

#

     3

# Dumps output generated by Mercurial's command server in a formatted style to a

     4

# given file or stderr if '-' is specified. Output is also written in its raw

     5

# format to stdout.

     6

#

     7

# $ ./hg serve --cmds pipe | ./contrib/debugcmdserver.py -

     8

# o, 52   -> 'capabilities: getencoding runcommand\nencoding: UTF-8'

     9

    10

from __future__ import absolute_import, print_function

    11

import struct

    12

import sys

    13

    14

if len(sys.argv) != 2:

    15

    print('usage: debugcmdserver.py FILE')

    16

    sys.exit(1)

    17

    18

outputfmt = '>cI'

    19

outputfmtsize = struct.calcsize(outputfmt)

    20

    21

if sys.argv[1] == '-':

    22

    log = sys.stderr

    23

else:

    24

    log = open(sys.argv[1], 'a')

    25

    26

def read(size):

    27

    data = sys.stdin.read(size)

    28

    if not data:

    29

        raise EOFError

    30

    sys.stdout.write(data)

    31

    sys.stdout.flush()

    32

    return data

    33

    34

try:

    35

    while True:

    36

        header = read(outputfmtsize)

    37

        channel, length = struct.unpack(outputfmt, header)

    38

        log.write('%s, %-4d' % (channel, length))

    39

        if channel in 'IL':

    40

            log.write(' -> waiting for input\n')

    41

        else:

    42

            data = read(length)

    43

            log.write(' -> %r\n' % data)

    44

        log.flush()

    45

except EOFError:

    46

    pass

    47

finally:

    48

    if log != sys.stderr:

    49

        log.close()