Repository: ambari Updated Branches: refs/heads/branch-2.1 67df5c6e4 -> 88d38ab3a
AMBARI-12450. Kerberos: ServiceResourceProvider queries for KDC connectivity when not needed (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/88d38ab3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/88d38ab3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/88d38ab3 Branch: refs/heads/branch-2.1 Commit: 88d38ab3a6b26d9b23666f661da69d8253385880 Parents: 67df5c6 Author: Robert Levas <rle...@hortonworks.com> Authored: Tue Jul 21 11:04:07 2015 -0400 Committer: Robert Levas <rle...@hortonworks.com> Committed: Tue Jul 21 11:04:12 2015 -0400 ---------------------------------------------------------------------- .../controller/internal/BaseProvider.java | 4 +- .../internal/ServiceResourceProvider.java | 60 ++++++++++------- .../internal/ServiceResourceProviderTest.java | 71 ++++++++++++++++++++ 3 files changed, 107 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/88d38ab3/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java index ca5e70e..9024a7e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java @@ -384,7 +384,7 @@ public abstract class BaseProvider { * * @return true if the given property is a category for any of the requested ids */ - private static boolean isPropertyEntryRequested(String propertyId, Set<String> requestedIds) { + protected static boolean isPropertyEntryRequested(String propertyId, Set<String> requestedIds) { for (String requestedId : requestedIds) { if (requestedId.startsWith(propertyId)) { return true; @@ -403,7 +403,7 @@ public abstract class BaseProvider { * * @return true if the given property's category is part of the given set of requested ids */ - private static boolean isPropertyCategoryRequested(String propertyId, Set<String> requestedIds) { + protected static boolean isPropertyCategoryRequested(String propertyId, Set<String> requestedIds) { String category = PropertyHelper.getPropertyCategory(propertyId); while (category != null ) { if (requestedIds.contains(category)) { http://git-wip-us.apache.org/repos/asf/ambari/blob/88d38ab3/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java index a13bbd3..a79c04b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java @@ -89,6 +89,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider public static final String SERVICE_SERVICE_STATE_PROPERTY_ID = PropertyHelper.getPropertyId("ServiceInfo", "state"); public static final String SERVICE_MAINTENANCE_STATE_PROPERTY_ID = PropertyHelper.getPropertyId("ServiceInfo", "maintenance_state"); + public static final String SERVICE_ATTRIBUTES_PROPERTY_ID = PropertyHelper.getPropertyId("Services", "attributes"); + //Parameters from the predicate private static final String QUERY_PARAMETERS_RUN_SMOKE_TEST_ID = "params/run_smoke_test"; @@ -200,7 +202,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider response.getMaintenanceState(), requestedIds); Map<String, Object> serviceSpecificProperties = getServiceSpecificProperties( - response.getClusterName(), response.getServiceName()); + response.getClusterName(), response.getServiceName(), requestedIds); for (Map.Entry<String, Object> entry : serviceSpecificProperties.entrySet()) { setResourceProperty(resource, entry.getKey(), entry.getValue(), requestedIds); @@ -1387,35 +1389,41 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider * * @param clusterName cluster name * @param serviceName service name + * @param requestedIds relevant request property ids */ - private Map<String, Object> getServiceSpecificProperties(String clusterName, String serviceName) { + private Map<String, Object> getServiceSpecificProperties(String clusterName, String serviceName, Set<String> requestedIds) { Map<String, Object> serviceSpecificProperties = new HashMap<String, Object>(); if (serviceName.equals("KERBEROS")) { - Map<String, String> kerberosAttributes = new HashMap<String, String>(); - String kdcValidationResult = "OK"; - String failureDetails = ""; - try { - kerberosHelper.validateKDCCredentials( - getManagementController().getClusters().getCluster(clusterName)); - - } catch (KerberosInvalidConfigurationException e) { - kdcValidationResult = "INVALID_CONFIGURATION"; - failureDetails = e.getMessage(); - } catch (KerberosAdminAuthenticationException e) { - kdcValidationResult = "INVALID_CREDENTIALS"; - failureDetails = e.getMessage(); - } catch (KerberosMissingAdminCredentialsException e) { - kdcValidationResult = "MISSING_CREDENTIALS"; - failureDetails = e.getMessage(); - } catch (AmbariException e) { - kdcValidationResult = "VALIDATION_ERROR"; - failureDetails = e.getMessage(); - } + // Only include details on whether the KDC administrator credentials are set and correct if + // implicitly (Service/attributes) or explicitly (Service/attributes/kdc_...) queried + if (requestedIds.contains(SERVICE_ATTRIBUTES_PROPERTY_ID) || + isPropertyCategoryRequested(SERVICE_ATTRIBUTES_PROPERTY_ID, requestedIds) || + isPropertyEntryRequested(SERVICE_ATTRIBUTES_PROPERTY_ID, requestedIds)) { + Map<String, String> kerberosAttributes = new HashMap<String, String>(); + String kdcValidationResult = "OK"; + String failureDetails = ""; + try { + kerberosHelper.validateKDCCredentials( + getManagementController().getClusters().getCluster(clusterName)); + + } catch (KerberosInvalidConfigurationException e) { + kdcValidationResult = "INVALID_CONFIGURATION"; + failureDetails = e.getMessage(); + } catch (KerberosAdminAuthenticationException e) { + kdcValidationResult = "INVALID_CREDENTIALS"; + failureDetails = e.getMessage(); + } catch (KerberosMissingAdminCredentialsException e) { + kdcValidationResult = "MISSING_CREDENTIALS"; + failureDetails = e.getMessage(); + } catch (AmbariException e) { + kdcValidationResult = "VALIDATION_ERROR"; + failureDetails = e.getMessage(); + } - kerberosAttributes.put("kdc_validation_result", kdcValidationResult); - kerberosAttributes.put("kdc_validation_failure_details", failureDetails); - serviceSpecificProperties.put(PropertyHelper.getPropertyId( - "Services", "attributes"), kerberosAttributes); + kerberosAttributes.put("kdc_validation_result", kdcValidationResult); + kerberosAttributes.put("kdc_validation_failure_details", failureDetails); + serviceSpecificProperties.put(SERVICE_ATTRIBUTES_PROPERTY_ID, kerberosAttributes); + } } return serviceSpecificProperties; http://git-wip-us.apache.org/repos/asf/ambari/blob/88d38ab3/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java index 9ec1610..2460789 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java @@ -334,6 +334,77 @@ public class ServiceResourceProviderTest { } @Test + public void testGetResources_KerberosSpecificProperties_NoKDCValidation() throws Exception{ + AmbariManagementController managementController = createMock(AmbariManagementController.class); + Clusters clusters = createNiceMock(Clusters.class); + Cluster cluster = createNiceMock(Cluster.class); + Service service0 = createNiceMock(Service.class); + ServiceResponse serviceResponse0 = createNiceMock(ServiceResponse.class); + + StackId stackId = createNiceMock(StackId.class); + ServiceFactory serviceFactory = createNiceMock(ServiceFactory.class); + AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class); + KerberosHelper kerberosHelper = createStrictMock(KerberosHelper.class); + + Map<String, Service> allResponseMap = new HashMap<String, Service>(); + allResponseMap.put("KERBEROS", service0); + + // set expectations + expect(managementController.getClusters()).andReturn(clusters).anyTimes(); + expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); + expect(managementController.getServiceFactory()).andReturn(serviceFactory).anyTimes(); + expect(managementController.getHostComponents((Set<ServiceComponentHostRequest>) anyObject())). + andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); + + expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); + + expect(cluster.getServices()).andReturn(allResponseMap).anyTimes(); + expect(cluster.getService("KERBEROS")).andReturn(service0); + + expect(service0.convertToResponse()).andReturn(serviceResponse0).anyTimes(); + + expect(service0.getName()).andReturn("Service100").anyTimes(); + + expect(serviceResponse0.getClusterName()).andReturn("Cluster100").anyTimes(); + expect(serviceResponse0.getServiceName()).andReturn("KERBEROS").anyTimes(); + + // The following call should NOT be made + // kerberosHelper.validateKDCCredentials(cluster); + + // replay + replay(managementController, clusters, cluster, service0, serviceResponse0, + ambariMetaInfo, stackId, serviceFactory, kerberosHelper); + + ResourceProvider provider = getServiceProvider(managementController); + // set kerberos helper on provider + Class<?> c = provider.getClass(); + Field f = c.getDeclaredField("kerberosHelper"); + f.setAccessible(true); + f.set(provider, kerberosHelper); + + Set<String> propertyIds = new HashSet<String>(); + + propertyIds.add(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID); + propertyIds.add(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID); + + // create the request + Predicate predicate = new PredicateBuilder().property(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and(). + property(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals("KERBEROS").toPredicate(); + Request request = PropertyHelper.getReadRequest("ServiceInfo"); + Set<Resource> resources = provider.getResources(request, predicate); + + Assert.assertEquals(1, resources.size()); + for (Resource resource : resources) { + Assert.assertEquals("Cluster100", resource.getPropertyValue(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID)); + Assert.assertEquals("KERBEROS", resource.getPropertyValue(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID)); + } + + // verify + verify(managementController, clusters, cluster, service0, serviceResponse0, + ambariMetaInfo, stackId, serviceFactory, kerberosHelper); + } + + @Test public void testGetResources_KerberosSpecificProperties_KDCInvalidCredentials() throws Exception{ AmbariManagementController managementController = createMock(AmbariManagementController.class); Clusters clusters = createNiceMock(Clusters.class);
