Files
@ b232a36cc51f
Branch filter:
Location: kallithea/rhodecode/model/users_group.py - annotation
b232a36cc51f
3.7 KiB
text/x-python
Improve LDAP authentication
* Adds an LDAP filter for locating the LDAP object
* Adds a search scope policy when using the Base DN
* Adds option required certificate policy when using LDAPS
* Adds attribute mapping for username, firstname, lastname, email
* Initializes rhodecode user using LDAP info (no longer uses "@ldap")
* Remembers the user object (DN) in the user table
* Updates admin interfaces
* Authenticates against actual user objects in LDAP
* Possibly other things.
Really, this should be extended to a list of LDAP configurations, but this is a good start.
* Adds an LDAP filter for locating the LDAP object
* Adds a search scope policy when using the Base DN
* Adds option required certificate policy when using LDAPS
* Adds attribute mapping for username, firstname, lastname, email
* Initializes rhodecode user using LDAP info (no longer uses "@ldap")
* Remembers the user object (DN) in the user table
* Updates admin interfaces
* Authenticates against actual user objects in LDAP
* Possibly other things.
Really, this should be extended to a list of LDAP configurations, but this is a good start.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c 2c8fd84935a4 fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c 2c8fd84935a4 2c8fd84935a4 fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c fff21c9b075c 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 2c8fd84935a4 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 9be6d46c72d6 | # -*- coding: utf-8 -*-
"""
rhodecode.model.user_group
~~~~~~~~~~~~~~~~~~~~~~~~~~
users groups model for RhodeCode
:created_on: Jan 25, 2011
:author: marcink
:copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
:license: GPLv3, see COPYING for more details.
"""
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; version 2
# of the License or (at your opinion) any later version of the license.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA.
import logging
import traceback
from pylons.i18n.translation import _
from rhodecode.model import BaseModel
from rhodecode.model.caching_query import FromCache
from rhodecode.model.db import UsersGroup, UsersGroupMember
from sqlalchemy.exc import DatabaseError
log = logging.getLogger(__name__)
class UsersGroupModel(BaseModel):
def get(self, users_group_id, cache=False):
users_group = self.sa.query(UsersGroup)
if cache:
users_group = users_group.options(FromCache("sql_cache_short",
"get_users_group_%s" % users_group_id))
return users_group.get(users_group_id)
def get_by_groupname(self, users_group_name, cache=False,
case_insensitive=False):
if case_insensitive:
user = self.sa.query(UsersGroup)\
.filter(UsersGroup.users_group_name.ilike(users_group_name))
else:
user = self.sa.query(UsersGroup)\
.filter(UsersGroup.users_group_name == users_group_name)
if cache:
user = user.options(FromCache("sql_cache_short",
"get_user_%s" % users_group_name))
return user.scalar()
def create(self, form_data):
try:
new_users_group = UsersGroup()
for k, v in form_data.items():
setattr(new_users_group, k, v)
self.sa.add(new_users_group)
self.sa.commit()
except:
log.error(traceback.format_exc())
self.sa.rollback()
raise
def update(self, users_group_id, form_data):
try:
users_group = self.get(users_group_id, cache=False)
for k, v in form_data.items():
if k == 'users_group_members':
users_group.members = []
self.sa.flush()
members_list = []
if v:
for u_id in set(v):
members_list.append(UsersGroupMember(users_group_id,
u_id))
setattr(users_group, 'members', members_list)
setattr(users_group, k, v)
self.sa.add(users_group)
self.sa.commit()
except:
log.error(traceback.format_exc())
self.sa.rollback()
raise
def delete(self, users_group_id):
try:
users_group = self.get(users_group_id, cache=False)
self.sa.delete(users_group)
self.sa.commit()
except:
log.error(traceback.format_exc())
self.sa.rollback()
raise
|