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

Allow access to resources to anonymous users #88

Closed
wants to merge 1 commit into from
Closed

Allow access to resources to anonymous users #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 38 additions & 2 deletions ...src/main/java/io/arlas/persistence/server/impl/GoogleFirestorePersistenceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public Pair<Long, List<Data>> list(String zone, IdentityParam identityParam, Int

@Override
public Data get(String zone, String key, IdentityParam identityParam) throws ArlasException {
Optional<Data> data = getByZoneKeyOrga(zone, key, identityParam.organisation);
Optional<Data> data = getByZoneKeyOrga(zone, key, identityParam);
if (data.isPresent()) {
if (PersistenceService.isReaderOnData(identityParam, data.get()) ||
PersistenceService.isWriterOnData(identityParam, data.get())) {
Expand Down Expand Up @@ -298,7 +298,7 @@ public Data update(String id, String key, IdentityParam identityParam, Set<Strin
String zone = data.getDocZone();
PersistenceService.checkReadersWritersGroups(zone, identityParam, readers,writers);
// If the key is updated, we need to check if a triplet Zone/Key/orga already exist with this new key
if(Optional.ofNullable(key).isPresent() && !Optional.ofNullable(key).get().equals(data.getDocKey())){
if(key != null && !key.equals(data.getDocKey())){
Optional<Data> alreadyExisting = getByZoneKeyOrga(zone, key, List.of(data.getDocOrganization()));
if (alreadyExisting.isPresent()) {
throw new ArlasException("A resource with zone " + zone + " and key " + key + " already exists.");
Expand Down Expand Up @@ -373,6 +373,42 @@ private Optional<Data> getByZoneKeyOrga(String zone, String key, List<String> or
}
}

private Optional<Data> getByZoneKeyOrga(String zone, String key, IdentityParam idp) throws ArlasException {

try {
// get the data matching zone+key whatever the organisation
List<Data> res = db.collection(this.collection)
.whereEqualTo(Data.zoneColumn, zone)
.whereEqualTo(Data.keyColumn, key)
.get().get()
.getDocuments()
.stream()
.map(d -> {
try {
return toData(d.getId(), d);
} catch (NotFoundException e) { //can't happen in this case
return null;
}
})
.filter(Objects::nonNull)
// if the data's organisation is the org of the user
.filter(d -> idp.organisation.contains(d.getDocOrganization())
Copy link
Member

Choose a reason for hiding this comment

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

in this case, we might endup fetching more zones in the case
of an anonymous idp no ?

// or the user is anonymous (we don't have an organisation to match with)
|| idp.isAnonymous)
.toList();

if (res.isEmpty()) {
return Optional.empty();
} else if (res.size() == 1) {
return Optional.of(res.get(0));
} else {
throw new ArlasException("More than one doc for key/zone: need one org to filter properly");
}
} catch (InterruptedException | ExecutionException e) {
throw new ArlasException("Error listing document: " + e.getMessage());
}
}

private Data getById(String id) throws ArlasException {
try {
return toData(id, db.collection(collection).document(id).get().get());
Expand Down
25 changes: 24 additions & 1 deletion ...-core/src/main/java/io/arlas/persistence/server/impl/HibernatePersistenceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public Pair list(String zone, IdentityParam identityParam, Integer size, Integer

@Override
public Data get(String zone, String key, IdentityParam identityParam) throws ArlasException {
Optional<Data> data = getByZoneKeyOrga(zone, key, identityParam.organisation);
Optional<Data> data = getByZoneKeyOrga(zone, key, identityParam);
if (data.isPresent()) {
if (PersistenceService.isReaderOnData(identityParam, data.get()) ||
PersistenceService.isWriterOnData(identityParam, data.get())) {
Expand Down Expand Up @@ -192,6 +192,29 @@ private Optional<Data> getByZoneKeyOrga(String zone, String key, List<String> or
return Optional.ofNullable(data);
}

private Optional<Data> getByZoneKeyOrga(String zone, String key, IdentityParam idp) throws ArlasException {
List<Data> res = currentSession().createQuery("from Data ud"
+ " where ud." + Data.zoneColumn + "=:zone"
+ " and ud." + Data.keyColumn + "=:key", Data.class)
.setParameter("zone", zone)
.setParameter("key", key)
.list()
.stream()
// if the data's organisation is the org of the user
.filter(d -> idp.organisation.contains(d.getDocOrganization())
// or the user is anonymous (we don't have an organisation to match with)
|| idp.isAnonymous)
.toList();

if (res.isEmpty()) {
return Optional.empty();
} else if (res.size() == 1) {
return Optional.of(res.get(0));
} else {
throw new ArlasException("More than one doc for key/zone: need one org to filter properly");
}
}

private Data deleteData(Data data, IdentityParam identityParam) throws ForbiddenException {
if (PersistenceService.isWriterOnData(identityParam, data)) {
currentSession().delete(data);
Expand Down
Loading