upstream/mercurial-mirror Files · contrib/memory.py

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.

Bryan O'Sullivan - - Load All Authors

File last commit:

r31958:de5c9d0e default


                r32050:77eaf953

4.1.3 stable

Download file

             memory.py
        
                    32 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / memory.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # memory.py - track memory usage

      #

      # Copyright 2009 Matt Mackall <mpm@selenic.com> and others

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      '''helper extension to measure memory usage

      Reads current and peak memory usage from ``/proc/self/status`` and

      prints it to ``stderr`` on exit.

      '''

      from __future__ import absolute_import

      import atexit

      def memusage(ui):

          """Report memory usage of the current process."""

          result = {'peak': 0, 'rss': 0}

          with open('/proc/self/status', 'r') as status:

              # This will only work on systems with a /proc file system

              # (like Linux).

              for line in status:

                  parts = line.split()

                  key = parts[0][2:-1].lower()

                  if key in result:

                      result[key] = int(parts[1])

          ui.write_err(", ".join(["%s: %.1f MiB" % (k, v / 1024.0)

                                  for k, v in result.iteritems()]) + "\n")

      def extsetup(ui):

          atexit.register(memusage, ui)

	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

				# memory.py - track memory usage
				#
				# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				'''helper extension to measure memory usage

				Reads current and peak memory usage from ``/proc/self/status`` and
				prints it to ``stderr`` on exit.
				'''

				from __future__ import absolute_import
				import atexit

				def memusage(ui):
				"""Report memory usage of the current process."""
				result = {'peak': 0, 'rss': 0}
				with open('/proc/self/status', 'r') as status:
				# This will only work on systems with a /proc file system
				# (like Linux).
				for line in status:
				parts = line.split()
				key = parts[0][2:-1].lower()
				if key in result:
				result[key] = int(parts[1])
				ui.write_err(", ".join(["%s: %.1f MiB" % (k, v / 1024.0)
				for k, v in result.iteritems()]) + "\n")

				def extsetup(ui):
				atexit.register(memusage, ui)