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

Jump to bottom

set resource ownership when generating JWS domain #2746

Merged
merged 1 commit into from
Sep 29, 2024
Merged

set resource ownership when generating JWS domain #2746

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
1 change: 1 addition & 0 deletions servers/zms/src/main/java/com/yahoo/athenz/zms/ZMSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7042,6 +7042,7 @@ void setDomainDataAttributes(DomainData domainData, Domain domain) {
domainData.setCertDnsDomain(domain.getCertDnsDomain());
domainData.setMemberPurgeExpiryDays(domain.getMemberPurgeExpiryDays());
domainData.setContacts(domain.getContacts());
domainData.setResourceOwnership(domain.getResourceOwnership());
}

SignedDomain retrieveSignedDomain(Domain domain, final String metaAttr, boolean setMetaDataOnly, boolean masterCopy, boolean includeConditions) {
Expand Down
67 changes: 67 additions & 0 deletions servers/zms/src/test/java/com/yahoo/athenz/zms/ZMSImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23765,6 +23765,73 @@ public void testGetJWSDomainError() {
zmsImpl.privateKey = pkey;
}

@Test
public void testGetJWSDomainResourceOwnership() throws JsonProcessingException, ParseException, JOSEException {

final String domainName = "jws-domain-resource-owner";

ZMSImpl zmsImpl = zmsTestInitializer.getZms();
RsrcCtxWrapper ctx = zmsTestInitializer.getMockDomRsrcCtx();
final String auditRef = zmsTestInitializer.getAuditRef();

TopLevelDomain dom1 = zmsTestInitializer.createTopLevelDomainObject(domainName,
"Test Domain1", "testOrg", zmsTestInitializer.getAdminUser());
dom1.setMemberPurgeExpiryDays(90);

zmsImpl.postTopLevelDomain(ctx, auditRef, "unit-test", dom1);

Response response = zmsImpl.getJWSDomain(ctx, domainName, null, null);
JWSDomain jwsDomain = (JWSDomain) response.getEntity();
DomainData domainData = zmsTestInitializer.getDomainData(jwsDomain);

assertNotNull(domainData);
assertEquals(domainData.getName(), "jws-domain-resource-owner");
assertEquals(domainData.getMemberPurgeExpiryDays(), 90);
assertNotNull(domainData.getResourceOwnership());
assertEquals(domainData.getResourceOwnership().getObjectOwner(), "unit-test");
assertEquals(domainData.getResourceOwnership().getMetaOwner(), "unit-test");

Map<String, String> header = jwsDomain.getHeader();
assertEquals(header.get("kid"), "0");

// now we're going to ask for the same domain with the tag
// and make sure we get back 304

EntityTag tag = response.getEntityTag();
response = zmsImpl.getJWSDomain(ctx, domainName, Boolean.FALSE, tag.getValue());
assertEquals(response.getStatus(), ResourceException.NOT_MODIFIED);

// pass a timestamp a minute back and make sure we
// get back the domain

Timestamp tstamp = Timestamp.fromMillis(System.currentTimeMillis() - 3600);
response = zmsImpl.getJWSDomain(ctx, domainName, false, tstamp.toString());
jwsDomain = (JWSDomain) response.getEntity();
domainData = zmsTestInitializer.getDomainData(jwsDomain);

assertNotNull(domainData);
assertEquals(domainData.getName(), "jws-domain-resource-owner");
assertEquals(domainData.getMemberPurgeExpiryDays(), 90);
assertNotNull(domainData.getResourceOwnership());
assertEquals(domainData.getResourceOwnership().getObjectOwner(), "unit-test");
assertEquals(domainData.getResourceOwnership().getMetaOwner(), "unit-test");

// any invalid data is also treated as no etag

response = zmsImpl.getJWSDomain(ctx, domainName, null, "unknown-date");
jwsDomain = (JWSDomain) response.getEntity();
domainData = zmsTestInitializer.getDomainData(jwsDomain);

assertNotNull(domainData);
assertEquals(domainData.getName(), "jws-domain-resource-owner");
assertEquals(domainData.getMemberPurgeExpiryDays(), 90);
assertNotNull(domainData.getResourceOwnership());
assertEquals(domainData.getResourceOwnership().getObjectOwner(), "unit-test");
assertEquals(domainData.getResourceOwnership().getMetaOwner(), "unit-test");

zmsImpl.deleteTopLevelDomain(ctx, domainName, auditRef, "unit-test");
}

@Test
public void testValidateIntegerValue() {

Expand Down