This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from 4260d2f Merge pull request #1023 from
duncangrant/docker-build-plugin-version
new 5df761c adding oauth server
new 2beae0d Merge branch 'master' of
https://github.com/apache/brooklyn-server
new 2950e2f add filter and dependencies
new 9a2855a add json-simple dependency to feature.xml
new 20e92ab change json-simple entry to remove hard coded version no
new 94cee32 change hard coded version of json-simple
new b728046 add oauth filter to service.xml
new d6f5aaa Merge branch 'oauth-integration' of
https://github.com/frogfather/brooklyn-server into jdServer
new e3eaf3e adding new GoogleOauthSecurityProvider
new 7e3ff13 changes after Andrew
new 5418709 GoogleOauthLoginModule, doesn't want to redirect
new e3b9cbf add cors header to server response
new 41c7c4b cors settings
new d3478bc refactor to use github for auth
new 41a7a90 correct redirect url
new a9ef32b alterations to headers
new fc5ee8d remove unnecessary headers from response
new 8dc19c1 minimal Google Oauth login module
new bf952bf Merge branch 'oauth-juan' into oauth-merged
new 65fa561 logging and tidy to use gson
new 9ee99f4 switching to security provider filter from login module
new 2b0cd8d clean up removing jaas stuff to support oauth
new 6c0574d bump the jetty version declared to match the one actually
provided by karaf
new 5e1bf35 working filter, sharing sessions
new 5d8b28b changed HashLoginService to use UserStore
new 3c6afd9 Change SessionHandler to SessionManager due to upgrade of
jetty
new 342ea6c remove jaas dependency
new dc9b355 add'l tidy for removal of jaas, introduction of
SecurityProvider as filter
new ba31401 remove json-simple; our yaml code will do what it did
new ad6a387 Merge remote-tracking branch 'apache-git/master' into
oauth-merged
new 945c0df bump jax and cxf versions to align with jetty bump
new f710a50 name tidy-up
new f19af47 Updated CXF and JAX-RS version
new 1402f10 Updated dependencies and test corrected
new f03bd6b Merge remote-tracking branch 'jcabrerizo/testOauth' into
oauth-merged
new 20d4ecf Solved dependency problem
new 9906c01 Merge remote-tracking branch 'jcabrerizo/testOauth' into
oauth-merged
new f4a6fe7 remove count in http session maintained by
DelegatingSecurityProvider
new bd686f1 add comments to AnyoneSecProvs
new 96d0968 Added `BrooklynSecurityProviderFilterJersey` for test
new 874f58b Solved dependency problems
new b00d994 Change redirection method and added log
new eed8f07 Doc added
new 2b191de a few more cleanups
new 7f2ad46 fix skipSecurity method for new security provider stack
new 3c76612 fix access to osgi boot bundles
new d494b08 bump karaf to 4.2.2, and the plugin builder now
new 551be90 ASM version bump needed
new 061057c This closes #1024
The 49 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
create mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterHelper.java
create mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJavax.java
create mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJersey.java
delete mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/BrooklynLoginModule.java
delete mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/JaasUtils.java
delete mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/ManagementContextHolder.java
delete mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
create mode 100644
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/OauthSecurityProvider.java
delete mode 100644 rest/rest-resources/src/main/resources/jaas.conf
delete mode 100644
rest/rest-resources/src/test/java/org/apache/brooklyn/rest/security/jaas/BrooklynLoginModuleTest.java
delete mode 100644
rest/rest-resources/src/test/java/org/apache/brooklyn/rest/security/jaas/TestCallbackHandler.java
delete mode 100644
rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
