Changeset - f0649c7cf94a
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 14 years ago 2012-03-04 04:08:54
marcin@python-works.com
fixed some unicode problems with waitress
- fixed clonning repos from non-ascii groups
4 files changed with 41 insertions and 19 deletions:
rhodecode/lib/auth.py
6
1
rhodecode/lib/middleware/simplegit.py
4
3
rhodecode/lib/middleware/simplehg.py
23
12
rhodecode/lib/utils.py
8
3
0 comments (0 inline, 0 general)
rhodecode/lib/auth.py
➞
Show inline comments
 
@@ -779,28 +779,33 @@ class HasReposGroupPermissionAll(PermsFu
 
            return True
 
        return False
 

			




	
	
	
		
 

			




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

			




	
	
	
		
 
# SPECIAL VERSION TO HANDLE MIDDLEWARE AUTH

			




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

			




	
	
	
		
 
class HasPermissionAnyMiddleware(object):

			




	
	
	
		
 
    def __init__(self, *perms):

			




	
	
	
		
 
        self.required_perms = set(perms)

			




	
	
	
		
 

			




	
	
	
		
 
    def __call__(self, user, repo_name):

			




	
	
	
		
 
        # repo_name MUST be unicode, since we handle keys in permission

			




	
	
	
		
 
        # dict by unicode

			




	
	
	
		
 
        repo_name = safe_unicode(repo_name)

			




	
	
	
		
 
        usr = AuthUser(user.user_id)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.user_perms = set([usr.permissions['repositories'][repo_name]])

			




	
	
	
		
 
        except:

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error('Exception while accessing permissions %s' % 

			




	
	
	
		
 
                      traceback.format_exc())

			




	
	
	
		
 
            self.user_perms = set()

			




	
	
	
		
 
        self.granted_for = ''

			




	
	
	
		
 
        self.username = user.username

			




	
	
	
		
 
        self.repo_name = repo_name

			




	
	
	
		
 
        return self.check_permissions()

			




	
	
	
		
 

			




	
	
	
		
 
    def check_permissions(self):

			




	
	
	
		
 
        log.debug('checking mercurial protocol '

			




	
	
	
		
 
                  'permissions %s for user:%s repository:%s', self.user_perms,

			




	
	
	
		
 
                                                self.username, self.repo_name)

			




	
	
	
		
 
        if self.required_perms.intersection(self.user_perms):

			




	
	
	
		
 
            log.debug('permission granted')

			




        

    


    
    

    

        

                

                    rhodecode/lib/middleware/simplegit.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -77,25 +77,27 @@ from rhodecode.model.db import User

			




	
	
	
		
 

			




	
	
	
		
 
from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
GIT_PROTO_PAT = re.compile(r'^/(.+)/(info/refs|git-upload-pack|git-receive-pack)')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def is_git(environ):

			




	
	
	
		
 
    path_info = environ['PATH_INFO']

			




	
	
	
		
 
    isgit_path = GIT_PROTO_PAT.match(path_info)

			




	
	
	
		
 
    log.debug('is a git path %s pathinfo : %s' % (isgit_path, path_info))

			




	
	
	
		
 
    log.debug('pathinfo: %s detected as GIT %s' % (

			




	
	
	
		
 
        path_info, isgit_path != None)

			




	
	
	
		
 
    )

			




	
	
	
		
 
    return isgit_path

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class SimpleGit(BaseVCSController):

			




	
	
	
		
 

			




	
	
	
		
 
    def _handle_request(self, environ, start_response):

			




	
	
	
		
 

			




	
	
	
		
 
        if not is_git(environ):

			




	
	
	
		
 
            return self.application(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 
        proxy_key = 'HTTP_X_REAL_IP'

			




	
	
	
		
 
        def_key = 'REMOTE_ADDR'

			




	
	
		
 
@@ -112,25 +114,24 @@ class SimpleGit(BaseVCSController):

			




	
	
	
		
 
            log.debug('Extracted repo name is %s' % repo_name)

			




	
	
	
		
 
        except:

			




	
	
	
		
 
            return HTTPInternalServerError()(environ, start_response)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        # GET ACTION PULL or PUSH

			




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

			




	
	
	
		
 
        action = self.__get_action(environ)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        # CHECK ANONYMOUS PERMISSION

			




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

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            anonymous_user = self.__get_user('default')

			




	
	
	
		
 
            username = anonymous_user.username

			




	
	
	
		
 
            anonymous_perm = self._check_permission(action, anonymous_user,

			




	
	
	
		
 
                                                    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')

			




	
	
	
		
 
                if anonymous_user.active is False:

			




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

			




	
	
		
 
@@ -168,25 +169,25 @@ class SimpleGit(BaseVCSController):

			




	
	
	
		
 
                        log.error(traceback.format_exc())

			




	
	
	
		
 
                        return HTTPInternalServerError()(environ,

			




	
	
	
		
 
                                                         start_response)

			




	
	
	
		
 

			




	
	
	
		
 
                    #check permissions for this repository

			




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

			




	
	
	
		
 
                    if perm is not True:

			




	
	
	
		
 
                        return HTTPForbidden()(environ, start_response)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        # GIT REQUEST HANDLING

			




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

			




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

			




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

			




	
	
	
		
 
        log.debug('Repository path is %s' % repo_path)

			




	
	
	
		
 

			




	
	
	
		
 
        # quick check if that dir exists...

			




	
	
	
		
 
        if is_valid_repo(repo_name, self.basepath) is False:

			




	
	
	
		
 
            return HTTPNotFound()(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            #invalidate cache on push

			




	
	
	
		
 
            if action == 'push':

			




	
	
	
		
 
                self._invalidate_cache(repo_name)

			




	
	
	
		
 
            log.info('%s action on GIT repo "%s"' % (action, repo_name))

			




	
	
	
		
 
            app = self.__make_app(repo_name, repo_path)

			




        

    


    
    

    

        

                

                    rhodecode/lib/middleware/simplehg.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,49 +18,58 @@

			




	
	
	
		
 
#

			




	
	
	
		
 
# This program is distributed in the hope that it will be useful,

			




	
	
	
		
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
# GNU General Public License for more details.

			




	
	
	
		
 
#

			




	
	
	
		
 
# You should have received a copy of the GNU General Public License

			




	
	
	
		
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 

			




	
	
	
		
 
import os

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import urllib

			




	
	
	
		
 

			




	
	
	
		
 
from mercurial.error import RepoError

			




	
	
	
		
 
from mercurial.hgweb import hgweb_mod

			




	
	
	
		
 

			




	
	
	
		
 
from paste.httpheaders import REMOTE_USER, AUTH_TYPE

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib import safe_str

			




	
	
	
		
 
from rhodecode.lib.base import BaseVCSController

			




	
	
	
		
 
from rhodecode.lib.auth import get_container_username

			




	
	
	
		
 
from rhodecode.lib.utils import make_ui, is_valid_repo, ui_sections

			




	
	
	
		
 
from rhodecode.model.db import User

			




	
	
	
		
 

			




	
	
	
		
 
from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def is_mercurial(environ):

			




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

			




	
	
	
		
 
    """

			




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

			




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

			




	
	
	
		
 
    """

			




	
	
	
		
 
    http_accept = environ.get('HTTP_ACCEPT')

			




	
	
	
		
 
    path_info = environ['PATH_INFO']

			




	
	
	
		
 
    if http_accept and http_accept.startswith('application/mercurial'):

			




	
	
	
		
 
        return True

			




	
	
	
		
 
    return False

			




	
	
	
		
 
        ishg_path = True

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        ishg_path = False

			




	
	
	
		
 

			




	
	
	
		
 
    log.debug('pathinfo: %s detected as HG %s' % (

			




	
	
	
		
 
        path_info, ishg_path)

			




	
	
	
		
 
    )

			




	
	
	
		
 
    return ishg_path

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class SimpleHg(BaseVCSController):

			




	
	
	
		
 

			




	
	
	
		
 
    def _handle_request(self, environ, start_response):

			




	
	
	
		
 
        if not is_mercurial(environ):

			




	
	
	
		
 
            return self.application(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 
        proxy_key = 'HTTP_X_REAL_IP'

			




	
	
	
		
 
        def_key = 'REMOTE_ADDR'

			




	
	
	
		
 
        ipaddr = environ.get(proxy_key, environ.get(def_key, '0.0.0.0'))

			




	
	
	
		
 

			




	
	
		
 
@@ -71,30 +80,30 @@ class SimpleHg(BaseVCSController):

			




	
	
	
		
 
        # EXTRACT REPOSITORY NAME FROM ENV

			




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

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            repo_name = environ['REPO_NAME'] = self.__get_repository(environ)

			




	
	
	
		
 
            log.debug('Extracted repo name is %s' % repo_name)

			




	
	
	
		
 
        except:

			




	
	
	
		
 
            return HTTPInternalServerError()(environ, start_response)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        # GET ACTION PULL or PUSH

			




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

			




	
	
	
		
 
        action = self.__get_action(environ)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        # CHECK ANONYMOUS PERMISSION

			




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

			




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

			




	
	
	
		
 
            anonymous_user = self.__get_user('default')

			




	
	
	
		
 

			




	
	
	
		
 
            username = anonymous_user.username

			




	
	
	
		
 
            anonymous_perm = self._check_permission(action, anonymous_user,

			




	
	
	
		
 
                                                    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')

			




	
	
	
		
 
                if anonymous_user.active is False:

			




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

			




	
	
	
		
 
                              'authentication')

			




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

			




	
	
		
 
@@ -123,39 +132,41 @@ class SimpleHg(BaseVCSController):

			




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

			




	
	
	
		
 
                    try:

			




	
	
	
		
 
                        user = self.__get_user(username)

			




	
	
	
		
 
                        if user is None or not user.active:

			




	
	
	
		
 
                            return HTTPForbidden()(environ, start_response)

			




	
	
	
		
 
                        username = user.username

			




	
	
	
		
 
                    except:

			




	
	
	
		
 
                        log.error(traceback.format_exc())

			




	
	
	
		
 
                        return HTTPInternalServerError()(environ,

			




	
	
	
		
 
                                                         start_response)

			




	
	
	
		
 

			




	
	
	
		
 
                    #check permissions for this repository

			




	
	
	
		
 
                    perm = self._check_permission(action, user,

			




	
	
	
		
 
                                                   repo_name)

			




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

			




	
	
	
		
 
                    if perm is not True:

			




	
	
	
		
 
                        return HTTPForbidden()(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 
        extras = {'ip': ipaddr,

			




	
	
	
		
 
                  'username': username,

			




	
	
	
		
 
                  'action': action,

			




	
	
	
		
 
                  'repository': repo_name}

			




	
	
	
		
 
        # extras are injected into mercurial UI object and later available

			




	
	
	
		
 
        # in hg hooks executed by rhodecode

			




	
	
	
		
 
        extras = {

			




	
	
	
		
 
            'ip': ipaddr,

			




	
	
	
		
 
            'username': username,

			




	
	
	
		
 
            'action': action,

			




	
	
	
		
 
            'repository': repo_name

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        # MERCURIAL REQUEST HANDLING

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        log.debug('Repository path is %s' % repo_path)

			




	
	
	
		
 

			




	
	
	
		
 
        baseui = make_ui('db')

			




	
	
	
		
 
        self.__inject_extras(repo_path, baseui, extras)

			




	
	
	
		
 

			




	
	
	
		
 
        # quick check if that dir exists...

			




	
	
	
		
 
        if is_valid_repo(repo_name, self.basepath) is False:

			




	
	
	
		
 
            return HTTPNotFound()(environ, start_response)

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            # invalidate cache on push

			




	
	
	
		
 
            if action == 'push':

			




        

    


    
    

    

        

                

                    rhodecode/lib/utils.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,24 +45,25 @@ from rhodecode.lib.vcs import get_backen

			




	
	
	
		
 
from rhodecode.lib.vcs.backends.base import BaseChangeset

			




	
	
	
		
 
from rhodecode.lib.vcs.utils.lazy import LazyProperty

			




	
	
	
		
 
from rhodecode.lib.vcs.utils.helpers import get_scm

			




	
	
	
		
 
from rhodecode.lib.vcs.exceptions import VCSError

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.caching_query import FromCache

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.model import meta

			




	
	
	
		
 
from rhodecode.model.db import Repository, User, RhodeCodeUi, \

			




	
	
	
		
 
    UserLog, RepoGroup, RhodeCodeSetting, UserRepoGroupToPerm

			




	
	
	
		
 
from rhodecode.model.meta import Session

			




	
	
	
		
 
from rhodecode.model.repos_group import ReposGroupModel

			




	
	
	
		
 
from rhodecode.lib import safe_str, safe_unicode

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 
REMOVED_REPO_PAT = re.compile(r'rm__\d{8}_\d{6}_\d{6}__.*')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def recursive_replace(str_, replace=' '):

			




	
	
	
		
 
    """Recursive replace of given sign to just one instance

			




	
	
	
		
 

			




	
	
	
		
 
    :param str_: given string

			




	
	
	
		
 
    :param replace: char to find and replace multiple instances

			




	
	
	
		
 

			




	
	
		
 
@@ -145,25 +146,28 @@ def action_logger(user, action, repo, ip

			




	
	
	
		
 

			




	
	
	
		
 
        user_log = UserLog()

			




	
	
	
		
 
        user_log.user_id = user_obj.user_id

			




	
	
	
		
 
        user_log.action = action

			




	
	
	
		
 

			




	
	
	
		
 
        user_log.repository_id = repo_obj.repo_id

			




	
	
	
		
 
        user_log.repository_name = repo_name

			




	
	
	
		
 

			




	
	
	
		
 
        user_log.action_date = datetime.datetime.now()

			




	
	
	
		
 
        user_log.user_ip = ipaddr

			




	
	
	
		
 
        sa.add(user_log)

			




	
	
	
		
 

			




	
	
	
		
 
        log.info('Adding user %s, action %s on %s' % (user_obj, action, repo))

			




	
	
	
		
 
        log.info(

			




	
	
	
		
 
            'Adding user %s, action %s on %s' % (user_obj, action,

			




	
	
	
		
 
                                                 safe_unicode(repo))

			




	
	
	
		
 
        )

			




	
	
	
		
 
        if commit:

			




	
	
	
		
 
            sa.commit()

			




	
	
	
		
 
    except:

			




	
	
	
		
 
        log.error(traceback.format_exc())

			




	
	
	
		
 
        raise

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def get_repos(path, recursive=False):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Scans given path for repos and return (name,(type,path)) tuple

			




	
	
	
		
 

			




	
	
	
		
 
    :param path: path to scan for repositories

			




	
	
		
 
@@ -189,46 +193,47 @@ def get_repos(path, recursive=False):

			




	
	
	
		
 
                #check if this dir containts other repos for recursive scan

			




	
	
	
		
 
                rec_path = os.path.join(p, dirpath)

			




	
	
	
		
 
                if os.path.isdir(rec_path):

			




	
	
	
		
 
                    for inner_scm in _get_repos(rec_path):

			




	
	
	
		
 
                        yield inner_scm

			




	
	
	
		
 

			




	
	
	
		
 
    return _get_repos(path)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def is_valid_repo(repo_name, base_path):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Returns True if given path is a valid repository False otherwise

			




	
	
	
		
 

			




	
	
	
		
 
    :param repo_name:

			




	
	
	
		
 
    :param base_path:

			




	
	
	
		
 

			




	
	
	
		
 
    :return True: if given path is a valid repository

			




	
	
	
		
 
    """

			




	
	
	
		
 
    full_path = os.path.join(base_path, repo_name)

			




	
	
	
		
 
    full_path = os.path.join(safe_str(base_path), safe_str(repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        get_scm(full_path)

			




	
	
	
		
 
        return True

			




	
	
	
		
 
    except VCSError:

			




	
	
	
		
 
        return False

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def is_valid_repos_group(repos_group_name, base_path):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Returns True if given path is a repos group False otherwise

			




	
	
	
		
 

			




	
	
	
		
 
    :param repo_name:

			




	
	
	
		
 
    :param base_path:

			




	
	
	
		
 
    """

			




	
	
	
		
 
    full_path = os.path.join(base_path, repos_group_name)

			




	
	
	
		
 
    full_path = os.path.join(safe_str(base_path), safe_str(repos_group_name))

			




	
	
	
		
 

			




	
	
	
		
 
    # check if it's not a repo

			




	
	
	
		
 
    if is_valid_repo(repos_group_name, base_path):

			




	
	
	
		
 
        return False

			




	
	
	
		
 

			




	
	
	
		
 
    # check if it's a valid path

			




	
	
	
		
 
    if os.path.isdir(full_path):

			




	
	
	
		
 
        return True

			




	
	
	
		
 

			




	
	
	
		
 
    return False

			




	
	
	
		
 

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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.