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
31 changes: 27 additions & 4 deletions servers/zms/src/main/java/com/yahoo/athenz/zms/ZMSImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -12776,12 +12776,35 @@ public ServiceIdentityList getDependentServiceList(ResourceContext ctx, String d

// for consistent handling of all requests, we're going to convert
// all incoming object values into lower case (e.g. domain, role,
// policy, service, etc name)
// policy, service, etc. name)

domainName = domainName.toLowerCase();
setRequestDomain(ctx, domainName);
String serviceDomainName = domainName.toLowerCase();
setRequestDomain(ctx, serviceDomainName);

// first let's get the service dependencies from our own database

ServiceIdentityList services = dbService.listServiceDependencies(serviceDomainName);
Set<String> dependentServices = new HashSet<>(services.getNames());
Comment thread
havetisyan marked this conversation as resolved.

return dbService.listServiceDependencies(domainName);
// now we'll check with each service provider to see if
// they have a dependency on our domain

Principal principal = ((RsrcCtxWrapper) ctx).principal();
Map<String, ServiceProviderManager.DomainDependencyProvider> serviceProvidersWithEndpoints
= serviceProviderManager.getServiceProvidersWithEndpoints();

Set<String> dynamicDependencies = serviceProvidersWithEndpoints.entrySet().parallelStream()
.filter(entry -> {
DomainDependencyProviderResponse providerResponse = serviceProviderClient.getDependencyStatus(
entry.getValue(), serviceDomainName, principal.getFullName());
return providerResponse.getStatus().equals(ZMSConsts.PROVIDER_RESPONSE_DENY);
})
.map(Map.Entry::getKey)
.collect(Collectors.toSet());

dependentServices.addAll(dynamicDependencies);
services.setNames(new ArrayList<>(dependentServices));
return services;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,12 @@ public void testDomainDependency() {
"to get response from server: https://localhost/service-provider\"}");
}

// get the domain dependency list and make sure provider is included

ServiceIdentityList serviceIdentityList = zmsImpl.getDependentServiceList(sysAdminCtx, secondTopLevelDomain);
assertEquals(serviceIdentityList.getNames().size(), 1);
assertEquals(serviceIdentityList.getNames().get(0), fullServiceProviderName);

// Now make the service provider client approve deletion of the domains

ServiceProviderClient serviceProviderClient = Mockito.mock(ServiceProviderClient.class);
Expand Down
Loading