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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r32050:77eaf953

4.1.3 stable

Download file

             test-import-context.t
        
                    126 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-import-context.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test applying context diffs

        $ cat > writepatterns.py <<EOF

        > import sys

        > 

        > path = sys.argv[1]

        > lasteol = sys.argv[2] == '1'

        > patterns = sys.argv[3:]

        > 

        > fp = file(path, 'wb')

        > for i, pattern in enumerate(patterns):

        >     count = int(pattern[0:-1])

        >     char = pattern[-1] + '\n'

        >     if not lasteol and i == len(patterns) - 1:

        >         fp.write((char*count)[:-1])

        >     else:

        >         fp.write(char*count)

        > fp.close()

        > EOF

        $ cat > cat.py <<EOF

        > import sys

        > sys.stdout.write(repr(file(sys.argv[1], 'rb').read()) + '\n')

        > EOF

      Initialize the test repository

        $ hg init repo

        $ cd repo

        $ python ../writepatterns.py a 0 5A 1B 5C 1D

        $ python ../writepatterns.py b 1 1A 1B

        $ python ../writepatterns.py c 1 5A

        $ python ../writepatterns.py d 1 5A 1B

        $ hg add

        adding a

        adding b

        adding c

        adding d

        $ hg ci -m addfiles

      Add file, missing a last end of line

        $ hg import --no-commit - <<EOF

        > *** /dev/null	2010-10-16 18:05:49.000000000 +0200

        > --- b/newnoeol	2010-10-16 18:23:26.000000000 +0200

        > ***************

        > *** 0 ****

        > --- 1,2 ----

        > + a

        > + b

        > \ No newline at end of file

        > *** a/a	Sat Oct 16 16:35:51 2010

        > --- b/a	Sat Oct 16 16:35:51 2010

        > ***************

        > *** 3,12 ****

        >   A

        >   A

        >   A

        > ! B

        >   C

        >   C

        >   C

        >   C

        >   C

        > ! D

        > \ No newline at end of file

        > --- 3,13 ----

        >   A

        >   A

        >   A

        > ! E

        >   C

        >   C

        >   C

        >   C

        >   C

        > ! F

        > ! F

        > 

        > *** a/b	2010-10-16 18:40:38.000000000 +0200

        > --- /dev/null	2010-10-16 18:05:49.000000000 +0200

        > ***************

        > *** 1,2 ****

        > - A

        > - B

        > --- 0 ----

        > *** a/c	Sat Oct 16 21:34:26 2010

        > --- b/c	Sat Oct 16 21:34:27 2010

        > ***************

        > *** 3,5 ****

        > --- 3,7 ----

        >   A

        >   A

        >   A

        > + B

        > + B

        > *** a/d	Sat Oct 16 21:47:20 2010

        > --- b/d	Sat Oct 16 21:47:22 2010

        > ***************

        > *** 2,6 ****

        >   A

        >   A

        >   A

        > - A

        > - B

        > --- 2,4 ----

        > EOF

        applying patch from stdin

        $ hg st

        M a

        M c

        M d

        A newnoeol

        R b

      What's in a

        $ python ../cat.py a

        'A\nA\nA\nA\nA\nE\nC\nC\nC\nC\nC\nF\nF\n'

        $ python ../cat.py newnoeol

        'a\nb'

        $ python ../cat.py c

        'A\nA\nA\nA\nA\nB\nB\n'

        $ python ../cat.py d

        'A\nA\nA\nA\n'

        $ 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 applying context diffs

				$ cat > writepatterns.py <<EOF
				> import sys
				>
				> path = sys.argv[1]
				> lasteol = sys.argv[2] == '1'
				> patterns = sys.argv[3:]
				>
				> fp = file(path, 'wb')
				> for i, pattern in enumerate(patterns):
				> count = int(pattern[0:-1])
				> char = pattern[-1] + '\n'
				> if not lasteol and i == len(patterns) - 1:
				> fp.write((char*count)[:-1])
				> else:
				> fp.write(char*count)
				> fp.close()
				> EOF
				$ cat > cat.py <<EOF
				> import sys
				> sys.stdout.write(repr(file(sys.argv[1], 'rb').read()) + '\n')
				> EOF

				Initialize the test repository

				$ hg init repo
				$ cd repo
				$ python ../writepatterns.py a 0 5A 1B 5C 1D
				$ python ../writepatterns.py b 1 1A 1B
				$ python ../writepatterns.py c 1 5A
				$ python ../writepatterns.py d 1 5A 1B
				$ hg add
				adding a
				adding b
				adding c
				adding d
				$ hg ci -m addfiles

				Add file, missing a last end of line

				$ hg import --no-commit - <<EOF
				> *** /dev/null 2010-10-16 18:05:49.000000000 +0200
				> --- b/newnoeol 2010-10-16 18:23:26.000000000 +0200
				> ***************
				> * 0 **
				> --- 1,2 ----
				> + a
				> + b
				> \ No newline at end of file
				> *** a/a Sat Oct 16 16:35:51 2010
				> --- b/a Sat Oct 16 16:35:51 2010
				> ***************
				> * 3,12 **
				> A
				> A
				> A
				> ! B
				> C
				> C
				> C
				> C
				> C
				> ! D
				> \ No newline at end of file
				> --- 3,13 ----
				> A
				> A
				> A
				> ! E
				> C
				> C
				> C
				> C
				> C
				> ! F
				> ! F
				>
				> *** a/b 2010-10-16 18:40:38.000000000 +0200
				> --- /dev/null 2010-10-16 18:05:49.000000000 +0200
				> ***************
				> * 1,2 **
				> - A
				> - B
				> --- 0 ----
				> *** a/c Sat Oct 16 21:34:26 2010
				> --- b/c Sat Oct 16 21:34:27 2010
				> ***************
				> * 3,5 **
				> --- 3,7 ----
				> A
				> A
				> A
				> + B
				> + B
				> *** a/d Sat Oct 16 21:47:20 2010
				> --- b/d Sat Oct 16 21:47:22 2010
				> ***************
				> * 2,6 **
				> A
				> A
				> A
				> - A
				> - B
				> --- 2,4 ----
				> EOF
				applying patch from stdin
				$ hg st
				M a
				M c
				M d
				A newnoeol
				R b

				What's in a

				$ python ../cat.py a
				'A\nA\nA\nA\nA\nE\nC\nC\nC\nC\nC\nF\nF\n'
				$ python ../cat.py newnoeol
				'a\nb'
				$ python ../cat.py c
				'A\nA\nA\nA\nA\nB\nB\n'
				$ python ../cat.py d
				'A\nA\nA\nA\n'

				$ cd ..