upstream/mercurial-mirror Files · tests/test-pull-r.t

dispatch: protect against malicious 'hg serve --stdio' invocations (sec)...

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.

Jun Wu - - Load All Authors

File last commit:

r28549:e01bd738 default


                r32050:77eaf953

4.1.3 stable

Download file

             test-pull-r.t
        
                    144 lines
            
             | 3.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-r.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo >> foo

        $ hg ci -m 'change foo'

        $ hg up -qC 0

        $ echo bar > bar

        $ hg ci -qAm 'add bar'

        $ hg log

        changeset:   2:effea6de0384

        tag:         tip

        parent:      0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add bar

        changeset:   1:ed1b79f46b9a

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

        $ cd ..

      don't show "(+1 heads)" message when pulling closed head

        $ hg clone -q repo repo2

        $ hg clone -q repo2 repo3

        $ cd repo2

        $ hg up -q 0

        $ echo hello >> foo

        $ hg ci -mx1

        created new head

        $ hg ci -mx2 --close-branch

        $ cd ../repo3

        $ hg heads -q --closed

        2:effea6de0384

        1:ed1b79f46b9a

        $ hg pull

        pulling from $TESTTMP/repo2 (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg heads -q --closed

        4:00cfe9073916

        2:effea6de0384

        1:ed1b79f46b9a

        $ cd ..

        $ hg init copy

        $ cd copy

      Pull a missing revision:

        $ hg pull -qr missing ../repo

        abort: unknown revision 'missing'!

        [255]

      Pull multiple revisions with update:

        $ hg pull -qu -r 0 -r 1 ../repo

        $ hg -q parents

        0:bbd179dfa0a7

        $ hg rollback

        repository tip rolled back to revision -1 (undo pull)

        working directory now based on revision -1

        $ hg pull -qr 0 ../repo

        $ hg log

        changeset:   0:bbd179dfa0a7

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

        $ hg pull -qr 1 ../repo

        $ hg log

        changeset:   1:ed1b79f46b9a

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

      This used to abort: received changelog group is empty:

        $ hg pull -qr 1 ../repo

      Test race condition with -r and -U (issue4707)

      We pull '-U -r <name>' and the name change right after/during the changegroup emission.

      We use http because http is better is our racy-est option.

        $ echo babar > ../repo/jungle

        $ cat <<EOF > ../repo/.hg/hgrc

        > [hooks]

        > outgoing.makecommit = hg ci -Am 'racy commit'; echo committed in pull-race

        > EOF

        $ hg serve -R ../repo -p $HGPORT2 -d --pid-file=../repo.pid

        $ cat ../repo.pid >> $DAEMON_PIDS

        $ hg pull --rev default --update http://localhost:$HGPORT2/

        pulling from http://localhost:$HGPORT2/

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg log -G

        @  changeset:   2:effea6de0384

        |  tag:         tip

        |  parent:      0:bbd179dfa0a7

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     add bar

        |

        | o  changeset:   1:ed1b79f46b9a

        |/   user:        test

        |    date:        Thu Jan 01 00:00:00 1970 +0000

        |    summary:     change foo

        |

        o  changeset:   0:bbd179dfa0a7

           user:        test

           date:        Thu Jan 01 00:00:00 1970 +0000

           summary:     add foo

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ hg init repo
				$ cd repo
				$ echo foo > foo
				$ hg ci -qAm 'add foo'
				$ echo >> foo
				$ hg ci -m 'change foo'
				$ hg up -qC 0
				$ echo bar > bar
				$ hg ci -qAm 'add bar'

				$ hg log
				changeset: 2:effea6de0384
				tag: tip
				parent: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add bar

				changeset: 1:ed1b79f46b9a
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ cd ..

				don't show "(+1 heads)" message when pulling closed head

				$ hg clone -q repo repo2
				$ hg clone -q repo2 repo3
				$ cd repo2
				$ hg up -q 0
				$ echo hello >> foo
				$ hg ci -mx1
				created new head
				$ hg ci -mx2 --close-branch
				$ cd ../repo3
				$ hg heads -q --closed
				2:effea6de0384
				1:ed1b79f46b9a
				$ hg pull
				pulling from $TESTTMP/repo2 (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg heads -q --closed
				4:00cfe9073916
				2:effea6de0384
				1:ed1b79f46b9a

				$ cd ..

				$ hg init copy
				$ cd copy

				Pull a missing revision:

				$ hg pull -qr missing ../repo
				abort: unknown revision 'missing'!
				[255]

				Pull multiple revisions with update:

				$ hg pull -qu -r 0 -r 1 ../repo
				$ hg -q parents
				0:bbd179dfa0a7
				$ hg rollback
				repository tip rolled back to revision -1 (undo pull)
				working directory now based on revision -1

				$ hg pull -qr 0 ../repo
				$ hg log
				changeset: 0:bbd179dfa0a7
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ hg pull -qr 1 ../repo
				$ hg log
				changeset: 1:ed1b79f46b9a
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo


				This used to abort: received changelog group is empty:

				$ hg pull -qr 1 ../repo

				Test race condition with -r and -U (issue4707)

				We pull '-U -r <name>' and the name change right after/during the changegroup emission.
				We use http because http is better is our racy-est option.


				$ echo babar > ../repo/jungle
				$ cat <<EOF > ../repo/.hg/hgrc
				> [hooks]
				> outgoing.makecommit = hg ci -Am 'racy commit'; echo committed in pull-race
				> EOF
				$ hg serve -R ../repo -p $HGPORT2 -d --pid-file=../repo.pid
				$ cat ../repo.pid >> $DAEMON_PIDS
				$ hg pull --rev default --update http://localhost:$HGPORT2/
				pulling from http://localhost:$HGPORT2/
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg log -G
				@ changeset: 2:effea6de0384
				\| tag: tip
				\| parent: 0:bbd179dfa0a7
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: add bar
				\|
				\| o changeset: 1:ed1b79f46b9a
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: change foo
				\|
				o changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo


				$ cd ..