Changeset - 520d27f40b51
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 15 years ago 2011-02-15 23:19:01
marcin@python-works.com
#113 removed anonymous access from forking, added system messages in login box.
3 files changed with 22 insertions and 3 deletions:
rhodecode/controllers/settings.py
6
2
rhodecode/lib/auth.py
5
rhodecode/templates/login.html
11
1
0 comments (0 inline, 0 general)
rhodecode/controllers/settings.py
➞
Show inline comments
 
@@ -26,27 +26,30 @@
 
# MA  02110-1301, USA.
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 

			




	
	
	
		
 
import formencode

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import tmpl_context as c, request, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 

			




	
	
	
		
 
import rhodecode.lib.helpers as h

			




	
	
	
		
 
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAllDecorator

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAllDecorator, \

			




	
	
	
		
 
    NotAnonymous

			




	
	
	
		
 
from rhodecode.lib.base import BaseRepoController, render

			




	
	
	
		
 
from rhodecode.lib.utils import invalidate_cache, action_logger

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.model.forms import RepoSettingsForm, RepoForkForm

			




	
	
	
		
 
from rhodecode.model.repo import RepoModel

			




	
	
	
		
 
from rhodecode.model.db import User

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 
class SettingsController(BaseRepoController):

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(SettingsController, self).__before__()

			




	
	
	
		
 

			




	
	
		
 
@@ -148,40 +151,41 @@ class SettingsController(BaseRepoControl

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            action_logger(self.rhodecode_user, 'user_deleted_repo',

			




	
	
	
		
 
                              repo_name, '', self.sa)

			




	
	
	
		
 
            repo_model.delete(repo)

			




	
	
	
		
 
            invalidate_cache('get_repo_cached_%s' % repo_name)

			




	
	
	
		
 
            h.flash(_('deleted repository %s') % repo_name, category='success')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            h.flash(_('An error occurred during deletion of %s') % repo_name,

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('home'))

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.read')

			




	
	
	
		
 
    def fork(self, repo_name):

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        c.repo_info = repo = repo_model.get_by_repo_name(repo_name)

			




	
	
	
		
 
        if not repo:

			




	
	
	
		
 
            h.flash(_('%s repository is not mapped to db perhaps'

			




	
	
	
		
 
                      ' it was created or renamed from the file system'

			




	
	
	
		
 
                      ' please run the application again'

			




	
	
	
		
 
                      ' in order to rescan repositories') % repo_name,

			




	
	
	
		
 
                      category='error')

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 

			




	
	
	
		
 
        return render('settings/repo_fork.html')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.read')

			




	
	
	
		
 
    def fork_create(self, repo_name):

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        c.repo_info = repo_model.get_by_repo_name(repo_name)

			




	
	
	
		
 
        _form = RepoForkForm(old_data={'repo_type':c.repo_info.repo_type})()

			




	
	
	
		
 
        form_result = {}

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            form_result = _form.to_python(dict(request.POST))

			




	
	
	
		
 
            form_result.update({'repo_name':repo_name})

			




	
	
	
		
 
            repo_model.create_fork(form_result, c.rhodecode_user)

			




	
	
	
		
 
            h.flash(_('forked %s repository as %s') \

			




	
	
	
		
 
                      % (repo_name, form_result['fork_name']),

			




        

    


    
    

    

        

                

                    rhodecode/lib/auth.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,24 +24,25 @@

			




	
	
	
		
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

			




	
	
	
		
 
# MA  02110-1301, USA.

			




	
	
	
		
 

			




	
	
	
		
 
import bcrypt

			




	
	
	
		
 
import random

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 

			




	
	
	
		
 
from decorator import decorator

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import config, session, url, request

			




	
	
	
		
 
from pylons.controllers.util import abort, redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.exceptions import LdapPasswordError, LdapUsernameError

			




	
	
	
		
 
from rhodecode.lib.utils import get_repo_slug

			




	
	
	
		
 
from rhodecode.lib.auth_ldap import AuthLdap

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.model import meta

			




	
	
	
		
 
from rhodecode.model.user import UserModel

			




	
	
	
		
 
from rhodecode.model.db import User, RepoToPerm, Repository, Permission, \

			




	
	
	
		
 
    UserToPerm, UsersGroupToPerm, UsersGroupMember

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
		
 
@@ -375,24 +376,28 @@ class NotAnonymous(object):

			




	
	
	
		
 
        log.debug('Checking if user is not anonymous')

			




	
	
	
		
 

			




	
	
	
		
 
        anonymous = user.username == 'default'

			




	
	
	
		
 

			




	
	
	
		
 
        if anonymous:

			




	
	
	
		
 
            p = ''

			




	
	
	
		
 
            if request.environ.get('SCRIPT_NAME') != '/':

			




	
	
	
		
 
                p += request.environ.get('SCRIPT_NAME')

			




	
	
	
		
 

			




	
	
	
		
 
            p += request.environ.get('PATH_INFO')

			




	
	
	
		
 
            if request.environ.get('QUERY_STRING'):

			




	
	
	
		
 
                p += '?' + request.environ.get('QUERY_STRING')

			




	
	
	
		
 

			




	
	
	
		
 
            import rhodecode.lib.helpers as h

			




	
	
	
		
 
            h.flash(_('You need to be a registered user to perform this action'),

			




	
	
	
		
 
                    category='warning')

			




	
	
	
		
 
            return redirect(url('login_home', came_from=p))

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            return func(*fargs, **fkwargs)

			




	
	
	
		
 

			




	
	
	
		
 
class PermsDecorator(object):

			




	
	
	
		
 
    """Base class for decorators"""

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, *required_perms):

			




	
	
	
		
 
        available_perms = config['available_permissions']

			




	
	
	
		
 
        for perm in required_perms:

			




	
	
	
		
 
            if perm not in available_perms:

			




	
	
	
		
 
                raise Exception("'%s' permission is not defined" % perm)

			




        

    


    
    

    

        

                

                    rhodecode/templates/login.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3,25 +3,35 @@

			




	
	
	
		
 
<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">

			




	
	
	
		
 
    <head>

			




	
	
	
		
 
        <title>${_('Sign In')} - ${c.rhodecode_name}</title>

			




	
	
	
		
 
        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />

			




	
	
	
		
 
        <link rel="icon" href="${h.url("/images/icons/database_gear.png")}" type="image/png" />

			




	
	
	
		
 
        <meta name="robots" content="index, nofollow"/>

			




	
	
	
		
 
            

			




	
	
	
		
 
        <!-- stylesheets -->

			




	
	
	
		
 
        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />

			




	
	
	
		
 

			




	
	
	
		
 
    </head>

			




	
	
	
		
 
    <body>

			




	
	
	
		
 
<div id="login">

			




	
	
	
		
 
        <div id="login">

			




	
	
	
		
 
        <div class="flash_msg">

			




	
	
	
		
 
            <% messages = h.flash.pop_messages() %>

			




	
	
	
		
 
            % if messages:

			




	
	
	
		
 
            <ul id="flash-messages">

			




	
	
	
		
 
                % for message in messages:

			




	
	
	
		
 
                <li class="${message.category}_msg">${message}</li>

			




	
	
	
		
 
                % endfor

			




	
	
	
		
 
            </ul>

			




	
	
	
		
 
            % endif

			




	
	
	
		
 
        </div>          

			




	
	
	
		
 
            <!-- login -->

			




	
	
	
		
 
            <div class="title top-left-rounded-corner top-right-rounded-corner">

			




	
	
	
		
 
                <h5>${_('Sign In to')} ${c.rhodecode_name}</h5>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="inner">            

			




	
	
	
		
 
                ${h.form(h.url.current(came_from=c.came_from))}

			




	
	
	
		
 
                <div class="form">

			




	
	
	
		
 
                    <!-- fields -->

			




	
	
	
		
 

			




	
	
	
		
 
                    <div class="fields">

			




	
	
	
		
 
                        <div class="field">

			




	
	
	
		
 
                            <div class="label">

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-1180
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support