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

#require svn13

     2

     3

  $ cat <<EOF >> $HGRCPATH

     4

  > [extensions]

     5

  > mq =

     6

  > [diff]

     7

  > nodates = 1

     8

  > EOF

     9

    10

fn to create new repository, and cd into it

    11

  $ mkrepo() {

    12

  >     hg init $1

    13

  >     cd $1

    14

  >     hg qinit

    15

  > }

    16

    17

    18

handle svn subrepos safely

    19

    20

  $ svnadmin create svn-repo-2499

    21

    22

  $ SVNREPOPATH=`pwd`/svn-repo-2499/project

    23

#if windows

    24

  $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

    25

#else

    26

  $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

    27

#endif

    28

    29

  $ mkdir -p svn-project-2499/trunk

    30

  $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"

    31

    32

qnew on repo w/svn subrepo

    33

  $ mkrepo repo-2499-svn-subrepo

    34

  $ svn co "$SVNREPOURL"/trunk sub

    35

  Checked out revision 1.

    36

  $ echo 'sub = [svn]sub' >> .hgsub

    37

  $ hg add .hgsub

    38

  $ hg status -S -X '**/format'

    39

  A .hgsub

    40

  $ hg qnew -m0 0.diff

    41

  $ cd sub

    42

  $ echo a > a

    43

  $ svn add a

    44

  A         a

    45

  $ svn st

    46

  A*    a (glob)

    47

  $ cd ..

    48

  $ hg status -S        # doesn't show status for svn subrepos (yet)

    49

  $ hg qnew -m1 1.diff

    50

  abort: uncommitted changes in subrepository 'sub'

    51

  [255]

    52

    53

  $ cd ..