upstream/mercurial-mirror Files · mercurial/i18n.py

hgweb: fail if an invalid command was supplied in url path (issue4071)...

hgweb: fail if an invalid command was supplied in url path (issue4071) Traditionally, the way to specify a command for hgweb was to use url query arguments (e.g. "?cmd=batch"). If the command is unknown to hgweb, it gives an error (e.g. "400 no such method: badcmd"). But there's also another way to specify a command: as a url path fragment (e.g. "/graph"). Before, hgweb was made forgiving (looks like it was made in 44c5157474e7) and user could put any unknown command in the url. If hgweb couldn't understand it, it would just silently fall back to the default command, which depends on the actual style (e.g. for paper it's shortlog, for monoblue it's summary). This was inconsistent and was breaking some tools that rely on http status codes (as noted in the issue4071). So this patch changes that behavior to the more consistent one, i.e. hgweb will now return "400 no such method: badcmd". So if some tool was relying on having an invalid command return http status code 200 and also have some information, then it will stop working. That is, if somebody typed foobar when they really meant shortlog (and the user was lucky enough to choose a style where the default command is shortlog too), that fact will now be revealed. Code-wise, the changed if block is only relevant when there's no "?cmd" query parameter (i.e. only when command is specified as a url path fragment), and looks like the removed else branch was there only for falling back to default command. With that removed, the rest of the code works as expected: it looks at the command, and if it's not known, raises a proper ErrorResponse exception with an appropriate message. Evidently, there were no tests that required the old behavior. But, frankly, I don't know any way to tell if anyone actually exploited such forgiving behavior in some in-house tool.

Yuya Nishihara - - Load All Authors

File last commit:

r21987:4953cd19 default


                r22506:6e1fbcb1

stable

Download file

             i18n.py
        
                    67 lines
            
             | 2.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / i18n.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # i18n.py - internationalization support for mercurial

      #

      # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

      #

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

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

      import encoding

      import gettext, sys, os

      # modelled after templater.templatepath:

      if getattr(sys, 'frozen', None) is not None:

          module = sys.executable

      else:

          module = __file__

      base = os.path.dirname(module)

      for dir in ('.', '..'):

          localedir = os.path.join(base, dir, 'locale')

          if os.path.isdir(localedir):

              break

      t = gettext.translation('hg', localedir, fallback=True)

      def gettext(message):

          """Translate message.

          The message is looked up in the catalog to get a Unicode string,

          which is encoded in the local encoding before being returned.

          Important: message is restricted to characters in the encoding

          given by sys.getdefaultencoding() which is most likely 'ascii'.

          """

          # If message is None, t.ugettext will return u'None' as the

          # translation whereas our callers expect us to return None.

          if message is None:

              return message

          if type(message) is unicode:

              # goofy unicode docstrings in test

              paragraphs = message.split(u'\n\n')

          else:

              paragraphs = [p.decode("ascii") for p in message.split('\n\n')]

          # Be careful not to translate the empty string -- it holds the

          # meta data of the .po file.

          u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])

          try:

              # encoding.tolocal cannot be used since it will first try to

              # decode the Unicode string. Calling u.decode(enc) really

              # means u.encode(sys.getdefaultencoding()).decode(enc). Since

              # the Python encoding defaults to 'ascii', this fails if the

              # translated string use non-ASCII characters.

              return u.encode(encoding.encoding, "replace")

          except LookupError:

              # An unknown encoding results in a LookupError.

              return message

      def _plain():

          if 'HGPLAIN' not in os.environ and 'HGPLAINEXCEPT' not in os.environ:

              return False

          exceptions = os.environ.get('HGPLAINEXCEPT', '').strip().split(',')

          return 'i18n' not in exceptions

      if _plain():

          _ = lambda message: message

      else:

          _ = gettext

	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

				# i18n.py - internationalization support for mercurial
				#
				# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				import encoding
				import gettext, sys, os

				# modelled after templater.templatepath:
				if getattr(sys, 'frozen', None) is not None:
				module = sys.executable
				else:
				module = __file__

				base = os.path.dirname(module)
				for dir in ('.', '..'):
				localedir = os.path.join(base, dir, 'locale')
				if os.path.isdir(localedir):
				break

				t = gettext.translation('hg', localedir, fallback=True)

				def gettext(message):
				"""Translate message.

				The message is looked up in the catalog to get a Unicode string,
				which is encoded in the local encoding before being returned.

				Important: message is restricted to characters in the encoding
				given by sys.getdefaultencoding() which is most likely 'ascii'.
				"""
				# If message is None, t.ugettext will return u'None' as the
				# translation whereas our callers expect us to return None.
				if message is None:
				return message

				if type(message) is unicode:
				# goofy unicode docstrings in test
				paragraphs = message.split(u'\n\n')
				else:
				paragraphs = [p.decode("ascii") for p in message.split('\n\n')]
				# Be careful not to translate the empty string -- it holds the
				# meta data of the .po file.
				u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
				try:
				# encoding.tolocal cannot be used since it will first try to
				# decode the Unicode string. Calling u.decode(enc) really
				# means u.encode(sys.getdefaultencoding()).decode(enc). Since
				# the Python encoding defaults to 'ascii', this fails if the
				# translated string use non-ASCII characters.
				return u.encode(encoding.encoding, "replace")
				except LookupError:
				# An unknown encoding results in a LookupError.
				return message

				def _plain():
				if 'HGPLAIN' not in os.environ and 'HGPLAINEXCEPT' not in os.environ:
				return False
				exceptions = os.environ.get('HGPLAINEXCEPT', '').strip().split(',')
				return 'i18n' not in exceptions

				if _plain():
				_ = lambda message: message
				else:
				_ = gettext