Changeset - 2723276285ae
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 15 years ago 2011-04-23 15:17:42
marcin@python-works.com
pep8ify middlewares
3 files changed with 60 insertions and 51 deletions:
rhodecode/lib/middleware/https_fixup.py
4
2
rhodecode/lib/middleware/simplegit.py
31
25
rhodecode/lib/middleware/simplehg.py
25
24
0 comments (0 inline, 0 general)
rhodecode/lib/middleware/https_fixup.py
➞
Show inline comments
 
@@ -25,7 +25,9 @@
 

			




	
	
	
		
 
from rhodecode.lib import str2bool

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class HttpsFixup(object):

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, app, config):

			




	
	
	
		
 
        self.application = app

			




	
	
	
		
 
        self.config = config

			




	
	
		
 
@@ -34,9 +36,9 @@ class HttpsFixup(object):

			




	
	
	
		
 
        self.__fixup(environ)

			




	
	
	
		
 
        return self.application(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __fixup(self, environ):

			




	
	
	
		
 
        """Function to fixup the environ as needed. In order to use this

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Function to fixup the environ as needed. In order to use this

			




	
	
	
		
 
        middleware you should set this header inside your

			




	
	
	
		
 
        proxy ie. nginx, apache etc.

			




	
	
	
		
 
        """

			




        

    


    
    

    

        

                

                    rhodecode/lib/middleware/simplegit.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,13 +30,15 @@ import traceback

			




	
	
	
		
 

			




	
	
	
		
 
from dulwich import server as dulserver

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class SimpleGitUploadPackHandler(dulserver.UploadPackHandler):

			




	
	
	
		
 

			




	
	
	
		
 
    def handle(self):

			




	
	
	
		
 
        write = lambda x: self.proto.write_sideband(1, x)

			




	
	
	
		
 

			




	
	
	
		
 
        graph_walker = dulserver.ProtocolGraphWalker(self, self.repo.object_store,

			




	
	
	
		
 
            self.repo.get_peeled)

			




	
	
	
		
 
        graph_walker = dulserver.ProtocolGraphWalker(self,

			




	
	
	
		
 
                                                     self.repo.object_store,

			




	
	
	
		
 
                                                     self.repo.get_peeled)

			




	
	
	
		
 
        objects_iter = self.repo.fetch_objects(

			




	
	
	
		
 
          graph_walker.determine_wants, graph_walker, self.progress,

			




	
	
	
		
 
          get_tagged=self.get_tagged)

			




	
	
		
 
@@ -46,8 +48,8 @@ class SimpleGitUploadPackHandler(dulserv

			




	
	
	
		
 
            return

			




	
	
	
		
 

			




	
	
	
		
 
        self.progress("counting objects: %d, done.\n" % len(objects_iter))

			




	
	
	
		
 
        dulserver.write_pack_data(dulserver.ProtocolFile(None, write), objects_iter,

			




	
	
	
		
 
                        len(objects_iter))

			




	
	
	
		
 
        dulserver.write_pack_data(dulserver.ProtocolFile(None, write),

			




	
	
	
		
 
                                  objects_iter, len(objects_iter))

			




	
	
	
		
 
        messages = []

			




	
	
	
		
 
        messages.append('thank you for using rhodecode')

			




	
	
	
		
 

			




	
	
		
 
@@ -75,6 +77,7 @@ from webob.exc import HTTPNotFound, HTTP

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def is_git(environ):

			




	
	
	
		
 
    """Returns True if request's target is git server.

			




	
	
	
		
 
    ``HTTP_USER_AGENT`` would then have git client version given.

			




	
	
		
 
@@ -86,6 +89,7 @@ def is_git(environ):

			




	
	
	
		
 
        return True

			




	
	
	
		
 
    return False

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class SimpleGit(object):

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, application, config):

			




	
	
		
 
@@ -126,13 +130,14 @@ class SimpleGit(object):

			




	
	
	
		
 
        if self.action in ['pull', 'push'] or self.action:

			




	
	
	
		
 
            anonymous_user = self.__get_user('default')

			




	
	
	
		
 
            self.username = anonymous_user.username

			




	
	
	
		
 
            anonymous_perm = self.__check_permission(self.action, anonymous_user ,

			




	
	
	
		
 
                                           self.repo_name)

			




	
	
	
		
 
            anonymous_perm = self.__check_permission(self.action,

			




	
	
	
		
 
                                                     anonymous_user,

			




	
	
	
		
 
                                                     self.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
            if anonymous_perm is not True or anonymous_user.active is False:

			




	
	
	
		
 
                if anonymous_perm is not True:

			




	
	
	
		
 
                    log.debug('Not enough credentials to access this repository'

			




	
	
	
		
 
                              'as anonymous user')

			




	
	
	
		
 
                    log.debug('Not enough credentials to access this '

			




	
	
	
		
 
                              'repository as anonymous user')

			




	
	
	
		
 
                if anonymous_user.active is False:

			




	
	
	
		
 
                    log.debug('Anonymous access is disabled, running '

			




	
	
	
		
 
                              'authentication')

			




	
	
		
 
@@ -142,7 +147,8 @@ class SimpleGit(object):

			




	
	
	
		
 
                #==============================================================

			




	
	
	
		
 

			




	
	
	
		
 
                if not REMOTE_USER(environ):

			




	
	
	
		
 
                    self.authenticate.realm = str(self.config['rhodecode_realm'])

			




	
	
	
		
 
                    self.authenticate.realm = str(

			




	
	
	
		
 
                                                self.config['rhodecode_realm'])

			




	
	
	
		
 
                    result = self.authenticate(environ)

			




	
	
	
		
 
                    if isinstance(result, str):

			




	
	
	
		
 
                        AUTH_TYPE.update(environ, 'basic')

			




	
	
		
 
@@ -150,7 +156,6 @@ class SimpleGit(object):

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        return result.wsgi_application(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
                #==============================================================

			




	
	
	
		
 
                # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME FROM

			




	
	
	
		
 
                # BASIC AUTH

			




	
	
		
 
@@ -163,18 +168,20 @@ class SimpleGit(object):

			




	
	
	
		
 
                        self.username = user.username

			




	
	
	
		
 
                    except:

			




	
	
	
		
 
                        log.error(traceback.format_exc())

			




	
	
	
		
 
                        return HTTPInternalServerError()(environ, start_response)

			




	
	
	
		
 
                        return HTTPInternalServerError()(environ,

			




	
	
	
		
 
                                                         start_response)

			




	
	
	
		
 

			




	
	
	
		
 
                    #check permissions for this repository

			




	
	
	
		
 
                    perm = self.__check_permission(self.action, user, self.repo_name)

			




	
	
	
		
 
                    perm = self.__check_permission(self.action, user,

			




	
	
	
		
 
                                                   self.repo_name)

			




	
	
	
		
 
                    if perm is not True:

			




	
	
	
		
 
                        print 'not allowed'

			




	
	
	
		
 
                        return HTTPForbidden()(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 
        self.extras = {'ip':self.ipaddr,

			




	
	
	
		
 
                       'username':self.username,

			




	
	
	
		
 
                       'action':self.action,

			




	
	
	
		
 
                       'repository':self.repo_name}

			




	
	
	
		
 
        self.extras = {'ip': self.ipaddr,

			




	
	
	
		
 
                       'username': self.username,

			




	
	
	
		
 
                       'action': self.action,

			




	
	
	
		
 
                       'repository': self.repo_name}

			




	
	
	
		
 

			




	
	
	
		
 
        #===================================================================

			




	
	
	
		
 
        # GIT REQUEST HANDLING

			




	
	
		
 
@@ -199,9 +206,9 @@ class SimpleGit(object):

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            return app(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __make_app(self):

			




	
	
	
		
 
        backend = dulserver.DictBackend({'/' + self.repo_name: Repo(self.repo_path)})

			




	
	
	
		
 
        _d = {'/' + self.repo_name: Repo(self.repo_path)}

			




	
	
	
		
 
        backend = dulserver.DictBackend(_d)

			




	
	
	
		
 
        gitserve = HTTPGitApplication(backend)

			




	
	
	
		
 

			




	
	
	
		
 
        return gitserve

			




	
	
		
 
@@ -216,21 +223,20 @@ class SimpleGit(object):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        if action == 'push':

			




	
	
	
		
 
            if not HasPermissionAnyMiddleware('repository.write',

			




	
	
	
		
 
                                              'repository.admin')\

			




	
	
	
		
 
                                                (user, repo_name):

			




	
	
	
		
 
                                              'repository.admin')(user,

			




	
	
	
		
 
                                                                  repo_name):

			




	
	
	
		
 
                return False

			




	
	
	
		
 

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            #any other action need at least read permission

			




	
	
	
		
 
            if not HasPermissionAnyMiddleware('repository.read',

			




	
	
	
		
 
                                              'repository.write',

			




	
	
	
		
 
                                              'repository.admin')\

			




	
	
	
		
 
                                                (user, repo_name):

			




	
	
	
		
 
                                              'repository.admin')(user,

			




	
	
	
		
 
                                                                  repo_name):

			




	
	
	
		
 
                return False

			




	
	
	
		
 

			




	
	
	
		
 
        return True

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __get_repository(self, environ):

			




	
	
	
		
 
        """Get's repository name out of PATH_INFO header

			




	
	
	
		
 

			




	
	
		
 
@@ -246,7 +252,6 @@ class SimpleGit(object):

			




	
	
	
		
 
        repo_name = repo_name.split('/')[0]

			




	
	
	
		
 
        return repo_name

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __get_user(self, username):

			




	
	
	
		
 
        return UserModel().get_by_username(username, cache=True)

			




	
	
	
		
 

			




	
	
		
 
@@ -262,7 +267,8 @@ class SimpleGit(object):

			




	
	
	
		
 
                       'git-upload-pack': 'pull',

			




	
	
	
		
 
                       }

			




	
	
	
		
 

			




	
	
	
		
 
            return mapping.get(service_cmd, service_cmd if service_cmd else 'other')

			




	
	
	
		
 
            return mapping.get(service_cmd,

			




	
	
	
		
 
                               service_cmd if service_cmd else 'other')

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            return 'other'

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/lib/middleware/simplehg.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -44,6 +44,7 @@ from webob.exc import HTTPNotFound, HTTP

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def is_mercurial(environ):

			




	
	
	
		
 
    """Returns True if request's target is mercurial server - header

			




	
	
	
		
 
    ``HTTP_ACCEPT`` of such request would start with ``application/mercurial``.

			




	
	
		
 
@@ -53,6 +54,7 @@ def is_mercurial(environ):

			




	
	
	
		
 
        return True

			




	
	
	
		
 
    return False

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class SimpleHg(object):

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, application, config):

			




	
	
		
 
@@ -93,13 +95,14 @@ class SimpleHg(object):

			




	
	
	
		
 
        if self.action in ['pull', 'push']:

			




	
	
	
		
 
            anonymous_user = self.__get_user('default')

			




	
	
	
		
 
            self.username = anonymous_user.username

			




	
	
	
		
 
            anonymous_perm = self.__check_permission(self.action, anonymous_user ,

			




	
	
	
		
 
                                           self.repo_name)

			




	
	
	
		
 
            anonymous_perm = self.__check_permission(self.action,

			




	
	
	
		
 
                                                     anonymous_user,

			




	
	
	
		
 
                                                     self.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
            if anonymous_perm is not True or anonymous_user.active is False:

			




	
	
	
		
 
                if anonymous_perm is not True:

			




	
	
	
		
 
                    log.debug('Not enough credentials to access this repository'

			




	
	
	
		
 
                              'as anonymous user')

			




	
	
	
		
 
                    log.debug('Not enough credentials to access this '

			




	
	
	
		
 
                              'repository as anonymous user')

			




	
	
	
		
 
                if anonymous_user.active is False:

			




	
	
	
		
 
                    log.debug('Anonymous access is disabled, running '

			




	
	
	
		
 
                              'authentication')

			




	
	
		
 
@@ -109,7 +112,8 @@ class SimpleHg(object):

			




	
	
	
		
 
                #==============================================================

			




	
	
	
		
 

			




	
	
	
		
 
                if not REMOTE_USER(environ):

			




	
	
	
		
 
                    self.authenticate.realm = str(self.config['rhodecode_realm'])

			




	
	
	
		
 
                    self.authenticate.realm = str(

			




	
	
	
		
 
                                                self.config['rhodecode_realm'])

			




	
	
	
		
 
                    result = self.authenticate(environ)

			




	
	
	
		
 
                    if isinstance(result, str):

			




	
	
	
		
 
                        AUTH_TYPE.update(environ, 'basic')

			




	
	
		
 
@@ -117,7 +121,6 @@ class SimpleHg(object):

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        return result.wsgi_application(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
                #==============================================================

			




	
	
	
		
 
                # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME FROM

			




	
	
	
		
 
                # BASIC AUTH

			




	
	
		
 
@@ -130,22 +133,24 @@ class SimpleHg(object):

			




	
	
	
		
 
                        self.username = user.username

			




	
	
	
		
 
                    except:

			




	
	
	
		
 
                        log.error(traceback.format_exc())

			




	
	
	
		
 
                        return HTTPInternalServerError()(environ, start_response)

			




	
	
	
		
 
                        return HTTPInternalServerError()(environ,

			




	
	
	
		
 
                                                         start_response)

			




	
	
	
		
 

			




	
	
	
		
 
                    #check permissions for this repository

			




	
	
	
		
 
                    perm = self.__check_permission(self.action, user, self.repo_name)

			




	
	
	
		
 
                    perm = self.__check_permission(self.action, user,

			




	
	
	
		
 
                                                   self.repo_name)

			




	
	
	
		
 
                    if perm is not True:

			




	
	
	
		
 
                        return HTTPForbidden()(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 
        self.extras = {'ip':self.ipaddr,

			




	
	
	
		
 
                       'username':self.username,

			




	
	
	
		
 
                       'action':self.action,

			




	
	
	
		
 
                       'repository':self.repo_name}

			




	
	
	
		
 
        self.extras = {'ip': self.ipaddr,

			




	
	
	
		
 
                       'username': self.username,

			




	
	
	
		
 
                       'action': self.action,

			




	
	
	
		
 
                       'repository': self.repo_name}

			




	
	
	
		
 

			




	
	
	
		
 
        #===================================================================

			




	
	
	
		
 
        #======================================================================

			




	
	
	
		
 
        # MERCURIAL REQUEST HANDLING

			




	
	
	
		
 
        #===================================================================

			




	
	
	
		
 
        environ['PATH_INFO'] = '/'#since we wrap into hgweb, reset the path

			




	
	
	
		
 
        #======================================================================

			




	
	
	
		
 
        environ['PATH_INFO'] = '/'  # since we wrap into hgweb, reset the path

			




	
	
	
		
 
        self.baseui = make_ui('db')

			




	
	
	
		
 
        self.basepath = self.config['base_path']

			




	
	
	
		
 
        self.repo_path = os.path.join(self.basepath, self.repo_name)

			




	
	
		
 
@@ -168,7 +173,6 @@ class SimpleHg(object):

			




	
	
	
		
 

			




	
	
	
		
 
        return app(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __make_app(self):

			




	
	
	
		
 
        """Make an wsgi application using hgweb, and my generated baseui

			




	
	
	
		
 
        instance

			




	
	
		
 
@@ -177,7 +181,6 @@ class SimpleHg(object):

			




	
	
	
		
 
        hgserve = hgweb(str(self.repo_path), baseui=self.baseui)

			




	
	
	
		
 
        return  self.__load_web_settings(hgserve, self.extras)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __check_permission(self, action, user, repo_name):

			




	
	
	
		
 
        """Checks permissions using action (push/pull) user and repository

			




	
	
	
		
 
        name

			




	
	
		
 
@@ -188,21 +191,20 @@ class SimpleHg(object):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        if action == 'push':

			




	
	
	
		
 
            if not HasPermissionAnyMiddleware('repository.write',

			




	
	
	
		
 
                                              'repository.admin')\

			




	
	
	
		
 
                                                (user, repo_name):

			




	
	
	
		
 
                                              'repository.admin')(user,

			




	
	
	
		
 
                                                                  repo_name):

			




	
	
	
		
 
                return False

			




	
	
	
		
 

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            #any other action need at least read permission

			




	
	
	
		
 
            if not HasPermissionAnyMiddleware('repository.read',

			




	
	
	
		
 
                                              'repository.write',

			




	
	
	
		
 
                                              'repository.admin')\

			




	
	
	
		
 
                                                (user, repo_name):

			




	
	
	
		
 
                                              'repository.admin')(user,

			




	
	
	
		
 
                                                                  repo_name):

			




	
	
	
		
 
                return False

			




	
	
	
		
 

			




	
	
	
		
 
        return True

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __get_repository(self, environ):

			




	
	
	
		
 
        """Get's repository name out of PATH_INFO header

			




	
	
	
		
 

			




	
	
		
 
@@ -236,7 +238,7 @@ class SimpleHg(object):

			




	
	
	
		
 
        for qry in environ['QUERY_STRING'].split('&'):

			




	
	
	
		
 
            if qry.startswith('cmd'):

			




	
	
	
		
 
                cmd = qry.split('=')[-1]

			




	
	
	
		
 
                if mapping.has_key(cmd):

			




	
	
	
		
 
                if cmd in mapping:

			




	
	
	
		
 
                    return mapping[cmd]

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    return 'pull'

			




	
	
		
 
@@ -247,7 +249,6 @@ class SimpleHg(object):

			




	
	
	
		
 
        push requests"""

			




	
	
	
		
 
        invalidate_cache('get_repo_cached_%s' % repo_name)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __load_web_settings(self, hgserve, extras={}):

			




	
	
	
		
 
        #set the global ui for hgserve instance passed

			




	
	
	
		
 
        hgserve.repo.ui = self.baseui

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.