kallithea: rhodecode/model/user.py comparison

Added UserIpMap interface for allowed IP addresses and IP restriction access ref #264 IP restriction for users and user groups

author	Marcin Kuzminski <marcin@python-works.com>
date	Sun, 30 Dec 2012 23:06:03 +0100
parents	69b25f1b0b45
children	c5169e445fb8

comparison

equal deleted inserted replaced

-:6659c5af04e7
+:9b92cf5a0cca
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
 from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \
 UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \
 Notification, RepoGroup, UserRepoGroupToPerm, UsersGroupRepoGroupToPerm, \
-UserEmailMap
+UserEmailMap, UserIpMap
 from rhodecode.lib.exceptions import DefaultUserException, \
 UserOwnsReposException
 log = logging.getLogger(__name__)
 """
 user = self._get_user(user)
 obj = UserEmailMap.query().get(email_id)
 if obj:
 self.sa.delete(obj)
+def add_extra_ip(self, user, ip):
+"""
+Adds ip address to UserIpMap
+:param user:
+:param ip:
+"""
+from rhodecode.model import forms
+form = forms.UserExtraIpForm()()
+data = form.to_python(dict(ip=ip))
+user = self._get_user(user)
+obj = UserIpMap()
+obj.user = user
+obj.ip_addr = data['ip']
+self.sa.add(obj)
+return obj
+def delete_extra_ip(self, user, ip_id):
+"""
+Removes ip address from UserIpMap
+:param user:
+:param ip_id:
+"""
+user = self._get_user(user)
+obj = UserIpMap.query().get(ip_id)
+if obj:
+self.sa.delete(obj)

Mercurial > kallithea