Mercurial > kallithea
comparison rhodecode/lib/auth.py @ 1618:9353189b7675 beta
Added automatic logout of deactivated/deleted users
author | Liad Shani <liadff@gmail.com> |
---|---|
date | Thu, 27 Oct 2011 20:40:49 +0200 |
parents | cf128ced8c85 |
children | cbc2b1913cdf |
comparison
equal
deleted
inserted
replaced
1617:cf128ced8c85 | 1618:9353189b7675 |
---|---|
269 self.anonymous_user = User.get_by_username('default') | 269 self.anonymous_user = User.get_by_username('default') |
270 is_user_loaded = False | 270 is_user_loaded = False |
271 if self._api_key and self._api_key != self.anonymous_user.api_key: | 271 if self._api_key and self._api_key != self.anonymous_user.api_key: |
272 #try go get user by api key | 272 #try go get user by api key |
273 log.debug('Auth User lookup by API KEY %s', self._api_key) | 273 log.debug('Auth User lookup by API KEY %s', self._api_key) |
274 user_model.fill_data(self, api_key=self._api_key) | 274 is_user_loaded = user_model.fill_data(self, api_key=self._api_key) |
275 is_user_loaded = True | |
276 elif self.user_id is not None \ | 275 elif self.user_id is not None \ |
277 and self.user_id != self.anonymous_user.user_id: | 276 and self.user_id != self.anonymous_user.user_id: |
278 log.debug('Auth User lookup by USER ID %s', self.user_id) | 277 log.debug('Auth User lookup by USER ID %s', self.user_id) |
279 user_model.fill_data(self, user_id=self.user_id) | 278 is_user_loaded = user_model.fill_data(self, user_id=self.user_id) |
280 is_user_loaded = True | |
281 elif self.username: | 279 elif self.username: |
282 log.debug('Auth User lookup by USER NAME %s', self.username) | 280 log.debug('Auth User lookup by USER NAME %s', self.username) |
283 dbuser = User.get_by_username(self.username) | 281 dbuser = User.get_by_username(self.username) |
284 if dbuser is not None and dbuser.active: | 282 if dbuser is not None and dbuser.active: |
285 for k, v in dbuser.get_dict().items(): | 283 for k, v in dbuser.get_dict().items(): |
294 user_model.fill_data(self, | 292 user_model.fill_data(self, |
295 user_id=self.anonymous_user.user_id) | 293 user_id=self.anonymous_user.user_id) |
296 #then we set this user is logged in | 294 #then we set this user is logged in |
297 self.is_authenticated = True | 295 self.is_authenticated = True |
298 else: | 296 else: |
297 self.user_id = None | |
298 self.username = None | |
299 self.is_authenticated = False | 299 self.is_authenticated = False |
300 | 300 |
301 if not self.username: | 301 if not self.username: |
302 self.username = 'None' | 302 self.username = 'None' |
303 | 303 |