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.

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

904 read permissions of entities within flex model or flex context #1071

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6ecb17f
feature: allow checking permissions on optional fields
Flix6x May 17, 2024
2546546
feature: decorator supports custom error handler
Flix6x May 17, 2024
c3a5920
docs: add inline note explaining status code
Flix6x May 17, 2024
482dd0a
feature: flex_context_loader lists all sensors contained in a flex-co…
Flix6x May 17, 2024
cc7248b
feature: support context loader that returns multiple contexts
Flix6x May 17, 2024
0b41e77
feature: check permissions on sensors referenced in flex-context
Flix6x May 17, 2024
e616d1c
feature: add test checking permissions
Flix6x May 17, 2024
019d772
fix: response with field names
Flix6x May 17, 2024
aa27d79
feature: check permissions on sensors referenced in flex-model
Flix6x May 24, 2024
6ea9202
refactor: sensor_loader
Flix6x May 24, 2024
f72ab14
feature: add test case for unauthorized sensor in flex-model
Flix6x May 24, 2024
edfa646
style: black
Flix6x May 24, 2024
16684e6
style: black once more
Flix6x May 24, 2024
7a12c49
style: flake8
Flix6x May 24, 2024
c7938fa
docs: fix test docstring
Flix6x May 24, 2024
8733408
docs: API changelog entry
Flix6x May 24, 2024
38d8241
docs: main changelog entry
Flix6x May 24, 2024
075db1a
Merge remote-tracking branch 'refs/remotes/origin/main' into 904-read…
Flix6x Jun 8, 2024
97aa1d7
docs: update docstring for supported ctx_loader return values
Flix6x Jun 8, 2024
b2ec43a
fix: narrow down skipping auth check for optional keyword arguments o…
Flix6x Jun 8, 2024
d7862fc
fix: permission_required_for_context returns 403 rather than 422
Flix6x Jun 8, 2024
07b864c
fix: typo
Flix6x Jun 10, 2024
b07d76f
Revert "fix: narrow down skipping auth check for optional keyword arg…
Flix6x Jun 10, 2024
ff73a4c
fix: only return None in case of no context from args, but not when c…
Flix6x Jun 10, 2024
110d027
fix: mypy
Flix6x Jun 10, 2024
54c87d4
Merge branch 'main' into 904-read-permissions-of-entities-within-flex…
Flix6x Aug 19, 2024
0873183
Merge branch 'main' into 904-read-permissions-of-entities-within-flex…
nhoening Sep 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions documentation/api/change_log.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ v3.0-19 | 2024-08-09
- ``soc-usage``


v3.0-19 | 2024-05-24
""""""""""""""""""""
- Add authorization check on sensors referred to in flex-model and flex-context fields for `/sensors/<id>/schedules/trigger` (POST).


v3.0-18 | 2024-03-07
""""""""""""""""""""

Expand Down
5 changes: 5 additions & 0 deletions documentation/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ FlexMeasures Changelog
v0.23.0 | August XX, 2024
============================

Bugfixes
-----------

* Add authorization check on sensors referred to in ``flex-model`` and ``flex-context`` fields [see `PR #1071 <https://github.com/FlexMeasures/flexmeasures/pull/1071>`_]

New features
-------------
* Added support for adding custom titles the graphs on the asset page. This works via an extension to the sensors_to_show format. [see `PR #1125 <https://github.com/FlexMeasures/flexmeasures/pull/1125>`_]
Expand Down
7 changes: 6 additions & 1 deletion flexmeasures/api/common/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ def invalid_role(requested_access_role: str) -> ResponseTuple:

def invalid_sender(
required_permissions: list[str] | None = None,
field_name: str | None = None,
) -> ResponseTuple:
"""
Signify that the sender is invalid to perform the request. Fits well with 403 errors.
Expand All @@ -186,7 +187,11 @@ def invalid_sender(
if required_permissions:
message += f" It requires {p.join(required_permissions)} permission(s)."
return (
dict(result="Rejected", status="INVALID_SENDER", message=message),
dict(
result="Rejected",
status="INVALID_SENDER",
message={"json": {field_name: message}} if field_name else message,
),
FORBIDDEN_STATUS_CODE,
)

Expand Down
25 changes: 25 additions & 0 deletions flexmeasures/api/v3_0/sensors.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
unrecognized_event,
unknown_schedule,
invalid_flex_config,
invalid_sender,
fallback_schedule_redirect,
)
from flexmeasures.api.common.utils.validators import (
Expand All @@ -34,6 +35,10 @@
from flexmeasures.data.models.audit_log import AssetAuditLog
from flexmeasures.data.models.user import Account
from flexmeasures.data.models.generic_assets import GenericAsset
from flexmeasures.data.models.planning.utils import (
flex_context_loader,
flex_model_loader,
)
from flexmeasures.data.models.time_series import Sensor, TimedBelief
from flexmeasures.data.queries.utils import simplify_index
from flexmeasures.data.schemas.sensors import SensorSchema, SensorIdField
Expand Down Expand Up @@ -227,6 +232,26 @@ def get_data(self, sensor_data_description: dict):
location="json",
)
@permission_required_for_context("create-children", ctx_arg_name="sensor")
@permission_required_for_context(
"read",
ctx_arg_name="flex_model",
ctx_loader=flex_model_loader,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a comment: "This extracts sensors from the flex model parameter - user needs read access to them"

pass_ctx_to_loader=True,
error_handler=lambda context, permission, origin: invalid_sender(
required_permissions=[f"{permission} sensor {context.id}"],
field_name=origin,
),
)
@permission_required_for_context(
"read",
ctx_arg_name="flex_context",
ctx_loader=flex_context_loader,
pass_ctx_to_loader=True,
error_handler=lambda context, permission, origin: invalid_sender(
required_permissions=[f"{permission} sensor {context.id}"],
field_name=origin,
),
)
def trigger_schedule(
self,
sensor: Sensor,
Expand Down
13 changes: 13 additions & 0 deletions flexmeasures/api/v3_0/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,16 @@ def add_temperature_measurements(db, source: Source, sensor: Sensor):
for event_start, event_value in zip(event_starts, event_values)
]
db.session.add_all(beliefs)


@pytest.fixture(scope="module")
def setup_capacity_sensor_on_asset_in_supplier_account(db, setup_generic_assets):
asset = setup_generic_assets["test_wind_turbine"]
sensor = Sensor(
name="capacity",
generic_asset=asset,
event_resolution=timedelta(minutes=15),
unit="MVA",
)
db.session.add(sensor)
return sensor
78 changes: 77 additions & 1 deletion flexmeasures/api/v3_0/tests/test_sensor_schedules.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_trigger_schedule_with_invalid_flexmodel(
)
print("Server responded with:\n%s" % trigger_schedule_response.json)
check_deprecation(trigger_schedule_response, deprecation=None, sunset=None)
assert trigger_schedule_response.status_code == 422
assert trigger_schedule_response.status_code == 422 # Unprocessable entity
assert field in trigger_schedule_response.json["message"]["json"]
if isinstance(trigger_schedule_response.json["message"]["json"], str):
# ValueError
Expand Down Expand Up @@ -422,3 +422,79 @@ def test_get_schedule_fallback_not_redirect(
assert schedule["scheduler_info"]["scheduler"] == "StorageFallbackScheduler"

app.config["FLEXMEASURES_FALLBACK_REDIRECT"] = False


@pytest.mark.parametrize(
"message, flex_config, field, err_msg",
[
(
message_for_trigger_schedule(),
"flex-context",
"site-consumption-capacity",
"requires read sensor",
),
(
message_for_trigger_schedule(),
"flex-model",
"site-consumption-capacity",
"requires read sensor",
),
],
)
@pytest.mark.parametrize(
"requesting_user", ["[email protected]"], indirect=True
)
def test_trigger_schedule_with_unauthorized_sensor(
app,
add_battery_assets,
setup_capacity_sensor_on_asset_in_supplier_account,
keep_scheduling_queue_empty,
message,
flex_config,
field,
err_msg,
requesting_user,
):
"""Test triggering a schedule using a flex config that refers to a capacity sensor from a different account.

The user is not authorized to read sensors from the other account,
so we expect a 403 (Forbidden) response referring to the relevant flex-config field.
"""
sensor = add_battery_assets["Test battery"].sensors[0]
with app.test_client() as client:
if flex_config not in message:
message[flex_config] = {}
sensor_id = setup_capacity_sensor_on_asset_in_supplier_account.id
message[flex_config][field] = {"sensor": sensor_id}

trigger_schedule_response = client.post(
url_for("SensorAPI:trigger_schedule", id=sensor.id),
json=message,
)
print("Server responded with:\n%s" % trigger_schedule_response.json)
assert trigger_schedule_response.status_code == 403 # Forbidden
assert (
f"{flex_config}.{field}.sensor"
in trigger_schedule_response.json["message"]["json"]
)
if isinstance(
trigger_schedule_response.json["message"]["json"][
f"{flex_config}.{field}.sensor"
],
str,
):
# ValueError
assert (
err_msg
in trigger_schedule_response.json["message"]["json"][
f"{flex_config}.{field}.sensor"
]
)
else:
# ValidationError (marshmallow)
assert (
err_msg
in trigger_schedule_response.json["message"]["json"][
f"{flex_config}.{field}.sensor"
][field][0]
)
92 changes: 63 additions & 29 deletions flexmeasures/auth/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def permission_required_for_context(
ctx_arg_name: str | None = None,
ctx_loader: Callable | None = None,
pass_ctx_to_loader: bool = False,
error_handler: Callable | None = None,
):
"""
This decorator can be used to make sure that the current user has the necessary permission to access the context.
Expand All @@ -119,6 +120,7 @@ def permission_required_for_context(

A 403 response is raised if there is no principal for the required permission.
A 401 response is raised if the user is not authenticated at all.
A custom response can be generated by passing an error_handler, which should be a function that accepts the context, permission and a context origin.

We will now explain how to load a context, and give an example:

Expand All @@ -145,7 +147,9 @@ def view(resource_id: int, the_resource: Resource):

The ctx_loader:

The ctx_loader can be a function without arguments or it takes the context loaded from the arguments as input (using pass_ctx_to_loader=True).
The ctx_loader can be a function without arguments, or it takes the context loaded from the arguments as input (using pass_ctx_to_loader=True).
It should return the context, a list of contexts, or a list of (context, origin) tuples,
where an origin defines where (e.g. what API field) the context came from, to help with responding with more informative errors.
A special case is useful when the arguments contain the context ID (not the instance).
Then, the loader can be a subclass of AuthModelMixin, and this decorator will look up the instance.

Expand All @@ -168,38 +172,68 @@ def post(self, resource_data: dict):
def wrapper(fn):
@wraps(fn)
def decorated_view(*args, **kwargs):
# load & check context
context: AuthModelMixin = None

# first set context_from_args, if possible
context_from_args: AuthModelMixin = None
if ctx_arg_pos is not None and ctx_arg_name is not None:
context_from_args = args[ctx_arg_pos][ctx_arg_name]
elif ctx_arg_pos is not None:
context_from_args = args[ctx_arg_pos]
elif ctx_arg_name is not None:
context_from_args = kwargs[ctx_arg_name]
elif len(args) > 0:
context_from_args = args[0]

# if a loader is given, use that, otherwise fall back to context_from_args
if ctx_loader is not None:
if pass_ctx_to_loader:
if inspect.isclass(ctx_loader) and issubclass(
ctx_loader, AuthModelMixin
):
context = db.session.get(ctx_loader, context_from_args)
else:
context = ctx_loader(context_from_args)
else:
context = ctx_loader()
else:
context = context_from_args
context = load_context(
ctx_arg_pos, ctx_arg_name, ctx_loader, pass_ctx_to_loader, args, kwargs
)

check_access(context, permission)
# skip check in case (optional) argument was not passed
if context is None:
Flix6x marked this conversation as resolved.
Show resolved Hide resolved
return fn(*args, **kwargs)

# Check access for possibly multiple contexts
if not isinstance(context, list):
context = [context]
for ctx in context:
if isinstance(ctx, tuple):
c = ctx[0] # c[0] is the context, c[1] is its origin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's mention for ease of reading that the origin is just a string.

# the context loader may narrow down the origin of the context (e.g. a nested field rather than a function argument)
origin = ctx[1]
else:
c = ctx
origin = ctx_arg_name
try:
check_access(c, permission)
except Exception as e: # noqa: B902
if error_handler:
return error_handler(c, permission, origin)
raise e

return fn(*args, **kwargs)

return decorated_view

return wrapper


def load_context(
ctx_arg_pos, ctx_arg_name, ctx_loader, pass_ctx_to_loader, args, kwargs
) -> AuthModelMixin | None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this return type still valid? It can be a list or tuples with origins, right?


# first set context_from_args, if possible
context_from_args: AuthModelMixin | None = None
if ctx_arg_pos is not None and ctx_arg_name is not None:
context_from_args = args[ctx_arg_pos][ctx_arg_name]
elif ctx_arg_pos is not None:
context_from_args = args[ctx_arg_pos]
elif ctx_arg_name is not None:
context_from_args = kwargs.get(ctx_arg_name)
# skip check in case (optional) argument was not passed
if context_from_args is None:
return None
Copy link
Contributor

@nhoening nhoening Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I (still) believe this should be a LookupError. Above, you skip the auth check if this looking up of a context by argument name did not work out (which I also am in favor of not doing). This could quite easily happen by programmer mistake, and could easily be overlooked during testing.

ctx_arg_name is an optional attribute, but if it is given, we need to actually use it.

Copy link
Contributor Author

@Flix6x Flix6x Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the major problem blocking my progress on this PR. How do you propose I deal with checking authorization on an optional argument (in this case coming from an optional API field)? Should I add a boolean argument to permission_required_for_context telling the argument is optional (i.e. skip if context is None) or required (i.e. raise if context is None)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not check that context_from_args has to be something if the developer gave information to look it up?

I.e. if ctx_arg_name is not None, then we expect that context_from_args is also not None, otherwise we got wrong parameterisation.

Simply put, if permission_required_for_context() has no context, we cannot say the permission is granted.

Why did you change the logic so that it could be granted? The field was optional before. Maybe it is because the flex context can contain no sensors to check? That is a case I can imagine, and maybe we could add a parameter to permission_required_for_context() that says pass_if_no_context_found or similar.

But the interpretation has to fit.

elif len(args) > 0:
context_from_args = args[0]

# if a loader is given, use that, otherwise fall back to context_from_args
if ctx_loader is not None:
if pass_ctx_to_loader:
if inspect.isclass(ctx_loader) and issubclass(ctx_loader, AuthModelMixin):
context = db.session.get(ctx_loader, context_from_args)
else:
context = ctx_loader(context_from_args)
else:
context = ctx_loader()
else:
context = context_from_args
if context is None:
raise LookupError(f"No context could be loaded from {context_from_args}.")
return context
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another thought: We provide several means of looking up context(s). Should we maybe check here that all context(s) are actually a subclass of AuthModelMixin and throw a meaningful LookupError if they are not?

I just checked, and check_access does this check. So we can not do it here. But it could help debugging problems.

Loading
Loading