This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 061057cfa55f06e8514ec492d29ab05a8e5000cd Merge: 4260d2f 551be90 Author: Alex Heneveld <[email protected]> AuthorDate: Wed Jan 16 02:11:22 2019 +0000 This closes #1024 .../org/apache/brooklyn/core/test/HttpService.java | 9 +- karaf/features/src/main/feature/feature.xml | 1 + karaf/jetty-config/pom.xml | 1 - .../brooklyn/launcher/BrooklynWebServer.java | 46 +-- .../brooklyn/launcher/WebAppContextProvider.java | 14 +- pom.xml | 12 +- .../org/apache/brooklyn/rest/api/LogoutApi.java | 11 +- rest/rest-resources/pom.xml | 9 +- .../apache/brooklyn/rest/BrooklynWebConfig.java | 5 + .../BrooklynSecurityProviderFilterHelper.java | 175 ++++++++++ .../BrooklynSecurityProviderFilterJavax.java | 91 +++++ .../BrooklynSecurityProviderFilterJersey.java | 79 +++++ .../rest/filter/CorsImplSupplierFilter.java | 1 + .../rest/filter/EntitlementContextFilter.java | 38 ++- .../rest/filter/HaHotCheckResourceFilter.java | 1 - .../brooklyn/rest/resources/LogoutResource.java | 22 +- .../rest/security/jaas/BrooklynLoginModule.java | 366 --------------------- .../brooklyn/rest/security/jaas/JaasUtils.java | 48 --- .../security/jaas/ManagementContextHolder.java | 36 -- .../security/jaas/SecurityProviderHttpSession.java | 120 ------- .../security/provider/AnyoneSecurityProvider.java | 10 +- .../provider/BlackholeSecurityProvider.java | 8 +- ...klynUserWithRandomPasswordSecurityProvider.java | 5 + .../provider/DelegatingSecurityProvider.java | 113 +++++-- .../provider/ExplicitUsersSecurityProvider.java | 5 + .../security/provider/LdapSecurityProvider.java | 5 + .../security/provider/OauthSecurityProvider.java | 322 ++++++++++++++++++ .../rest/security/provider/SecurityProvider.java | 33 +- .../rest/util/ManagementContextProvider.java | 27 +- .../main/resources/OSGI-INF/blueprint/service.xml | 21 +- rest/rest-resources/src/main/resources/jaas.conf | 21 -- .../rest/filter/EntitlementContextFilterTest.java | 12 +- .../security/jaas/BrooklynLoginModuleTest.java | 195 ----------- .../rest/security/jaas/TestCallbackHandler.java | 50 --- .../brooklyn/rest/testing/BrooklynRestApiTest.java | 4 +- .../rest/testing/BrooklynRestResourceTest.java | 17 +- .../filter/BrooklynPropertiesSecurityFilter.java | 179 ---------- .../src/main/resources/web-security.xml | 29 +- .../brooklyn/rest/BrooklynRestApiLauncher.java | 28 +- .../AuthenticateAnyoneSecurityProvider.java | 10 +- .../security/provider/TestSecurityProvider.java | 5 + software/base/pom.xml | 5 + software/winrm/pom.xml | 8 + .../brooklyn/rt/felix/EmbeddedFelixFramework.java | 34 +- 44 files changed, 1003 insertions(+), 1228 deletions(-)
