give access decorator override function a clearer name; exception -> override

This commit is contained in:
dandds 2019-03-28 09:32:51 -04:00
parent 09d6b5fb09
commit 29ec4a80af
6 changed files with 15 additions and 16 deletions

View File

@ -10,7 +10,7 @@ from atst.domain.invitations import Invitations
from atst.domain.exceptions import UnauthorizedError
def check_access(permission, message, exception, *args, **kwargs):
def check_access(permission, message, override, *args, **kwargs):
access_args = {"message": message}
if "application_id" in kwargs:
@ -30,7 +30,7 @@ def check_access(permission, message, exception, *args, **kwargs):
g.current_user, kwargs["portfolio_id"]
)
if exception is not None and exception(g.current_user, **access_args, **kwargs):
if override is not None and override(g.current_user, **access_args, **kwargs):
return True
user_can_access(g.current_user, permission, **access_args)
@ -38,12 +38,12 @@ def check_access(permission, message, exception, *args, **kwargs):
return True
def user_can_access_decorator(permission, message=None, exception=None):
def user_can_access_decorator(permission, message=None, override=None):
def decorator(f):
@wraps(f)
def decorated_function(*args, **kwargs):
try:
check_access(permission, message, exception, *args, **kwargs)
check_access(permission, message, override, *args, **kwargs)
app.logger.info(
"[access] User {} accessed {} {}".format(
g.current_user.id, request.method, request.path

View File

@ -107,7 +107,7 @@ def wrap_environment_role_lookup(
@portfolios_bp.route("/portfolios/<portfolio_id>/environments/<environment_id>/access")
@user_can(None, exception=wrap_environment_role_lookup, message="access environment")
@user_can(None, override=wrap_environment_role_lookup, message="access environment")
def access_environment(portfolio_id, environment_id):
env_role = EnvironmentRoles.get(g.current_user.id, environment_id)
token = app.csp.cloud.get_access_token(env_role)

View File

@ -99,7 +99,7 @@ def wrap_check_is_ko_or_cor(user, task_order_id=None, **_kwargs):
@portfolios_bp.route("/portfolios/<portfolio_id>/task_order/<task_order_id>/review")
@user_can(
None,
exception=wrap_check_is_ko_or_cor,
override=wrap_check_is_ko_or_cor,
message="view contracting officer review form",
)
def ko_review(portfolio_id, task_order_id):
@ -182,7 +182,7 @@ def resend_invite(portfolio_id, task_order_id):
"/portfolios/<portfolio_id>/task_order/<task_order_id>/review", methods=["POST"]
)
@user_can(
None, exception=wrap_check_is_ko_or_cor, message="submit contracting officer review"
None, override=wrap_check_is_ko_or_cor, message="submit contracting officer review"
)
def submit_ko_review(portfolio_id, task_order_id, form=None):
task_order = TaskOrders.get(task_order_id)
@ -296,7 +296,7 @@ def wrap_check_is_so(user, task_order_id=None, **_kwargs):
@portfolios_bp.route("/portfolios/<portfolio_id>/task_order/<task_order_id>/dd254")
@user_can(None, exception=wrap_check_is_so, message="view security officer review form")
@user_can(None, override=wrap_check_is_so, message="view security officer review form")
def so_review(portfolio_id, task_order_id):
task_order = TaskOrders.get(task_order_id)
form = so_review_form(task_order)
@ -313,7 +313,7 @@ def so_review(portfolio_id, task_order_id):
"/portfolios/<portfolio_id>/task_order/<task_order_id>/dd254", methods=["POST"]
)
@user_can(
None, exception=wrap_check_is_so, message="submit security officer review form"
None, override=wrap_check_is_so, message="submit security officer review form"
)
def submit_so_review(portfolio_id, task_order_id):
task_order = TaskOrders.get(task_order_id)

View File

@ -265,7 +265,7 @@ def is_new_task_order(*_args, **kwargs):
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new/<int:screen>")
@user_can(
Permissions.CREATE_TASK_ORDER,
exception=is_new_task_order,
override=is_new_task_order,
message="view new task order form",
)
def new(screen, task_order_id=None, portfolio_id=None):
@ -316,7 +316,7 @@ def new(screen, task_order_id=None, portfolio_id=None):
)
@user_can(
Permissions.CREATE_TASK_ORDER,
exception=is_new_task_order,
override=is_new_task_order,
message="update task order",
)
def update(screen, task_order_id=None, portfolio_id=None):

View File

@ -29,7 +29,7 @@ def wrap_check_is_ko(user, task_order_id=None, **_kwargs):
@task_orders_bp.route("/task_orders/<task_order_id>/digital_signature", methods=["GET"])
@user_can(
None, exception=wrap_check_is_ko, message="view contracting officer signature page"
None, override=wrap_check_is_ko, message="view contracting officer signature page"
)
def signature_requested(task_order_id):
task_order = find_unsigned_ko_to(task_order_id)
@ -46,7 +46,7 @@ def signature_requested(task_order_id):
"/task_orders/<task_order_id>/digital_signature", methods=["POST"]
)
@user_can(
None, exception=wrap_check_is_ko, message="submit contracting officer signature"
None, override=wrap_check_is_ko, message="submit contracting officer signature"
)
def record_signature(task_order_id):
task_order = find_unsigned_ko_to(task_order_id)

View File

@ -136,10 +136,9 @@ def test_user_can_access_decorator(set_current_user):
_edit_portfolio_name(portfolio_id=portfolio.id)
def test_user_can_access_decorator_exceptions(set_current_user):
def test_user_can_access_decorator_override(set_current_user):
rando_calrissian = UserFactory.create()
darth_vader = UserFactory.create()
portfolio = PortfolioFactory.create()
def _can_fly_the_millenium_falcon(u, *args, **kwargs):
if u == rando_calrissian:
@ -148,7 +147,7 @@ def test_user_can_access_decorator_exceptions(set_current_user):
raise UnauthorizedError(u, "is not rando")
@user_can_access_decorator(
Permissions.EDIT_PORTFOLIO_NAME, exception=_can_fly_the_millenium_falcon
Permissions.EDIT_PORTFOLIO_NAME, override=_can_fly_the_millenium_falcon
)
def _cloud_city(*args, **kwargs):
return True