rhodecode-enterprise-ce Files · pkgs/patch-beaker-lock-func-debug.diff

mercurial: protocol security updates....

mercurial: protocol security updates. - fixes Mercurial CVE for lack of permissions checking on mercurial batch commands - more strict checks for permissions, now default to push instead of pull to be always on safe side. - decypher batch commands and pick top-most permission to be used

marcink - - Load All Authors

File last commit:

r2680:59717596 default


                r2724:7a057a98

default

Download file

             patch-beaker-lock-func-debug.diff
        
                    20 lines
            
             | 976 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / pkgs / patch-beaker-lock-func-debug.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff -rup Beaker-1.9.1-orig/beaker/container.py Beaker-1.9.1/beaker/container.py

      --- Beaker-1.9.1-orig/beaker/container.py	2018-04-10 10:23:04.000000000 +0200

      +++ Beaker-1.9.1/beaker/container.py	2018-04-10 10:23:34.000000000 +0200

      @@ -353,13 +353,13 @@ class Value(object):

                       debug("get_value returning old value while new one is created")

                       return value

                   else:

      -                debug("lock_creatfunc (didnt wait)")

      +                debug("lock_creatfunc `%s` (didnt wait)", self.createfunc.__name__)

                       has_createlock = True

               if not has_createlock:

      -            debug("lock_createfunc (waiting)")

      +            debug("lock_createfunc `%s` (waiting)", self.createfunc.__name__)

                   creation_lock.acquire()

      -            debug("lock_createfunc (waited)")

      +            debug("lock_createfunc `%s` (waited)", self.createfunc.__name__)

               try:

                   # see if someone created the value already

	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

				diff -rup Beaker-1.9.1-orig/beaker/container.py Beaker-1.9.1/beaker/container.py
				--- Beaker-1.9.1-orig/beaker/container.py 2018-04-10 10:23:04.000000000 +0200
				+++ Beaker-1.9.1/beaker/container.py 2018-04-10 10:23:34.000000000 +0200
				@@ -353,13 +353,13 @@ class Value(object):
				debug("get_value returning old value while new one is created")
				return value
				else:
				- debug("lock_creatfunc (didnt wait)")
				+ debug("lock_creatfunc `%s` (didnt wait)", self.createfunc.__name__)
				has_createlock = True

				if not has_createlock:
				- debug("lock_createfunc (waiting)")
				+ debug("lock_createfunc `%s` (waiting)", self.createfunc.__name__)
				creation_lock.acquire()
				- debug("lock_createfunc (waited)")
				+ debug("lock_createfunc `%s` (waited)", self.createfunc.__name__)

				try:
				# see if someone created the value already