openstack
/
keystone
Code Issues Proposed changes

Do not use flask.g imported as g 

Always explicitly use flask.g as `flask.g` and do not do `from flask
import g`.

Change-Id: I3737115717d8a5040c3e299d206fbddd43b33aa6
Partial-Bug: #1776504
This commit is contained in:
Morgan Fainberg 2018-07-03 13:54:40 -07:00
parent 0f4fd2e4f3
commit dbc2ac06b8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/server/flask/common.py
View File

@ -20,7 +20,6 @@ import wsgiref.util
import flask
from flask import blueprints
from flask import g
import flask_restful
from oslo_log import log
import six
@ -123,7 +122,7 @@ def construct_json_home_data(rel, status=json_home.Status.STABLE,
def _initialize_rbac_enforcement_check():
setattr(g, enforcer._ENFORCEMENT_CHECK_ATTR, False)
setattr(flask.g, enforcer._ENFORCEMENT_CHECK_ATTR, False)
def _assert_rbac_enforcement_called(resp):
@ -132,6 +131,7 @@ def _assert_rbac_enforcement_called(resp):
msg = ('PROGRAMMING ERROR: enforcement (`keystone.common.rbac_enforcer.'
'enforcer.RBACKEnforcer.enforce_call()`) has not been called; API '
'is unenforced.')
g = flask.g
assert getattr(g, enforcer._ENFORCEMENT_CHECK_ATTR, False), msg # nosec
return resp
@ -421,7 +421,7 @@ class APIBase(object):
"""
@functools.wraps(f)
def wrapper(*args, **kwargs):
setattr(g, enforcer._ENFORCEMENT_CHECK_ATTR, True)
setattr(flask.g, enforcer._ENFORCEMENT_CHECK_ATTR, True)
return f(*args, **kwargs)
return wrapper

3
keystone/tests/unit/common/test_rbac_enforcer.py
View File

@ -15,7 +15,6 @@ import uuid
import fixtures
import flask
from flask import blueprints
from flask import g
import flask_restful
import mock
from oslo_policy import policy
@ -389,7 +388,7 @@ class TestRBACEnforcerRest(_TestRBACEnforcerBase):
with self.test_client() as c:
c.get('%s' % self.url_prefix)
self.assertEqual(
action, getattr(g, self.enforcer.ACTION_STORE_ATTR))
action, getattr(flask.g, self.enforcer.ACTION_STORE_ATTR))
def test_policy_enforcer_action_invalid_action_decorator(self):
# If the "action" is not a registered policy enforcement point, check