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 an...@apache.org on 2015/03/26 19:21:20 UTC
svn commit: r1669400 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security:
SecurityProviderImpl.java authentication/AuthenticationConfigurationImpl.java
authentication/LoginContextProviderImpl.java
Author: angela
Date: Thu Mar 26 18:21:20 2015
New Revision: 1669400
URL: http://svn.apache.org/r1669400
Log:
OAK-2674 : Fix FindBug Issues
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1669400&r1=1669399&r2=1669400&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java Thu Mar 26 18:21:20 2015
@@ -189,7 +189,7 @@ public class SecurityProviderImpl implem
//----------------------------------------------------------------< SCR >---
@Activate
- protected void activate(BundleContext context) throws Exception {
+ protected void activate(BundleContext context) {
whiteboard = new OsgiWhiteboard(context);
authorizableActionProvider.start(whiteboard);
authorizableNodeName.start(whiteboard);
@@ -200,7 +200,7 @@ public class SecurityProviderImpl implem
}
@Deactivate
- protected void deactivate() throws Exception {
+ protected void deactivate() {
authorizableActionProvider.stop();
authorizableNodeName.stop();
restrictionProvider.stop();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java?rev=1669400&r1=1669399&r2=1669400&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java Thu Mar 26 18:21:20 2015
@@ -30,7 +30,6 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.security.authentication.AuthenticationConfiguration;
-import org.apache.jackrabbit.oak.spi.security.authentication.ConfigurationUtil;
import org.apache.jackrabbit.oak.spi.security.authentication.LoginContextProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAware;
@@ -100,7 +99,7 @@ public class AuthenticationConfiguration
* {@link javax.security.auth.login.Configuration#getConfiguration() JAAS}
* functionality. In case no login configuration for the specified app name
* can be retrieve this implementation uses the default as defined by
- * {@link ConfigurationUtil#getDefaultConfiguration(org.apache.jackrabbit.oak.spi.security.ConfigurationParameters)}.
+ * {@link org.apache.jackrabbit.oak.spi.security.authentication.ConfigurationUtil#getDefaultConfiguration(org.apache.jackrabbit.oak.spi.security.ConfigurationParameters)}.
* <p>
* The {@link LoginContextProvider} implementation is intended to be used with
* <ul>
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java?rev=1669400&r1=1669399&r2=1669400&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java Thu Mar 26 18:21:20 2015
@@ -107,15 +107,19 @@ class LoginContextProviderImpl implement
if (configuration == null) {
Configuration loginConfig = null;
- //Default value cannot be set to null so using a sentinel to determine
- //case when its not set
- String configSpiName = params.getConfigValue(PARAM_CONFIG_SPI_NAME, "NA");
- if(!"NA".equals(configSpiName)){
+ String configSpiName = params.getConfigValue(PARAM_CONFIG_SPI_NAME, null, String.class);
+ if (configSpiName != null) {
try {
+ /*
+ Create a configuration instance with the following characteristics
+ - Algorithm name : "JavaLoginConfig"
+ - Extra parameters : 'null' for this impl
+ - Name of the config provider : 'configSpiName' as retrieved from the PARAM_CONFIG_SPI_NAME configuration (default: null)
+ */
loginConfig = Configuration.getInstance(
- "JavaLoginConfig", //Algorithm name
- null, //Extra params to be passed. For this impl its null
- configSpiName //Name of the config provider
+ "JavaLoginConfig",
+ null,
+ configSpiName
);
if (loginConfig.getAppConfigurationEntry(appName) == null) {
log.warn("No configuration found for application {} though fetching JAAS " +
@@ -128,7 +132,7 @@ class LoginContextProviderImpl implement
}
}
- if(loginConfig == null) {
+ if (loginConfig == null) {
try {
loginConfig = Configuration.getConfiguration();
// NOTE: workaround for Java7 behavior (see OAK-497)