projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor CMS life cycle.
[lgpl/argeo-commons.git]
/
org.argeo.cms
/
src
/
org
/
argeo
/
cms
/
auth
/
SpnegoLoginModule.java
diff --git
a/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java
b/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java
index 27de54be35567496e81c14477b3ae3f9b4768eb5..2dbad96d28d592bcb007d7e186ea6223c054f62c 100644
(file)
--- a/
org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java
+++ b/
org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java
@@
-8,9
+8,8
@@
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.internal.kernel.Activator;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.internal.runtime.CmsContextImpl;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
@@
-19,7
+18,7
@@
import org.ietf.jgss.GSSName;
/** SPNEGO login */
public class SpnegoLoginModule implements LoginModule {
/** SPNEGO login */
public class SpnegoLoginModule implements LoginModule {
- private final static
Log log = LogFactory
.getLog(SpnegoLoginModule.class);
+ private final static
CmsLog log = CmsLog
.getLog(SpnegoLoginModule.class);
private Subject subject;
private Map<String, Object> sharedState = null;
private Subject subject;
private Map<String, Object> sharedState = null;
@@
-112,7
+111,7
@@
public class SpnegoLoginModule implements LoginModule {
private GSSContext checkToken(byte[] authToken) {
GSSManager manager = GSSManager.getInstance();
try {
private GSSContext checkToken(byte[] authToken) {
GSSManager manager = GSSManager.getInstance();
try {
- GSSContext gContext = manager.createContext(
Activator
.getAcceptorCredentials());
+ GSSContext gContext = manager.createContext(
CmsContextImpl
.getAcceptorCredentials());
if (gContext == null) {
log.debug("SpnegoUserRealm: failed to establish GSSContext");
if (gContext == null) {
log.debug("SpnegoUserRealm: failed to establish GSSContext");
@@
-132,4
+131,9
@@
public class SpnegoLoginModule implements LoginModule {
return null;
}
return null;
}
+
+ @Deprecated
+ public static boolean hasAcceptorCredentials() {
+ return CmsContextImpl.getAcceptorCredentials() != null;
+ }
}
}