upstream/mercurial-mirror Files · tests/test-mq-git.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.

Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default


                r32050:77eaf953

4.1.3 stable

Download file

             test-mq-git.t
        
                    212 lines
            
             | 3.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-git.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Test the plumbing of mq.git option

      # Automatic upgrade itself is tested elsewhere.

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > mq =

        > [diff]

        > nodates = 1

        > EOF

        $ hg init repo-auto

        $ cd repo-auto

      git=auto: regular patch creation:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f adda

        $ cat .hg/patches/adda

        # HG changeset patch

        # Date 0 0

        # Parent  0000000000000000000000000000000000000000

        diff -r 000000000000 -r ef8dafc9fa4c a

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,1 @@

        +a

      git=auto: git patch creation with copy:

        $ hg cp a b

        $ hg qnew -d '0 0' -f copy

        $ cat .hg/patches/copy

        # HG changeset patch

        # Date 0 0

        # Parent  ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

        diff --git a/a b/b

        copy from a

        copy to b

      git=auto: git patch when using --git:

        $ echo regular > regular

        $ hg add regular

        $ hg qnew -d '0 0' --git -f git

        $ cat .hg/patches/git

        # HG changeset patch

        # Date 0 0

        # Parent  99586d5f048c399e20f81cee41fbb3809c0e735d

        diff --git a/regular b/regular

        new file mode 100644

        --- /dev/null

        +++ b/regular

        @@ -0,0 +1,1 @@

        +regular

      git=auto: regular patch after qrefresh without --git:

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/git

        # HG changeset patch

        # Date 0 0

        # Parent  99586d5f048c399e20f81cee41fbb3809c0e735d

        diff -r 99586d5f048c regular

        --- /dev/null

        +++ b/regular

        @@ -0,0 +1,1 @@

        +regular

        $ cd ..

        $ hg init repo-keep

        $ cd repo-keep

        $ echo '[mq]' > .hg/hgrc

        $ echo 'git = KEEP' >> .hg/hgrc

      git=keep: git patch with --git:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f --git git

        $ cat .hg/patches/git

        # HG changeset patch

        # Date 0 0

        # Parent  0000000000000000000000000000000000000000

        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,1 @@

        +a

      git=keep: git patch after qrefresh without --git:

        $ echo a >> a

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/git

        # HG changeset patch

        # Date 0 0

        # Parent  0000000000000000000000000000000000000000

        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,2 @@

        +a

        +a

        $ cd ..

        $ hg init repo-yes

        $ cd repo-yes

        $ echo '[mq]' > .hg/hgrc

        $ echo 'git = yes' >> .hg/hgrc

      git=yes: git patch:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f git

        $ cat .hg/patches/git

        # HG changeset patch

        # Date 0 0

        # Parent  0000000000000000000000000000000000000000

        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,1 @@

        +a

      git=yes: git patch after qrefresh:

        $ echo a >> a

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/git

        # HG changeset patch

        # Date 0 0

        # Parent  0000000000000000000000000000000000000000

        diff --git a/a b/a

        new file mode 100644

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,2 @@

        +a

        +a

        $ cd ..

        $ hg init repo-no

        $ cd repo-no

        $ echo '[diff]' > .hg/hgrc

        $ echo 'git = True' >> .hg/hgrc

        $ echo '[mq]' > .hg/hgrc

        $ echo 'git = False' >> .hg/hgrc

      git=no: regular patch with copy:

        $ echo a > a

        $ hg add a

        $ hg qnew -d '0 0' -f adda

        $ hg cp a b

        $ hg qnew -d '0 0' -f regular

        $ cat .hg/patches/regular

        # HG changeset patch

        # Date 0 0

        # Parent  ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

        diff -r ef8dafc9fa4c -r a70404f79ba3 b

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +a

      git=no: regular patch after qrefresh with copy:

        $ hg cp a c

        $ hg qrefresh -d '0 0'

        $ cat .hg/patches/regular

        # HG changeset patch

        # Date 0 0

        # Parent  ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

        diff -r ef8dafc9fa4c b

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +a

        diff -r ef8dafc9fa4c c

        --- /dev/null

        +++ b/c

        @@ -0,0 +1,1 @@

        +a

        $ 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

				# Test the plumbing of mq.git option
				# Automatic upgrade itself is tested elsewhere.

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> mq =
				> [diff]
				> nodates = 1
				> EOF

				$ hg init repo-auto
				$ cd repo-auto

				git=auto: regular patch creation:

				$ echo a > a
				$ hg add a
				$ hg qnew -d '0 0' -f adda

				$ cat .hg/patches/adda
				# HG changeset patch
				# Date 0 0
				# Parent 0000000000000000000000000000000000000000

				diff -r 000000000000 -r ef8dafc9fa4c a
				--- /dev/null
				+++ b/a
				@@ -0,0 +1,1 @@
				+a

				git=auto: git patch creation with copy:

				$ hg cp a b
				$ hg qnew -d '0 0' -f copy

				$ cat .hg/patches/copy
				# HG changeset patch
				# Date 0 0
				# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

				diff --git a/a b/b
				copy from a
				copy to b

				git=auto: git patch when using --git:

				$ echo regular > regular
				$ hg add regular
				$ hg qnew -d '0 0' --git -f git

				$ cat .hg/patches/git
				# HG changeset patch
				# Date 0 0
				# Parent 99586d5f048c399e20f81cee41fbb3809c0e735d

				diff --git a/regular b/regular
				new file mode 100644
				--- /dev/null
				+++ b/regular
				@@ -0,0 +1,1 @@
				+regular

				git=auto: regular patch after qrefresh without --git:

				$ hg qrefresh -d '0 0'

				$ cat .hg/patches/git
				# HG changeset patch
				# Date 0 0
				# Parent 99586d5f048c399e20f81cee41fbb3809c0e735d

				diff -r 99586d5f048c regular
				--- /dev/null
				+++ b/regular
				@@ -0,0 +1,1 @@
				+regular

				$ cd ..

				$ hg init repo-keep
				$ cd repo-keep
				$ echo '[mq]' > .hg/hgrc
				$ echo 'git = KEEP' >> .hg/hgrc

				git=keep: git patch with --git:

				$ echo a > a
				$ hg add a
				$ hg qnew -d '0 0' -f --git git

				$ cat .hg/patches/git
				# HG changeset patch
				# Date 0 0
				# Parent 0000000000000000000000000000000000000000

				diff --git a/a b/a
				new file mode 100644
				--- /dev/null
				+++ b/a
				@@ -0,0 +1,1 @@
				+a

				git=keep: git patch after qrefresh without --git:

				$ echo a >> a
				$ hg qrefresh -d '0 0'

				$ cat .hg/patches/git
				# HG changeset patch
				# Date 0 0
				# Parent 0000000000000000000000000000000000000000

				diff --git a/a b/a
				new file mode 100644
				--- /dev/null
				+++ b/a
				@@ -0,0 +1,2 @@
				+a
				+a
				$ cd ..

				$ hg init repo-yes
				$ cd repo-yes
				$ echo '[mq]' > .hg/hgrc
				$ echo 'git = yes' >> .hg/hgrc

				git=yes: git patch:

				$ echo a > a
				$ hg add a
				$ hg qnew -d '0 0' -f git

				$ cat .hg/patches/git
				# HG changeset patch
				# Date 0 0
				# Parent 0000000000000000000000000000000000000000

				diff --git a/a b/a
				new file mode 100644
				--- /dev/null
				+++ b/a
				@@ -0,0 +1,1 @@
				+a

				git=yes: git patch after qrefresh:

				$ echo a >> a
				$ hg qrefresh -d '0 0'

				$ cat .hg/patches/git
				# HG changeset patch
				# Date 0 0
				# Parent 0000000000000000000000000000000000000000

				diff --git a/a b/a
				new file mode 100644
				--- /dev/null
				+++ b/a
				@@ -0,0 +1,2 @@
				+a
				+a
				$ cd ..

				$ hg init repo-no
				$ cd repo-no
				$ echo '[diff]' > .hg/hgrc
				$ echo 'git = True' >> .hg/hgrc
				$ echo '[mq]' > .hg/hgrc
				$ echo 'git = False' >> .hg/hgrc

				git=no: regular patch with copy:

				$ echo a > a
				$ hg add a
				$ hg qnew -d '0 0' -f adda
				$ hg cp a b
				$ hg qnew -d '0 0' -f regular

				$ cat .hg/patches/regular
				# HG changeset patch
				# Date 0 0
				# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

				diff -r ef8dafc9fa4c -r a70404f79ba3 b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+a

				git=no: regular patch after qrefresh with copy:

				$ hg cp a c
				$ hg qrefresh -d '0 0'

				$ cat .hg/patches/regular
				# HG changeset patch
				# Date 0 0
				# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4

				diff -r ef8dafc9fa4c b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+a
				diff -r ef8dafc9fa4c c
				--- /dev/null
				+++ b/c
				@@ -0,0 +1,1 @@
				+a

				$ cd ..