archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Added function for None-safe fetching of user ID.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-06-16 17:20:38 +02:00
parent 83618a5639
commit 1513649cd8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pillar/application/modules/projects.py
View File

@ -9,7 +9,8 @@ from flask import g, Blueprint, request, abort, current_app
from gcloud import exceptions as gcs_exceptions from gcloud import exceptions as gcs_exceptions
from werkzeug import exceptions as wz_exceptions from werkzeug import exceptions as wz_exceptions
from application.utils import remove_private_keys, authorization, jsonify, mongo from application.utils import remove_private_keys, jsonify, mongo
from application.utils import authorization, authentication
from application.utils.gcs import GoogleCloudStorageBucket from application.utils.gcs import GoogleCloudStorageBucket
from application.utils.authorization import user_has_role, check_permissions, require_login from application.utils.authorization import user_has_role, check_permissions, require_login
from manage_extra.node_types.asset import node_type_asset from manage_extra.node_types.asset import node_type_asset
@ -397,7 +398,7 @@ def before_returning_project_resource_permissions(response):
allow.append(project) allow.append(project)
else: else:
log.debug('User %s requested project %s, but has no access to it; filtered out.', log.debug('User %s requested project %s, but has no access to it; filtered out.',
g.get('current_user', {}).get('user_id'), project['_id']) authentication.current_user_id(), project['_id'])
response['_items'] = allow response['_items'] = allow

7
pillar/application/utils/authentication.py
View File

@ -189,3 +189,10 @@ def _delete_expired_tokens():
result = token_coll.delete_many({'expire_time': {"$lt": expiry_date}}) result = token_coll.delete_many({'expire_time': {"$lt": expiry_date}})
log.debug('Deleted %i expired authentication tokens', result.deleted_count) log.debug('Deleted %i expired authentication tokens', result.deleted_count)
def current_user_id():
"""None-safe fetching of user ID. Can return None itself, though."""
current_user = g.get('current_user') or {}
return current_user.get('user_id')