You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/07/28 10:09:41 UTC
svn commit: r1693021 - in /jackrabbit/oak/trunk/oak-auth-external: ./
src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/
Author: chetanm
Date: Tue Jul 28 08:09:41 2015
New Revision: 1693021
URL: http://svn.apache.org/r1693021
Log:
OAK-3146 - ExternalLoginModuleFactory should inject SyncManager and ExternalIdentityProviderManager
Reverting 1692998
Removed:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleFactoryTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/pom.xml
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1693021&r1=1693020&r2=1693021&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-auth-external/pom.xml Tue Jul 28 08:09:41 2015
@@ -185,10 +185,5 @@
<version>2.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1693021&r1=1693020&r2=1693021&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java Tue Jul 28 08:09:41 2015
@@ -76,10 +76,6 @@ public class ExternalLoginModule extends
*/
public static final String PARAM_SYNC_HANDLER_NAME = "sync.handlerName";
- private ExternalIdentityProviderManager idpManager;
-
- private SyncManager syncManager;
-
/**
* internal configuration when invoked from a factory rather than jaas
*/
@@ -140,13 +136,11 @@ public class ExternalLoginModule extends
if (idpName.isEmpty()) {
log.error("External login module needs IPD name. Will not be used for login.");
} else {
- if (idpManager == null) {
- idpManager = WhiteboardUtils.getService(whiteboard, ExternalIdentityProviderManager.class);
- }
- if (idpManager == null) {
+ ExternalIdentityProviderManager idpMgr = WhiteboardUtils.getService(whiteboard, ExternalIdentityProviderManager.class);
+ if (idpMgr == null) {
log.error("External login module needs IDPManager. Will not be used for login.");
} else {
- idp = idpManager.getProvider(idpName);
+ idp = idpMgr.getProvider(idpName);
if (idp == null) {
log.error("No IDP found with name {}. Will not be used for login.", idpName);
}
@@ -157,13 +151,11 @@ public class ExternalLoginModule extends
if (syncHandlerName.isEmpty()) {
log.error("External login module needs SyncHandler name. Will not be used for login.");
} else {
- if (syncManager == null) {
- syncManager = WhiteboardUtils.getService(whiteboard, SyncManager.class);
- }
- if (syncManager == null) {
+ SyncManager syncMgr = WhiteboardUtils.getService(whiteboard, SyncManager.class);
+ if (syncMgr == null) {
log.error("External login module needs SyncManager. Will not be used for login.");
} else {
- syncHandler = syncManager.getSyncHandler(syncHandlerName);
+ syncHandler = syncMgr.getSyncHandler(syncHandlerName);
if (syncHandler == null) {
log.error("No SyncHandler found with name {}. Will not be used for login.", syncHandlerName);
}
@@ -413,13 +405,4 @@ public class ExternalLoginModule extends
Class scClass = SimpleCredentials.class;
return Collections.singleton(scClass);
}
-
-
- public void setSyncManager(SyncManager syncManager) {
- this.syncManager = syncManager;
- }
-
- public void setIdpManager(ExternalIdentityProviderManager idpManager) {
- this.idpManager = idpManager;
- }
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java?rev=1693021&r1=1693020&r2=1693021&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java Tue Jul 28 08:09:41 2015
@@ -165,9 +165,7 @@ public class ExternalLoginModuleFactory
*/
@Override
public LoginModule createLoginModule() {
- ExternalLoginModule lm = new ExternalLoginModule(osgiConfig);
- lm.setIdpManager(idpManager);
- lm.setSyncManager(syncManager);
- return lm;
+ return new ExternalLoginModule(osgiConfig);
}
+
}
\ No newline at end of file
Re: svn commit: r1693021 - in /jackrabbit/oak/trunk/oak-auth-external:
./ src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/
Posted by Tobias Bocanegra <tr...@apache.org>.
Hi,
can we keep those changes at least in trunk? I think it an important
improvement.
thanks.
regards, toby
On Tue, Jul 28, 2015 at 1:09 AM, <ch...@apache.org> wrote:
> Author: chetanm
> Date: Tue Jul 28 08:09:41 2015
> New Revision: 1693021
>
> URL: http://svn.apache.org/r1693021
> Log:
> OAK-3146 - ExternalLoginModuleFactory should inject SyncManager and ExternalIdentityProviderManager
>
> Reverting 1692998
>
> Removed:
> jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleFactoryTest.java
> Modified:
> jackrabbit/oak/trunk/oak-auth-external/pom.xml
> jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
> jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
>
> Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1693021&r1=1693020&r2=1693021&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-auth-external/pom.xml (original)
> +++ jackrabbit/oak/trunk/oak-auth-external/pom.xml Tue Jul 28 08:09:41 2015
> @@ -185,10 +185,5 @@
> <version>2.4</version>
> <scope>test</scope>
> </dependency>
> - <dependency>
> - <groupId>org.apache.sling</groupId>
> - <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
> - <scope>test</scope>
> - </dependency>
> </dependencies>
> </project>
>
> Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1693021&r1=1693020&r2=1693021&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java (original)
> +++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java Tue Jul 28 08:09:41 2015
> @@ -76,10 +76,6 @@ public class ExternalLoginModule extends
> */
> public static final String PARAM_SYNC_HANDLER_NAME = "sync.handlerName";
>
> - private ExternalIdentityProviderManager idpManager;
> -
> - private SyncManager syncManager;
> -
> /**
> * internal configuration when invoked from a factory rather than jaas
> */
> @@ -140,13 +136,11 @@ public class ExternalLoginModule extends
> if (idpName.isEmpty()) {
> log.error("External login module needs IPD name. Will not be used for login.");
> } else {
> - if (idpManager == null) {
> - idpManager = WhiteboardUtils.getService(whiteboard, ExternalIdentityProviderManager.class);
> - }
> - if (idpManager == null) {
> + ExternalIdentityProviderManager idpMgr = WhiteboardUtils.getService(whiteboard, ExternalIdentityProviderManager.class);
> + if (idpMgr == null) {
> log.error("External login module needs IDPManager. Will not be used for login.");
> } else {
> - idp = idpManager.getProvider(idpName);
> + idp = idpMgr.getProvider(idpName);
> if (idp == null) {
> log.error("No IDP found with name {}. Will not be used for login.", idpName);
> }
> @@ -157,13 +151,11 @@ public class ExternalLoginModule extends
> if (syncHandlerName.isEmpty()) {
> log.error("External login module needs SyncHandler name. Will not be used for login.");
> } else {
> - if (syncManager == null) {
> - syncManager = WhiteboardUtils.getService(whiteboard, SyncManager.class);
> - }
> - if (syncManager == null) {
> + SyncManager syncMgr = WhiteboardUtils.getService(whiteboard, SyncManager.class);
> + if (syncMgr == null) {
> log.error("External login module needs SyncManager. Will not be used for login.");
> } else {
> - syncHandler = syncManager.getSyncHandler(syncHandlerName);
> + syncHandler = syncMgr.getSyncHandler(syncHandlerName);
> if (syncHandler == null) {
> log.error("No SyncHandler found with name {}. Will not be used for login.", syncHandlerName);
> }
> @@ -413,13 +405,4 @@ public class ExternalLoginModule extends
> Class scClass = SimpleCredentials.class;
> return Collections.singleton(scClass);
> }
> -
> -
> - public void setSyncManager(SyncManager syncManager) {
> - this.syncManager = syncManager;
> - }
> -
> - public void setIdpManager(ExternalIdentityProviderManager idpManager) {
> - this.idpManager = idpManager;
> - }
> }
> \ No newline at end of file
>
> Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java?rev=1693021&r1=1693020&r2=1693021&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java (original)
> +++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java Tue Jul 28 08:09:41 2015
> @@ -165,9 +165,7 @@ public class ExternalLoginModuleFactory
> */
> @Override
> public LoginModule createLoginModule() {
> - ExternalLoginModule lm = new ExternalLoginModule(osgiConfig);
> - lm.setIdpManager(idpManager);
> - lm.setSyncManager(syncManager);
> - return lm;
> + return new ExternalLoginModule(osgiConfig);
> }
> +
> }
> \ No newline at end of file
>
>