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

Simon Farnsworth - - Load All Authors

File last commit:

r29775:978b907d default


                r32050:77eaf953

4.1.3 stable

Download file

             test-subrepo-missing.t
        
                    142 lines
            
             | 3.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-missing.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ hg init subrepo

        $ echo a > subrepo/a

        $ hg -R subrepo ci -Am adda

        adding a

        $ echo 'subrepo = subrepo' > .hgsub

        $ hg ci -Am addsubrepo

        adding .hgsub

        $ echo b > subrepo/b

        $ hg -R subrepo ci -Am addb

        adding b

        $ hg ci -m updatedsub

      ignore blanklines in .hgsubstate

        >>> file('.hgsubstate', 'wb').write('\n\n   \t \n   \n')

        $ hg st --subrepos

        M .hgsubstate

        $ hg revert -qC .hgsubstate

      abort more gracefully on .hgsubstate parsing error

        $ cp .hgsubstate .hgsubstate.old

        >>> file('.hgsubstate', 'wb').write('\ninvalid')

        $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo

        abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2

        [255]

        $ mv .hgsubstate.old .hgsubstate

      delete .hgsub and revert it

        $ rm .hgsub

        $ hg revert .hgsub

        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

      delete .hgsubstate and revert it

        $ rm .hgsubstate

        $ hg revert .hgsubstate

      delete .hgsub and update

        $ rm .hgsub

        $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo

        warning: subrepo spec file 'repo/.hgsub' not found

        warning: subrepo spec file 'repo/.hgsub' not found

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st

        warning: subrepo spec file '.hgsub' not found

        ! .hgsub

        $ ls subrepo

        a

      delete .hgsubstate and update

        $ hg up -C

        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

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

        $ rm .hgsubstate

        $ hg up 0

        other [destination] changed .hgsubstate which local [working copy] deleted

        use (c)hanged version or leave (d)eleted? c

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st

        $ ls subrepo

        a

      Enable obsolete

        $ cat >> $HGRCPATH << EOF

        > [ui]

        > logtemplate= {rev}:{node|short} {desc|firstline}

        > [phases]

        > publish=False

        > [experimental]

        > evolution=createmarkers

        > EOF

      check that we can update parent repo with missing (amended) subrepo revision

        $ hg up --repository subrepo -r tip

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg ci -m "updated subrepo to tip"

        created new head

        $ cd subrepo

        $ hg update -r tip

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

        $ echo foo > a

        $ hg commit --amend -m "addb (amended)"

        $ cd ..

        $ hg update --clean .

        revision 102a90ea7b4a in subrepo subrepo is hidden

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      check that --hidden is propagated to the subrepo

        $ hg -R subrepo up tip

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg ci -m 'commit with amended subrepo'

        $ echo bar > subrepo/a

        $ hg -R subrepo ci --amend -m "amend a (again)"

        $ hg --hidden cat subrepo/a

        foo

      verify will warn if locked-in subrepo revisions are hidden or missing

        $ hg ci -m "amended subrepo (again)"

        $ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip'

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        2 files, 5 changesets, 5 total revisions

        checking subrepo links

        subrepo 'subrepo' is hidden in revision a66de08943b6

        subrepo 'subrepo' is hidden in revision 674d05939c1e

        subrepo 'subrepo' not found in revision a7d05d9055a4

      verifying shouldn't init a new subrepo if the reference doesn't exist

        $ mv subrepo b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        2 files, 5 changesets, 5 total revisions

        checking subrepo links

        0: repository $TESTTMP/repo/subrepo not found (glob)

        1: repository $TESTTMP/repo/subrepo not found (glob)

        3: repository $TESTTMP/repo/subrepo not found (glob)

        4: repository $TESTTMP/repo/subrepo not found (glob)

        $ ls

        b

        $ mv b subrepo

        $ 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
				$ hg init subrepo
				$ echo a > subrepo/a
				$ hg -R subrepo ci -Am adda
				adding a
				$ echo 'subrepo = subrepo' > .hgsub
				$ hg ci -Am addsubrepo
				adding .hgsub
				$ echo b > subrepo/b
				$ hg -R subrepo ci -Am addb
				adding b
				$ hg ci -m updatedsub

				ignore blanklines in .hgsubstate

				>>> file('.hgsubstate', 'wb').write('\n\n \t \n \n')
				$ hg st --subrepos
				M .hgsubstate
				$ hg revert -qC .hgsubstate

				abort more gracefully on .hgsubstate parsing error

				$ cp .hgsubstate .hgsubstate.old
				>>> file('.hgsubstate', 'wb').write('\ninvalid')
				$ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo
				abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2
				[255]
				$ mv .hgsubstate.old .hgsubstate

				delete .hgsub and revert it

				$ rm .hgsub
				$ hg revert .hgsub
				warning: subrepo spec file '.hgsub' not found
				warning: subrepo spec file '.hgsub' not found
				warning: subrepo spec file '.hgsub' not found

				delete .hgsubstate and revert it

				$ rm .hgsubstate
				$ hg revert .hgsubstate

				delete .hgsub and update

				$ rm .hgsub
				$ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo
				warning: subrepo spec file 'repo/.hgsub' not found
				warning: subrepo spec file 'repo/.hgsub' not found
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				warning: subrepo spec file '.hgsub' not found
				! .hgsub
				$ ls subrepo
				a

				delete .hgsubstate and update

				$ hg up -C
				warning: subrepo spec file '.hgsub' not found
				warning: subrepo spec file '.hgsub' not found
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm .hgsubstate
				$ hg up 0
				other [destination] changed .hgsubstate which local [working copy] deleted
				use (c)hanged version or leave (d)eleted? c
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				$ ls subrepo
				a

				Enable obsolete

				$ cat >> $HGRCPATH << EOF
				> [ui]
				> logtemplate= {rev}:{node\|short} {desc\|firstline}
				> [phases]
				> publish=False
				> [experimental]
				> evolution=createmarkers
				> EOF

				check that we can update parent repo with missing (amended) subrepo revision

				$ hg up --repository subrepo -r tip
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg ci -m "updated subrepo to tip"
				created new head
				$ cd subrepo
				$ hg update -r tip
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo foo > a
				$ hg commit --amend -m "addb (amended)"
				$ cd ..
				$ hg update --clean .
				revision 102a90ea7b4a in subrepo subrepo is hidden
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				check that --hidden is propagated to the subrepo

				$ hg -R subrepo up tip
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg ci -m 'commit with amended subrepo'
				$ echo bar > subrepo/a
				$ hg -R subrepo ci --amend -m "amend a (again)"
				$ hg --hidden cat subrepo/a
				foo

				verify will warn if locked-in subrepo revisions are hidden or missing

				$ hg ci -m "amended subrepo (again)"
				$ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip'
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				2 files, 5 changesets, 5 total revisions
				checking subrepo links
				subrepo 'subrepo' is hidden in revision a66de08943b6
				subrepo 'subrepo' is hidden in revision 674d05939c1e
				subrepo 'subrepo' not found in revision a7d05d9055a4

				verifying shouldn't init a new subrepo if the reference doesn't exist

				$ mv subrepo b
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				2 files, 5 changesets, 5 total revisions
				checking subrepo links
				0: repository $TESTTMP/repo/subrepo not found (glob)
				1: repository $TESTTMP/repo/subrepo not found (glob)
				3: repository $TESTTMP/repo/subrepo not found (glob)
				4: repository $TESTTMP/repo/subrepo not found (glob)
				$ ls
				b
				$ mv b subrepo

				$ cd ..