philorg/gisaf-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages 6 Wiki Activity Actions

Fix ACL

Browse source
This commit is contained in:
phil 2024-01-07 23:09:39 +05:30
parent c3caedea0e
commit aed84e0f36
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gisaf/geoapi.py
View file

@ -90,7 +90,7 @@ async def get_geojson(store_name,
model = registry.stores.loc[store_name].model
except KeyError:
raise HTTPException(status.HTTP_404_NOT_FOUND)
if hasattr(model, 'viewable_role'):
if getattr(model, 'viewable_role', None):
if not(user and user.can_view(model)):
username = user.username if user else "Anonymous"
logger.info(f'{username} tried to access {model}')

5
src/gisaf/models/authentication.py
View file

@ -32,8 +32,9 @@ class User(UserBase, table=True):
password: str | None = None
def can_view(self, model) -> bool:
if hasattr(model, 'viewable_role'):
return model.viewable_role in (role.name for role in self.roles)
viewable_role = getattr(model, 'viewable_role', None)
if viewable_role:
return viewable_role in (role.name for role in self.roles)
else:
return True