11680151427

Committed 05 Nov 2024 08:20AM UTC coverage: 67.424% (-0.04%) from 67.459%

Build # 11680151427

Build Type

push

github

Committed by

web-flow

Commit Message

Restrict Audit Log Button Visibility (#1228)

* core: initilize repo

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>

* refactor: access check logic tweak

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>

* refactor: made logic more concise and added to chaneglog

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>

* chore: extend use permssion checks for auditlog buttons

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>

* chore: variable name change

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>

---------

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
Signed-off-by: JDev <45713692+joshuaunity@users.noreply.github.com>

Run Details

6337 of 10227 branches covered (61.96%)

Branch coverage included in aggregate %.

16 of 38 new or added lines in 3 files covered. (42.11%)

3 existing lines in 1 file now uncovered.

7973 of 10997 relevant lines covered (72.5%)

5.74 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

45.83

/flexmeasures/ui/views/logged_in_user.py

from sqlalchemy import select
from werkzeug.exceptions import Forbidden, Unauthorized
from flask_security.core import current_user
from flask_security import login_required

from flexmeasures.auth.policy import check_access

from flexmeasures.data import db
from flexmeasures.data.models.audit_log import AuditLog
from flexmeasures.data.models.user import Account
from flexmeasures.ui.views import flexmeasures_ui
from flexmeasures.data.services.accounts import (
    get_number_of_assets_in_account,
    get_account_roles,
)
from flexmeasures.ui.utils.view_utils import render_flexmeasures_template


@flexmeasures_ui.route("/logged-in-user", methods=["GET"])
@login_required
def logged_in_user_view():
    """
    Basic information about the currently logged-in user.
    Plus basic actions (logout, reset pwd)
    """
    account_roles = get_account_roles(current_user.account_id)
    account_role_names = [account_role.name for account_role in account_roles]
    account = db.session.execute(
        select(Account).filter_by(id=current_user.account_id)
    ).scalar()

    user_can_view_account_auditlog = True
    try:
        check_access(AuditLog.account_table_acl(account), "read")
    except (Forbidden, Unauthorized):
        user_can_view_account_auditlog = False

    user_view_user_auditlog = True
    try:
        check_access(AuditLog.user_table_acl(current_user), "read")
    except (Forbidden, Unauthorized):
        user_view_user_auditlog = False

    return render_flexmeasures_template(
        "admin/logged_in_user.html",
        logged_in_user=current_user,
        roles=",".join([role.name for role in current_user.roles]),
        num_assets=get_number_of_assets_in_account(current_user.account_id),
        account_role_names=account_role_names,
        can_view_account_auditlog=user_can_view_account_auditlog,
        can_view_user_auditlog=user_view_user_auditlog,
    )

1	from sqlalchemy import select	8✔
2	from werkzeug.exceptions import Forbidden, Unauthorized	8✔
3	from flask_security.core import current_user	8✔
4	from flask_security import login_required	8✔
5
6	from flexmeasures.auth.policy import check_access	8✔
7
8	from flexmeasures.data import db	8✔
9	from flexmeasures.data.models.audit_log import AuditLog	8✔
10	from flexmeasures.data.models.user import Account	8✔
11	from flexmeasures.ui.views import flexmeasures_ui	8✔
12	from flexmeasures.data.services.accounts import (	8✔
13	get_number_of_assets_in_account,
14	get_account_roles,
15	)
16	from flexmeasures.ui.utils.view_utils import render_flexmeasures_template	8✔
17
18
19	@flexmeasures_ui.route("/logged-in-user", methods=["GET"])	8✔
20	@login_required	8✔
21	def logged_in_user_view():	8✔
22	"""
23	Basic information about the currently logged-in user.
24	Plus basic actions (logout, reset pwd)
25	"""
26	account_roles = get_account_roles(current_user.account_id)	×
27	account_role_names = [account_role.name for account_role in account_roles]	×
NEW 28	account = db.session.execute(	×
29	select(Account).filter_by(id=current_user.account_id)
30	).scalar()
31
NEW 32	user_can_view_account_auditlog = True	×
NEW 33	try:	×
NEW 34	check_access(AuditLog.account_table_acl(account), "read")	×
NEW 35	except (Forbidden, Unauthorized):	×
NEW 36	user_can_view_account_auditlog = False	×
37
NEW 38	user_view_user_auditlog = True	×
NEW 39	try:	×
NEW 40	check_access(AuditLog.user_table_acl(current_user), "read")	×
NEW 41	except (Forbidden, Unauthorized):	×
NEW 42	user_view_user_auditlog = False	×
43
44	return render_flexmeasures_template(	×
45	"admin/logged_in_user.html",
46	logged_in_user=current_user,
47	roles=",".join([role.name for role in current_user.roles]),
48	num_assets=get_number_of_assets_in_account(current_user.account_id),
49	account_role_names=account_role_names,
50	can_view_account_auditlog=user_can_view_account_auditlog,
51	can_view_user_auditlog=user_view_user_auditlog,
52	)

FlexMeasures / flexmeasures / 11680151427

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous