Merge branch 'master' into KNOX-1049
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/1ee93707 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/1ee93707 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/1ee93707 Branch: refs/heads/KNOX-1049 Commit: 1ee937071b236909a38dc764db451e65a3225ad6 Parents: f549041 986615f Author: Larry McCay <[email protected]> Authored: Thu Oct 26 10:21:54 2017 -0400 Committer: Larry McCay <[email protected]> Committed: Thu Oct 26 10:21:54 2017 -0400 ---------------------------------------------------------------------- gateway-discovery-ambari/pom.xml | 66 ++ .../discovery/ambari/AmbariCluster.java | 115 +++ .../discovery/ambari/AmbariComponent.java | 85 ++ .../ambari/AmbariDynamicServiceURLCreator.java | 151 ++++ .../ambari/AmbariServiceDiscovery.java | 305 +++++++ .../ambari/AmbariServiceDiscoveryMessages.java | 121 +++ .../ambari/AmbariServiceDiscoveryType.java | 35 + .../ambari/ConditionalValueHandler.java | 24 + .../discovery/ambari/PropertyEqualsHandler.java | 76 ++ .../ambari/ServiceURLPropertyConfig.java | 324 +++++++ .../discovery/ambari/SimpleValueHandler.java | 32 + ...eway.topology.discovery.ServiceDiscoveryType | 19 + ...iscovery-component-config-mapping.properties | 36 + .../ambari-service-discovery-url-mappings.xml | 398 +++++++++ .../AmbariDynamicServiceURLCreatorTest.java | 876 +++++++++++++++++++ .../ambari/AmbariServiceDiscoveryTest.java | 858 ++++++++++++++++++ .../ha/provider/impl/DefaultURLManager.java | 9 +- ...entityAsserterHttpServletRequestWrapper.java | 25 +- .../provider/federation/jwt/JWTMessages.java | 3 + .../jwt/filter/AbstractJWTFilter.java | 59 +- .../filter/JWTAccessTokenAssertionFilter.java | 23 +- .../jwt/filter/JWTAuthCodeAssertionFilter.java | 16 +- .../jwt/filter/JWTFederationFilter.java | 5 +- .../jwt/filter/SSOCookieFederationFilter.java | 5 +- .../federation/AbstractJWTFilterTest.java | 287 +++++- .../federation/SSOCookieProviderTest.java | 5 +- gateway-provider-security-picketlink/pom.xml | 76 -- .../gateway/picketlink/PicketlinkMessages.java | 40 - .../picketlink/deploy/PicketlinkConf.java | 194 ---- ...PicketlinkFederationProviderContributor.java | 132 --- .../filter/CaptureOriginalURLFilter.java | 89 -- .../filter/PicketlinkIdentityAdapter.java | 102 --- ...gateway.deploy.ProviderDeploymentContributor | 19 - .../gateway/picketlink/PicketlinkTest.java | 30 - gateway-release/home/conf/descriptors/README | 1 + .../home/conf/shared-providers/README | 1 + gateway-release/pom.xml | 8 +- gateway-server/pom.xml | 5 + .../apache/hadoop/gateway/GatewayMessages.java | 9 +- .../gateway/config/impl/GatewayConfigImpl.java | 10 + .../services/DefaultGatewayServices.java | 3 +- .../impl/DefaultServiceRegistryService.java | 50 +- .../security/impl/DefaultAliasService.java | 12 +- .../services/security/impl/JettySSLService.java | 11 +- .../impl/DefaultTokenAuthorityService.java | 43 +- .../topology/impl/DefaultTopologyService.java | 294 ++++++- .../builder/BeanPropertyTopologyBuilder.java | 2 +- .../DefaultServiceDiscoveryConfig.java | 48 + .../discovery/ServiceDiscoveryFactory.java | 81 ++ .../topology/simple/SimpleDescriptor.java | 48 + .../simple/SimpleDescriptorFactory.java | 71 ++ .../simple/SimpleDescriptorHandler.java | 267 ++++++ .../topology/simple/SimpleDescriptorImpl.java | 123 +++ .../simple/SimpleDescriptorMessages.java | 50 ++ .../websockets/GatewayWebsocketHandler.java | 41 +- .../gateway/websockets/ProxyInboundClient.java | 107 +++ .../websockets/ProxyWebSocketAdapter.java | 20 +- .../impl/DefaultTokenAuthorityServiceTest.java | 253 ++++++ .../topology/DefaultTopologyServiceTest.java | 70 +- .../PropertiesFileServiceDiscoveryTest.java | 90 ++ .../discovery/ServiceDiscoveryFactoryTest.java | 81 ++ .../test/extension/DummyServiceDiscovery.java | 66 ++ .../extension/DummyServiceDiscoveryType.java | 32 + .../PropertiesFileServiceDiscovery.java | 108 +++ .../PropertiesFileServiceDiscoveryType.java | 35 + .../extension/SneakyServiceDiscoveryImpl.java | 40 + .../extension/SneakyServiceDiscoveryType.java | 33 + .../simple/SimpleDescriptorFactoryTest.java | 422 +++++++++ .../simple/SimpleDescriptorHandlerTest.java | 447 ++++++++++ .../websockets/ProxyInboundClientTest.java | 374 ++++++++ ...eway.topology.discovery.ServiceDiscoveryType | 21 + .../resources/keystores/server-keystore.jks | Bin 0 -> 1387 bytes .../topology/file/ambari-cluster-policy.xml | 74 ++ .../topology/file/simple-topology-four.json | 18 + .../services/ambariui/2.2.0/service.xml | 5 + .../resources/services/atlas/0.8.0/rewrite.xml | 6 +- gateway-service-knoxsso/pom.xml | 11 +- .../gateway/service/knoxsso/WebSSOResource.java | 29 +- .../service/knoxsso/WebSSOResourceTest.java | 411 ++++++++- .../service/knoxtoken/TokenResource.java | 50 +- .../knoxtoken/TokenServiceResourceTest.java | 288 +++++- gateway-shell-release/pom.xml | 4 + .../apache/hadoop/gateway/shell/job/Sqoop.java | 2 +- .../hadoop/gateway/config/GatewayConfig.java | 2 + .../dispatch/AbstractGatewayDispatch.java | 8 + .../gateway/dispatch/DefaultDispatch.java | 9 + .../hadoop/gateway/dispatch/Dispatch.java | 6 + .../gateway/dispatch/GatewayDispatchFilter.java | 8 + .../security/token/JWTokenAuthority.java | 19 +- .../services/security/token/impl/JWT.java | 42 +- .../services/security/token/impl/JWTToken.java | 59 +- .../topology/discovery/GatewayService.java | 29 + .../topology/discovery/ServiceDiscovery.java | 76 ++ .../discovery/ServiceDiscoveryConfig.java | 42 + .../discovery/ServiceDiscoveryType.java | 40 + .../security/token/impl/JWTTokenTest.java | 67 +- .../hadoop/gateway/GatewayTestConfig.java | 5 + .../apache/hadoop/gateway/util/HttpUtils.java | 7 +- .../hadoop/gateway/util/urltemplate/Parser.java | 10 +- .../gateway/util/urltemplate/ParserTest.java | 17 + pom.xml | 51 +- 101 files changed, 8396 insertions(+), 1016 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/1ee93707/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/builder/BeanPropertyTopologyBuilder.java ---------------------------------------------------------------------- diff --cc gateway-server/src/main/java/org/apache/hadoop/gateway/topology/builder/BeanPropertyTopologyBuilder.java index b33e52c,a30cf13..65278a1 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/builder/BeanPropertyTopologyBuilder.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/builder/BeanPropertyTopologyBuilder.java @@@ -86,9 -76,8 +86,9 @@@ public class BeanPropertyTopologyBuilde public Topology build() { Topology topology = new Topology(); topology.setName(name); + topology.setDefaultServicePath(defaultService); - for (Provider provider : providers) { + for (Provider provider : providers) { topology.addProvider(provider); }
