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
 
@@ -25,14 +25,14 @@ Original author and date, and relevant c
 

			




	
	
	
		
 
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

			




	
	
		
 
@@ -143,7 +143,7 @@ class AuthSettingsController(BaseControl

			




	
	
	
		
 
            )

			




	
	
	
		
 
        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
                    
                

        

        

            



	
	
		
 
@@ -28,14 +28,14 @@ Original author and date, and relevant c

			




	
	
	
		
 
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

			




	
	
		
 
@@ -109,13 +109,13 @@ class DefaultsController(BaseController)

			




	
	
	
		
 
                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:

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/gists.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,26 +28,25 @@ Original author and date, and relevant c

			




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

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
		
 
@@ -141,14 +140,14 @@ class GistsController(BaseController):

			




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

			




	
	
		
 
@@ -182,13 +181,13 @@ class GistsController(BaseController):

			




	
	
	
		
 
            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)

			




	
	
		
 
@@ -267,13 +266,13 @@ class GistsController(BaseController):

			




	
	
	
		
 
                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

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/my_account.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,14 +29,14 @@ 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

			




	
	
		
 
@@ -66,13 +66,13 @@ class MyAccountController(BaseController

			




	
	
	
		
 

			




	
	
	
		
 
    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

			




	
	
		
 
@@ -141,13 +141,13 @@ class MyAccountController(BaseController

			




	
	
	
		
 
                    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)

			




	
	
	
		
 

			




	
	
		
 
@@ -222,21 +222,21 @@ class MyAccountController(BaseController

			




	
	
	
		
 
            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 = [

			




	
	
		
 
@@ -254,13 +254,13 @@ class MyAccountController(BaseController

			




	
	
	
		
 
    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)

			




	
	
		
 
@@ -271,7 +271,7 @@ class MyAccountController(BaseController

			




	
	
	
		
 
                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
                    
                

        

        

            



	
	
		
 
@@ -29,14 +29,14 @@ Original author and date, and relevant c

			




	
	
	
		
 
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

			




	
	
		
 
@@ -136,13 +136,13 @@ class PermissionsController(BaseControll

			




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

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/repo_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,15 +30,14 @@ 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, \

			




	
	
		
 
@@ -186,16 +185,16 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
        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

			




	
	
		
 
@@ -263,13 +262,13 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
                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" />

			




	
	
		
 
@@ -280,19 +279,19 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -300,14 +299,14 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
        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

			




	
	
	
		
 
        """

			




	
	
		
 
@@ -401,13 +400,13 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
        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'],

			




	
	
		
 
@@ -415,13 +414,13 @@ class RepoGroupsController(BaseControlle

			




	
	
	
		
 
                                             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

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/repos.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -26,17 +26,16 @@ Original author and date, and relevant c

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
		
 
@@ -68,13 +67,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -149,15 +148,15 @@ class ReposController(BaseRepoController

			




	
	
	
		
 

			




	
	
	
		
 
        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"""

			




	
	
		
 
@@ -279,13 +278,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                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:

			




	
	
		
 
@@ -296,13 +295,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
        # 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':

			




	
	
		
 
@@ -324,14 +323,14 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
        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)

			




	
	
		
 
@@ -369,13 +368,13 @@ class ReposController(BaseRepoController

			




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

			




	
	
		
 
@@ -406,13 +405,13 @@ class ReposController(BaseRepoController

			




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

			




	
	
		
 
@@ -428,25 +427,25 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
        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)

			




	
	
		
 
@@ -465,13 +464,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
		
 
@@ -492,13 +491,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                    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

			




	
	
		
 
@@ -518,13 +517,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
            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 !

			




	
	
	
		
 

			




	
	
		
 
@@ -539,13 +538,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                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

			




	
	
	
		
 

			




	
	
		
 
@@ -564,13 +563,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                    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)

			




	
	
		
 
@@ -583,13 +582,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                        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)

			




	
	
		
 
@@ -600,13 +599,13 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                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)

			




	
	
		
 
@@ -633,9 +632,9 @@ class ReposController(BaseRepoController

			




	
	
	
		
 
                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
                    
                

        

        

            



	
	
		
 
@@ -28,14 +28,14 @@ Original author and date, and relevant c

			




	
	
	
		
 
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

			




	
	
		
 
@@ -215,13 +215,13 @@ class SettingsController(BaseController)

			




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

			




	
	
		
 
@@ -275,13 +275,13 @@ class SettingsController(BaseController)

			




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

			




	
	
		
 
@@ -333,13 +333,13 @@ class SettingsController(BaseController)

			




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

			




	
	
		
 
@@ -356,13 +356,13 @@ class SettingsController(BaseController)

			




	
	
	
		
 
            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,

			




	
	
		
 
@@ -371,13 +371,13 @@ class SettingsController(BaseController)

			




	
	
	
		
 
            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

			




	
	
		
 
@@ -422,13 +422,13 @@ class SettingsController(BaseController)

			




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

			




	
	
		
 
@@ -446,13 +446,13 @@ class SettingsController(BaseController)

			




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

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/user_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,14 +28,14 @@ Original author and date, and relevant c

			




	
	
	
		
 
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

			




	
	
		
 
@@ -160,13 +160,13 @@ class UserGroupsController(BaseControlle

			




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

			




	
	
		
 
@@ -221,13 +221,13 @@ class UserGroupsController(BaseControlle

			




	
	
	
		
 
                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" />

			




	
	
		
 
@@ -243,13 +243,13 @@ class UserGroupsController(BaseControlle

			




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

			




	
	
		
 
@@ -309,19 +309,19 @@ class UserGroupsController(BaseControlle

			




	
	
	
		
 
        # 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

			




	
	
	
		
 

			




	
	
		
 
@@ -441,13 +441,13 @@ class UserGroupsController(BaseControlle

			




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

			




        

    


    
    

    

        

                

                    kallithea/controllers/admin/users.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,16 +28,15 @@ Original author and date, and relevant c

			




	
	
	
		
 
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, \

			




	
	
		
 
@@ -145,13 +144,13 @@ class UsersController(BaseController):

			




	
	
	
		
 
        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

			




	
	
		
 
@@ -198,13 +197,13 @@ class UsersController(BaseController):

			




	
	
	
		
 
                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:

			




	
	
		
 
@@ -219,13 +218,13 @@ class UsersController(BaseController):

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
		
 
@@ -303,13 +302,13 @@ class UsersController(BaseController):

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -321,13 +320,13 @@ class UsersController(BaseController):

			




	
	
	
		
 
                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)

			




	
	
		
 
@@ -384,13 +383,13 @@ class UsersController(BaseController):

			




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

			




	
	
		
 
@@ -417,24 +416,24 @@ class UsersController(BaseController):

			




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

			




	
	
		
 
@@ -467,21 +466,21 @@ class UsersController(BaseController):

			




	
	
	
		
 
        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
                    
                

        

        

            



	
	
		
 
@@ -26,15 +26,14 @@ Original author and date, and relevant c

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
		
 
@@ -96,14 +95,14 @@ class ChangelogController(BaseRepoContro

			




	
	
	
		
 
    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

			




	
	
		
 
@@ -115,13 +114,13 @@ class ChangelogController(BaseRepoContro

			




	
	
	
		
 
        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

			




	
	
		
 
@@ -137,13 +136,13 @@ class ChangelogController(BaseRepoContro

			




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

			




	
	
	
		
 

			




	
	
		
 
@@ -152,17 +151,17 @@ class ChangelogController(BaseRepoContro

			




	
	
	
		
 

			




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

			




        

    


    
    

    

        

                

                    kallithea/controllers/changeset.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -26,19 +26,18 @@ Original author and date, and relevant c

			




	
	
	
		
 
: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,\

			




	
	
		
 
@@ -380,22 +379,22 @@ class ChangesetController(BaseRepoContro

			




	
	
	
		
 
                )

			




	
	
	
		
 
            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:

			




        

    


    
    

    

        

                

                    kallithea/controllers/compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -27,16 +27,15 @@ Original author and date, and relevant c

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
		
 
@@ -204,25 +203,25 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        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

			




        

    


    
    

    

        

                

                    kallithea/controllers/files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,15 +30,15 @@ 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

			




	
	
		
 
@@ -303,23 +303,23 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
        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)

			




	
	
		
 
@@ -349,13 +349,13 @@ class FilesController(BaseRepoController

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -363,33 +363,33 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
        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:

			




	
	
	
		
 

			




	
	
		
 
@@ -402,26 +402,26 @@ class FilesController(BaseRepoController

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -430,13 +430,13 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
        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)

			




	
	
		
 
@@ -459,17 +459,17 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                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

			




	
	
	
		
 

			




	
	
		
 
@@ -489,20 +489,20 @@ class FilesController(BaseRepoController

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -617,13 +617,13 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                _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():

			




	
	
		
 
@@ -652,13 +652,13 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                    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)

			




        

    


    
    

    

        

                

                    kallithea/controllers/forks.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,14 +28,14 @@ Original author and date, and relevant c

			




	
	
	
		
 
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

			




	
	
		
 
@@ -74,13 +74,13 @@ class ForksController(BaseRepoController

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
		
 
@@ -134,13 +134,13 @@ class ForksController(BaseRepoController

			




	
	
	
		
 
    @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,

			




	
	
		
 
@@ -183,9 +183,9 @@ class ForksController(BaseRepoController

			




	
	
	
		
 
                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
                    
                

        

        

            



	
	
		
 
@@ -28,16 +28,15 @@ Original author and date, and relevant c

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
		
 
@@ -149,13 +148,13 @@ class LoginController(BaseController):

			




	
	
	
		
 
                                                 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 {},

			




	
	
		
 
@@ -193,13 +192,13 @@ class LoginController(BaseController):

			




	
	
	
		
 
                        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 {},

			




	
	
		
 
@@ -246,18 +245,18 @@ class LoginController(BaseController):

			




	
	
	
		
 
                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.

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -27,17 +27,15 @@ Original author and date, and relevant c

			




	
	
	
		
 

			




	
	
	
		
 
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

			




	
	
		
 
@@ -234,13 +232,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        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

			




	
	
		
 
@@ -366,15 +364,15 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
            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)

			




	
	
	
		
 

			




	
	
		
 
@@ -453,13 +451,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
            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,

			




	
	
		
 
@@ -467,13 +465,13 @@ class PullrequestsController(BaseRepoCon

			




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

			




	
	
		
 
@@ -510,13 +508,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
            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

			




	
	
		
 
@@ -525,13 +523,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        #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):

			




	
	
		
 
@@ -759,13 +757,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
                          '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

			




        

    


    
    

    

        

                

                    kallithea/lib/auth.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -32,19 +32,18 @@ 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

			




	
	
		
 
@@ -714,13 +713,13 @@ def set_available_permissions(config):

			




	
	
	
		
 
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

			




        

    


    
    

    

        

                

                    kallithea/lib/base.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -37,13 +37,12 @@ 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,\

			




	
	
		
 
@@ -476,13 +475,13 @@ class BaseRepoController(BaseController)

			




	
	
	
		
 
                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)

			




        

    



    


    



    



      

      





    
    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.