Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions hydra_base/lib/groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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_can_edit=True, check_unlocked=True)
#Check whether the ref_id is correct.

if group_item.ref_key == 'NODE':
Expand Down Expand Up @@ -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_can_edit=True, check_unlocked=True)
db.DBSession.delete(group_item_i)
db.DBSession.flush()

Expand Down
23 changes: 22 additions & 1 deletion hydra_base/lib/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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,
Expand Down
49 changes: 25 additions & 24 deletions hydra_base/lib/scenario.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@ 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_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)

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.')

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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_can_edit=True)

if scen.locked == 'Y':
raise PermissionError('Scenario is locked. Unlock before editing.')
Expand Down Expand Up @@ -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_can_edit=True, check_unlocked=True)

scenario_i.status = status
db.DBSession.flush()
Expand All @@ -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_can_edit=True, check_unlocked=True)

db.DBSession.delete(scenario_i)
db.DBSession.flush()
Expand All @@ -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_can_edit=True)

log.info("Creating child scenario of %s", scen_i.name)

Expand Down Expand Up @@ -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_can_edit=True)

log.info("cloning scenario %s", scen_i.name)

Expand Down Expand Up @@ -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_can_edit=True, check_unlocked=True)

#this is cast as a string so it can be read into a JSONObject
res[str(scenario_id)] = []
Expand Down Expand Up @@ -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_can_edit=True, check_unlocked=True)

res = []
for rs in resource_scenarios:
Expand All @@ -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_can_edit=True, check_unlocked=True)

results_rs = db.DBSession.query(ResourceScenario)\
.join(ResourceAttr)\
Expand All @@ -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_can_edit=True, check_unlocked=True)

_delete_resourcescenario(scenario_id, resource_attr_id, suppress_error=quiet)

Expand All @@ -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_can_edit=True, check_unlocked=True)

for resource_attr_id in resource_attr_ids:
_delete_resourcescenario(scenario_id, resource_attr_id, suppress_error=quiet)
Expand All @@ -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_can_edit=True, check_unlocked=True)

_delete_resourcescenario(scenario_id, resource_scenario.resource_attr_id, suppress_error=quiet)

Expand Down Expand Up @@ -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_can_edit=True, check_unlocked=True)

try:
r_scen_i = db.DBSession.query(ResourceScenario).filter(
Expand Down Expand Up @@ -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_can_edit=True, check_unlocked=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()
Expand All @@ -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_can_edit=True, check_unlocked=True)

rgi = db.DBSession.query(ResourceGroupItem).\
filter(ResourceGroupItem.group_id == group_id).\
Expand All @@ -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_can_edit=True, check_unlocked=True)

_check_network_ownership(scenario.network_id, user_id)

Expand Down Expand Up @@ -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_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,
Expand Down
Loading
Loading