[jboss-cvs] JBossAS SVN: r63507 - in trunk/server/src/main/org/jboss: ejb/plugins and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 13 15:30:43 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-06-13 15:30:43 -0400 (Wed, 13 Jun 2007)
New Revision: 63507
Modified:
trunk/server/src/main/org/jboss/ejb/SecurityActions.java
trunk/server/src/main/org/jboss/ejb/plugins/SecurityActions.java
trunk/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java
trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/SecurityActions.java
trunk/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java
trunk/server/src/main/org/jboss/ejb/plugins/security/SecurityActions.java
trunk/server/src/main/org/jboss/ejb/txtimer/SecurityActions.java
trunk/server/src/main/org/jboss/proxy/SecurityActions.java
trunk/server/src/main/org/jboss/proxy/SecurityInterceptor.java
Log:
SECURITY-62: differentiate incoming/outgoing runas
Modified: trunk/server/src/main/org/jboss/ejb/SecurityActions.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/SecurityActions.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/ejb/SecurityActions.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -186,7 +186,7 @@
if(securityContext != null)
{
- caller = securityContext.getUtil().getCallerRunAs();
+ caller = securityContext.getIncomingRunAs();
//If there is no caller run as, use the call principal
if(caller == null)
caller = securityContext.getUtil().getUserPrincipal();
@@ -207,7 +207,7 @@
if(securityContext != null)
{
- caller = securityContext.getUtil().getCallerRunAs();
+ caller = securityContext.getIncomingRunAs();
//If there is no caller run as, use the call principal
if(caller == null)
caller = securityContext.getUtil().getUserPrincipal();
Modified: trunk/server/src/main/org/jboss/ejb/plugins/SecurityActions.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/SecurityActions.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/ejb/plugins/SecurityActions.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -59,7 +59,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- return sc.getRunAs();
+ return sc.getOutgoingRunAs();
}
};
@@ -71,8 +71,8 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- RunAs ra = sc.getRunAs();
- sc.setRunAs(null);
+ RunAs ra = sc.getOutgoingRunAs();
+ sc.setOutgoingRunAs(null);
return ra;
}
};
@@ -93,7 +93,7 @@
SecurityContext sa = SecurityContextAssociation.getSecurityContext();
if(sa == null)
throw new IllegalStateException("Security Context is null to push runas");
- sa.setRunAs(id);
+ sa.setOutgoingRunAs(id);
return null;
}
}
@@ -114,7 +114,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- return sc.getRunAs();
+ return sc.getOutgoingRunAs();
}
public void push(RunAs id)
@@ -123,7 +123,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null to push runas");
- sc.setRunAs(id);
+ sc.setOutgoingRunAs(id);
}
public RunAs pop()
@@ -134,8 +134,8 @@
if(sc == null)
throw new IllegalStateException("Security Context is null");
RunAs ra = null;
- ra = sc.getRunAs();
- sc.setRunAs(null);
+ ra = sc.getOutgoingRunAs();
+ sc.setOutgoingRunAs(null);
return ra;
}
};
@@ -474,7 +474,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.getUtil().setCallerRunAs(ra);
+ sc.setIncomingRunAs(ra);
return null;
}
});
@@ -488,7 +488,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.getUtil().setCallerRunAs(null);
+ sc.setIncomingRunAs(null);
return null;
}
});
Modified: trunk/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/ejb/plugins/SecurityInterceptor.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -258,7 +258,7 @@
if(callerSC != null)
{
//authenticate the current principal
- RunAs callerRunAsIdentity = callerSC.getRunAs();
+ RunAs callerRunAsIdentity = callerSC.getOutgoingRunAs();
if(callerRunAsIdentity != null)
{
//Either has to be a in-vm call or the invocation has to be secure
@@ -379,7 +379,7 @@
if(callerSC != null)
{
- callerRAI = callerSC.getRunAs();
+ callerRAI = callerSC.getOutgoingRunAs();
}
return callerRAI;
}
Modified: trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/SecurityActions.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/SecurityActions.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/SecurityActions.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -59,7 +59,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- return sc.getRunAs();
+ return sc.getOutgoingRunAs();
}
};
@@ -71,8 +71,8 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- RunAs ra = sc.getRunAs();
- sc.setRunAs(null);
+ RunAs ra = sc.getOutgoingRunAs();
+ sc.setOutgoingRunAs(null);
return ra;
}
};
@@ -93,7 +93,7 @@
SecurityContext sa = SecurityContextAssociation.getSecurityContext();
if(sa == null)
throw new IllegalStateException("Security Context is null to push runas");
- sa.setRunAs(id);
+ sa.setOutgoingRunAs(id);
return null;
}
}
@@ -114,7 +114,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- return sc.getRunAs();
+ return sc.getOutgoingRunAs();
}
public void push(RunAs id)
@@ -123,7 +123,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null to push runas");
- sc.setRunAs(id);
+ sc.setOutgoingRunAs(id);
}
public RunAs pop()
@@ -134,8 +134,8 @@
if(sc == null)
throw new IllegalStateException("Security Context is null");
RunAs ra = null;
- ra = sc.getRunAs();
- sc.setRunAs(null);
+ ra = sc.getOutgoingRunAs();
+ sc.setOutgoingRunAs(null);
return ra;
}
};
@@ -474,7 +474,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.getUtil().setCallerRunAs(ra);
+ sc.setIncomingRunAs(ra);
return null;
}
});
@@ -488,7 +488,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.getUtil().setCallerRunAs(null);
+ sc.setIncomingRunAs(null);
return null;
}
});
Modified: trunk/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/ejb/plugins/security/PreSecurityInterceptor.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -95,7 +95,7 @@
try
{
//Establish the run-as on the SC as the caller SC
- SecurityActions.pushCallerRunAsIdentity(SecurityActions.getSecurityContext().getRunAs());
+ SecurityActions.pushCallerRunAsIdentity(SecurityActions.getSecurityContext().getOutgoingRunAs());
Object returnValue = getNext().invoke(mi);
return returnValue;
}
@@ -128,7 +128,7 @@
try
{
//Establish the run-as on the SC as the caller SC
- SecurityActions.pushCallerRunAsIdentity(SecurityActions.getSecurityContext().getRunAs());
+ SecurityActions.pushCallerRunAsIdentity(SecurityActions.getSecurityContext().getOutgoingRunAs());
Object returnValue = getNext().invokeHome(mi);
return returnValue;
}
Modified: trunk/server/src/main/org/jboss/ejb/plugins/security/SecurityActions.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/security/SecurityActions.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/ejb/plugins/security/SecurityActions.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -72,7 +72,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.getUtil().setCallerRunAs(ra);
+ sc.setIncomingRunAs(ra);
return null;
}
});
@@ -87,7 +87,7 @@
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.getUtil().setCallerRunAs(null);
+ sc.setIncomingRunAs(null);
return null;
}
});
Modified: trunk/server/src/main/org/jboss/ejb/txtimer/SecurityActions.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/txtimer/SecurityActions.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/ejb/txtimer/SecurityActions.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -49,7 +49,7 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- return sc.getRunAs();
+ return sc.getOutgoingRunAs();
//return SecurityAssociation.peekRunAsIdentity();
}
};
@@ -62,8 +62,8 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- RunAs ra = sc.getRunAs();
- sc.setRunAs(null);
+ RunAs ra = sc.getOutgoingRunAs();
+ sc.setOutgoingRunAs(null);
return ra;
}
};
@@ -84,7 +84,7 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.setRunAs(id);
+ sc.setOutgoingRunAs(id);
return null;
}
}
@@ -104,7 +104,7 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- return sc.getRunAs();
+ return sc.getOutgoingRunAs();
//return SecurityAssociation.peekRunAsIdentity();
}
@@ -114,7 +114,7 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- sc.setRunAs(id);
+ sc.setOutgoingRunAs(id);
}
public RunAs pop()
@@ -123,8 +123,8 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- RunAs ra = sc.getRunAs();
- sc.setRunAs(null);
+ RunAs ra = sc.getOutgoingRunAs();
+ sc.setOutgoingRunAs(null);
return ra;
}
};
Modified: trunk/server/src/main/org/jboss/proxy/SecurityActions.java
===================================================================
--- trunk/server/src/main/org/jboss/proxy/SecurityActions.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/proxy/SecurityActions.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -81,7 +81,7 @@
SecurityContext existingSC = getSecurityContext();
if(existingSC != null)
{
- rai = existingSC.getRunAs();
+ rai = existingSC.getOutgoingRunAs();
}
return rai;
}
@@ -164,7 +164,7 @@
SecurityContext existingSC = getSecurityContext();
if(existingSC != null)
{
- rai = existingSC.getRunAs();
+ rai = existingSC.getOutgoingRunAs();
}
return rai;
}});
Modified: trunk/server/src/main/org/jboss/proxy/SecurityInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/proxy/SecurityInterceptor.java 2007-06-13 19:27:27 UTC (rev 63506)
+++ trunk/server/src/main/org/jboss/proxy/SecurityInterceptor.java 2007-06-13 19:30:43 UTC (rev 63507)
@@ -73,8 +73,8 @@
//Push the caller run-as identity onto the security context
if(callerRAI != null)
{
- newSc.setRunAs(callerRAI);
- newSc.getUtil().setCallerRunAs(callerRAI);
+ newSc.setOutgoingRunAs(callerRAI);
+ newSc.setIncomingRunAs(callerRAI);
}
/**
* Push the security context on the invocation
More information about the jboss-cvs-commits
mailing list