Changeset - d9b78d8f1db3
Parent rev.
Child rev.
[Not reviewed]
default
0 19 0
Søren Løvborg - 10 years ago 2015-09-09 12:41:20
sorenl@unity3d.com
cleanup: replace redirect with WebOb exceptions

All redirect does is to log "Generating 302 redirect" with logging the actual
location and raise a WebOb HTTPFound exception, and the logging is redundant,
as WebOb exceptions and their status codes are already logged.

Instead, just raise the exception directly, which is both explicit and simpler
(and finally, gets rid of "return redirect" which never really returns).
19 files changed with 130 insertions and 142 deletions:
kallithea/controllers/admin/auth_settings.py
2
2
kallithea/controllers/admin/defaults.py
2
2
kallithea/controllers/admin/gists.py
5
6
kallithea/controllers/admin/my_account.py
7
7
kallithea/controllers/admin/permissions.py
2
2
kallithea/controllers/admin/repo_groups.py
10
11
kallithea/controllers/admin/repos.py
20
21
kallithea/controllers/admin/settings.py
8
8
kallithea/controllers/admin/user_groups.py
7
7
kallithea/controllers/admin/users.py
13
14
kallithea/controllers/changelog.py
7
8
kallithea/controllers/changeset.py
4
5
kallithea/controllers/compare.py
4
5
kallithea/controllers/files.py
17
17
kallithea/controllers/forks.py
4
4
kallithea/controllers/login.py
6
7
kallithea/controllers/pullrequests.py
9
11
kallithea/lib/auth.py
2
3
kallithea/lib/base.py
1
2
0 comments (0 inline, 0 general)
kallithea/controllers/admin/auth_settings.py
➞
Show inline comments
 
@@ -19,26 +19,26 @@ pluggable authentication controller for
 

			




	
	
	
		
 
This file was forked by the Kallithea project in July 2014.

			




	
	
	
		
 
Original author and date, and relevant copyright and licensing information is below:

			




	
	
	
		
 
:created_on: Nov 26, 2010

			




	
	
	
		
 
:author: akesterson

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import formencode.htmlfill

			




	
	
	
		
 
import traceback

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.compat import formatted_json

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator

			




	
	
	
		
 
from kallithea.lib import auth_modules

			




	
	
	
		
 
from kallithea.model.forms import AuthSettingsForm

			




	
	
	
		
 
from kallithea.model.db import Setting

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
		
 
@@ -137,13 +137,13 @@ class AuthSettingsController(BaseControl

			




	
	
	
		
 
        except formencode.Invalid as errors:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            e = errors.error_dict or {}

			




	
	
	
		
 
            return self.__render(

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=e,

			




	
	
	
		
 
            )

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('error occurred during update of auth settings'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('auth_home'))

			




	
	
	
		
 
        raise HTTPFound(location=url('auth_home'))

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/defaults.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,26 +22,26 @@ Original author and date, and relevant c

			




	
	
	
		
 
:created_on: Apr 27, 2010

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.model.forms import DefaultsForm

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea import BACKENDS

			




	
	
	
		
 
from kallithea.model.db import Setting

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
		
 
@@ -103,25 +103,25 @@ class DefaultsController(BaseController)

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/defaults/defaults.html'),

			




	
	
	
		
 
                defaults=defaults,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during update of defaults'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('defaults'))

			




	
	
	
		
 
        raise HTTPFound(location=url('defaults'))

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, id):

			




	
	
	
		
 
        """DELETE /defaults/id: Delete an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="DELETE" />

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('default', id=ID),

			




	
	
	
		
 
        #           method='delete')

			




	
	
	
		
 
        # url('default', id=ID)

			




	
	
	
		
 

			




	
	
	
		
 
    def show(self, id, format='html'):

			




	
	
	
		
 
        """GET /defaults/id: Show a specific item"""

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/gists.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,38 +22,37 @@ Original author and date, and relevant c

			




	
	
	
		
 
:created_on: May 9, 2013

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import time

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode.htmlfill

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, response, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPNotFound, HTTPForbidden

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.model.forms import GistForm

			




	
	
	
		
 
from kallithea.model.gist import GistModel

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.model.db import Gist, User

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, NotAnonymous

			




	
	
	
		
 
from kallithea.lib.utils import jsonify

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_int, time_to_datetime

			




	
	
	
		
 
from kallithea.lib.helpers import Page

			




	
	
	
		
 
from webob.exc import HTTPNotFound, HTTPForbidden

			




	
	
	
		
 
from sqlalchemy.sql.expression import or_

			




	
	
	
		
 
from kallithea.lib.vcs.exceptions import VCSError, NodeNotChangedError

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class GistsController(BaseController):

			




	
	
	
		
 
    """REST Controller styled on the Atom Publishing Protocol"""

			




	
	
	
		
 

			




	
	
	
		
 
    def __load_defaults(self, extra_values=None):

			




	
	
	
		
 
        c.lifetime_values = [

			




	
	
	
		
 
            (str(-1), _('Forever')),

			




	
	
		
 
@@ -135,26 +134,26 @@ class GistsController(BaseController):

			




	
	
	
		
 

			




	
	
	
		
 
            return formencode.htmlfill.render(

			




	
	
	
		
 
                render('admin/gists/new.html'),

			




	
	
	
		
 
                defaults=defaults,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
        except Exception as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during gist creation'), category='error')

			




	
	
	
		
 
            return redirect(url('new_gist'))

			




	
	
	
		
 
        return redirect(url('gist', gist_id=new_gist_id))

			




	
	
	
		
 
            raise HTTPFound(location=url('new_gist'))

			




	
	
	
		
 
        raise HTTPFound(location=url('gist', gist_id=new_gist_id))

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    def new(self, format='html'):

			




	
	
	
		
 
        """GET /admin/gists/new: Form to create a new item"""

			




	
	
	
		
 
        # url('new_gist')

			




	
	
	
		
 
        self.__load_defaults()

			




	
	
	
		
 
        return render('admin/gists/new.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    def update(self, gist_id):

			




	
	
		
 
@@ -176,25 +175,25 @@ class GistsController(BaseController):

			




	
	
	
		
 
        #    h.form(url('gist', gist_id=ID),

			




	
	
	
		
 
        #           method='delete')

			




	
	
	
		
 
        # url('gist', gist_id=ID)

			




	
	
	
		
 
        gist = GistModel().get_gist(gist_id)

			




	
	
	
		
 
        owner = gist.gist_owner == c.authuser.user_id

			




	
	
	
		
 
        if h.HasPermissionAny('hg.admin')() or owner:

			




	
	
	
		
 
            GistModel().delete(gist)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Deleted gist %s') % gist.gist_access_id, category='success')

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('gists'))

			




	
	
	
		
 
        raise HTTPFound(location=url('gists'))

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    def show(self, gist_id, revision='tip', format='html', f_path=None):

			




	
	
	
		
 
        """GET /admin/gists/gist_id: Show a specific item"""

			




	
	
	
		
 
        # url('gist', gist_id=ID)

			




	
	
	
		
 
        c.gist = Gist.get_or_404(gist_id)

			




	
	
	
		
 

			




	
	
	
		
 
        #check if this gist is not expired

			




	
	
	
		
 
        if c.gist.gist_expires != -1:

			




	
	
	
		
 
            if time.time() > c.gist.gist_expires:

			




	
	
	
		
 
                log.error('Gist expired at %s',

			




	
	
	
		
 
                          time_to_datetime(c.gist.gist_expires))

			




	
	
		
 
@@ -261,25 +260,25 @@ class GistsController(BaseController):

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                h.flash(_('Successfully updated gist content'), category='success')

			




	
	
	
		
 
            except NodeNotChangedError:

			




	
	
	
		
 
                # raised if nothing was changed in repo itself. We anyway then

			




	
	
	
		
 
                # store only DB stuff for gist

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                h.flash(_('Successfully updated gist data'), category='success')

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during update of gist %s') % gist_id,

			




	
	
	
		
 
                        category='error')

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(url('gist', gist_id=gist_id))

			




	
	
	
		
 
            raise HTTPFound(location=url('gist', gist_id=gist_id))

			




	
	
	
		
 

			




	
	
	
		
 
        return rendered

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def check_revision(self, gist_id):

			




	
	
	
		
 
        c.gist = Gist.get_or_404(gist_id)

			




	
	
	
		
 
        last_rev = c.gist.scm_instance.get_changeset()

			




	
	
	
		
 
        success = True

			




	
	
	
		
 
        revision = request.POST.get('revision')

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/my_account.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,26 +23,26 @@ Original author and date, and relevant c

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 

			




	
	
	
		
 
from sqlalchemy import func

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea import EXTERN_TYPE_INTERNAL

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib import auth_modules

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, NotAnonymous, AuthUser

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.lib.utils2 import generate_api_key, safe_int

			




	
	
	
		
 
from kallithea.lib.compat import json

			




	
	
	
		
 
from kallithea.model.db import Repository, UserEmailMap, User, UserFollowing

			




	
	
	
		
 
from kallithea.model.forms import UserForm, PasswordChangeForm

			




	
	
	
		
 
from kallithea.model.user import UserModel

			




	
	
	
		
 
from kallithea.model.repo import RepoModel

			




	
	
		
 
@@ -60,25 +60,25 @@ class MyAccountController(BaseController

			




	
	
	
		
 
    #         path_prefix='/admin', name_prefix='admin_')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(MyAccountController, self).__before__()

			




	
	
	
		
 

			




	
	
	
		
 
    def __load_data(self):

			




	
	
	
		
 
        c.user = User.get(self.authuser.user_id)

			




	
	
	
		
 
        if c.user.username == User.DEFAULT_USER:

			




	
	
	
		
 
            h.flash(_("You can't edit this user since it's"

			




	
	
	
		
 
                      " crucial for entire application"), category='warning')

			




	
	
	
		
 
            return redirect(url('users'))

			




	
	
	
		
 
            raise HTTPFound(location=url('users'))

			




	
	
	
		
 
        c.EXTERN_TYPE_INTERNAL = EXTERN_TYPE_INTERNAL

			




	
	
	
		
 

			




	
	
	
		
 
    def _load_my_repos_data(self, watched=False):

			




	
	
	
		
 
        if watched:

			




	
	
	
		
 
            admin = False

			




	
	
	
		
 
            repos_list = [x.follows_repository for x in

			




	
	
	
		
 
                          Session().query(UserFollowing).filter(

			




	
	
	
		
 
                              UserFollowing.user_id ==

			




	
	
	
		
 
                              self.authuser.user_id).all()]

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            admin = True

			




	
	
	
		
 
            repos_list = Session().query(Repository)\

			




	
	
		
 
@@ -135,25 +135,25 @@ class MyAccountController(BaseController

			




	
	
	
		
 
                return htmlfill.render(

			




	
	
	
		
 
                    render('admin/my_account/my_account.html'),

			




	
	
	
		
 
                    defaults=errors.value,

			




	
	
	
		
 
                    errors=errors.error_dict or {},

			




	
	
	
		
 
                    prefix_error=False,

			




	
	
	
		
 
                    encoding="UTF-8",

			




	
	
	
		
 
                    force_defaults=False)

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during update of user %s') \

			




	
	
	
		
 
                        % form_result.get('username'), category='error')

			




	
	
	
		
 
        if update:

			




	
	
	
		
 
            return redirect('my_account')

			




	
	
	
		
 
            raise HTTPFound(location='my_account')

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/my_account/my_account.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    def my_account_password(self):

			




	
	
	
		
 
        c.active = 'password'

			




	
	
	
		
 
        self.__load_data()

			




	
	
	
		
 

			




	
	
	
		
 
        managed_fields = auth_modules.get_managed_fields(c.user)

			




	
	
	
		
 
        c.can_change_password = 'password' not in managed_fields

			




	
	
		
 
@@ -216,62 +216,62 @@ class MyAccountController(BaseController

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            UserModel().add_extra_email(self.authuser.user_id, email)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_("Added email %s to user") % email, category='success')

			




	
	
	
		
 
        except formencode.Invalid as error:

			




	
	
	
		
 
            msg = error.error_dict['email']

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during email saving'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('my_account_emails'))

			




	
	
	
		
 
        raise HTTPFound(location=url('my_account_emails'))

			




	
	
	
		
 

			




	
	
	
		
 
    def my_account_emails_delete(self):

			




	
	
	
		
 
        email_id = request.POST.get('del_email_id')

			




	
	
	
		
 
        user_model = UserModel()

			




	
	
	
		
 
        user_model.delete_extra_email(self.authuser.user_id, email_id)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_("Removed email from user"), category='success')

			




	
	
	
		
 
        return redirect(url('my_account_emails'))

			




	
	
	
		
 
        raise HTTPFound(location=url('my_account_emails'))

			




	
	
	
		
 

			




	
	
	
		
 
    def my_account_api_keys(self):

			




	
	
	
		
 
        c.active = 'api_keys'

			




	
	
	
		
 
        self.__load_data()

			




	
	
	
		
 
        show_expired = True

			




	
	
	
		
 
        c.lifetime_values = [

			




	
	
	
		
 
            (str(-1), _('Forever')),

			




	
	
	
		
 
            (str(5), _('5 minutes')),

			




	
	
	
		
 
            (str(60), _('1 hour')),

			




	
	
	
		
 
            (str(60 * 24), _('1 day')),

			




	
	
	
		
 
            (str(60 * 24 * 30), _('1 month')),

			




	
	
	
		
 
        ]

			




	
	
	
		
 
        c.lifetime_options = [(c.lifetime_values, _("Lifetime"))]

			




	
	
	
		
 
        c.user_api_keys = ApiKeyModel().get_api_keys(self.authuser.user_id,

			




	
	
	
		
 
                                                     show_expired=show_expired)

			




	
	
	
		
 
        return render('admin/my_account/my_account.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def my_account_api_keys_add(self):

			




	
	
	
		
 
        lifetime = safe_int(request.POST.get('lifetime'), -1)

			




	
	
	
		
 
        description = request.POST.get('description')

			




	
	
	
		
 
        ApiKeyModel().create(self.authuser.user_id, description, lifetime)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_("API key successfully created"), category='success')

			




	
	
	
		
 
        return redirect(url('my_account_api_keys'))

			




	
	
	
		
 
        raise HTTPFound(location=url('my_account_api_keys'))

			




	
	
	
		
 

			




	
	
	
		
 
    def my_account_api_keys_delete(self):

			




	
	
	
		
 
        api_key = request.POST.get('del_api_key')

			




	
	
	
		
 
        user_id = self.authuser.user_id

			




	
	
	
		
 
        if request.POST.get('del_api_key_builtin'):

			




	
	
	
		
 
            user = User.get(user_id)

			




	
	
	
		
 
            if user is not None:

			




	
	
	
		
 
                user.api_key = generate_api_key()

			




	
	
	
		
 
                Session().add(user)

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                h.flash(_("API key successfully reset"), category='success')

			




	
	
	
		
 
        elif api_key:

			




	
	
	
		
 
            ApiKeyModel().delete(api_key, self.authuser.user_id)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_("API key successfully deleted"), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('my_account_api_keys'))

			




	
	
	
		
 
        raise HTTPFound(location=url('my_account_api_keys'))

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/permissions.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,26 +23,26 @@ Original author and date, and relevant c

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.model.forms import DefaultPermissionsForm

			




	
	
	
		
 
from kallithea.model.permission import PermissionModel

			




	
	
	
		
 
from kallithea.model.db import User, UserIpMap

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
		
 
@@ -130,25 +130,25 @@ class PermissionsController(BaseControll

			




	
	
	
		
 
                return htmlfill.render(

			




	
	
	
		
 
                    render('admin/permissions/permissions.html'),

			




	
	
	
		
 
                    defaults=defaults,

			




	
	
	
		
 
                    errors=errors.error_dict or {},

			




	
	
	
		
 
                    prefix_error=False,

			




	
	
	
		
 
                    encoding="UTF-8",

			




	
	
	
		
 
                    force_defaults=False)

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during update of permissions'),

			




	
	
	
		
 
                        category='error')

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(url('admin_permissions'))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_permissions'))

			




	
	
	
		
 

			




	
	
	
		
 
        c.user = User.get_default_user()

			




	
	
	
		
 
        defaults = {'anonymous': c.user.active}

			




	
	
	
		
 

			




	
	
	
		
 
        for p in c.user.user_perms:

			




	
	
	
		
 
            if p.permission.permission_name.startswith('repository.'):

			




	
	
	
		
 
                defaults['default_repo_perm'] = p.permission.permission_name

			




	
	
	
		
 

			




	
	
	
		
 
            if p.permission.permission_name.startswith('group.'):

			




	
	
	
		
 
                defaults['default_group_perm'] = p.permission.permission_name

			




	
	
	
		
 

			




	
	
	
		
 
            if p.permission.permission_name.startswith('usergroup.'):

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/repo_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,27 +24,26 @@ Original author and date, and relevant c

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 
import itertools

			




	
	
	
		
 

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _, ungettext

			




	
	
	
		
 
from webob.exc import HTTPForbidden, HTTPNotFound, HTTPInternalServerError

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPForbidden, HTTPNotFound, HTTPInternalServerError

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.compat import json

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, \

			




	
	
	
		
 
    HasRepoGroupPermissionAnyDecorator, HasRepoGroupPermissionAll, \

			




	
	
	
		
 
    HasPermissionAll

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.model.db import RepoGroup, Repository

			




	
	
	
		
 
from kallithea.model.scm import RepoGroupList, AvailableRepoGroupChoices

			




	
	
	
		
 
from kallithea.model.repo_group import RepoGroupModel

			




	
	
	
		
 
from kallithea.model.forms import RepoGroupForm, RepoGroupPermsForm

			




	
	
		
 
@@ -180,28 +179,28 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
                render('admin/repo_groups/repo_group_add.html'),

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during creation of repository group %s') \

			




	
	
	
		
 
                    % request.POST.get('group_name'), category='error')

			




	
	
	
		
 
            parent_group_id = form_result['group_parent_id']

			




	
	
	
		
 
            #TODO: maybe we should get back to the main view, not the admin one

			




	
	
	
		
 
            return redirect(url('repos_groups', parent_group=parent_group_id))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos_groups', parent_group=parent_group_id))

			




	
	
	
		
 
        h.flash(_('Created repository group %s') % gr.group_name,

			




	
	
	
		
 
                category='success')

			




	
	
	
		
 
        return redirect(url('repos_group_home', group_name=gr.group_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('repos_group_home', group_name=gr.group_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def new(self):

			




	
	
	
		
 
        """GET /repo_groups/new: Form to create a new item"""

			




	
	
	
		
 
        # url('new_repos_group')

			




	
	
	
		
 
        if HasPermissionAll('hg.admin')('group create'):

			




	
	
	
		
 
            #we're global admin, we're ok and we can create TOP level groups

			




	
	
	
		
 
            pass

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            # we pass in parent group into creation form, thus we know

			




	
	
	
		
 
            # what would be the group, we can check perms here !

			




	
	
	
		
 
            group_id = safe_int(request.GET.get('parent_group'))

			




	
	
	
		
 
            group = RepoGroup.get(group_id) if group_id else None

			




	
	
		
 
@@ -257,63 +256,63 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/repo_groups/repo_group_edit.html'),

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during update of repository group %s') \

			




	
	
	
		
 
                    % request.POST.get('group_name'), category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('edit_repo_group', group_name=group_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_group', group_name=group_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoGroupPermissionAnyDecorator('group.admin')

			




	
	
	
		
 
    def delete(self, group_name):

			




	
	
	
		
 
        """DELETE /repo_groups/group_name: Delete an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="DELETE" />

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('repos_group', group_name=GROUP_NAME),

			




	
	
	
		
 
        #           method='delete')

			




	
	
	
		
 
        # url('repos_group', group_name=GROUP_NAME)

			




	
	
	
		
 

			




	
	
	
		
 
        gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)

			




	
	
	
		
 
        repos = gr.repositories.all()

			




	
	
	
		
 
        if repos:

			




	
	
	
		
 
            h.flash(_('This group contains %s repositories and cannot be '

			




	
	
	
		
 
                      'deleted') % len(repos), category='warning')

			




	
	
	
		
 
            return redirect(url('repos_groups'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos_groups'))

			




	
	
	
		
 

			




	
	
	
		
 
        children = gr.children.all()

			




	
	
	
		
 
        if children:

			




	
	
	
		
 
            h.flash(_('This group contains %s subgroups and cannot be deleted'

			




	
	
	
		
 
                      % (len(children))), category='warning')

			




	
	
	
		
 
            return redirect(url('repos_groups'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos_groups'))

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            RepoGroupModel().delete(group_name)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Removed repository group %s') % group_name,

			




	
	
	
		
 
                    category='success')

			




	
	
	
		
 
            #TODO: in future action_logger(, '', '', '', self.sa)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during deletion of repository group %s')

			




	
	
	
		
 
                    % group_name, category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        if gr.parent_group:

			




	
	
	
		
 
            return redirect(url('repos_group_home', group_name=gr.parent_group.group_name))

			




	
	
	
		
 
        return redirect(url('repos_groups'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos_group_home', group_name=gr.parent_group.group_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('repos_groups'))

			




	
	
	
		
 

			




	
	
	
		
 
    def show_by_name(self, group_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        This is a proxy that does a lookup group_name -> id, and shows

			




	
	
	
		
 
        the group by id view instead

			




	
	
	
		
 
        """

			




	
	
	
		
 
        group_name = group_name.rstrip('/')

			




	
	
	
		
 
        id_ = RepoGroup.get_by_group_name(group_name)

			




	
	
	
		
 
        if id_:

			




	
	
	
		
 
            return self.show(group_name)

			




	
	
	
		
 
        raise HTTPNotFound

			




	
	
	
		
 

			




	
	
		
 
@@ -395,39 +394,39 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
        Update permissions for given repository group

			




	
	
	
		
 

			




	
	
	
		
 
        :param group_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 

			




	
	
	
		
 
        c.repo_group = RepoGroupModel()._get_repo_group(group_name)

			




	
	
	
		
 
        valid_recursive_choices = ['none', 'repos', 'groups', 'all']

			




	
	
	
		
 
        form_result = RepoGroupPermsForm(valid_recursive_choices)().to_python(request.POST)

			




	
	
	
		
 
        if not c.authuser.is_admin:

			




	
	
	
		
 
            if self._revoke_perms_on_yourself(form_result):

			




	
	
	
		
 
                msg = _('Cannot revoke permission for yourself as admin')

			




	
	
	
		
 
                h.flash(msg, category='warning')

			




	
	
	
		
 
                return redirect(url('edit_repo_group_perms', group_name=group_name))

			




	
	
	
		
 
                raise HTTPFound(location=url('edit_repo_group_perms', group_name=group_name))

			




	
	
	
		
 
        recursive = form_result['recursive']

			




	
	
	
		
 
        # iterate over all members(if in recursive mode) of this groups and

			




	
	
	
		
 
        # set the permissions !

			




	
	
	
		
 
        # this can be potentially heavy operation

			




	
	
	
		
 
        RepoGroupModel()._update_permissions(c.repo_group,

			




	
	
	
		
 
                                             form_result['perms_new'],

			




	
	
	
		
 
                                             form_result['perms_updates'],

			




	
	
	
		
 
                                             recursive)

			




	
	
	
		
 
        #TODO: implement this

			




	
	
	
		
 
        #action_logger(self.authuser, 'admin_changed_repo_permissions',

			




	
	
	
		
 
        #              repo_name, self.ip_addr, self.sa)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('Repository group permissions updated'), category='success')

			




	
	
	
		
 
        return redirect(url('edit_repo_group_perms', group_name=group_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_group_perms', group_name=group_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoGroupPermissionAnyDecorator('group.admin')

			




	
	
	
		
 
    def delete_perms(self, group_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        DELETE an existing repository group permission user

			




	
	
	
		
 

			




	
	
	
		
 
        :param group_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            obj_type = request.POST.get('obj_type')

			




	
	
	
		
 
            obj_id = None

			




	
	
	
		
 
            if obj_type == 'user':

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/repos.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,29 +20,28 @@ Repositories controller for Kallithea

			




	
	
	
		
 
This file was forked by the Kallithea project in July 2014.

			




	
	
	
		
 
Original author and date, and relevant copyright and licensing information is below:

			




	
	
	
		
 
:created_on: Apr 7, 2010

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 
from webob.exc import HTTPInternalServerError, HTTPForbidden, HTTPNotFound

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from sqlalchemy.sql.expression import func

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPInternalServerError, HTTPForbidden, HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, \

			




	
	
	
		
 
    HasRepoPermissionAllDecorator, NotAnonymous, HasPermissionAny, \

			




	
	
	
		
 
    HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.lib.utils import action_logger, jsonify

			




	
	
	
		
 
from kallithea.lib.vcs import RepositoryError

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.model.db import User, Repository, UserFollowing, RepoGroup,\

			




	
	
	
		
 
    Setting, RepositoryField

			




	
	
	
		
 
from kallithea.model.forms import RepoForm, RepoFieldForm, RepoPermsForm

			




	
	
		
 
@@ -62,25 +61,25 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
    # file has a resource setup:

			




	
	
	
		
 
    #     map.resource('repo', 'repos')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    def __before__(self):

			




	
	
	
		
 
        super(ReposController, self).__before__()

			




	
	
	
		
 

			




	
	
	
		
 
    def _load_repo(self, repo_name):

			




	
	
	
		
 
        repo_obj = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
        if repo_obj is None:

			




	
	
	
		
 
            h.not_mapped_error(repo_name)

			




	
	
	
		
 
            return redirect(url('repos'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos'))

			




	
	
	
		
 

			




	
	
	
		
 
        return repo_obj

			




	
	
	
		
 

			




	
	
	
		
 
    def __load_defaults(self, repo=None):

			




	
	
	
		
 
        top_perms = ['hg.create.repository']

			




	
	
	
		
 
        repo_group_perms = ['group.admin']

			




	
	
	
		
 
        if HasPermissionAny('hg.create.write_on_repogroup.true')():

			




	
	
	
		
 
            repo_group_perms.append('group.write')

			




	
	
	
		
 
        extras = [] if repo is None else [repo.group]

			




	
	
	
		
 

			




	
	
	
		
 
        c.repo_groups = AvailableRepoGroupChoices(top_perms, repo_group_perms, extras)

			




	
	
	
		
 

			




	
	
		
 
@@ -143,27 +142,27 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                render('admin/repos/repo_add.html'),

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                force_defaults=False,

			




	
	
	
		
 
                encoding="UTF-8")

			




	
	
	
		
 

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            msg = (_('Error creating repository %s')

			




	
	
	
		
 
                   % form_result.get('repo_name'))

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 
            raise HTTPFound(location=url('home'))

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(h.url('repo_creating_home',

			




	
	
	
		
 
        raise HTTPFound(location=h.url('repo_creating_home',

			




	
	
	
		
 
                              repo_name=form_result['repo_name_full'],

			




	
	
	
		
 
                              task_id=task_id))

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    def create_repository(self):

			




	
	
	
		
 
        """GET /_admin/create_repository: Form to create a new item"""

			




	
	
	
		
 
        self.__load_defaults()

			




	
	
	
		
 
        if not c.repo_groups:

			




	
	
	
		
 
            raise HTTPForbidden

			




	
	
	
		
 
        parent_group = request.GET.get('parent_group')

			




	
	
	
		
 

			




	
	
	
		
 
        ## apply the defaults from defaults page

			




	
	
		
 
@@ -273,42 +272,42 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/repos/repo_edit.html'),

			




	
	
	
		
 
                defaults=defaults,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during update of repository %s') \

			




	
	
	
		
 
                    % repo_name, category='error')

			




	
	
	
		
 
        return redirect(url('edit_repo', repo_name=changed_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo', repo_name=changed_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def delete(self, repo_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        DELETE /repos/repo_name: Delete an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="DELETE" />

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('delete_repo', repo_name=ID),

			




	
	
	
		
 
        #           method='delete')

			




	
	
	
		
 
        # url('delete_repo', repo_name=ID)

			




	
	
	
		
 

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        repo = repo_model.get_by_repo_name(repo_name)

			




	
	
	
		
 
        if not repo:

			




	
	
	
		
 
            h.not_mapped_error(repo_name)

			




	
	
	
		
 
            return redirect(url('repos'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos'))

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            _forks = repo.forks.count()

			




	
	
	
		
 
            handle_forks = None

			




	
	
	
		
 
            if _forks and request.POST.get('forks'):

			




	
	
	
		
 
                do = request.POST['forks']

			




	
	
	
		
 
                if do == 'detach_forks':

			




	
	
	
		
 
                    handle_forks = 'detach'

			




	
	
	
		
 
                    h.flash(_('Detached %s forks') % _forks, category='success')

			




	
	
	
		
 
                elif do == 'delete_forks':

			




	
	
	
		
 
                    handle_forks = 'delete'

			




	
	
	
		
 
                    h.flash(_('Deleted %s forks') % _forks, category='success')

			




	
	
	
		
 
            repo_model.delete(repo, forks=handle_forks)

			




	
	
		
 
@@ -318,26 +317,26 @@ class ReposController(BaseRepoController

			




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

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        except AttachedForksError:

			




	
	
	
		
 
            h.flash(_('Cannot delete repository %s which still has forks')

			




	
	
	
		
 
                        % repo_name, category='warning')

			




	
	
	
		
 

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




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

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        if repo.group:

			




	
	
	
		
 
            return redirect(url('repos_group_home', group_name=repo.group.group_name))

			




	
	
	
		
 
        return redirect(url('repos'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos_group_home', group_name=repo.group.group_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('repos'))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit(self, repo_name):

			




	
	
	
		
 
        """GET /repo_name/settings: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_repo', repo_name=ID)

			




	
	
	
		
 
        defaults = self.__load_data(repo_name)

			




	
	
	
		
 
        c.repo_fields = RepositoryField.query()\

			




	
	
	
		
 
            .filter(RepositoryField.repository == c.repo_info).all()

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        c.users_array = repo_model.get_users_js()

			




	
	
	
		
 
        c.active = 'settings'

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
		
 
@@ -363,25 +362,25 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    def edit_permissions_update(self, repo_name):

			




	
	
	
		
 
        form = RepoPermsForm()().to_python(request.POST)

			




	
	
	
		
 
        RepoModel()._update_permissions(repo_name, form['perms_new'],

			




	
	
	
		
 
                                        form['perms_updates'])

			




	
	
	
		
 
        #TODO: implement this

			




	
	
	
		
 
        #action_logger(self.authuser, 'admin_changed_repo_permissions',

			




	
	
	
		
 
        #              repo_name, self.ip_addr, self.sa)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('Repository permissions updated'), category='success')

			




	
	
	
		
 
        return redirect(url('edit_repo_perms', repo_name=repo_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_perms', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def edit_permissions_revoke(self, repo_name):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            obj_type = request.POST.get('obj_type')

			




	
	
	
		
 
            obj_id = None

			




	
	
	
		
 
            if obj_type == 'user':

			




	
	
	
		
 
                obj_id = safe_int(request.POST.get('user_id'))

			




	
	
	
		
 
            elif obj_type == 'user_group':

			




	
	
	
		
 
                obj_id = safe_int(request.POST.get('user_group_id'))

			




	
	
	
		
 

			




	
	
	
		
 
            if obj_type == 'user':

			




	
	
	
		
 
                RepoModel().revoke_user_permission(repo=repo_name, user=obj_id)

			




	
	
		
 
@@ -400,84 +399,84 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
            raise HTTPInternalServerError()

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_fields(self, repo_name):

			




	
	
	
		
 
        """GET /repo_name/settings: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_repo', repo_name=ID)

			




	
	
	
		
 
        c.repo_info = self._load_repo(repo_name)

			




	
	
	
		
 
        c.repo_fields = RepositoryField.query()\

			




	
	
	
		
 
            .filter(RepositoryField.repository == c.repo_info).all()

			




	
	
	
		
 
        c.active = 'fields'

			




	
	
	
		
 
        if request.POST:

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(url('repo_edit_fields'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repo_edit_fields'))

			




	
	
	
		
 
        return render('admin/repos/repo_edit.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def create_repo_field(self, repo_name):

			




	
	
	
		
 
        try:

			




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

			




	
	
	
		
 
            new_field = RepositoryField()

			




	
	
	
		
 
            new_field.repository = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 
            new_field.field_key = form_result['new_field_key']

			




	
	
	
		
 
            new_field.field_type = form_result['new_field_type']  # python type

			




	
	
	
		
 
            new_field.field_value = form_result['new_field_value']  # set initial blank value

			




	
	
	
		
 
            new_field.field_desc = form_result['new_field_desc']

			




	
	
	
		
 
            new_field.field_label = form_result['new_field_label']

			




	
	
	
		
 
            Session().add(new_field)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        except Exception as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            msg = _('An error occurred during creation of field')

			




	
	
	
		
 
            if isinstance(e, formencode.Invalid):

			




	
	
	
		
 
                msg += ". " + e.msg

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
        return redirect(url('edit_repo_fields', repo_name=repo_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_fields', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def delete_repo_field(self, repo_name, field_id):

			




	
	
	
		
 
        field = RepositoryField.get_or_404(field_id)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            Session().delete(field)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        except Exception as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            msg = _('An error occurred during removal of field')

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
        return redirect(url('edit_repo_fields', repo_name=repo_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_fields', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_advanced(self, repo_name):

			




	
	
	
		
 
        """GET /repo_name/settings: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_repo', repo_name=ID)

			




	
	
	
		
 
        c.repo_info = self._load_repo(repo_name)

			




	
	
	
		
 
        c.default_user_id = User.get_default_user().user_id

			




	
	
	
		
 
        c.in_public_journal = UserFollowing.query()\

			




	
	
	
		
 
            .filter(UserFollowing.user_id == c.default_user_id)\

			




	
	
	
		
 
            .filter(UserFollowing.follows_repository == c.repo_info).scalar()

			




	
	
	
		
 

			




	
	
	
		
 
        _repos = Repository.query().order_by(Repository.repo_name).all()

			




	
	
	
		
 
        read_access_repos = RepoList(_repos)

			




	
	
	
		
 
        c.repos_list = [(None, _('-- Not a fork --'))]

			




	
	
	
		
 
        c.repos_list += [(x.repo_id, x.repo_name)

			




	
	
	
		
 
                         for x in read_access_repos

			




	
	
	
		
 
                         if x.repo_id != c.repo_info.repo_id]

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = {

			




	
	
	
		
 
            'id_fork_of': c.repo_info.fork.repo_id if c.repo_info.fork else ''

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        c.active = 'advanced'

			




	
	
	
		
 
        if request.POST:

			




	
	
	
		
 
            return redirect(url('repo_edit_advanced'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repo_edit_advanced'))

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/repos/repo_edit.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_advanced_journal(self, repo_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Sets this repository to be visible in public journal,

			




	
	
	
		
 
        in other words asking default user to follow this repo

			




	
	
	
		
 

			




	
	
		
 
@@ -486,25 +485,25 @@ class ReposController(BaseRepoController

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            repo_id = Repository.get_by_repo_name(repo_name).repo_id

			




	
	
	
		
 
            user_id = User.get_default_user().user_id

			




	
	
	
		
 
            self.scm_model.toggle_following_repo(repo_id, user_id)

			




	
	
	
		
 
            h.flash(_('Updated repository visibility in public journal'),

			




	
	
	
		
 
                    category='success')

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            h.flash(_('An error occurred during setting this'

			




	
	
	
		
 
                      ' repository in public journal'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('edit_repo_advanced', repo_name=repo_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_advanced', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_advanced_fork(self, repo_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Mark given repository as a fork of another

			




	
	
	
		
 

			




	
	
	
		
 
        :param repo_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            fork_id = request.POST.get('id_fork_of')

			




	
	
	
		
 
            repo = ScmModel().mark_as_fork(repo_name, fork_id,

			




	
	
		
 
@@ -512,107 +511,107 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
            fork = repo.fork.repo_name if repo.fork else _('Nothing')

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Marked repository %s as fork of %s') % (repo_name, fork),

			




	
	
	
		
 
                    category='success')

			




	
	
	
		
 
        except RepositoryError as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(str(e), category='error')

			




	
	
	
		
 
        except Exception as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during this operation'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('edit_repo_advanced', repo_name=repo_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_advanced', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_advanced_locking(self, repo_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Unlock repository when it is locked !

			




	
	
	
		
 

			




	
	
	
		
 
        :param repo_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            repo = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 
            if request.POST.get('set_lock'):

			




	
	
	
		
 
                Repository.lock(repo, c.authuser.user_id)

			




	
	
	
		
 
                h.flash(_('Repository has been locked'), category='success')

			




	
	
	
		
 
            elif request.POST.get('set_unlock'):

			




	
	
	
		
 
                Repository.unlock(repo)

			




	
	
	
		
 
                h.flash(_('Repository has been unlocked'), category='success')

			




	
	
	
		
 
        except Exception as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during unlocking'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('edit_repo_advanced', repo_name=repo_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_repo_advanced', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')

			




	
	
	
		
 
    def toggle_locking(self, repo_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Toggle locking of repository by simple GET call to url

			




	
	
	
		
 

			




	
	
	
		
 
        :param repo_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            repo = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
            if repo.enable_locking:

			




	
	
	
		
 
                if repo.locked[0]:

			




	
	
	
		
 
                    Repository.unlock(repo)

			




	
	
	
		
 
                    h.flash(_('Repository has been unlocked'), category='success')

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    Repository.lock(repo, c.authuser.user_id)

			




	
	
	
		
 
                    h.flash(_('Repository has been locked'), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        except Exception as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during unlocking'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('summary_home', repo_name=repo_name))

			




	
	
	
		
 
        raise HTTPFound(location=url('summary_home', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_caches(self, repo_name):

			




	
	
	
		
 
        """GET /repo_name/settings: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_repo', repo_name=ID)

			




	
	
	
		
 
        c.repo_info = self._load_repo(repo_name)

			




	
	
	
		
 
        c.active = 'caches'

			




	
	
	
		
 
        if request.POST:

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                ScmModel().mark_for_invalidation(repo_name)

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                h.flash(_('Cache invalidation successful'),

			




	
	
	
		
 
                        category='success')

			




	
	
	
		
 
            except Exception as e:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('An error occurred during cache invalidation'),

			




	
	
	
		
 
                        category='error')

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(url('edit_repo_caches', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('edit_repo_caches', repo_name=c.repo_name))

			




	
	
	
		
 
        return render('admin/repos/repo_edit.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_remote(self, repo_name):

			




	
	
	
		
 
        """GET /repo_name/settings: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_repo', repo_name=ID)

			




	
	
	
		
 
        c.repo_info = self._load_repo(repo_name)

			




	
	
	
		
 
        c.active = 'remote'

			




	
	
	
		
 
        if request.POST:

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                ScmModel().pull_changes(repo_name, self.authuser.username)

			




	
	
	
		
 
                h.flash(_('Pulled from remote location'), category='success')

			




	
	
	
		
 
            except Exception as e:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('An error occurred during pull from remote location'),

			




	
	
	
		
 
                        category='error')

			




	
	
	
		
 
            return redirect(url('edit_repo_remote', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('edit_repo_remote', repo_name=c.repo_name))

			




	
	
	
		
 
        return render('admin/repos/repo_edit.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAllDecorator('repository.admin')

			




	
	
	
		
 
    def edit_statistics(self, repo_name):

			




	
	
	
		
 
        """GET /repo_name/settings: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_repo', repo_name=ID)

			




	
	
	
		
 
        c.repo_info = self._load_repo(repo_name)

			




	
	
	
		
 
        repo = c.repo_info.scm_instance

			




	
	
	
		
 

			




	
	
	
		
 
        if c.repo_info.stats:

			




	
	
	
		
 
            # this is on what revision we ended up so we add +1 for count

			




	
	
	
		
 
            last_rev = c.repo_info.stats.stat_on_revision + 1

			




	
	
		
 
@@ -627,15 +626,15 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            c.stats_percentage = '%.2f' % ((float((last_rev)) / c.repo_last_rev) * 100)

			




	
	
	
		
 

			




	
	
	
		
 
        c.active = 'statistics'

			




	
	
	
		
 
        if request.POST:

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                RepoModel().delete_stats(repo_name)

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
            except Exception as e:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('An error occurred during deletion of repository stats'),

			




	
	
	
		
 
                        category='error')

			




	
	
	
		
 
            return redirect(url('edit_repo_statistics', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('edit_repo_statistics', repo_name=c.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        return render('admin/repos/repo_edit.html')

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/settings.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,26 +22,26 @@ Original author and date, and relevant c

			




	
	
	
		
 
:created_on: Jul 14, 2010

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url, config

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.lib.celerylib import tasks, run_task

			




	
	
	
		
 
from kallithea.lib.exceptions import HgsubversionImportError

			




	
	
	
		
 
from kallithea.lib.utils import repo2db_mapper, set_app_settings

			




	
	
	
		
 
from kallithea.model.db import Ui, Repository, Setting

			




	
	
	
		
 
from kallithea.model.forms import ApplicationSettingsForm, \

			




	
	
	
		
 
    ApplicationUiSettingsForm, ApplicationVisualisationForm

			




	
	
	
		
 
from kallithea.model.scm import ScmModel

			




	
	
	
		
 
from kallithea.model.notification import EmailNotificationModel

			




	
	
		
 
@@ -209,25 +209,25 @@ class SettingsController(BaseController)

			




	
	
	
		
 
                    ScmModel().mark_for_invalidation(repo.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
            filesystem_repos = ScmModel().repo_scan()

			




	
	
	
		
 
            added, removed = repo2db_mapper(filesystem_repos, rm_obsolete,

			




	
	
	
		
 
                                            install_git_hooks=install_git_hooks,

			




	
	
	
		
 
                                            user=c.authuser.username,

			




	
	
	
		
 
                                            overwrite_git_hooks=overwrite_git_hooks)

			




	
	
	
		
 
            h.flash(h.literal(_('Repositories successfully rescanned. Added: %s. Removed: %s.') %

			




	
	
	
		
 
                (', '.join(h.link_to(safe_unicode(repo_name), h.url('summary_home', repo_name=repo_name))

			




	
	
	
		
 
                 for repo_name in added) or '-',

			




	
	
	
		
 
                 ', '.join(h.escape(safe_unicode(repo_name)) for repo_name in removed) or '-')),

			




	
	
	
		
 
                category='success')

			




	
	
	
		
 
            return redirect(url('admin_settings_mapping'))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_settings_mapping'))

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = Setting.get_app_settings()

			




	
	
	
		
 
        defaults.update(self._get_hg_ui_settings())

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/settings/settings.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAllDecorator('hg.admin')

			




	
	
	
		
 
    def settings_global(self):

			




	
	
		
 
@@ -269,25 +269,25 @@ class SettingsController(BaseController)

			




	
	
	
		
 
                Session().add(sett5)

			




	
	
	
		
 

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                set_app_settings(config)

			




	
	
	
		
 
                h.flash(_('Updated application settings'), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred while updating '

			




	
	
	
		
 
                          'application settings'),

			




	
	
	
		
 
                          category='error')

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(url('admin_settings_global'))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_settings_global'))

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = Setting.get_app_settings()

			




	
	
	
		
 
        defaults.update(self._get_hg_ui_settings())

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/settings/settings.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAllDecorator('hg.admin')

			




	
	
	
		
 
    def settings_visual(self):

			




	
	
		
 
@@ -327,63 +327,63 @@ class SettingsController(BaseController)

			




	
	
	
		
 

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                set_app_settings(config)

			




	
	
	
		
 
                h.flash(_('Updated visualisation settings'),

			




	
	
	
		
 
                        category='success')

			




	
	
	
		
 

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during updating '

			




	
	
	
		
 
                          'visualisation settings'),

			




	
	
	
		
 
                        category='error')

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(url('admin_settings_visual'))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_settings_visual'))

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = Setting.get_app_settings()

			




	
	
	
		
 
        defaults.update(self._get_hg_ui_settings())

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/settings/settings.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAllDecorator('hg.admin')

			




	
	
	
		
 
    def settings_email(self):

			




	
	
	
		
 
        """GET /admin/settings/email: All items in the collection"""

			




	
	
	
		
 
        # url('admin_settings_email')

			




	
	
	
		
 
        c.active = 'email'

			




	
	
	
		
 
        if request.POST:

			




	
	
	
		
 
            test_email = request.POST.get('test_email')

			




	
	
	
		
 
            test_email_subj = 'Kallithea test email'

			




	
	
	
		
 
            test_body = ('Kallithea Email test, '

			




	
	
	
		
 
                               'Kallithea version: %s' % c.kallithea_version)

			




	
	
	
		
 
            if not test_email:

			




	
	
	
		
 
                h.flash(_('Please enter email address'), category='error')

			




	
	
	
		
 
                return redirect(url('admin_settings_email'))

			




	
	
	
		
 
                raise HTTPFound(location=url('admin_settings_email'))

			




	
	
	
		
 

			




	
	
	
		
 
            test_email_txt_body = EmailNotificationModel()\

			




	
	
	
		
 
                .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT,

			




	
	
	
		
 
                                'txt', body=test_body)

			




	
	
	
		
 
            test_email_html_body = EmailNotificationModel()\

			




	
	
	
		
 
                .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT,

			




	
	
	
		
 
                                'html', body=test_body)

			




	
	
	
		
 

			




	
	
	
		
 
            recipients = [test_email] if test_email else None

			




	
	
	
		
 

			




	
	
	
		
 
            run_task(tasks.send_email, recipients, test_email_subj,

			




	
	
	
		
 
                     test_email_txt_body, test_email_html_body)

			




	
	
	
		
 

			




	
	
	
		
 
            h.flash(_('Send email task created'), category='success')

			




	
	
	
		
 
            return redirect(url('admin_settings_email'))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_settings_email'))

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = Setting.get_app_settings()

			




	
	
	
		
 
        defaults.update(self._get_hg_ui_settings())

			




	
	
	
		
 

			




	
	
	
		
 
        import kallithea

			




	
	
	
		
 
        c.ini = kallithea.CONFIG

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/settings/settings.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
		
 
@@ -416,49 +416,49 @@ class SettingsController(BaseController)

			




	
	
	
		
 
                                    _d.get('hook_ui_value_new', [])):

			




	
	
	
		
 
                        Ui.create_or_update_hook(k, v)

			




	
	
	
		
 
                        update = True

			




	
	
	
		
 

			




	
	
	
		
 
                    if update:

			




	
	
	
		
 
                        h.flash(_('Updated hooks'), category='success')

			




	
	
	
		
 
                    Session().commit()

			




	
	
	
		
 
                except Exception:

			




	
	
	
		
 
                    log.error(traceback.format_exc())

			




	
	
	
		
 
                    h.flash(_('Error occurred during hook creation'),

			




	
	
	
		
 
                            category='error')

			




	
	
	
		
 

			




	
	
	
		
 
                return redirect(url('admin_settings_hooks'))

			




	
	
	
		
 
                raise HTTPFound(location=url('admin_settings_hooks'))

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = Setting.get_app_settings()

			




	
	
	
		
 
        defaults.update(self._get_hg_ui_settings())

			




	
	
	
		
 

			




	
	
	
		
 
        c.hooks = Ui.get_builtin_hooks()

			




	
	
	
		
 
        c.custom_hooks = Ui.get_custom_hooks()

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/settings/settings.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAllDecorator('hg.admin')

			




	
	
	
		
 
    def settings_search(self):

			




	
	
	
		
 
        """GET /admin/settings/search: All items in the collection"""

			




	
	
	
		
 
        # url('admin_settings_search')

			




	
	
	
		
 
        c.active = 'search'

			




	
	
	
		
 
        if request.POST:

			




	
	
	
		
 
            repo_location = self._get_hg_ui_settings()['paths_root_path']

			




	
	
	
		
 
            full_index = request.POST.get('full_index', False)

			




	
	
	
		
 
            run_task(tasks.whoosh_index, repo_location, full_index)

			




	
	
	
		
 
            h.flash(_('Whoosh reindex task scheduled'), category='success')

			




	
	
	
		
 
            return redirect(url('admin_settings_search'))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_settings_search'))

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = Setting.get_app_settings()

			




	
	
	
		
 
        defaults.update(self._get_hg_ui_settings())

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/settings/settings.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAllDecorator('hg.admin')

			




	
	
	
		
 
    def settings_system(self):

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/user_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,26 +22,26 @@ Original author and date, and relevant c

			




	
	
	
		
 
:created_on: Jan 25, 2011

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url, config

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
from sqlalchemy.orm import joinedload

			




	
	
	
		
 
from sqlalchemy.sql.expression import func

			




	
	
	
		
 
from webob.exc import HTTPInternalServerError

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.exceptions import UserGroupsAssignedException, \

			




	
	
	
		
 
    RepoGroupAssignmentError

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_unicode, safe_int

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, \

			




	
	
	
		
 
    HasUserGroupPermissionAnyDecorator, HasPermissionAnyDecorator

			




	
	
		
 
@@ -154,25 +154,25 @@ class UserGroupsController(BaseControlle

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/user_groups/user_group_add.html'),

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during creation of user group %s') \

			




	
	
	
		
 
                    % request.POST.get('users_group_name'), category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('users_groups'))

			




	
	
	
		
 
        raise HTTPFound(location=url('users_groups'))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')

			




	
	
	
		
 
    def new(self, format='html'):

			




	
	
	
		
 
        """GET /user_groups/new: Form to create a new item"""

			




	
	
	
		
 
        # url('new_users_group')

			




	
	
	
		
 
        return render('admin/user_groups/user_group_add.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def update(self, id):

			




	
	
	
		
 
        """PUT /user_groups/id: Update an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="PUT" />

			




	
	
		
 
@@ -215,47 +215,47 @@ class UserGroupsController(BaseControlle

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/user_groups/user_group_edit.html'),

			




	
	
	
		
 
                defaults=defaults,

			




	
	
	
		
 
                errors=e,

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during update of user group %s') \

			




	
	
	
		
 
                    % request.POST.get('users_group_name'), category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('edit_users_group', id=id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_users_group', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def delete(self, id):

			




	
	
	
		
 
        """DELETE /user_groups/id: Delete an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="DELETE" />

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('users_group', id=ID),

			




	
	
	
		
 
        #           method='delete')

			




	
	
	
		
 
        # url('users_group', id=ID)

			




	
	
	
		
 
        usr_gr = UserGroup.get_or_404(id)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            UserGroupModel().delete(usr_gr)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Successfully deleted user group'), category='success')

			




	
	
	
		
 
        except UserGroupsAssignedException as e:

			




	
	
	
		
 
            h.flash(e, category='error')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during deletion of user group'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('users_groups'))

			




	
	
	
		
 
        raise HTTPFound(location=url('users_groups'))

			




	
	
	
		
 

			




	
	
	
		
 
    def show(self, id, format='html'):

			




	
	
	
		
 
        """GET /user_groups/id: Show a specific item"""

			




	
	
	
		
 
        # url('users_group', id=ID)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def edit(self, id, format='html'):

			




	
	
	
		
 
        """GET /user_groups/id/edit: Form to edit an existing item"""

			




	
	
	
		
 
        # url('edit_users_group', id=ID)

			




	
	
	
		
 

			




	
	
	
		
 
        c.user_group = UserGroup.get_or_404(id)

			




	
	
	
		
 
        c.active = 'settings'

			




	
	
		
 
@@ -303,31 +303,31 @@ class UserGroupsController(BaseControlle

			




	
	
	
		
 

			




	
	
	
		
 
        :param id:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        user_group = UserGroup.get_or_404(id)

			




	
	
	
		
 
        form = UserGroupPermsForm()().to_python(request.POST)

			




	
	
	
		
 

			




	
	
	
		
 
        # set the permissions !

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            UserGroupModel()._update_permissions(user_group, form['perms_new'],

			




	
	
	
		
 
                                                 form['perms_updates'])

			




	
	
	
		
 
        except RepoGroupAssignmentError:

			




	
	
	
		
 
            h.flash(_('Target group cannot be the same'), category='error')

			




	
	
	
		
 
            return redirect(url('edit_user_group_perms', id=id))

			




	
	
	
		
 
            raise HTTPFound(location=url('edit_user_group_perms', id=id))

			




	
	
	
		
 
        #TODO: implement this

			




	
	
	
		
 
        #action_logger(self.authuser, 'admin_changed_repo_permissions',

			




	
	
	
		
 
        #              repo_name, self.ip_addr, self.sa)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('User group permissions updated'), category='success')

			




	
	
	
		
 
        return redirect(url('edit_user_group_perms', id=id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_group_perms', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def delete_perms(self, id):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        DELETE an existing repository group permission user

			




	
	
	
		
 

			




	
	
	
		
 
        :param group_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            obj_type = request.POST.get('obj_type')

			




	
	
	
		
 
            obj_id = None

			




	
	
	
		
 
            if obj_type == 'user':

			




	
	
		
 
@@ -435,25 +435,25 @@ class UserGroupsController(BaseControlle

			




	
	
	
		
 
            if form_result['fork_repo_perm']:

			




	
	
	
		
 
                usergroup_model.grant_perm(id, 'hg.fork.repository')

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                usergroup_model.grant_perm(id, 'hg.fork.none')

			




	
	
	
		
 

			




	
	
	
		
 
            h.flash(_("Updated permissions"), category='success')

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during permissions saving'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('edit_user_group_default_perms', id=id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_group_default_perms', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def edit_advanced(self, id):

			




	
	
	
		
 
        c.user_group = UserGroup.get_or_404(id)

			




	
	
	
		
 
        c.active = 'advanced'

			




	
	
	
		
 
        c.group_members_obj = sorted((x.user for x in c.user_group.members),

			




	
	
	
		
 
                                     key=lambda u: u.username.lower())

			




	
	
	
		
 
        return render('admin/user_groups/user_group_edit.html')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    @HasUserGroupPermissionAnyDecorator('usergroup.admin')

			




	
	
	
		
 
    def edit_members(self, id):

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/users.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,28 +22,27 @@ Original author and date, and relevant c

			




	
	
	
		
 
:created_on: Apr 4, 2010

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url, config

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from sqlalchemy.sql.expression import func

			




	
	
	
		
 
from webob.exc import HTTPNotFound

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea

			




	
	
	
		
 
from kallithea.lib.exceptions import DefaultUserException, \

			




	
	
	
		
 
    UserOwnsReposException, UserCreationError

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator, \

			




	
	
	
		
 
    AuthUser

			




	
	
	
		
 
from kallithea.lib import auth_modules

			




	
	
	
		
 
from kallithea.lib.auth_modules import auth_internal

			




	
	
	
		
 
from kallithea.lib.base import BaseController, render

			




	
	
	
		
 
from kallithea.model.api_key import ApiKeyModel

			




	
	
	
		
 

			




	
	
		
 
@@ -139,25 +138,25 @@ class UsersController(BaseController):

			




	
	
	
		
 
                render('admin/users/user_add.html'),

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except UserCreationError as e:

			




	
	
	
		
 
            h.flash(e, 'error')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during creation of user %s') \

			




	
	
	
		
 
                    % request.POST.get('username'), category='error')

			




	
	
	
		
 
        return redirect(url('users'))

			




	
	
	
		
 
        raise HTTPFound(location=url('users'))

			




	
	
	
		
 

			




	
	
	
		
 
    def new(self, format='html'):

			




	
	
	
		
 
        """GET /users/new: Form to create a new item"""

			




	
	
	
		
 
        # url('new_user')

			




	
	
	
		
 
        c.default_extern_type = auth_internal.KallitheaAuthPlugin.name

			




	
	
	
		
 
        c.default_extern_name = auth_internal.KallitheaAuthPlugin.name

			




	
	
	
		
 
        return render('admin/users/user_add.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def update(self, id):

			




	
	
	
		
 
        """PUT /users/id: Update an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="PUT" />

			




	
	
		
 
@@ -192,46 +191,46 @@ class UsersController(BaseController):

			




	
	
	
		
 
            })

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                self._render_edit_profile(user),

			




	
	
	
		
 
                defaults=defaults,

			




	
	
	
		
 
                errors=e,

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('Error occurred during update of user %s') \

			




	
	
	
		
 
                    % form_result.get('username'), category='error')

			




	
	
	
		
 
        return redirect(url('edit_user', id=id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, id):

			




	
	
	
		
 
        """DELETE /users/id: Delete an existing item"""

			




	
	
	
		
 
        # Forms posted to this method should contain a hidden field:

			




	
	
	
		
 
        #    <input type="hidden" name="_method" value="DELETE" />

			




	
	
	
		
 
        # Or using helpers:

			




	
	
	
		
 
        #    h.form(url('delete_user', id=ID),

			




	
	
	
		
 
        #           method='delete')

			




	
	
	
		
 
        # url('user', id=ID)

			




	
	
	
		
 
        usr = User.get_or_404(id)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            UserModel().delete(usr)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Successfully deleted user'), category='success')

			




	
	
	
		
 
        except (UserOwnsReposException, DefaultUserException) as e:

			




	
	
	
		
 
            h.flash(e, category='warning')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during deletion of user'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('users'))

			




	
	
	
		
 
        raise HTTPFound(location=url('users'))

			




	
	
	
		
 

			




	
	
	
		
 
    def show(self, id, format='html'):

			




	
	
	
		
 
        """GET /users/id: Show a specific item"""

			




	
	
	
		
 
        # url('user', id=ID)

			




	
	
	
		
 
        User.get_or_404(-1)

			




	
	
	
		
 

			




	
	
	
		
 
    def _get_user_or_raise_if_default(self, id):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return User.get_or_404(id, allow_default=False)

			




	
	
	
		
 
        except DefaultUserException:

			




	
	
	
		
 
            h.flash(_("The default user cannot be edited"), category='warning')

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
		
 
@@ -297,43 +296,43 @@ class UsersController(BaseController):

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    def add_api_key(self, id):

			




	
	
	
		
 
        c.user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 

			




	
	
	
		
 
        lifetime = safe_int(request.POST.get('lifetime'), -1)

			




	
	
	
		
 
        description = request.POST.get('description')

			




	
	
	
		
 
        ApiKeyModel().create(c.user.user_id, description, lifetime)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_("API key successfully created"), category='success')

			




	
	
	
		
 
        return redirect(url('edit_user_api_keys', id=c.user.user_id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_api_keys', id=c.user.user_id))

			




	
	
	
		
 

			




	
	
	
		
 
    def delete_api_key(self, id):

			




	
	
	
		
 
        c.user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 

			




	
	
	
		
 
        api_key = request.POST.get('del_api_key')

			




	
	
	
		
 
        if request.POST.get('del_api_key_builtin'):

			




	
	
	
		
 
            user = User.get(c.user.user_id)

			




	
	
	
		
 
            if user is not None:

			




	
	
	
		
 
                user.api_key = generate_api_key()

			




	
	
	
		
 
                Session().add(user)

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                h.flash(_("API key successfully reset"), category='success')

			




	
	
	
		
 
        elif api_key:

			




	
	
	
		
 
            ApiKeyModel().delete(api_key, c.user.user_id)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_("API key successfully deleted"), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('edit_user_api_keys', id=c.user.user_id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_api_keys', id=c.user.user_id))

			




	
	
	
		
 

			




	
	
	
		
 
    def update_account(self, id):

			




	
	
	
		
 
        pass

			




	
	
	
		
 

			




	
	
	
		
 
    def edit_perms(self, id):

			




	
	
	
		
 
        c.user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 
        c.active = 'perms'

			




	
	
	
		
 
        c.perm_user = AuthUser(user_id=id)

			




	
	
	
		
 
        c.ip_addr = self.ip_addr

			




	
	
	
		
 

			




	
	
	
		
 
        umodel = UserModel()

			




	
	
	
		
 
        defaults = c.user.get_dict()

			




	
	
		
 
@@ -378,25 +377,25 @@ class UsersController(BaseController):

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                user_model.grant_perm(id, 'hg.usergroup.create.false')

			




	
	
	
		
 
            if form_result['fork_repo_perm']:

			




	
	
	
		
 
                user_model.grant_perm(id, 'hg.fork.repository')

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                user_model.grant_perm(id, 'hg.fork.none')

			




	
	
	
		
 
            h.flash(_("Updated permissions"), category='success')

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during permissions saving'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('edit_user_perms', id=id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_perms', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    def edit_emails(self, id):

			




	
	
	
		
 
        c.user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 
        c.active = 'emails'

			




	
	
	
		
 
        c.user_email_map = UserEmailMap.query()\

			




	
	
	
		
 
            .filter(UserEmailMap.user == c.user).all()

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = c.user.get_dict()

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/users/user_edit.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
		
 
@@ -411,36 +410,36 @@ class UsersController(BaseController):

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            user_model.add_extra_email(id, email)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_("Added email %s to user") % email, category='success')

			




	
	
	
		
 
        except formencode.Invalid as error:

			




	
	
	
		
 
            msg = error.error_dict['email']

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during email saving'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
        return redirect(url('edit_user_emails', id=id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_emails', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    def delete_email(self, id):

			




	
	
	
		
 
        """DELETE /user_emails_delete/id: Delete an existing item"""

			




	
	
	
		
 
        # url('user_emails_delete', id=ID, method='delete')

			




	
	
	
		
 
        user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 
        email_id = request.POST.get('del_email_id')

			




	
	
	
		
 
        user_model = UserModel()

			




	
	
	
		
 
        user_model.delete_extra_email(id, email_id)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_("Removed email from user"), category='success')

			




	
	
	
		
 
        return redirect(url('edit_user_emails', id=id))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_emails', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    def edit_ips(self, id):

			




	
	
	
		
 
        c.user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 
        c.active = 'ips'

			




	
	
	
		
 
        c.user_ip_map = UserIpMap.query()\

			




	
	
	
		
 
            .filter(UserIpMap.user == c.user).all()

			




	
	
	
		
 

			




	
	
	
		
 
        c.inherit_default_ips = c.user.inherit_default_permissions

			




	
	
	
		
 
        c.default_user_ip_map = UserIpMap.query()\

			




	
	
	
		
 
            .filter(UserIpMap.user == User.get_default_user()).all()

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = c.user.get_dict()

			




	
	
		
 
@@ -461,27 +460,27 @@ class UsersController(BaseController):

			




	
	
	
		
 
            user_model.add_extra_ip(id, ip)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_("Added IP address %s to user whitelist") % ip, category='success')

			




	
	
	
		
 
        except formencode.Invalid as error:

			




	
	
	
		
 
            msg = error.error_dict['ip']

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred while adding IP address'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        if 'default_user' in request.POST:

			




	
	
	
		
 
            return redirect(url('admin_permissions_ips'))

			




	
	
	
		
 
        return redirect(url('edit_user_ips', id=id))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_permissions_ips'))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_ips', id=id))

			




	
	
	
		
 

			




	
	
	
		
 
    def delete_ip(self, id):

			




	
	
	
		
 
        """DELETE /user_ips_delete/id: Delete an existing item"""

			




	
	
	
		
 
        # url('user_ips_delete', id=ID, method='delete')

			




	
	
	
		
 
        ip_id = request.POST.get('del_ip_id')

			




	
	
	
		
 
        user_model = UserModel()

			




	
	
	
		
 
        user_model.delete_extra_ip(id, ip_id)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_("Removed IP address from user whitelist"), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        if 'default_user' in request.POST:

			




	
	
	
		
 
            return redirect(url('admin_permissions_ips'))

			




	
	
	
		
 
        return redirect(url('edit_user_ips', id=id))

			




	
	
	
		
 
            raise HTTPFound(location=url('admin_permissions_ips'))

			




	
	
	
		
 
        raise HTTPFound(location=url('edit_user_ips', id=id))

			




        

    


    
    

    

        

                

                    kallithea/controllers/changelog.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,27 +20,26 @@ changelog controller for Kallithea

			




	
	
	
		
 
This file was forked by the Kallithea project in July 2014.

			




	
	
	
		
 
Original author and date, and relevant copyright and licensing information is below:

			




	
	
	
		
 
:created_on: Apr 21, 2010

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, url, session, tmpl_context as c

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPNotFound, HTTPBadRequest

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPNotFound, HTTPBadRequest

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea.lib.helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.lib.helpers import RepoPage

			




	
	
	
		
 
from kallithea.lib.compat import json

			




	
	
	
		
 
from kallithea.lib.graphmod import graph_data

			




	
	
	
		
 
from kallithea.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError,\

			




	
	
	
		
 
    ChangesetError, NodeDoesNotExistError, EmptyRepositoryError

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_int, safe_str

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
		
 
@@ -90,85 +89,85 @@ class ChangelogController(BaseRepoContro

			




	
	
	
		
 
            h.flash(safe_str(e), category='error')

			




	
	
	
		
 
        raise HTTPBadRequest()

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def index(self, repo_name, revision=None, f_path=None):

			




	
	
	
		
 
        # Fix URL after page size form submission via GET

			




	
	
	
		
 
        # TODO: Somehow just don't send this extra junk in the GET URL

			




	
	
	
		
 
        if request.GET.get('set'):

			




	
	
	
		
 
            request.GET.pop('set', None)

			




	
	
	
		
 
            if revision is None:

			




	
	
	
		
 
                return redirect(url('changelog_home', repo_name=repo_name, **request.GET))

			




	
	
	
		
 
            return redirect(url('changelog_file_home', repo_name=repo_name, revision=revision, f_path=f_path, **request.GET))

			




	
	
	
		
 
                raise HTTPFound(location=url('changelog_home', repo_name=repo_name, **request.GET))

			




	
	
	
		
 
            raise HTTPFound(location=url('changelog_file_home', repo_name=repo_name, revision=revision, f_path=f_path, **request.GET))

			




	
	
	
		
 

			




	
	
	
		
 
        limit = 2000

			




	
	
	
		
 
        default = 100

			




	
	
	
		
 
        if request.GET.get('size'):

			




	
	
	
		
 
            c.size = max(min(safe_int(request.GET.get('size')), limit), 1)

			




	
	
	
		
 
            session['changelog_size'] = c.size

			




	
	
	
		
 
            session.save()

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            c.size = int(session.get('changelog_size', default))

			




	
	
	
		
 
        # min size must be 1

			




	
	
	
		
 
        c.size = max(c.size, 1)

			




	
	
	
		
 
        p = safe_int(request.GET.get('page', 1), 1)

			




	
	
	
		
 
        branch_name = request.GET.get('branch', None)

			




	
	
	
		
 
        if (branch_name and

			




	
	
	
		
 
            branch_name not in c.db_repo_scm_instance.branches and

			




	
	
	
		
 
            branch_name not in c.db_repo_scm_instance.closed_branches and

			




	
	
	
		
 
            not revision):

			




	
	
	
		
 
            return redirect(url('changelog_file_home', repo_name=c.repo_name,

			




	
	
	
		
 
            raise HTTPFound(location=url('changelog_file_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                    revision=branch_name, f_path=f_path or ''))

			




	
	
	
		
 

			




	
	
	
		
 
        if revision == 'tip':

			




	
	
	
		
 
            revision = None

			




	
	
	
		
 

			




	
	
	
		
 
        c.changelog_for_path = f_path

			




	
	
	
		
 
        try:

			




	
	
	
		
 

			




	
	
	
		
 
            if f_path:

			




	
	
	
		
 
                log.debug('generating changelog for path %s', f_path)

			




	
	
	
		
 
                # get the history for the file !

			




	
	
	
		
 
                tip_cs = c.db_repo_scm_instance.get_changeset()

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    collection = tip_cs.get_file_history(f_path)

			




	
	
	
		
 
                except (NodeDoesNotExistError, ChangesetError):

			




	
	
	
		
 
                    #this node is not present at tip !

			




	
	
	
		
 
                    try:

			




	
	
	
		
 
                        cs = self.__get_cs(revision, repo_name)

			




	
	
	
		
 
                        collection = cs.get_file_history(f_path)

			




	
	
	
		
 
                    except RepositoryError as e:

			




	
	
	
		
 
                        h.flash(safe_str(e), category='warning')

			




	
	
	
		
 
                        redirect(h.url('changelog_home', repo_name=repo_name))

			




	
	
	
		
 
                        raise HTTPFound(location=h.url('changelog_home', repo_name=repo_name))

			




	
	
	
		
 
                collection = list(reversed(collection))

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                collection = c.db_repo_scm_instance.get_changesets(start=0, end=revision,

			




	
	
	
		
 
                                                        branch_name=branch_name)

			




	
	
	
		
 
            c.total_cs = len(collection)

			




	
	
	
		
 

			




	
	
	
		
 
            c.pagination = RepoPage(collection, page=p, item_count=c.total_cs,

			




	
	
	
		
 
                                    items_per_page=c.size, branch=branch_name,)

			




	
	
	
		
 

			




	
	
	
		
 
            page_revisions = [x.raw_id for x in c.pagination]

			




	
	
	
		
 
            c.comments = c.db_repo.get_comments(page_revisions)

			




	
	
	
		
 
            c.statuses = c.db_repo.statuses(page_revisions)

			




	
	
	
		
 
        except EmptyRepositoryError as e:

			




	
	
	
		
 
            h.flash(safe_str(e), category='warning')

			




	
	
	
		
 
            return redirect(url('summary_home', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('summary_home', repo_name=c.repo_name))

			




	
	
	
		
 
        except (RepositoryError, ChangesetDoesNotExistError, Exception) as e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(safe_str(e), category='error')

			




	
	
	
		
 
            return redirect(url('changelog_home', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('changelog_home', repo_name=c.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        c.branch_name = branch_name

			




	
	
	
		
 
        c.branch_filters = [('', _('None'))] + \

			




	
	
	
		
 
            [(k, k) for k in c.db_repo_scm_instance.branches.keys()]

			




	
	
	
		
 
        if c.db_repo_scm_instance.closed_branches:

			




	
	
	
		
 
            prefix = _('(closed)') + ' '

			




	
	
	
		
 
            c.branch_filters += [('-', '-')] + \

			




	
	
	
		
 
                [(k, prefix + k) for k in c.db_repo_scm_instance.closed_branches.keys()]

			




	
	
	
		
 
        revs = []

			




	
	
	
		
 
        if not f_path:

			




	
	
	
		
 
            revs = [x.revision for x in c.pagination]

			




	
	
	
		
 
        c.jsdata = json.dumps(graph_data(c.db_repo_scm_instance, revs))

			




        

    


    
    

    

        

                

                    kallithea/controllers/changeset.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,31 +20,30 @@ revisions

			




	
	
	
		
 

			




	
	
	
		
 
This file was forked by the Kallithea project in July 2014.

			




	
	
	
		
 
Original author and date, and relevant copyright and licensing information is below:

			




	
	
	
		
 
:created_on: Apr 25, 2010

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
from collections import defaultdict

			




	
	
	
		
 
from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import tmpl_context as c, request, response

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPForbidden, HTTPBadRequest, HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.utils import jsonify

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.vcs.exceptions import RepositoryError, \

			




	
	
	
		
 
    ChangesetDoesNotExistError

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.compat import json

			




	
	
	
		
 
import kallithea.lib.helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\

			




	
	
	
		
 
    NotAnonymous

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.lib.utils import action_logger

			




	
	
	
		
 
from kallithea.lib.compat import OrderedDict

			




	
	
	
		
 
from kallithea.lib import diffs

			




	
	
	
		
 
from kallithea.model.db import ChangesetComment, ChangesetStatus

			




	
	
		
 
@@ -374,34 +373,34 @@ class ChangesetController(BaseRepoContro

			




	
	
	
		
 
                    c.db_repo.repo_id,

			




	
	
	
		
 
                    status,

			




	
	
	
		
 
                    c.authuser.user_id,

			




	
	
	
		
 
                    comment,

			




	
	
	
		
 
                    revision=revision,

			




	
	
	
		
 
                    dont_allow_on_closed_pull_request=True

			




	
	
	
		
 
                )

			




	
	
	
		
 
            except StatusChangeOnClosedPullRequestError:

			




	
	
	
		
 
                log.debug(traceback.format_exc())

			




	
	
	
		
 
                msg = _('Changing status on a changeset associated with '

			




	
	
	
		
 
                        'a closed pull request is not allowed')

			




	
	
	
		
 
                h.flash(msg, category='warning')

			




	
	
	
		
 
                return redirect(h.url('changeset_home', repo_name=repo_name,

			




	
	
	
		
 
                raise HTTPFound(location=h.url('changeset_home', repo_name=repo_name,

			




	
	
	
		
 
                                      revision=revision))

			




	
	
	
		
 
        action_logger(self.authuser,

			




	
	
	
		
 
                      'user_commented_revision:%s' % revision,

			




	
	
	
		
 
                      c.db_repo, self.ip_addr, self.sa)

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        if not request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            return redirect(h.url('changeset_home', repo_name=repo_name,

			




	
	
	
		
 
            raise HTTPFound(location=h.url('changeset_home', repo_name=repo_name,

			




	
	
	
		
 
                                  revision=revision))

			




	
	
	
		
 
        #only ajax below

			




	
	
	
		
 
        data = {

			




	
	
	
		
 
           'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if comment is not None:

			




	
	
	
		
 
            data.update(comment.get_dict())

			




	
	
	
		
 
            data.update({'rendered_text':

			




	
	
	
		
 
                         render('changeset/changeset_comment_block.html')})

			




	
	
	
		
 

			




	
	
	
		
 
        return data

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/controllers/compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,28 +21,27 @@ repos, branches, bookmarks or tips

			




	
	
	
		
 
This file was forked by the Kallithea project in July 2014.

			




	
	
	
		
 
Original author and date, and relevant copyright and licensing information is below:

			




	
	
	
		
 
:created_on: May 6, 2012

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import re

			




	
	
	
		
 

			




	
	
	
		
 
from webob.exc import HTTPBadRequest

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPBadRequest

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_str

			




	
	
	
		
 
from kallithea.lib.vcs.utils.hgcompat import unionrepo

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from kallithea.lib import diffs

			




	
	
	
		
 
from kallithea.model.db import Repository

			




	
	
	
		
 
from kallithea.lib.diffs import LimitedDiffContainer

			




	
	
	
		
 
from kallithea.controllers.changeset import _ignorews_url, _context_url

			




	
	
	
		
 
from kallithea.lib.graphmod import graph_data

			




	
	
	
		
 
from kallithea.lib.compat import json

			




	
	
		
 
@@ -198,37 +197,37 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        c.ignorews_url = _ignorews_url

			




	
	
	
		
 
        c.context_url = _context_url

			




	
	
	
		
 
        ignore_whitespace = request.GET.get('ignorews') == '1'

			




	
	
	
		
 
        line_context = request.GET.get('context', 3)

			




	
	
	
		
 

			




	
	
	
		
 
        org_repo = Repository.get_by_repo_name(org_repo)

			




	
	
	
		
 
        other_repo = Repository.get_by_repo_name(other_repo)

			




	
	
	
		
 

			




	
	
	
		
 
        if org_repo is None:

			




	
	
	
		
 
            msg = 'Could not find org repo %s' % org_repo

			




	
	
	
		
 
            log.error(msg)

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
            return redirect(url('compare_home', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('compare_home', repo_name=c.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        if other_repo is None:

			




	
	
	
		
 
            msg = 'Could not find other repo %s' % other_repo

			




	
	
	
		
 
            log.error(msg)

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
            return redirect(url('compare_home', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('compare_home', repo_name=c.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        if org_repo.scm_instance.alias != other_repo.scm_instance.alias:

			




	
	
	
		
 
            msg = 'compare of two different kind of remote repos not available'

			




	
	
	
		
 
            log.error(msg)

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
            return redirect(url('compare_home', repo_name=c.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('compare_home', repo_name=c.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        c.a_rev = self._get_ref_rev(org_repo, org_ref_type, org_ref_name,

			




	
	
	
		
 
            returnempty=True)

			




	
	
	
		
 
        c.cs_rev = self._get_ref_rev(other_repo, other_ref_type, other_ref_name)

			




	
	
	
		
 

			




	
	
	
		
 
        c.compare_home = False

			




	
	
	
		
 
        c.a_repo = org_repo

			




	
	
	
		
 
        c.a_ref_name = org_ref_name

			




	
	
	
		
 
        c.a_ref_type = org_ref_type

			




	
	
	
		
 
        c.cs_repo = other_repo

			




	
	
	
		
 
        c.cs_ref_name = other_ref_name

			




	
	
	
		
 
        c.cs_ref_type = other_ref_type

			




        

    


    
    

    

        

                

                    kallithea/controllers/files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,27 +24,27 @@ Original author and date, and relevant c

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import os

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import tempfile

			




	
	
	
		
 
import shutil

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, response, tmpl_context as c, url

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.utils import jsonify, action_logger

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import diffs

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.compat import OrderedDict

			




	
	
	
		
 
from kallithea.lib.utils2 import convert_line_endings, detect_mode, safe_str,\

			




	
	
	
		
 
    str2bool

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.lib.vcs.backends.base import EmptyChangeset

			




	
	
	
		
 
from kallithea.lib.vcs.conf import settings

			




	
	
	
		
 
from kallithea.lib.vcs.exceptions import RepositoryError, \

			




	
	
	
		
 
    ChangesetDoesNotExistError, EmptyRepositoryError, \

			




	
	
		
 
@@ -297,35 +297,35 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
        response.content_type = mimetype

			




	
	
	
		
 
        return file_node.content

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')

			




	
	
	
		
 
    def delete(self, repo_name, revision, f_path):

			




	
	
	
		
 
        repo = c.db_repo

			




	
	
	
		
 
        if repo.enable_locking and repo.locked[0]:

			




	
	
	
		
 
            h.flash(_('This repository has been locked by %s on %s')

			




	
	
	
		
 
                % (h.person_by_id(repo.locked[0]),

			




	
	
	
		
 
                   h.fmt_date(h.time_to_datetime(repo.locked[1]))),

			




	
	
	
		
 
                'warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
            raise HTTPFound(location=h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        # check if revision is a branch identifier- basically we cannot

			




	
	
	
		
 
        # create multiple heads via file editing

			




	
	
	
		
 
        _branches = repo.scm_instance.branches

			




	
	
	
		
 
        # check if revision is a branch name or branch hash

			




	
	
	
		
 
        if revision not in _branches.keys() + _branches.values():

			




	
	
	
		
 
            h.flash(_('You can only delete files with revision '

			




	
	
	
		
 
                      'being a valid branch '), category='warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
            raise HTTPFound(location=h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip',

			




	
	
	
		
 
                                  f_path=f_path))

			




	
	
	
		
 

			




	
	
	
		
 
        r_post = request.POST

			




	
	
	
		
 

			




	
	
	
		
 
        c.cs = self.__get_cs(revision)

			




	
	
	
		
 
        c.file = self.__get_filenode(c.cs, f_path)

			




	
	
	
		
 

			




	
	
	
		
 
        c.default_message = _('Deleted file %s via Kallithea') % (f_path)

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 
        node_path = f_path

			




	
	
	
		
 
        author = self.authuser.full_contact

			




	
	
		
 
@@ -343,106 +343,106 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                    user=c.authuser.user_id, repo=c.db_repo,

			




	
	
	
		
 
                    message=message,

			




	
	
	
		
 
                    nodes=nodes,

			




	
	
	
		
 
                    parent_cs=c.cs,

			




	
	
	
		
 
                    author=author,

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
                h.flash(_('Successfully deleted file %s') % f_path,

			




	
	
	
		
 
                        category='success')

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during commit'), category='error')

			




	
	
	
		
 
            return redirect(url('changeset_home',

			




	
	
	
		
 
            raise HTTPFound(location=url('changeset_home',

			




	
	
	
		
 
                                repo_name=c.repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        return render('files/files_delete.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')

			




	
	
	
		
 
    def edit(self, repo_name, revision, f_path):

			




	
	
	
		
 
        repo = c.db_repo

			




	
	
	
		
 
        if repo.enable_locking and repo.locked[0]:

			




	
	
	
		
 
            h.flash(_('This repository has been locked by %s on %s')

			




	
	
	
		
 
                % (h.person_by_id(repo.locked[0]),

			




	
	
	
		
 
                   h.fmt_date(h.time_to_datetime(repo.locked[1]))),

			




	
	
	
		
 
                'warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
            raise HTTPFound(location=h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        # check if revision is a branch identifier- basically we cannot

			




	
	
	
		
 
        # create multiple heads via file editing

			




	
	
	
		
 
        _branches = repo.scm_instance.branches

			




	
	
	
		
 
        # check if revision is a branch name or branch hash

			




	
	
	
		
 
        if revision not in _branches.keys() + _branches.values():

			




	
	
	
		
 
            h.flash(_('You can only edit files with revision '

			




	
	
	
		
 
                      'being a valid branch '), category='warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
            raise HTTPFound(location=h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip',

			




	
	
	
		
 
                                  f_path=f_path))

			




	
	
	
		
 

			




	
	
	
		
 
        r_post = request.POST

			




	
	
	
		
 

			




	
	
	
		
 
        c.cs = self.__get_cs(revision)

			




	
	
	
		
 
        c.file = self.__get_filenode(c.cs, f_path)

			




	
	
	
		
 

			




	
	
	
		
 
        if c.file.is_binary:

			




	
	
	
		
 
            return redirect(url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
            raise HTTPFound(location=url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                            revision=c.cs.raw_id, f_path=f_path))

			




	
	
	
		
 
        c.default_message = _('Edited file %s via Kallithea') % (f_path)

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 

			




	
	
	
		
 
        if r_post:

			




	
	
	
		
 

			




	
	
	
		
 
            old_content = c.file.content

			




	
	
	
		
 
            sl = old_content.splitlines(1)

			




	
	
	
		
 
            first_line = sl[0] if sl else ''

			




	
	
	
		
 
            # modes:  0 - Unix, 1 - Mac, 2 - DOS

			




	
	
	
		
 
            mode = detect_mode(first_line, 0)

			




	
	
	
		
 
            content = convert_line_endings(r_post.get('content', ''), mode)

			




	
	
	
		
 

			




	
	
	
		
 
            message = r_post.get('message') or c.default_message

			




	
	
	
		
 
            author = self.authuser.full_contact

			




	
	
	
		
 

			




	
	
	
		
 
            if content == old_content:

			




	
	
	
		
 
                h.flash(_('No changes'), category='warning')

			




	
	
	
		
 
                return redirect(url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                    revision='tip'))

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                self.scm_model.commit_change(repo=c.db_repo_scm_instance,

			




	
	
	
		
 
                                             repo_name=repo_name, cs=c.cs,

			




	
	
	
		
 
                                             user=self.authuser.user_id,

			




	
	
	
		
 
                                             author=author, message=message,

			




	
	
	
		
 
                                             content=content, f_path=f_path)

			




	
	
	
		
 
                h.flash(_('Successfully committed to %s') % f_path,

			




	
	
	
		
 
                        category='success')

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during commit'), category='error')

			




	
	
	
		
 
            return redirect(url('changeset_home',

			




	
	
	
		
 
            raise HTTPFound(location=url('changeset_home',

			




	
	
	
		
 
                                repo_name=c.repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        return render('files/files_edit.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')

			




	
	
	
		
 
    def add(self, repo_name, revision, f_path):

			




	
	
	
		
 

			




	
	
	
		
 
        repo = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 
        if repo.enable_locking and repo.locked[0]:

			




	
	
	
		
 
            h.flash(_('This repository has been locked by %s on %s')

			




	
	
	
		
 
                % (h.person_by_id(repo.locked[0]),

			




	
	
	
		
 
                   h.fmt_date(h.time_to_datetime(repo.locked[1]))),

			




	
	
	
		
 
                  'warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
            raise HTTPFound(location=h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        r_post = request.POST

			




	
	
	
		
 
        c.cs = self.__get_cs(revision, silent_empty=True)

			




	
	
	
		
 
        if c.cs is None:

			




	
	
	
		
 
            c.cs = EmptyChangeset(alias=c.db_repo_scm_instance.alias)

			




	
	
	
		
 
        c.default_message = (_('Added file via Kallithea'))

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 

			




	
	
	
		
 
        if r_post:

			




	
	
	
		
 
            unix_mode = 0

			




	
	
	
		
 
            content = convert_line_endings(r_post.get('content', ''), unix_mode)

			




	
	
		
 
@@ -453,29 +453,29 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
            file_obj = r_post.get('upload_file', None)

			




	
	
	
		
 

			




	
	
	
		
 
            if file_obj is not None and hasattr(file_obj, 'filename'):

			




	
	
	
		
 
                filename = file_obj.filename

			




	
	
	
		
 
                content = file_obj.file

			




	
	
	
		
 

			




	
	
	
		
 
                if hasattr(content, 'file'):

			




	
	
	
		
 
                    # non posix systems store real file under file attr

			




	
	
	
		
 
                    content = content.file

			




	
	
	
		
 

			




	
	
	
		
 
            if not content:

			




	
	
	
		
 
                h.flash(_('No content'), category='warning')

			




	
	
	
		
 
                return redirect(url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                    revision='tip'))

			




	
	
	
		
 
            if not filename:

			




	
	
	
		
 
                h.flash(_('No filename'), category='warning')

			




	
	
	
		
 
                return redirect(url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                    revision='tip'))

			




	
	
	
		
 
            #strip all crap out of file, just leave the basename

			




	
	
	
		
 
            filename = os.path.basename(filename)

			




	
	
	
		
 
            node_path = os.path.join(location, filename)

			




	
	
	
		
 
            author = self.authuser.full_contact

			




	
	
	
		
 

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                nodes = {

			




	
	
	
		
 
                    node_path: {

			




	
	
	
		
 
                        'content': content

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                }

			




	
	
		
 
@@ -483,32 +483,32 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                    user=c.authuser.user_id, repo=c.db_repo,

			




	
	
	
		
 
                    message=message,

			




	
	
	
		
 
                    nodes=nodes,

			




	
	
	
		
 
                    parent_cs=c.cs,

			




	
	
	
		
 
                    author=author,

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
                h.flash(_('Successfully committed to %s') % node_path,

			




	
	
	
		
 
                        category='success')

			




	
	
	
		
 
            except NonRelativePathError as e:

			




	
	
	
		
 
                h.flash(_('Location must be relative path and must not '

			




	
	
	
		
 
                          'contain .. in path'), category='warning')

			




	
	
	
		
 
                return redirect(url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                    revision='tip'))

			




	
	
	
		
 
            except (NodeError, NodeAlreadyExistsError) as e:

			




	
	
	
		
 
                h.flash(_(e), category='error')

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during commit'), category='error')

			




	
	
	
		
 
            return redirect(url('changeset_home',

			




	
	
	
		
 
            raise HTTPFound(location=url('changeset_home',

			




	
	
	
		
 
                                repo_name=c.repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        return render('files/files_add.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def archivefile(self, repo_name, fname):

			




	
	
	
		
 
        fileformat = None

			




	
	
	
		
 
        revision = None

			




	
	
	
		
 
        ext = None

			




	
	
	
		
 
        subrepos = request.GET.get('subrepos') == 'true'

			




	
	
		
 
@@ -611,25 +611,25 @@ class FilesController(BaseRepoController

			




	
	
	
		
 

			




	
	
	
		
 
        #special case if we want a show rev only, it's impl here

			




	
	
	
		
 
        #to reduce JS and callbacks

			




	
	
	
		
 

			




	
	
	
		
 
        if request.GET.get('show_rev'):

			




	
	
	
		
 
            if str2bool(request.GET.get('annotate', 'False')):

			




	
	
	
		
 
                _url = url('files_annotate_home', repo_name=c.repo_name,

			




	
	
	
		
 
                           revision=diff1, f_path=c.f_path)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                _url = url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                           revision=diff1, f_path=c.f_path)

			




	
	
	
		
 

			




	
	
	
		
 
            return redirect(_url)

			




	
	
	
		
 
            raise HTTPFound(location=_url)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:

			




	
	
	
		
 
                c.changeset_1 = c.db_repo_scm_instance.get_changeset(diff1)

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    node1 = c.changeset_1.get_node(f_path)

			




	
	
	
		
 
                    if node1.is_dir():

			




	
	
	
		
 
                        raise NodeError('%s path is a %s not a file'

			




	
	
	
		
 
                                        % (node1, type(node1)))

			




	
	
	
		
 
                except NodeDoesNotExistError:

			




	
	
	
		
 
                    c.changeset_1 = EmptyChangeset(cs=diff1,

			




	
	
	
		
 
                                                   revision=c.changeset_1.revision,

			




	
	
	
		
 
                                                   repo=c.db_repo_scm_instance)

			




	
	
		
 
@@ -646,25 +646,25 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                        raise NodeError('%s path is a %s not a file'

			




	
	
	
		
 
                                        % (node2, type(node2)))

			




	
	
	
		
 
                except NodeDoesNotExistError:

			




	
	
	
		
 
                    c.changeset_2 = EmptyChangeset(cs=diff2,

			




	
	
	
		
 
                                                   revision=c.changeset_2.revision,

			




	
	
	
		
 
                                                   repo=c.db_repo_scm_instance)

			




	
	
	
		
 
                    node2 = FileNode(f_path, '', changeset=c.changeset_2)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.changeset_2 = EmptyChangeset(repo=c.db_repo_scm_instance)

			




	
	
	
		
 
                node2 = FileNode(f_path, '', changeset=c.changeset_2)

			




	
	
	
		
 
        except (RepositoryError, NodeError):

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            return redirect(url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
            raise HTTPFound(location=url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                f_path=f_path))

			




	
	
	
		
 

			




	
	
	
		
 
        if c.action == 'download':

			




	
	
	
		
 
            _diff = diffs.get_gitdiff(node1, node2,

			




	
	
	
		
 
                                      ignore_whitespace=ignore_whitespace,

			




	
	
	
		
 
                                      context=line_context)

			




	
	
	
		
 
            diff = diffs.DiffProcessor(_diff, format='gitdiff')

			




	
	
	
		
 

			




	
	
	
		
 
            diff_name = '%s_vs_%s.diff' % (diff1, diff2)

			




	
	
	
		
 
            response.content_type = 'text/plain'

			




	
	
	
		
 
            response.content_disposition = (

			




	
	
	
		
 
                'attachment; filename=%s' % diff_name

			




        

    


    
    

    

        

                

                    kallithea/controllers/forks.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,26 +22,26 @@ Original author and date, and relevant c

			




	
	
	
		
 
:created_on: Apr 23, 2011

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import formencode

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import tmpl_context as c, request, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea.lib.helpers as h

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.helpers import Page

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \

			




	
	
	
		
 
    NotAnonymous, HasRepoPermissionAny, HasPermissionAnyDecorator, HasPermissionAny

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.model.db import Repository, UserFollowing, User, Ui

			




	
	
	
		
 
from kallithea.model.repo import RepoModel

			




	
	
	
		
 
from kallithea.model.forms import RepoForkForm

			




	
	
	
		
 
from kallithea.model.scm import ScmModel, AvailableRepoGroupChoices

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_int

			




	
	
		
 
@@ -68,25 +68,25 @@ class ForksController(BaseRepoController

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Load defaults settings for edit, and update

			




	
	
	
		
 

			




	
	
	
		
 
        :param repo_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        self.__load_defaults()

			




	
	
	
		
 

			




	
	
	
		
 
        c.repo_info = db_repo = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 
        repo = db_repo.scm_instance

			




	
	
	
		
 

			




	
	
	
		
 
        if c.repo_info is None:

			




	
	
	
		
 
            h.not_mapped_error(repo_name)

			




	
	
	
		
 
            return redirect(url('repos'))

			




	
	
	
		
 
            raise HTTPFound(location=url('repos'))

			




	
	
	
		
 

			




	
	
	
		
 
        c.default_user_id = User.get_default_user().user_id

			




	
	
	
		
 
        c.in_public_journal = UserFollowing.query()\

			




	
	
	
		
 
            .filter(UserFollowing.user_id == c.default_user_id)\

			




	
	
	
		
 
            .filter(UserFollowing.follows_repository == c.repo_info).scalar()

			




	
	
	
		
 

			




	
	
	
		
 
        if c.repo_info.stats:

			




	
	
	
		
 
            last_rev = c.repo_info.stats.stat_on_revision+1

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            last_rev = 0

			




	
	
	
		
 
        c.stats_revision = last_rev

			




	
	
	
		
 

			




	
	
		
 
@@ -128,25 +128,25 @@ class ForksController(BaseRepoController

			




	
	
	
		
 

			




	
	
	
		
 
        return render('/forks/forks.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def fork(self, repo_name):

			




	
	
	
		
 
        c.repo_info = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 
        if not c.repo_info:

			




	
	
	
		
 
            h.not_mapped_error(repo_name)

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 
            raise HTTPFound(location=url('home'))

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = self.__load_data(repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('forks/fork.html'),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')

			




	
	
		
 
@@ -177,15 +177,15 @@ class ForksController(BaseRepoController

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('forks/fork.html'),

			




	
	
	
		
 
                defaults=errors.value,

			




	
	
	
		
 
                errors=errors.error_dict or {},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(_('An error occurred during repository forking %s') %

			




	
	
	
		
 
                    repo_name, category='error')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(h.url('repo_creating_home',

			




	
	
	
		
 
        raise HTTPFound(location=h.url('repo_creating_home',

			




	
	
	
		
 
                              repo_name=form_result['repo_name_full'],

			




	
	
	
		
 
                              task_id=task_id))

			




        

    


    
    

    

        

                

                    kallithea/controllers/login.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,28 +22,27 @@ Original author and date, and relevant c

			




	
	
	
		
 
:created_on: Apr 22, 2010

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import re

			




	
	
	
		
 
import formencode

			




	
	
	
		
 

			




	
	
	
		
 
from formencode import htmlfill

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from pylons import request, session, tmpl_context as c, url

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPBadRequest

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons import request, session, tmpl_context as c, url

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea.lib.helpers as h

			




	
	
	
		
 
from kallithea.lib.auth import AuthUser, HasPermissionAnyDecorator

			




	
	
	
		
 
from kallithea.lib.base import BaseController, log_in_user, render

			




	
	
	
		
 
from kallithea.lib.exceptions import UserCreationError

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_str

			




	
	
	
		
 
from kallithea.model.db import User, Setting

			




	
	
	
		
 
from kallithea.model.forms import \

			




	
	
	
		
 
    LoginForm, RegisterForm, PasswordResetRequestForm, PasswordResetConfirmationForm

			




	
	
	
		
 
from kallithea.model.user import UserModel

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 

			




	
	
		
 
@@ -143,25 +142,25 @@ class LoginController(BaseController):

			




	
	
	
		
 
                                      remoteip=self.ip_addr)

			




	
	
	
		
 
                    if c.captcha_active and not response.is_valid:

			




	
	
	
		
 
                        _value = form_result

			




	
	
	
		
 
                        _msg = _('Bad captcha')

			




	
	
	
		
 
                        error_dict = {'recaptcha_field': _msg}

			




	
	
	
		
 
                        raise formencode.Invalid(_msg, _value, None,

			




	
	
	
		
 
                                                 error_dict=error_dict)

			




	
	
	
		
 

			




	
	
	
		
 
                UserModel().create_registration(form_result)

			




	
	
	
		
 
                h.flash(_('You have successfully registered into Kallithea'),

			




	
	
	
		
 
                        category='success')

			




	
	
	
		
 
                Session().commit()

			




	
	
	
		
 
                return redirect(url('login_home'))

			




	
	
	
		
 
                raise HTTPFound(location=url('login_home'))

			




	
	
	
		
 

			




	
	
	
		
 
            except formencode.Invalid as errors:

			




	
	
	
		
 
                return htmlfill.render(

			




	
	
	
		
 
                    render('/register.html'),

			




	
	
	
		
 
                    defaults=errors.value,

			




	
	
	
		
 
                    errors=errors.error_dict or {},

			




	
	
	
		
 
                    prefix_error=False,

			




	
	
	
		
 
                    encoding="UTF-8",

			




	
	
	
		
 
                    force_defaults=False)

			




	
	
	
		
 
            except UserCreationError as e:

			




	
	
	
		
 
                # container auth or other auth functions that create users on

			




	
	
	
		
 
                # the fly can throw this exception signaling that there's issue

			




	
	
		
 
@@ -187,25 +186,25 @@ class LoginController(BaseController):

			




	
	
	
		
 
                                      request.POST.get('recaptcha_response_field'),

			




	
	
	
		
 
                                      private_key=captcha_private_key,

			




	
	
	
		
 
                                      remoteip=self.ip_addr)

			




	
	
	
		
 
                    if c.captcha_active and not response.is_valid:

			




	
	
	
		
 
                        _value = form_result

			




	
	
	
		
 
                        _msg = _('Bad captcha')

			




	
	
	
		
 
                        error_dict = {'recaptcha_field': _msg}

			




	
	
	
		
 
                        raise formencode.Invalid(_msg, _value, None,

			




	
	
	
		
 
                                                 error_dict=error_dict)

			




	
	
	
		
 
                redirect_link = UserModel().send_reset_password_email(form_result)

			




	
	
	
		
 
                h.flash(_('A password reset confirmation code has been sent'),

			




	
	
	
		
 
                            category='success')

			




	
	
	
		
 
                return redirect(redirect_link)

			




	
	
	
		
 
                raise HTTPFound(location=redirect_link)

			




	
	
	
		
 

			




	
	
	
		
 
            except formencode.Invalid as errors:

			




	
	
	
		
 
                return htmlfill.render(

			




	
	
	
		
 
                    render('/password_reset.html'),

			




	
	
	
		
 
                    defaults=errors.value,

			




	
	
	
		
 
                    errors=errors.error_dict or {},

			




	
	
	
		
 
                    prefix_error=False,

			




	
	
	
		
 
                    encoding="UTF-8",

			




	
	
	
		
 
                    force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
        return render('/password_reset.html')

			




	
	
	
		
 

			




	
	
		
 
@@ -240,26 +239,26 @@ class LoginController(BaseController):

			




	
	
	
		
 
            form_result['timestamp'],

			




	
	
	
		
 
            form_result['token'],

			




	
	
	
		
 
        ):

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('/password_reset_confirmation.html'),

			




	
	
	
		
 
                defaults=form_result,

			




	
	
	
		
 
                errors={'token': _('Invalid password reset token')},

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding='UTF-8')

			




	
	
	
		
 

			




	
	
	
		
 
        UserModel().reset_password(form_result['email'], form_result['password'])

			




	
	
	
		
 
        h.flash(_('Successfully updated password'), category='success')

			




	
	
	
		
 
        return redirect(url('login_home'))

			




	
	
	
		
 
        raise HTTPFound(location=url('login_home'))

			




	
	
	
		
 

			




	
	
	
		
 
    def logout(self):

			




	
	
	
		
 
        session.delete()

			




	
	
	
		
 
        log.info('Logging out and deleting session for user')

			




	
	
	
		
 
        redirect(url('home'))

			




	
	
	
		
 
        raise HTTPFound(location=url('home'))

			




	
	
	
		
 

			




	
	
	
		
 
    def authentication_token(self):

			




	
	
	
		
 
        """Return the CSRF protection token for the session - just like it

			




	
	
	
		
 
        could have been screen scraped from a page with a form.

			




	
	
	
		
 
        Only intended for testing but might also be useful for other kinds

			




	
	
	
		
 
        of automation.

			




	
	
	
		
 
        """

			




	
	
	
		
 
        return h.authentication_token()

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,29 +21,27 @@ This file was forked by the Kallithea pr

			




	
	
	
		
 
Original author and date, and relevant copyright and licensing information is below:

			




	
	
	
		
 
:created_on: May 7, 2012

			




	
	
	
		
 
:author: marcink

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import formencode

			




	
	
	
		
 
import re

			




	
	
	
		
 

			




	
	
	
		
 
from webob.exc import HTTPNotFound, HTTPForbidden, HTTPBadRequest

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import request, tmpl_context as c, url

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPNotFound, HTTPForbidden, HTTPBadRequest

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.vcs.utils.hgcompat import unionrepo

			




	
	
	
		
 
from kallithea.lib.compat import json

			




	
	
	
		
 
from kallithea.lib.base import BaseRepoController, render

			




	
	
	
		
 
from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\

			




	
	
	
		
 
    NotAnonymous

			




	
	
	
		
 
from kallithea.lib.helpers import Page

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
	
		
 
from kallithea.lib import diffs

			




	
	
	
		
 
from kallithea.lib.exceptions import UserInvalidException

			




	
	
	
		
 
from kallithea.lib.utils import action_logger, jsonify

			




	
	
	
		
 
from kallithea.lib.vcs.utils import safe_str

			




	
	
		
 
@@ -228,25 +226,25 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def index(self):

			




	
	
	
		
 
        org_repo = c.db_repo

			




	
	
	
		
 
        org_scm_instance = org_repo.scm_instance

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            org_scm_instance.get_changeset()

			




	
	
	
		
 
        except EmptyRepositoryError as e:

			




	
	
	
		
 
            h.flash(h.literal(_('There are no changesets yet')),

			




	
	
	
		
 
                    category='warning')

			




	
	
	
		
 
            redirect(url('summary_home', repo_name=org_repo.repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('summary_home', repo_name=org_repo.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        org_rev = request.GET.get('rev_end')

			




	
	
	
		
 
        # rev_start is not directly useful - its parent could however be used

			




	
	
	
		
 
        # as default for other and thus give a simple compare view

			




	
	
	
		
 
        rev_start = request.GET.get('rev_start')

			




	
	
	
		
 
        other_rev = None

			




	
	
	
		
 
        if rev_start:

			




	
	
	
		
 
            starters = org_repo.get_changeset(rev_start).parents

			




	
	
	
		
 
            if starters:

			




	
	
	
		
 
                other_rev = starters[0].raw_id

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                other_rev = org_repo.scm_instance.EMPTY_CHANGESET

			




	
	
		
 
@@ -360,27 +358,27 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
                other_ref, revisions, reviewers, title, description

			




	
	
	
		
 
            )

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Successfully opened new pull request'),

			




	
	
	
		
 
                    category='success')

			




	
	
	
		
 
        except UserInvalidException as u:

			




	
	
	
		
 
            h.flash(_('Invalid reviewer "%s" specified') % u, category='error')

			




	
	
	
		
 
            raise HTTPBadRequest()

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            h.flash(_('Error occurred while creating pull request'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            return redirect(url('pullrequest_home', repo_name=repo_name))

			




	
	
	
		
 
            raise HTTPFound(location=url('pullrequest_home', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(pull_request.url())

			




	
	
	
		
 
        raise HTTPFound(location=pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
    def create_update(self, old_pull_request, updaterev, title, description, reviewers_ids):

			




	
	
	
		
 
        org_repo = RepoModel()._get_repo(old_pull_request.org_repo.repo_name)

			




	
	
	
		
 
        org_ref_type, org_ref_name, org_rev = old_pull_request.org_ref.split(':')

			




	
	
	
		
 
        new_org_rev = self._get_ref_rev(org_repo, 'rev', updaterev)

			




	
	
	
		
 

			




	
	
	
		
 
        other_repo = RepoModel()._get_repo(old_pull_request.other_repo.repo_name)

			




	
	
	
		
 
        other_ref_type, other_ref_name, other_rev = old_pull_request.other_ref.split(':') # other_rev is ancestor

			




	
	
	
		
 
        #assert other_ref_type == 'branch', other_ref_type # TODO: what if not?

			




	
	
	
		
 
        new_other_rev = self._get_ref_rev(other_repo, other_ref_type, other_ref_name)

			




	
	
	
		
 

			




	
	
	
		
 
        cs_ranges, _cs_ranges_not, ancestor_rev = CompareController._get_changesets(org_repo.scm_instance.alias,

			




	
	
		
 
@@ -447,39 +445,39 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
                self.authuser.user_id,

			




	
	
	
		
 
                old_pull_request.org_repo.repo_name, new_org_ref,

			




	
	
	
		
 
                old_pull_request.other_repo.repo_name, new_other_ref,

			




	
	
	
		
 
                revisions, reviewers_ids, title, description

			




	
	
	
		
 
            )

			




	
	
	
		
 
        except UserInvalidException as u:

			




	
	
	
		
 
            h.flash(_('Invalid reviewer "%s" specified') % u, category='error')

			




	
	
	
		
 
            raise HTTPBadRequest()

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            h.flash(_('Error occurred while creating pull request'),

			




	
	
	
		
 
                    category='error')

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            return redirect(old_pull_request.url())

			




	
	
	
		
 
            raise HTTPFound(location=old_pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
        ChangesetCommentsModel().create(

			




	
	
	
		
 
            text=_('Closed, replaced by %s .') % pull_request.url(canonical=True),

			




	
	
	
		
 
            repo=old_pull_request.other_repo.repo_id,

			




	
	
	
		
 
            user=c.authuser.user_id,

			




	
	
	
		
 
            pull_request=old_pull_request.pull_request_id,

			




	
	
	
		
 
            closing_pr=True)

			




	
	
	
		
 
        PullRequestModel().close_pull_request(old_pull_request.pull_request_id)

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('Pull request update created'),

			




	
	
	
		
 
                category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(pull_request.url())

			




	
	
	
		
 
        raise HTTPFound(location=pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
    # pullrequest_post for PR editing

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def post(self, repo_name, pull_request_id):

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        if pull_request.is_closed():

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 
        assert pull_request.other_repo.repo_name == repo_name

			




	
	
	
		
 
        #only owner or admin can update it

			




	
	
		
 
@@ -504,40 +502,40 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        pull_request.owner = User.get_by_username(_form['owner'])

			




	
	
	
		
 
        user = User.get(c.authuser.user_id)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            PullRequestModel().mention_from_description(user, pull_request, old_description)

			




	
	
	
		
 
            PullRequestModel().update_reviewers(user, pull_request_id, reviewers_ids)

			




	
	
	
		
 
        except UserInvalidException as u:

			




	
	
	
		
 
            h.flash(_('Invalid reviewer "%s" specified') % u, category='error')

			




	
	
	
		
 
            raise HTTPBadRequest()

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('Pull request updated'), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(pull_request.url())

			




	
	
	
		
 
        raise HTTPFound(location=pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def delete(self, repo_name, pull_request_id):

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        #only owner can delete it !

			




	
	
	
		
 
        if pull_request.owner.user_id == c.authuser.user_id:

			




	
	
	
		
 
            PullRequestModel().delete(pull_request)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Successfully deleted pull request'),

			




	
	
	
		
 
                    category='success')

			




	
	
	
		
 
            return redirect(url('my_pullrequests'))

			




	
	
	
		
 
            raise HTTPFound(location=url('my_pullrequests'))

			




	
	
	
		
 
        raise HTTPForbidden()

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def show(self, repo_name, pull_request_id, extra=None):

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        c.users_array = repo_model.get_users_js()

			




	
	
	
		
 
        c.user_groups_array = repo_model.get_user_groups_js()

			




	
	
	
		
 
        c.pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request)

			




	
	
	
		
 
        cc_model = ChangesetCommentsModel()

			




	
	
		
 
@@ -753,25 +751,25 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
                pull_request=pull_request_id

			




	
	
	
		
 
            )

			




	
	
	
		
 

			




	
	
	
		
 
        if close_pr:

			




	
	
	
		
 
            PullRequestModel().close_pull_request(pull_request_id)

			




	
	
	
		
 
            action_logger(self.authuser,

			




	
	
	
		
 
                          'user_closed_pull_request:%s' % pull_request_id,

			




	
	
	
		
 
                          c.db_repo, self.ip_addr, self.sa)

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
        if not request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            return redirect(pull_request.url())

			




	
	
	
		
 
            raise HTTPFound(location=pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
        data = {

			




	
	
	
		
 
           'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if comment is not None:

			




	
	
	
		
 
            c.comment = comment

			




	
	
	
		
 
            data.update(comment.get_dict())

			




	
	
	
		
 
            data.update({'rendered_text':

			




	
	
	
		
 
                         render('changeset/changeset_comment_block.html')})

			




	
	
	
		
 

			




	
	
	
		
 
        return data

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/lib/auth.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -26,31 +26,30 @@ Original author and date, and relevant c

			




	
	
	
		
 
"""

			




	
	
	
		
 
import time

			




	
	
	
		
 
import os

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import traceback

			




	
	
	
		
 
import hashlib

			




	
	
	
		
 
import itertools

			




	
	
	
		
 
import collections

			




	
	
	
		
 

			




	
	
	
		
 
from decorator import decorator

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import url, request, session

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from webhelpers.pylonslib import secure_form

			




	
	
	
		
 
from sqlalchemy import or_

			




	
	
	
		
 
from sqlalchemy.orm.exc import ObjectDeletedError

			




	
	
	
		
 
from sqlalchemy.orm import joinedload

			




	
	
	
		
 
from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPMethodNotAllowed

			




	
	
	
		
 
from webob.exc import HTTPFound, HTTPBadRequest, HTTPForbidden, HTTPMethodNotAllowed

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea import __platform__, is_windows, is_unix

			




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

			




	
	
	
		
 
from kallithea.model import meta

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.model.user import UserModel

			




	
	
	
		
 
from kallithea.model.db import User, Repository, Permission, \

			




	
	
	
		
 
    UserToPerm, UserGroupRepoToPerm, UserGroupToPerm, UserGroupMember, \

			




	
	
	
		
 
    RepoGroup, UserGroupRepoGroupToPerm, UserIpMap, UserGroupUserGroupToPerm, \

			




	
	
	
		
 
    UserGroup, UserApiKeys

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_unicode, aslist

			




	
	
		
 
@@ -708,25 +707,25 @@ def set_available_permissions(config):

			




	
	
	
		
 

			




	
	
	
		
 

			




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

			




	
	
	
		
 
# CHECK DECORATORS

			




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

			




	
	
	
		
 

			




	
	
	
		
 
def redirect_to_login(message=None):

			




	
	
	
		
 
    from kallithea.lib import helpers as h

			




	
	
	
		
 
    p = request.path_qs

			




	
	
	
		
 
    if message:

			




	
	
	
		
 
        h.flash(h.literal(message), category='warning')

			




	
	
	
		
 
    log.debug('Redirecting to login page, origin: %s', p)

			




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

			




	
	
	
		
 
    raise HTTPFound(location=url('login_home', came_from=p))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class LoginRequired(object):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Must be logged in to execute this function else

			




	
	
	
		
 
    redirect to login page

			




	
	
	
		
 

			




	
	
	
		
 
    :param api_access: if enabled this checks only for valid auth token

			




	
	
	
		
 
        and grants access based on valid token

			




	
	
	
		
 
    """

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, api_access=False):

			




        

    


    
    

    

        

                

                    kallithea/lib/base.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,25 +31,24 @@ Original author and date, and relevant c

			




	
	
	
		
 
import datetime

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import time

			




	
	
	
		
 
import traceback

			




	
	
	
		
 

			




	
	
	
		
 
import webob.exc

			




	
	
	
		
 
import paste.httpexceptions

			




	
	
	
		
 
import paste.auth.basic

			




	
	
	
		
 
import paste.httpheaders

			




	
	
	
		
 

			




	
	
	
		
 
from pylons import config, tmpl_context as c, request, session, url

			




	
	
	
		
 
from pylons.controllers import WSGIController

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.templating import render_mako as render  # don't remove this import

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea import __version__, BACKENDS

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict,\

			




	
	
	
		
 
    safe_str, safe_int

			




	
	
	
		
 
from kallithea.lib import auth_modules

			




	
	
	
		
 
from kallithea.lib.auth import AuthUser, HasPermissionAnyMiddleware

			




	
	
	
		
 
from kallithea.lib.utils import get_repo_slug

			




	
	
	
		
 
from kallithea.lib.exceptions import UserCreationError

			




	
	
	
		
 
from kallithea.lib.vcs.exceptions import RepositoryError, EmptyRepositoryError, ChangesetDoesNotExistError

			




	
	
		
 
@@ -470,25 +469,25 @@ class BaseRepoController(BaseController)

			




	
	
	
		
 
            log.debug('Found repository in database %s with state `%s`',

			




	
	
	
		
 
                      safe_unicode(_dbr), safe_unicode(_dbr.repo_state))

			




	
	
	
		
 
            route = getattr(request.environ.get('routes.route'), 'name', '')

			




	
	
	
		
 

			




	
	
	
		
 
            # allow to delete repos that are somehow damages in filesystem

			




	
	
	
		
 
            if route in ['delete_repo']:

			




	
	
	
		
 
                return

			




	
	
	
		
 

			




	
	
	
		
 
            if _dbr.repo_state in [Repository.STATE_PENDING]:

			




	
	
	
		
 
                if route in ['repo_creating_home']:

			




	
	
	
		
 
                    return

			




	
	
	
		
 
                check_url = url('repo_creating_home', repo_name=c.repo_name)

			




	
	
	
		
 
                return redirect(check_url)

			




	
	
	
		
 
                raise webob.exc.HTTPFound(location=check_url)

			




	
	
	
		
 

			




	
	
	
		
 
            dbr = c.db_repo = _dbr

			




	
	
	
		
 
            c.db_repo_scm_instance = c.db_repo.scm_instance

			




	
	
	
		
 
            if c.db_repo_scm_instance is None:

			




	
	
	
		
 
                log.error('%s this repository is present in database but it '

			




	
	
	
		
 
                          'cannot be created as an scm instance', c.repo_name)

			




	
	
	
		
 
                from kallithea.lib import helpers as h

			




	
	
	
		
 
                h.flash(h.literal(_('Repository not found in the filesystem')),

			




	
	
	
		
 
                        category='error')

			




	
	
	
		
 
                raise paste.httpexceptions.HTTPNotFound()

			




	
	
	
		
 

			




	
	
	
		
 
            # some globals counter for menu

			




        

    



    


    



    



      

      





    
    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.