This is an automated email from the ASF dual-hosted git repository. more pushed a commit to branch webshell in repository https://gitbox.apache.org/repos/asf/knox.git
commit c75e0d9785a6d3273376e6948a86af07ba58bce1 Merge: f6201a3 2426bd4 Author: Sandeep Moré <[email protected]> AuthorDate: Thu Jan 20 10:47:51 2022 -0500 Merge branch 'master' into luliu8/master # Conflicts: # gateway-test-release/webhdfs-kerb-test/src/test/java/org/apache/knox/gateway/SecureKnoxShellTest.java .../discovery/ambari/AmbariServiceDiscovery.java | 30 ----------- .../ambari/AmbariServiceDiscoveryTest.java | 24 --------- .../cm/ClouderaManagerServiceDiscovery.java | 58 ++++------------------ .../model/impala/ImpalaServiceModelGenerator.java | 29 +++++++++++ .../cm/ClouderaManagerServiceDiscoveryTest.java | 3 +- .../impala/ImpalaServiceModelGeneratorTest.java | 29 +++++++++++ .../hadoopauth/filter/HadoopAuthFilterTest.java | 1 + .../federation/jwt/filter/AbstractJWTFilter.java | 4 +- .../federation/jwt/filter/JWTFederationFilter.java | 12 +++++ .../provider/federation/AbstractJWTFilterTest.java | 3 +- gateway-release/home/conf/topologies/homepage.xml | 4 ++ .../org/apache/knox/gateway/GatewayMessages.java | 5 ++ .../token/impl/DefaultTokenAuthorityService.java | 11 +++- .../topology/impl/DefaultTopologyService.java | 9 +++- .../topology/monitor/DescriptorsMonitor.java | 3 ++ .../topology/DefaultTopologyServiceTest.java | 31 ++++++++++-- .../test/extension/DummyServiceDiscovery.java | 5 -- .../extension/PropertiesFileServiceDiscovery.java | 6 +-- .../test/extension/SneakyServiceDiscoveryImpl.java | 7 --- .../simple/SimpleDescriptorHandlerTest.java | 23 ++------- .../service/knoxsso/WebSSOResourceTest.java | 4 +- .../gateway/service/knoxtoken/TokenResource.java | 8 ++- .../knoxtoken/TokenServiceResourceTest.java | 3 +- .../services/security/token/JWTokenAttributes.java | 9 +++- .../security/token/JWTokenAttributesBuilder.java | 8 ++- .../services/security/token/JWTokenAuthority.java | 5 +- .../gateway/services/security/token/impl/JWT.java | 3 ++ .../services/security/token/impl/JWTToken.java | 48 ++++++++++++------ .../topology/discovery/ServiceDiscovery.java | 12 ----- .../services/security/token/impl/JWTTokenTest.java | 25 +++++++--- .../apache/knox/gateway/SecureKnoxShellTest.java | 1 - .../gateway/SimpleDescriptorHandlerFuncTest.java | 27 +++++++--- .../topology/simple/DiscoveryException.java | 25 ++++++---- .../topology/simple/SimpleDescriptorHandler.java | 2 +- .../topology/simple/SimpleDescriptorMessages.java | 4 -- .../app/token.management.component.html | 7 +-- .../app/token.management.component.ts | 5 ++ pom.xml | 4 +- 38 files changed, 279 insertions(+), 218 deletions(-)
