Skip to content

update IT for add namespace field to policy entry #24

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

Open
hu-ahmed wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update IT for add namespace field to policy entry #24

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
63 changes: 63 additions & 0 deletions .../test/java/org/eclipse/ditto/testing/system/things/authorization/PolicyEnforcementIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -157,6 +158,38 @@ public void getThingWithoutGrantedRead() {
.fire();
}

@Test
public void getThingWithNamespaceScopedPolicyEntry() {
final PolicyId policyId =
PolicyId.of(idGenerator().withPrefixedRandomName("getThingWithNamespaceScopedPolicyEntry"));
final Policy policy = createPolicyRootAndNamespaceScopedAccess(policyId, defaultClientSubjectId,
client2SubjectId, "com.acme", "READ");
final ThingId allowedThingId = ThingId.of("com.acme", idGenerator().withRandomName());
final ThingId deniedThingId = ThingId.of("other.ns", idGenerator().withRandomName());

putPolicy(policy)
.expectingHttpStatus(HttpStatus.CREATED)
.fire();

putThing(API_V_2, Thing.newBuilder().setId(allowedThingId).setPolicyId(policyId).build(), JsonSchemaVersion.V_2)
.expectingHttpStatus(CREATED)
.fire();

putThing(API_V_2, Thing.newBuilder().setId(deniedThingId).setPolicyId(policyId).build(), JsonSchemaVersion.V_2)
.expectingHttpStatus(CREATED)
.fire();

getThing(API_V_2, allowedThingId)
.withConfiguredAuth(serviceEnv.getTestingContext2())
.expectingHttpStatus(HttpStatus.OK)
.fire();

getThing(API_V_2, deniedThingId)
.withConfiguredAuth(serviceEnv.getTestingContext2())
.expectingHttpStatus(HttpStatus.NOT_FOUND)
.fire();
}

@Test
public void postThingAlterPolicyForReadAccess() {
final ThingId thingId = ThingId.of(idGenerator().withRandomName());
Expand Down Expand Up @@ -931,6 +964,36 @@ private static Policy createPolicyRootAndAdditionalAccessWithRevoke(final Policy
return PoliciesModelFactory.newPolicy(policyId, entry1, entry2);
}

private static Policy createPolicyRootAndNamespaceScopedAccess(final PolicyId policyId,
final SubjectId rootUser,
final SubjectId additionalUser,
final String namespace,
final String additionalGrantedPermission) {

final EffectedPermissions permissionsAll =
EffectedPermissions.newInstance(collect("READ", "WRITE"), Permissions.none());
final EffectedPermissions permissionsAdditional = EffectedPermissions.newInstance(
Permissions.newInstance("READ", additionalGrantedPermission), Permissions.none());
final PolicyEntry rootEntry = PoliciesModelFactory.newPolicyEntry(
Label.of("rootUser"),
Subjects.newInstance(PoliciesModelFactory.newSubject(rootUser, SubjectType.GENERATED)),
PoliciesModelFactory.newResources(
Resource.newInstance(ResourceKey.newInstance("policy:"), permissionsAll),
Resource.newInstance(ResourceKey.newInstance("thing:"), permissionsAll)));

final PolicyEntry scopedEntry = PoliciesModelFactory.newPolicyEntry(
Label.of("namespaceScopedUser"),
Subjects.newInstance(
PoliciesModelFactory.newSubject(additionalUser, ARBITRARY_SUBJECT_TYPE)),
PoliciesModelFactory.newResources(
Resource.newInstance(ResourceKey.newInstance("thing:"), permissionsAdditional)),
Arrays.asList(namespace, namespace + ".*"),
org.eclipse.ditto.policies.model.ImportableType.IMPLICIT,
Collections.emptySet());

return PoliciesModelFactory.newPolicy(policyId, rootEntry, scopedEntry);
}

private static Policy createDefaultPolicy(final SubjectId user, final PolicyId policyId) {
return createDefaultPolicy(user, policyId, Label.of("DEFAULT"));
}
Expand Down
76 changes: 76 additions & 0 deletions .../test/java/org/eclipse/ditto/testing/system/things/rest/ThingsWithImportedPoliciesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,102 @@
import static org.eclipse.ditto.things.api.Permission.READ;
import static org.eclipse.ditto.things.api.Permission.WRITE;

import java.util.Arrays;
import java.util.List;
import java.util.UUID;

import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.policies.model.EffectedImports;
import org.eclipse.ditto.policies.model.EffectedPermissions;
import org.eclipse.ditto.policies.model.ImportableType;
import org.eclipse.ditto.policies.model.Label;
import org.eclipse.ditto.policies.model.Permissions;
import org.eclipse.ditto.policies.model.PoliciesModelFactory;
import org.eclipse.ditto.policies.model.PoliciesResourceType;
import org.eclipse.ditto.policies.model.Policy;
import org.eclipse.ditto.policies.model.PolicyEntry;
import org.eclipse.ditto.policies.model.PolicyId;
import org.eclipse.ditto.policies.model.Resource;
import org.eclipse.ditto.policies.model.ResourceKey;
import org.eclipse.ditto.testing.common.IntegrationTest;
import org.eclipse.ditto.testing.common.TestConstants;
import org.eclipse.ditto.things.model.Thing;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
import org.junit.Test;

public final class ThingsWithImportedPoliciesIT extends IntegrationTest {

@Test
public void getThingWithNamespaceScopedAuthorizationInImportedPolicy() {
final PolicyId importedPolicyId =
PolicyId.of(serviceEnv.getDefaultNamespaceName(), UUID.randomUUID().toString());
final PolicyId importingPolicyId =
PolicyId.of(serviceEnv.getDefaultNamespaceName(), UUID.randomUUID().toString());
final ThingId allowedThingId = ThingId.of("com.acme", UUID.randomUUID().toString());
final ThingId deniedThingId = ThingId.of("other.ns", UUID.randomUUID().toString());

final EffectedPermissions ownerPermissions = EffectedPermissions.newInstance(
PoliciesModelFactory.newPermissions(READ, WRITE), Permissions.none());
final PolicyEntry ownerEntry = PoliciesModelFactory.newPolicyEntry(
Label.of("OWNER"),
PoliciesModelFactory.newSubjects(serviceEnv.getDefaultTestingContext().getOAuthClient().getDefaultSubject()),
PoliciesModelFactory.newResources(
Resource.newInstance(ResourceKey.newInstance("policy:"), ownerPermissions),
Resource.newInstance(ResourceKey.newInstance("thing:"), ownerPermissions)));
final PolicyEntry scopedReaderEntry = PoliciesModelFactory.newPolicyEntry(
Label.of("SCOPED_READER"),
PoliciesModelFactory.newSubjects(serviceEnv.getTestingContext2().getOAuthClient().getDefaultSubject()),
PoliciesModelFactory.newResources(
Resource.newInstance(ResourceKey.newInstance("thing:"),
EffectedPermissions.newInstance(PoliciesModelFactory.newPermissions(READ),
Permissions.none()))),
Arrays.asList("com.acme", "com.acme.*"),
ImportableType.EXPLICIT,
java.util.Collections.emptySet());
final Policy importedPolicy = PoliciesModelFactory.newPolicy(importedPolicyId, ownerEntry, scopedReaderEntry);

putPolicy(importedPolicy)
.expectingHttpStatus(HttpStatus.CREATED)
.fire();

final Policy importingPolicy = Policy.newBuilder(importingPolicyId)
.forLabel("OWNER")
.setSubject(serviceEnv.getDefaultTestingContext().getOAuthClient().getDefaultSubject())
.setGrantedPermissions(PoliciesResourceType.policyResource("/"), READ, WRITE)
.setGrantedPermissions(PoliciesResourceType.thingResource("/"), READ, WRITE)
.setPolicyImport(PoliciesModelFactory.newPolicyImport(importedPolicyId,
EffectedImports.newInstance(List.of(Label.of("SCOPED_READER")))))
.build();

putPolicy(importingPolicy)
.expectingHttpStatus(HttpStatus.CREATED)
.fire();

putThing(TestConstants.API_V_2,
Thing.newBuilder().setId(allowedThingId).setPolicyId(importingPolicyId).build(),
org.eclipse.ditto.base.model.json.JsonSchemaVersion.V_2)
.expectingHttpStatus(HttpStatus.CREATED)
.fire();

putThing(TestConstants.API_V_2,
Thing.newBuilder().setId(deniedThingId).setPolicyId(importingPolicyId).build(),
org.eclipse.ditto.base.model.json.JsonSchemaVersion.V_2)
.expectingHttpStatus(HttpStatus.CREATED)
.fire();

getThing(TestConstants.API_V_2, allowedThingId)
.withConfiguredAuth(serviceEnv.getTestingContext2())
.expectingHttpStatus(HttpStatus.OK)
.fire();

getThing(TestConstants.API_V_2, deniedThingId)
.withConfiguredAuth(serviceEnv.getTestingContext2())
.expectingHttpStatus(HttpStatus.NOT_FOUND)
.fire();
}

/**
* Retrieves a persisted Thing with missing authorization to do so.
*/
Expand Down