You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ch...@apache.org on 2015/01/04 10:08:03 UTC
svn commit: r1649299 - in /sling/trunk/launchpad/builder/src/main: bundles/
config/oak/
Author: chetanm
Date: Sun Jan 4 09:08:03 2015
New Revision: 1649299
URL: http://svn.apache.org/r1649299
Log:
SLING-4277 - Enable JAAS integration with Oak
-- Adding Felix JAAS bundle at start level 9. The start level needs to be lower than start level of Oak
-- Add config related to default LoginModules provided as part of Oak
-- Make use of Configuration SPI (OAK-2051). This would allow JAAS auth without switching TCCL
Added:
sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.cfg
sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.cfg
sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.cfg
sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.ConfigurationSpi.cfg
sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl.cfg
Modified:
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1649299&r1=1649298&r2=1649299&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Sun Jan 4 09:08:03 2015
@@ -451,6 +451,12 @@
<artifactId>tika-bundle</artifactId>
<version>1.2</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.jaas</artifactId>
+ <version>0.0.2</version>
+ <runModes>oak</runModes>
+ </bundle>
</startLevel>
<startLevel level="15">
Added: sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.cfg
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.cfg?rev=1649299&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.cfg (added)
+++ sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.cfg Sun Jan 4 09:08:03 2015
@@ -0,0 +1,3 @@
+jaas.controlFlag=optional
+jaas.classname=org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule
+jaas.ranking=300
\ No newline at end of file
Added: sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.cfg
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.cfg?rev=1649299&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.cfg (added)
+++ sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.cfg Sun Jan 4 09:08:03 2015
@@ -0,0 +1,2 @@
+jaas.controlFlag=required
+jaas.classname=org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl
\ No newline at end of file
Added: sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.cfg
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.cfg?rev=1649299&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.cfg (added)
+++ sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.cfg Sun Jan 4 09:08:03 2015
@@ -0,0 +1,3 @@
+jaas.controlFlag=sufficient
+jaas.classname=org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule
+jaas.ranking=200
\ No newline at end of file
Added: sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.ConfigurationSpi.cfg
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.ConfigurationSpi.cfg?rev=1649299&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.ConfigurationSpi.cfg (added)
+++ sling/trunk/launchpad/builder/src/main/config/oak/org.apache.felix.jaas.ConfigurationSpi.cfg Sun Jan 4 09:08:03 2015
@@ -0,0 +1,2 @@
+jaas.defaultRealmName=jackrabbit.oak
+jaas.configProviderName=FelixJaasProvider
\ No newline at end of file
Added: sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl.cfg
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl.cfg?rev=1649299&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl.cfg (added)
+++ sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl.cfg Sun Jan 4 09:08:03 2015
@@ -0,0 +1 @@
+org.apache.jackrabbit.oak.authentication.configSpiName=FelixJaasProvider
\ No newline at end of file