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

Matt Harbison - - Load All Authors

File last commit:

r24497:2e0301ac default


                r32050:77eaf953

4.1.3 stable

Download file

             test-diffstat.t
        
                    107 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diffstat.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done

        $ hg add a

        $ cp a b

        $ hg add b

      Wide diffstat:

        $ hg diff --stat

         a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

         b |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

         2 files changed, 426 insertions(+), 0 deletions(-)

      diffstat width:

        $ COLUMNS=24 hg diff --config ui.interactive=true --stat

         a |  213 ++++++++++++++

         b |  213 ++++++++++++++

         2 files changed, 426 insertions(+), 0 deletions(-)

        $ hg ci -m adda

        $ cat >> a <<EOF

        > a

        > a

        > a

        > EOF

      Narrow diffstat:

        $ hg diff --stat

         a |  3 +++

         1 files changed, 3 insertions(+), 0 deletions(-)

        $ hg ci -m appenda

        >>> open("c", "wb").write("\0")

        $ touch d

        $ hg add c d

      Binary diffstat:

        $ hg diff --stat

         c |  Bin 

         1 files changed, 0 insertions(+), 0 deletions(-)

      Binary git diffstat:

        $ hg diff --stat --git

         c |  Bin 

         d |    0 

         2 files changed, 0 insertions(+), 0 deletions(-)

        $ hg ci -m createb

        >>> open("file with spaces", "wb").write("\0")

        $ hg add "file with spaces"

      Filename with spaces diffstat:

        $ hg diff --stat

         file with spaces |  Bin 

         1 files changed, 0 insertions(+), 0 deletions(-)

      Filename with spaces git diffstat:

        $ hg diff --stat --git

         file with spaces |  Bin 

         1 files changed, 0 insertions(+), 0 deletions(-)

      diffstat within directories:

        $ hg rm -f 'file with spaces'

        $ mkdir dir1 dir2

        $ echo new1 > dir1/new

        $ echo new2 > dir2/new

        $ hg add dir1/new dir2/new

        $ hg diff --stat

         dir1/new |  1 +

         dir2/new |  1 +

         2 files changed, 2 insertions(+), 0 deletions(-)

        $ hg diff --stat --root dir1

         new |  1 +

         1 files changed, 1 insertions(+), 0 deletions(-)

        $ hg diff --stat --root dir1 dir2

        warning: dir2 not inside relative root dir1

        $ hg diff --stat --root dir1 -I dir1/old

        $ cd dir1

        $ hg diff --stat .

         dir1/new |  1 +

         1 files changed, 1 insertions(+), 0 deletions(-)

        $ hg diff --stat --root .

         new |  1 +

         1 files changed, 1 insertions(+), 0 deletions(-)

        $ hg diff --stat --root ../dir1 ../dir2

        warning: ../dir2 not inside relative root . (glob)

        $ hg diff --stat --root . -I old

        $ 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
				$ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
				$ hg add a
				$ cp a b
				$ hg add b

				Wide diffstat:

				$ hg diff --stat
				a \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
				b \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
				2 files changed, 426 insertions(+), 0 deletions(-)

				diffstat width:

				$ COLUMNS=24 hg diff --config ui.interactive=true --stat
				a \| 213 ++++++++++++++
				b \| 213 ++++++++++++++
				2 files changed, 426 insertions(+), 0 deletions(-)

				$ hg ci -m adda

				$ cat >> a <<EOF
				> a
				> a
				> a
				> EOF

				Narrow diffstat:

				$ hg diff --stat
				a \| 3 +++
				1 files changed, 3 insertions(+), 0 deletions(-)

				$ hg ci -m appenda

				>>> open("c", "wb").write("\0")
				$ touch d
				$ hg add c d

				Binary diffstat:

				$ hg diff --stat
				c \| Bin
				1 files changed, 0 insertions(+), 0 deletions(-)

				Binary git diffstat:

				$ hg diff --stat --git
				c \| Bin
				d \| 0
				2 files changed, 0 insertions(+), 0 deletions(-)

				$ hg ci -m createb

				>>> open("file with spaces", "wb").write("\0")
				$ hg add "file with spaces"

				Filename with spaces diffstat:

				$ hg diff --stat
				file with spaces \| Bin
				1 files changed, 0 insertions(+), 0 deletions(-)

				Filename with spaces git diffstat:

				$ hg diff --stat --git
				file with spaces \| Bin
				1 files changed, 0 insertions(+), 0 deletions(-)

				diffstat within directories:

				$ hg rm -f 'file with spaces'

				$ mkdir dir1 dir2
				$ echo new1 > dir1/new
				$ echo new2 > dir2/new
				$ hg add dir1/new dir2/new
				$ hg diff --stat
				dir1/new \| 1 +
				dir2/new \| 1 +
				2 files changed, 2 insertions(+), 0 deletions(-)

				$ hg diff --stat --root dir1
				new \| 1 +
				1 files changed, 1 insertions(+), 0 deletions(-)

				$ hg diff --stat --root dir1 dir2
				warning: dir2 not inside relative root dir1

				$ hg diff --stat --root dir1 -I dir1/old

				$ cd dir1
				$ hg diff --stat .
				dir1/new \| 1 +
				1 files changed, 1 insertions(+), 0 deletions(-)
				$ hg diff --stat --root .
				new \| 1 +
				1 files changed, 1 insertions(+), 0 deletions(-)

				$ hg diff --stat --root ../dir1 ../dir2
				warning: ../dir2 not inside relative root . (glob)

				$ hg diff --stat --root . -I old

				$ cd ..