|
@@ -15,22 +15,6 @@
|
|
|
|
|
|
package org.springframework.security.authentication.jaas;
|
|
|
|
|
|
-import java.io.File;
|
|
|
-import java.io.IOException;
|
|
|
-import java.net.URL;
|
|
|
-import java.security.Principal;
|
|
|
-import java.security.Security;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.Set;
|
|
|
-
|
|
|
-import javax.security.auth.callback.Callback;
|
|
|
-import javax.security.auth.callback.CallbackHandler;
|
|
|
-import javax.security.auth.callback.UnsupportedCallbackException;
|
|
|
-import javax.security.auth.login.Configuration;
|
|
|
-import javax.security.auth.login.LoginContext;
|
|
|
-import javax.security.auth.login.LoginException;
|
|
|
-
|
|
|
import org.apache.commons.logging.Log;
|
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
import org.springframework.beans.factory.InitializingBean;
|
|
@@ -49,6 +33,19 @@ import org.springframework.security.core.context.SecurityContext;
|
|
|
import org.springframework.security.core.session.SessionDestroyedEvent;
|
|
|
import org.springframework.util.Assert;
|
|
|
|
|
|
+import javax.security.auth.callback.Callback;
|
|
|
+import javax.security.auth.callback.CallbackHandler;
|
|
|
+import javax.security.auth.callback.UnsupportedCallbackException;
|
|
|
+import javax.security.auth.login.Configuration;
|
|
|
+import javax.security.auth.login.LoginContext;
|
|
|
+import javax.security.auth.login.LoginException;
|
|
|
+import java.io.File;
|
|
|
+import java.io.IOException;
|
|
|
+import java.net.URL;
|
|
|
+import java.security.Principal;
|
|
|
+import java.security.Security;
|
|
|
+import java.util.*;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* An {@link AuthenticationProvider} implementation that retrieves user details from a JAAS login configuration.
|
|
@@ -269,14 +266,20 @@ public class JaasAuthenticationProvider implements AuthenticationProvider, Appli
|
|
|
}
|
|
|
|
|
|
private String convertLoginConfigToUrl() throws IOException {
|
|
|
- String loginConfigPath = loginConfig.getFile().getAbsolutePath();
|
|
|
- loginConfigPath.replace(File.separatorChar, '/');
|
|
|
+ String loginConfigPath;
|
|
|
|
|
|
- if (!loginConfigPath.startsWith("/")) {
|
|
|
- loginConfigPath = "/" + loginConfigPath;
|
|
|
- }
|
|
|
+ try {
|
|
|
+ loginConfigPath = loginConfig.getFile().getAbsolutePath().replace(File.separatorChar, '/');
|
|
|
|
|
|
- return new URL("file", "", loginConfigPath).toString();
|
|
|
+ if (!loginConfigPath.startsWith("/")) {
|
|
|
+ loginConfigPath = "/" + loginConfigPath;
|
|
|
+ }
|
|
|
+
|
|
|
+ return new URL("file", "", loginConfigPath).toString();
|
|
|
+ } catch (IOException e) {
|
|
|
+ // SEC-1700: May be inside a jar
|
|
|
+ return loginConfig.getURL().toString();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -427,7 +430,7 @@ public class JaasAuthenticationProvider implements AuthenticationProvider, Appli
|
|
|
* If set, a call to {@code Configuration#refresh()} will be made by {@code #configureJaas(Resource) }
|
|
|
* method. Defaults to {@code true}.
|
|
|
*
|
|
|
- * @see <a href="https://jira.springsource.org/browse/SEC-1320">SEC-1230</a>
|
|
|
+ * @see <a href="https://jira.springsource.org/browse/SEC-1320">SEC-1320</a>
|
|
|
*
|
|
|
* @param refresh set to {@code false} to disable reloading of the configuration.
|
|
|
* May be useful in some environments.
|