You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/06/14 10:06:31 UTC
svn commit: r547163 - in /geronimo/server/trunk/modules:
geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/
geronimo-openejb/src/main/java/org/apache/geronimo/openejb/
geronimo-security/src/main/java/org/apache/geronimo/security/jacc/
Author: djencks
Date: Thu Jun 14 01:06:30 2007
New Revision: 547163
URL: http://svn.apache.org/viewvc?view=rev&rev=547163
Log:
GERONIMO-2687 Fix some problems with deregistering default and run-as subjects
Modified:
geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java
geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java?view=diff&rev=547163&r1=547162&r2=547163
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java Thu Jun 14 01:06:30 2007
@@ -95,7 +95,6 @@
Subject subject = ContextManager.getServerSideSubject(loginContext.getSubject());
//TODO use the run-as subject as nextCaller
ContextManager.setCallers(subject, subject);
- ContextManager.setNextCaller(subject);
//login success
userPrincipal = new JAASJettyPrincipal(username);
@@ -110,7 +109,6 @@
}
} catch (LoginException e) {
-// log.warn("Login Failed", e);
log.debug("Login Failed", e);
return null;
}
Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java?view=diff&rev=547163&r1=547162&r2=547163
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java Thu Jun 14 01:06:30 2007
@@ -276,14 +276,6 @@
throw new IllegalStateException("Ejb does not exist " + deploymentId);
}
- if (defaultSubject != null) {
- ContextManager.registerSubject(defaultSubject);
- }
-
- if (runAs != null) {
- ContextManager.registerSubject(runAs);
- }
-
javaCompSubContext = (Context) deploymentInfo.getJndiEnc().lookup("java:comp");
if (componentContext != null) {
javaCompSubContext.bind("geronimo", componentContext);
@@ -295,14 +287,6 @@
if (deploymentInfo != null) {
deploymentInfo.set(EjbDeployment.class, null);
deploymentInfo = null;
- }
-
- if (defaultSubject != null) {
- ContextManager.unregisterSubject(defaultSubject);
- }
-
- if (runAs != null) {
- ContextManager.unregisterSubject(runAs);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java?view=diff&rev=547163&r1=547162&r2=547163
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java Thu Jun 14 01:06:30 2007
@@ -147,6 +147,9 @@
Subject roleDesignate = entry.getValue();
ContextManager.unregisterSubject(roleDesignate);
}
+ if (defaultSubject != ContextManager.EMPTY) {
+ ContextManager.unregisterSubject(defaultSubject);
+ }
if (principalRoleMapper != null) {
principalRoleMapper.uninstall();