Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix creation of assets from CLI #497

Merged
merged 4 commits into from Sep 6, 2022
Merged

Fix creation of assets from CLI #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d620fe
allow to create assets from CLI (lighten restriction in input validat…
nhoening Sep 6, 2022
dc2cdd4
small refactoring to use auth logic
nhoening Sep 6, 2022
65d03a7
Merge remote-tracking branch 'origin/main' into Issue-496-CLI-cannot-…
Flix6x Sep 6, 2022
6b206a1
Changelog entry
Flix6x Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion documentation/changelog.rst
View file
Open in desktop
Expand Up @@ -19,12 +19,13 @@ Infrastructure / Support
* Remove bokeh dependency and obsolete UI views [see `PR #476 <http://www.github.com/FlexMeasures/flexmeasures/pull/476>`_]


v0.11.2 | September XX, 2022
v0.11.2 | September 6, 2022
============================

Bugfixes
-----------
* Fix regression for sensors recording non-instantaneous values [see `PR #498 <http://www.github.com/FlexMeasures/flexmeasures/pull/498>`_]
* Fix broken auth check for creating assets with CLI [see `PR #497 <http://www.github.com/FlexMeasures/flexmeasures/pull/497>`_]


v0.11.1 | September 5, 2022
Expand Down
8 changes: 3 additions & 5 deletions flexmeasures/data/queries/utils.py
View file
Open in desktop
Expand Up @@ -13,9 +13,9 @@
from flexmeasures.data.models.generic_assets import GenericAsset
from flexmeasures.data.models.data_sources import DataSource
from flexmeasures.utils import flexmeasures_inflection
from flexmeasures.auth.policy import user_has_admin_access
from flexmeasures.cli import is_running as running_as_cli
import flexmeasures.data.models.time_series as ts # noqa: F401
from flexmeasures.auth.policy import ADMIN_ROLE, ADMIN_READER_ROLE


def create_beliefs_query(
Expand Down Expand Up @@ -53,10 +53,8 @@ def potentially_limit_assets_query_to_account(
"""
if not running_as_cli() and not current_user.is_authenticated:
raise Forbidden("Unauthenticated user cannot list assets.")
user_is_admin = (
running_as_cli()
or current_user.has_role(ADMIN_ROLE)
or (query.statement.is_select and current_user.has_role(ADMIN_READER_ROLE))
user_is_admin = running_as_cli() or user_has_admin_access(
current_user, permission="read" if query.statement.is_select else "update"
)
if account_id is None and user_is_admin:
return query # allow admins to query assets across all accounts
Expand Down
3 changes: 2 additions & 1 deletion flexmeasures/data/schemas/generic_assets.py
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
with_appcontext_if_needed,
)
from flexmeasures.auth.policy import user_has_admin_access
from flexmeasures.cli import is_running as running_as_cli


class JSON(fields.Field):
Expand Down Expand Up @@ -68,7 +69,7 @@ def validate_account(self, account_id: int):
account = Account.query.get(account_id)
if not account:
raise ValidationError(f"Account with Id {account_id} doesn't exist.")
if (
if not running_as_cli() and (
not user_has_admin_access(current_user, "update")
and account_id != current_user.account_id
):
Expand Down