From 0c2b3857eac29fb2af9868c8c3cf341846ab2650 Mon Sep 17 00:00:00 2001 From: Stephen Knox Date: Tue, 20 Oct 2026 20:36:43 +0000 Subject: [PATCH 1/3] Add missing write-permission checks to network, scenario and resource group updates --- hydra_base/lib/groups.py | 14 ++- hydra_base/lib/network.py | 23 ++++- hydra_base/lib/scenario.py | 21 ++-- tests/test_write_permissions.py | 165 ++++++++++++++++++++++++++++++++ 4 files changed, 209 insertions(+), 14 deletions(-) create mode 100644 tests/test_write_permissions.py diff --git a/hydra_base/lib/groups.py b/hydra_base/lib/groups.py index 7d332ba6..dbf58533 100644 --- a/hydra_base/lib/groups.py +++ b/hydra_base/lib/groups.py @@ -21,7 +21,7 @@ from . import scenario, network from .. import db -from ..db.model import ResourceGroup, ResourceGroupItem, Node, Link +from ..db.model import ResourceGroup, ResourceGroupItem, Node, Link, Network from .scenario import _get_scenario from sqlalchemy.orm.exc import NoResultFound @@ -45,6 +45,12 @@ def add_resourcegroup(group, network_id,**kwargs): """ Add a new group to a network. """ + try: + net_i = db.DBSession.query(Network).filter(Network.id==network_id).one() + except NoResultFound: + raise ResourceNotFoundError("Network %s not found"%(network_id,)) + net_i.check_write_permission(kwargs.get('user_id')) + group_i = ResourceGroup() group_i.name = group.name group_i.description = group.description @@ -59,6 +65,7 @@ def delete_resourcegroup(group_id, purge_data='N', **kwargs): Add a new group to a scenario. """ group_i = _get_group(group_id) + group_i.check_write_permission(kwargs.get('user_id')) if purge_data == 'Y': network._purge_datasets_unique_to_resource('GROUP', group_id) @@ -74,6 +81,7 @@ def update_resourcegroup(group,**kwargs): """ group_i = _get_group(group.id) + group_i.check_write_permission(kwargs.get('user_id')) group_i.name = group.name group_i.description = group.description group_i.status = group.status @@ -85,7 +93,7 @@ def update_resourcegroup(group,**kwargs): def add_resourcegroupitem(group_item, scenario_id,**kwargs): - _get_scenario(scenario_id, kwargs['user_id'], check_can_edit=True) + _get_scenario(scenario_id, kwargs['user_id'], check_write=True, check_can_edit=True) #Check whether the ref_id is correct. if group_item.ref_key == 'NODE': @@ -127,7 +135,7 @@ def add_resourcegroupitem(group_item, scenario_id,**kwargs): def delete_resourcegroupitem(item_id,**kwargs): group_item_i = _get_item(item_id) - _get_scenario(group_item_i.scenario_id, kwargs['user_id'], check_can_edit=True) + _get_scenario(group_item_i.scenario_id, kwargs['user_id'], check_write=True, check_can_edit=True) db.DBSession.delete(group_item_i) db.DBSession.flush() diff --git a/hydra_base/lib/network.py b/hydra_base/lib/network.py index 7566a358..30185d4a 100644 --- a/hydra_base/lib/network.py +++ b/hydra_base/lib/network.py @@ -1485,13 +1485,18 @@ def update_network(network, """ log.info("Updating Network %s", network.name) user_id = kwargs.get('user_id') - #check_perm('update_network') try: net_i = db.DBSession.query(Network).filter(Network.id == network.id).one() except NoResultFound: raise ResourceNotFoundError("Network with id %s not found"%(network.id)) + net_i.check_write_permission(user_id) + + #Moving the network to another project requires write access to that project too + if network.project_id != net_i.project_id: + _get_project_for_write(network.project_id, user_id) + net_i.project_id = network.project_id net_i.name = network.name net_i.description = network.description @@ -1644,6 +1649,8 @@ def move_network(network_id, target_project_id, **kwargs): net_i.check_write_permission(user_id) + _get_project_for_write(target_project_id, user_id) + net_i.project_id = target_project_id db.DBSession.flush() @@ -2893,6 +2900,20 @@ def get_all_resource_data( return return_data +def _get_project_for_write(project_id, user_id): + """ + Return the project with the given ID, raising if it does not exist + or if the user does not have write permission on it. + """ + try: + proj_i = db.DBSession.query(Project).filter(Project.id == project_id).one() + except NoResultFound: + raise ResourceNotFoundError("Project with id %s not found"%(project_id)) + + proj_i.check_write_permission(user_id) + + return proj_i + def clone_network(network_id, recipient_user_id=None, new_network_name=None, diff --git a/hydra_base/lib/scenario.py b/hydra_base/lib/scenario.py index d00e69c9..41355b68 100644 --- a/hydra_base/lib/scenario.py +++ b/hydra_base/lib/scenario.py @@ -411,7 +411,7 @@ def update_scenario(scenario, update_data=True, update_groups=True, flush=True, of another process, like update_network. """ user_id = kwargs.get('user_id') - scen = _get_scenario(scenario.id, user_id) + scen = _get_scenario(scenario.id, user_id, check_write=True) if scen.locked == 'Y': raise PermissionError('Scenario is locked. Unlock before editing.') @@ -506,7 +506,7 @@ def create_child_scenario(parent_scenario_id, child_name, **kwargs): user_id = kwargs.get('user_id') - scen_i = _get_scenario(parent_scenario_id, user_id) + scen_i = _get_scenario(parent_scenario_id, user_id, check_write=True) log.info("Creating child scenario of %s", scen_i.name) @@ -562,7 +562,7 @@ def clone_scenario(scenario_id, retain_results=False, scenario_name=None, **kwar user_id = kwargs.get('user_id') - scen_i = _get_scenario(scenario_id, user_id) + scen_i = _get_scenario(scenario_id, user_id, check_write=True) log.info("cloning scenario %s", scen_i.name) @@ -1765,11 +1765,12 @@ def delete_resourcegroupitems(scenario_id, item_ids, **kwargs): Delete specified items in a group, in a scenario. """ user_id = int(kwargs.get('user_id')) - #check the scenario exists - _get_scenario(scenario_id, user_id) + #check the scenario exists and the user can edit it + _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) for item_id in item_ids: rgi = db.DBSession.query(ResourceGroupItem).\ - filter(ResourceGroupItem.id == item_id).one() + filter(ResourceGroupItem.id == item_id, + ResourceGroupItem.scenario_id == scenario_id).one() db.DBSession.delete(rgi) db.DBSession.flush() @@ -1780,8 +1781,8 @@ def empty_group(group_id, scenario_id, **kwargs): Delete all itemas in a group, in a scenario. """ user_id = int(kwargs.get('user_id')) - #check the scenario exists - _get_scenario(scenario_id, user_id) + #check the scenario exists and the user can edit it + _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) rgi = db.DBSession.query(ResourceGroupItem).\ filter(ResourceGroupItem.group_id == group_id).\ @@ -1797,7 +1798,7 @@ def add_resourcegroupitems(scenario_id, items, scenario=None, **kwargs): user_id = int(kwargs.get('user_id')) if scenario is None: - scenario = _get_scenario(scenario_id, user_id) + scenario = _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) _check_network_ownership(scenario.network_id, user_id) @@ -1870,7 +1871,7 @@ def update_value_from_mapping(source_resource_attr_id, target_resource_attr_id, #check scenarios exist s1 = _get_scenario(source_scenario_id, user_id) - s2 = _get_scenario(target_scenario_id, user_id) + s2 = _get_scenario(target_scenario_id, user_id, check_write=True, check_can_edit=True) rs = aliased(ResourceScenario, name='rs') rs1 = db.DBSession.query(rs).filter(rs.resource_attr_id == source_resource_attr_id, diff --git a/tests/test_write_permissions.py b/tests/test_write_permissions.py new file mode 100644 index 00000000..14d58cf0 --- /dev/null +++ b/tests/test_write_permissions.py @@ -0,0 +1,165 @@ +""" + Tests that functions which modify a network, its scenarios or its + resource groups refuse a user who only has read access, and still + permit a user with write access. + + UserD (role 'developer', so it holds the edit_* role permissions) is given + view-only access to a network in a project which is shared with nobody, + so any refusal below comes from the resource-level check. +""" +import pytest +import hydra_base as hb +from hydra_base.lib.objects import JSONObject +from hydra_base.exceptions import HydraError + + +@pytest.fixture() +def shared_net(client, projectmaker, networkmaker): + """ + A network in a private project, shared view-only with UserD + and with write access with UserC. + """ + proj = projectmaker.create(share=False) + net = networkmaker.create(project_id=proj.id) + client.share_network(net.id, ["UserD"], 'Y', 'N') + client.share_network(net.id, ["UserC"], 'N', 'N') + return net + + +def _as(client, username): + client.login(username, 'password') + + +@pytest.fixture() +def as_viewer(client): + _as(client, 'UserD') + yield + client.login('root', '') + + +@pytest.fixture() +def as_writer(client): + _as(client, 'UserC') + yield + client.login('root', '') + + +class TestViewOnlyRefused: + + def test_update_network(self, client, shared_net, as_viewer): + net = JSONObject(client.get_network(shared_net.id)) + net.name = 'renamed by viewer' + with pytest.raises(HydraError): + client.update_network(net) + client.login('root', '') + assert client.get_network(shared_net.id, summary=True).name == shared_net.name + + def test_update_network_move_to_unwritable_project(self, client, shared_net, projectmaker): + other = projectmaker.create(share=False) + _as(client, 'UserC') + try: + net = JSONObject(client.get_network(shared_net.id)) + net.project_id = other.id + with pytest.raises(HydraError): + client.update_network(net) + finally: + client.login('root', '') + + def test_move_network_to_unwritable_project(self, client, shared_net, projectmaker): + other = projectmaker.create(share=False) + _as(client, 'UserC') + try: + with pytest.raises(HydraError): + client.move_network(shared_net.id, other.id) + finally: + client.login('root', '') + + def test_update_scenario(self, client, shared_net, as_viewer): + scenario = JSONObject(client.get_scenario(shared_net.scenarios[0].id)) + scenario.name = 'renamed by viewer' + with pytest.raises(HydraError): + client.update_scenario(scenario) + + def test_create_child_scenario(self, client, shared_net, as_viewer): + with pytest.raises(HydraError): + client.create_child_scenario(shared_net.scenarios[0].id, 'child') + + def test_clone_scenario(self, client, shared_net, as_viewer): + with pytest.raises(HydraError): + client.clone_scenario(shared_net.scenarios[0].id) + + def test_lock_and_unlock_scenario(self, client, shared_net, as_viewer): + with pytest.raises(HydraError): + client.lock_scenario(shared_net.scenarios[0].id) + with pytest.raises(HydraError): + client.unlock_scenario(shared_net.scenarios[0].id) + + def test_resourcegroup_functions(self, client, shared_net, as_viewer): + group = shared_net.resourcegroups[0] + scenario = shared_net.scenarios[0] + item = scenario.resourcegroupitems[0] + + new_group = JSONObject(dict(name='viewer group', description='x', status='A')) + with pytest.raises(HydraError): + client.add_resourcegroup(new_group, shared_net.id) + + group.name = 'renamed by viewer' + with pytest.raises(HydraError): + client.update_resourcegroup(group) + + with pytest.raises(HydraError): + client.delete_resourcegroup(group.id) + + with pytest.raises(HydraError): + client.add_resourcegroupitem( + JSONObject(dict(group_id=item.group_id, ref_key=item.ref_key, + ref_id=item.ref_id)), scenario.id) + + with pytest.raises(HydraError): + client.delete_resourcegroupitem(item.id) + + with pytest.raises(HydraError): + client.delete_resourcegroupitems(scenario.id, [item.id]) + + with pytest.raises(HydraError): + client.empty_group(group.id, scenario.id) + + +class TestWriteAccessPermitted: + + def test_owner_can_modify(self, client, shared_net): + """The creator (root) still has full access""" + net = JSONObject(client.get_network(shared_net.id)) + net.description = 'updated by owner' + assert client.update_network(net).description == 'updated by owner' + + scenario = JSONObject(client.get_scenario(shared_net.scenarios[0].id)) + scenario.description = 'updated by owner' + client.update_scenario(scenario) + + client.create_child_scenario(shared_net.scenarios[0].id, 'child') + client.clone_scenario(shared_net.scenarios[0].id) + + group = shared_net.resourcegroups[0] + group.description = 'updated by owner' + assert client.update_resourcegroup(group).description == 'updated by owner' + + new_group = client.add_resourcegroup( + JSONObject(dict(name='owner group', description='x', status='A')), shared_net.id) + client.delete_resourcegroup(new_group.id) + + def test_write_share_can_modify(self, client, shared_net, as_writer): + net = JSONObject(client.get_network(shared_net.id)) + net.description = 'updated by writer' + assert client.update_network(net).description == 'updated by writer' + + scenario = JSONObject(client.get_scenario(shared_net.scenarios[0].id)) + scenario.description = 'updated by writer' + client.update_scenario(scenario) + + client.create_child_scenario(shared_net.scenarios[0].id, 'writer child') + client.clone_scenario(shared_net.scenarios[0].id) + + group = shared_net.resourcegroups[0] + group.description = 'updated by writer' + client.update_resourcegroup(group) From 354f92890654088fd4c98372407ff1b586a85a75 Mon Sep 17 00:00:00 2001 From: Stephen Knox Date: Thu, 22 Oct 2026 15:22:23 +0000 Subject: [PATCH 2/3] Rename _get_scenario's check_can_edit to check_unlocked check_write is about the user's permission and check_can_edit only tests whether the scenario is locked, so the name read like a second permission check. check_unlocked says what it does. _get_scenario is private and has no callers outside hydra-base, so no alias is kept. --- hydra_base/lib/groups.py | 4 ++-- hydra_base/lib/scenario.py | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hydra_base/lib/groups.py b/hydra_base/lib/groups.py index dbf58533..68f8b1cb 100644 --- a/hydra_base/lib/groups.py +++ b/hydra_base/lib/groups.py @@ -93,7 +93,7 @@ def update_resourcegroup(group,**kwargs): def add_resourcegroupitem(group_item, scenario_id,**kwargs): - _get_scenario(scenario_id, kwargs['user_id'], check_write=True, check_can_edit=True) + _get_scenario(scenario_id, kwargs['user_id'], check_write=True, check_unlocked=True) #Check whether the ref_id is correct. if group_item.ref_key == 'NODE': @@ -135,7 +135,7 @@ def add_resourcegroupitem(group_item, scenario_id,**kwargs): def delete_resourcegroupitem(item_id,**kwargs): group_item_i = _get_item(item_id) - _get_scenario(group_item_i.scenario_id, kwargs['user_id'], check_write=True, check_can_edit=True) + _get_scenario(group_item_i.scenario_id, kwargs['user_id'], check_write=True, check_unlocked=True) db.DBSession.delete(group_item_i) db.DBSession.flush() diff --git a/hydra_base/lib/scenario.py b/hydra_base/lib/scenario.py index 41355b68..3dd38c9e 100644 --- a/hydra_base/lib/scenario.py +++ b/hydra_base/lib/scenario.py @@ -55,7 +55,7 @@ def _check_network_ownership(network_id, user_id): net.check_write_permission(user_id) -def _get_scenario(scenario_id, user_id, check_write=False, check_can_edit=False): +def _get_scenario(scenario_id, user_id, check_write=False, check_unlocked=False): log.info("Getting scenario %s", scenario_id) try: scenario_i = db.DBSession.query(Scenario).filter(Scenario.id == scenario_id).one() @@ -67,7 +67,7 @@ def _get_scenario(scenario_id, user_id, check_write=False, check_can_edit=False) #avoid doing basically the same query twice. scenario_i.network.check_read_permission(user_id) - if check_can_edit is True: + if check_unlocked is True: if scenario_i.locked == 'Y': raise PermissionError(f'Cannot update scenario {scenario_id} as it is locked.') @@ -476,7 +476,7 @@ def set_scenario_status(scenario_id, status, **kwargs): user_id = kwargs.get('user_id') - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) scenario_i.status = status db.DBSession.flush() @@ -490,7 +490,7 @@ def purge_scenario(scenario_id, **kwargs): user_id = kwargs.get('user_id') - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) db.DBSession.delete(scenario_i) db.DBSession.flush() @@ -1011,7 +1011,7 @@ def bulk_update_resourcedata(scenario_ids, resource_scenarios, **kwargs): for scenario_id in scenario_ids: - scen_i = _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + scen_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) #this is cast as a string so it can be read into a JSONObject res[str(scenario_id)] = [] @@ -1136,7 +1136,7 @@ def update_resourcedata(scenario_id, resource_scenarios, **kwargs): user_id = kwargs.get('user_id') res = None - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) res = [] for rs in resource_scenarios: @@ -1158,7 +1158,7 @@ def delete_scenario_results(scenario_id, **kwargs): """ user_id = kwargs.get('user_id') - _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) results_rs = db.DBSession.query(ResourceScenario)\ .join(ResourceAttr)\ @@ -1178,7 +1178,7 @@ def delete_resource_scenario(scenario_id, resource_attr_id, quiet=False, **kwarg """ user_id = kwargs.get('user_id') - _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) _delete_resourcescenario(scenario_id, resource_attr_id, suppress_error=quiet) @@ -1190,7 +1190,7 @@ def delete_resource_scenarios(scenario_id, resource_attr_ids, quiet=False, **kwa user_id = kwargs.get('user_id') log.info("Deleting %s resource scenarios from from scenario %s", len(resource_attr_ids), scenario_id) - _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) for resource_attr_id in resource_attr_ids: _delete_resourcescenario(scenario_id, resource_attr_id, suppress_error=quiet) @@ -1204,7 +1204,7 @@ def delete_resourcedata(scenario_id, resource_scenario, quiet = False, **kwargs) """ user_id = kwargs.get('user_id') - _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) _delete_resourcescenario(scenario_id, resource_scenario.resource_attr_id, suppress_error=quiet) @@ -1446,7 +1446,7 @@ def add_data_to_attribute(scenario_id, resource_attr_id, dataset,**kwargs): """ user_id = kwargs.get('user_id') - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) try: r_scen_i = db.DBSession.query(ResourceScenario).filter( @@ -1766,7 +1766,7 @@ def delete_resourcegroupitems(scenario_id, item_ids, **kwargs): """ user_id = int(kwargs.get('user_id')) #check the scenario exists and the user can edit it - _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) for item_id in item_ids: rgi = db.DBSession.query(ResourceGroupItem).\ filter(ResourceGroupItem.id == item_id, @@ -1782,7 +1782,7 @@ def empty_group(group_id, scenario_id, **kwargs): """ user_id = int(kwargs.get('user_id')) #check the scenario exists and the user can edit it - _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) rgi = db.DBSession.query(ResourceGroupItem).\ filter(ResourceGroupItem.group_id == group_id).\ @@ -1798,7 +1798,7 @@ def add_resourcegroupitems(scenario_id, items, scenario=None, **kwargs): user_id = int(kwargs.get('user_id')) if scenario is None: - scenario = _get_scenario(scenario_id, user_id, check_write=True, check_can_edit=True) + scenario = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) _check_network_ownership(scenario.network_id, user_id) @@ -1871,7 +1871,7 @@ def update_value_from_mapping(source_resource_attr_id, target_resource_attr_id, #check scenarios exist s1 = _get_scenario(source_scenario_id, user_id) - s2 = _get_scenario(target_scenario_id, user_id, check_write=True, check_can_edit=True) + s2 = _get_scenario(target_scenario_id, user_id, check_write=True, check_unlocked=True) rs = aliased(ResourceScenario, name='rs') rs1 = db.DBSession.query(rs).filter(rs.resource_attr_id == source_resource_attr_id, From ad3b50341be001dddfabd2f479d732650f542d6b Mon Sep 17 00:00:00 2001 From: Stephen Knox Date: Thu, 22 Oct 2026 15:55:59 +0000 Subject: [PATCH 3/3] Rename _get_scenario's check_write to check_can_edit With check_unlocked for the lock test, check_can_edit is the matching name for the user-permission test and says that it is about the user, not the scenario's state. Only _get_scenario's flag changes; the model's check_write_permission and the check_write flags on other helpers are untouched. --- hydra_base/lib/groups.py | 4 ++-- hydra_base/lib/scenario.py | 40 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/hydra_base/lib/groups.py b/hydra_base/lib/groups.py index 68f8b1cb..da7760b3 100644 --- a/hydra_base/lib/groups.py +++ b/hydra_base/lib/groups.py @@ -93,7 +93,7 @@ def update_resourcegroup(group,**kwargs): def add_resourcegroupitem(group_item, scenario_id,**kwargs): - _get_scenario(scenario_id, kwargs['user_id'], check_write=True, check_unlocked=True) + _get_scenario(scenario_id, kwargs['user_id'], check_can_edit=True, check_unlocked=True) #Check whether the ref_id is correct. if group_item.ref_key == 'NODE': @@ -135,7 +135,7 @@ def add_resourcegroupitem(group_item, scenario_id,**kwargs): def delete_resourcegroupitem(item_id,**kwargs): group_item_i = _get_item(item_id) - _get_scenario(group_item_i.scenario_id, kwargs['user_id'], check_write=True, check_unlocked=True) + _get_scenario(group_item_i.scenario_id, kwargs['user_id'], check_can_edit=True, check_unlocked=True) db.DBSession.delete(group_item_i) db.DBSession.flush() diff --git a/hydra_base/lib/scenario.py b/hydra_base/lib/scenario.py index 3dd38c9e..e8b55b0d 100644 --- a/hydra_base/lib/scenario.py +++ b/hydra_base/lib/scenario.py @@ -55,15 +55,15 @@ def _check_network_ownership(network_id, user_id): net.check_write_permission(user_id) -def _get_scenario(scenario_id, user_id, check_write=False, check_unlocked=False): +def _get_scenario(scenario_id, user_id, check_can_edit=False, check_unlocked=False): log.info("Getting scenario %s", scenario_id) try: scenario_i = db.DBSession.query(Scenario).filter(Scenario.id == scenario_id).one() - if check_write is True: + if check_can_edit is True: scenario_i.network.check_write_permission(user_id) else: - #always check read permission. only do this if check write is false to + #always check read permission. only do this if check_can_edit is false to #avoid doing basically the same query twice. scenario_i.network.check_read_permission(user_id) @@ -114,7 +114,7 @@ def merge_scenarios(source_scenario_id, target_scenario_id, match_all_names=True user_id = kwargs.get('user_id') source_scenario = _get_scenario(source_scenario_id, user_id) - target_scenario = _get_scenario(target_scenario_id, user_id, check_write=True) + target_scenario = _get_scenario(target_scenario_id, user_id, check_can_edit=True) source_network = source_scenario.network target_network = target_scenario.network @@ -411,7 +411,7 @@ def update_scenario(scenario, update_data=True, update_groups=True, flush=True, of another process, like update_network. """ user_id = kwargs.get('user_id') - scen = _get_scenario(scenario.id, user_id, check_write=True) + scen = _get_scenario(scenario.id, user_id, check_can_edit=True) if scen.locked == 'Y': raise PermissionError('Scenario is locked. Unlock before editing.') @@ -476,7 +476,7 @@ def set_scenario_status(scenario_id, status, **kwargs): user_id = kwargs.get('user_id') - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + scenario_i = _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) scenario_i.status = status db.DBSession.flush() @@ -490,7 +490,7 @@ def purge_scenario(scenario_id, **kwargs): user_id = kwargs.get('user_id') - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + scenario_i = _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) db.DBSession.delete(scenario_i) db.DBSession.flush() @@ -506,7 +506,7 @@ def create_child_scenario(parent_scenario_id, child_name, **kwargs): user_id = kwargs.get('user_id') - scen_i = _get_scenario(parent_scenario_id, user_id, check_write=True) + scen_i = _get_scenario(parent_scenario_id, user_id, check_can_edit=True) log.info("Creating child scenario of %s", scen_i.name) @@ -562,7 +562,7 @@ def clone_scenario(scenario_id, retain_results=False, scenario_name=None, **kwar user_id = kwargs.get('user_id') - scen_i = _get_scenario(scenario_id, user_id, check_write=True) + scen_i = _get_scenario(scenario_id, user_id, check_can_edit=True) log.info("cloning scenario %s", scen_i.name) @@ -1011,7 +1011,7 @@ def bulk_update_resourcedata(scenario_ids, resource_scenarios, **kwargs): for scenario_id in scenario_ids: - scen_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + scen_i = _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) #this is cast as a string so it can be read into a JSONObject res[str(scenario_id)] = [] @@ -1136,7 +1136,7 @@ def update_resourcedata(scenario_id, resource_scenarios, **kwargs): user_id = kwargs.get('user_id') res = None - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + scenario_i = _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) res = [] for rs in resource_scenarios: @@ -1158,7 +1158,7 @@ def delete_scenario_results(scenario_id, **kwargs): """ user_id = kwargs.get('user_id') - _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) results_rs = db.DBSession.query(ResourceScenario)\ .join(ResourceAttr)\ @@ -1178,7 +1178,7 @@ def delete_resource_scenario(scenario_id, resource_attr_id, quiet=False, **kwarg """ user_id = kwargs.get('user_id') - _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) _delete_resourcescenario(scenario_id, resource_attr_id, suppress_error=quiet) @@ -1190,7 +1190,7 @@ def delete_resource_scenarios(scenario_id, resource_attr_ids, quiet=False, **kwa user_id = kwargs.get('user_id') log.info("Deleting %s resource scenarios from from scenario %s", len(resource_attr_ids), scenario_id) - _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) for resource_attr_id in resource_attr_ids: _delete_resourcescenario(scenario_id, resource_attr_id, suppress_error=quiet) @@ -1204,7 +1204,7 @@ def delete_resourcedata(scenario_id, resource_scenario, quiet = False, **kwargs) """ user_id = kwargs.get('user_id') - _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) _delete_resourcescenario(scenario_id, resource_scenario.resource_attr_id, suppress_error=quiet) @@ -1446,7 +1446,7 @@ def add_data_to_attribute(scenario_id, resource_attr_id, dataset,**kwargs): """ user_id = kwargs.get('user_id') - scenario_i = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + scenario_i = _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) try: r_scen_i = db.DBSession.query(ResourceScenario).filter( @@ -1766,7 +1766,7 @@ def delete_resourcegroupitems(scenario_id, item_ids, **kwargs): """ user_id = int(kwargs.get('user_id')) #check the scenario exists and the user can edit it - _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) for item_id in item_ids: rgi = db.DBSession.query(ResourceGroupItem).\ filter(ResourceGroupItem.id == item_id, @@ -1782,7 +1782,7 @@ def empty_group(group_id, scenario_id, **kwargs): """ user_id = int(kwargs.get('user_id')) #check the scenario exists and the user can edit it - _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) rgi = db.DBSession.query(ResourceGroupItem).\ filter(ResourceGroupItem.group_id == group_id).\ @@ -1798,7 +1798,7 @@ def add_resourcegroupitems(scenario_id, items, scenario=None, **kwargs): user_id = int(kwargs.get('user_id')) if scenario is None: - scenario = _get_scenario(scenario_id, user_id, check_write=True, check_unlocked=True) + scenario = _get_scenario(scenario_id, user_id, check_can_edit=True, check_unlocked=True) _check_network_ownership(scenario.network_id, user_id) @@ -1871,7 +1871,7 @@ def update_value_from_mapping(source_resource_attr_id, target_resource_attr_id, #check scenarios exist s1 = _get_scenario(source_scenario_id, user_id) - s2 = _get_scenario(target_scenario_id, user_id, check_write=True, check_unlocked=True) + s2 = _get_scenario(target_scenario_id, user_id, check_can_edit=True, check_unlocked=True) rs = aliased(ResourceScenario, name='rs') rs1 = db.DBSession.query(rs).filter(rs.resource_attr_id == source_resource_attr_id,