Menu
▾
▴
[jboss-cvs] jboss-aspects/src/main/org/jboss/aspects/security ...
|
From: Bill B. <bi...@jb...> - 2005-09-14 22:20:32
|
User: bill
Date: 05/09/14 18:20:27
Modified: src/main/org/jboss/aspects/security Tag:
Branch_4_0 AuthenticationInterceptor.java
AuthenticationInterceptorFactory.java Exclude.java
Permissions.java
RoleBasedAuthorizationInterceptor.java
RoleBasedAuthorizationInterceptorFactory.java
RunAs.java RunAsSecurityInterceptor.java
RunAsSecurityInterceptorFactory.java
SecurityActions.java
SecurityClassMetaDataBinding.java
SecurityClassMetaDataLoader.java
SecurityClientInterceptor.java
SecurityConstructorConfig.java SecurityContext.java
SecurityDomain.java SecurityMethodConfig.java
Unchecked.java
Log:
ejb3 merge from head
Revision Changes Path
No revision
No revision
1.4.2.8 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -b -r1.4.2.7 -r1.4.2.8
--- AuthenticationInterceptor.java 2 Aug 2005 21:35:53 -0000 1.4.2.7
+++ AuthenticationInterceptor.java 14 Sep 2005 22:20:27 -0000 1.4.2.8
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:Sco...@jb...">Scott Stark</a>.
* @author <a href="bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.4.2.7 $
+ * @version $Revision: 1.4.2.8 $
*/
public class AuthenticationInterceptor implements org.jboss.aop.advice.Interceptor
{
1.4.2.6 +2 -3 jboss-aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptorFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticationInterceptorFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptorFactory.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -b -r1.4.2.5 -r1.4.2.6
--- AuthenticationInterceptorFactory.java 2 Aug 2005 21:35:53 -0000 1.4.2.5
+++ AuthenticationInterceptorFactory.java 14 Sep 2005 22:20:27 -0000 1.4.2.6
@@ -6,20 +6,19 @@
*/
package org.jboss.aspects.security;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import org.jboss.aop.Advisor;
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.advice.AspectFactory;
import org.jboss.aop.joinpoint.Joinpoint;
import org.jboss.security.AuthenticationManager;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
/**
* Comment
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.4.2.5 $
+ * @version $Revision: 1.4.2.6 $
*/
public class AuthenticationInterceptorFactory implements AspectFactory
{
1.1.4.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/Exclude.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Exclude.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/Exclude.java,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -b -r1.1.4.5 -r1.1.4.6
--- Exclude.java 2 Aug 2005 21:35:53 -0000 1.1.4.5
+++ Exclude.java 14 Sep 2005 22:20:27 -0000 1.1.4.6
@@ -9,7 +9,7 @@
/**
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.1.4.5 $
+ * @version $Revision: 1.1.4.6 $
*/
public interface Exclude {}
1.1.4.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/Permissions.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Permissions.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/Permissions.java,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -b -r1.1.4.5 -r1.1.4.6
--- Permissions.java 2 Aug 2005 21:35:53 -0000 1.1.4.5
+++ Permissions.java 14 Sep 2005 22:20:27 -0000 1.1.4.6
@@ -9,7 +9,7 @@
/**
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.1.4.5 $
+ * @version $Revision: 1.1.4.6 $
*/
public interface Permissions
{
1.4.2.6 +3 -4 jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RoleBasedAuthorizationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptor.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -b -r1.4.2.5 -r1.4.2.6
--- RoleBasedAuthorizationInterceptor.java 2 Aug 2005 21:35:53 -0000 1.4.2.5
+++ RoleBasedAuthorizationInterceptor.java 14 Sep 2005 22:20:27 -0000 1.4.2.6
@@ -6,6 +6,9 @@
*/
package org.jboss.aspects.security;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.logging.Logger;
import org.jboss.security.AnybodyPrincipal;
@@ -16,10 +19,6 @@
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
-import java.security.Principal;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* The RoleBasedAuthorizationInterceptor checks that the caller principal is
* authorized to call a method by verifing that it contains at least one
@@ -29,7 +28,7 @@
* @author <a href="on...@ib...">Oleg Nitz</a>
* @author <a href="mailto:Sco...@jb...">Scott Stark</a>.
* @author <a href="mailto:da...@da...">Dain Sundstrom</a>.
- * @version $Revision: 1.4.2.5 $
+ * @version $Revision: 1.4.2.6 $
*/
public class RoleBasedAuthorizationInterceptor implements org.jboss.aop.advice.Interceptor
{
1.5.2.6 +2 -3 jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptorFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RoleBasedAuthorizationInterceptorFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptorFactory.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -b -r1.5.2.5 -r1.5.2.6
--- RoleBasedAuthorizationInterceptorFactory.java 2 Aug 2005 21:35:53 -0000 1.5.2.5
+++ RoleBasedAuthorizationInterceptorFactory.java 14 Sep 2005 22:20:27 -0000 1.5.2.6
@@ -6,6 +6,8 @@
*/
package org.jboss.aspects.security;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import org.jboss.aop.Advisor;
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.advice.AspectFactory;
@@ -13,14 +15,11 @@
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
/**
* Comment
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.5.2.5 $
+ * @version $Revision: 1.5.2.6 $
*
**/
public class RoleBasedAuthorizationInterceptorFactory implements AspectFactory
1.1.4.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/RunAs.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RunAs.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RunAs.java,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -b -r1.1.4.5 -r1.1.4.6
--- RunAs.java 2 Aug 2005 21:35:53 -0000 1.1.4.5
+++ RunAs.java 14 Sep 2005 22:20:27 -0000 1.1.4.6
@@ -9,7 +9,7 @@
/**
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.1.4.5 $
+ * @version $Revision: 1.1.4.6 $
*/
public interface RunAs
{
1.4.2.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RunAsSecurityInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -b -r1.4.2.5 -r1.4.2.6
--- RunAsSecurityInterceptor.java 2 Aug 2005 21:35:53 -0000 1.4.2.5
+++ RunAsSecurityInterceptor.java 14 Sep 2005 22:20:27 -0000 1.4.2.6
@@ -17,7 +17,7 @@
*
* @author <a href="mailto:Sco...@jb...">Scott Stark</a>.
* @author <a href="mailto:da...@da...">Dain Sundstrom</a>.
- * @version $Revision: 1.4.2.5 $
+ * @version $Revision: 1.4.2.6 $
*/
public class RunAsSecurityInterceptor implements org.jboss.aop.advice.Interceptor
{
1.1.4.3 +2 -3 jboss-aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptorFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RunAsSecurityInterceptorFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptorFactory.java,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- RunAsSecurityInterceptorFactory.java 2 Aug 2005 21:35:53 -0000 1.1.4.2
+++ RunAsSecurityInterceptorFactory.java 14 Sep 2005 22:20:27 -0000 1.1.4.3
@@ -6,6 +6,8 @@
*/
package org.jboss.aspects.security;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import org.jboss.aop.Advisor;
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.advice.AspectFactory;
@@ -13,14 +15,11 @@
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
/**
* Comment
*
* @author <a href="mailto:bde...@jb...">William DeCoste</a>
- * @version $Revision: 1.1.4.2 $
+ * @version $Revision: 1.1.4.3 $
*
**/
public class RunAsSecurityInterceptorFactory implements AspectFactory
1.2.2.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/SecurityActions.java
(In the diff below, changes in quantity of whitespace are not shown.)
1.2.2.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataBinding.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityClassMetaDataBinding.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataBinding.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.5 -r1.2.2.6
--- SecurityClassMetaDataBinding.java 2 Aug 2005 21:35:53 -0000 1.2.2.5
+++ SecurityClassMetaDataBinding.java 14 Sep 2005 22:20:27 -0000 1.2.2.6
@@ -17,7 +17,7 @@
*
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.2.2.5 $
+ * @version $Revision: 1.2.2.6 $
*
*/
public class SecurityClassMetaDataBinding extends org.jboss.aop.metadata.ClassMetaDataBinding
1.3.2.6 +3 -2 jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityClassMetaDataLoader.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -b -r1.3.2.5 -r1.3.2.6
--- SecurityClassMetaDataLoader.java 2 Aug 2005 21:35:53 -0000 1.3.2.5
+++ SecurityClassMetaDataLoader.java 14 Sep 2005 22:20:27 -0000 1.3.2.6
@@ -35,7 +35,7 @@
* population of class metadata
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.3.2.5 $
+ * @version $Revision: 1.3.2.6 $
*/
public class SecurityClassMetaDataLoader implements org.jboss.aop.metadata.ClassMetaDataLoader
{
@@ -628,7 +628,8 @@
boolean permissions = getConstructorPermissions(constructors[i], meta);
if (permissions)
{
- advisor.getConstructorMetaData().addConstructorMetaData(constructors[i].getMethodInfo().getDescriptor(), "security", "roles", Boolean.TRUE, PayloadKey.TRANSIENT);
+ //Use getMethodInfo2() to avoid frozen check
+ advisor.getConstructorMetaData().addConstructorMetaData(constructors[i].getMethodInfo2().getDescriptor(), "security", "roles", Boolean.TRUE, PayloadKey.TRANSIENT);
}
}
}
1.3.2.7 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/SecurityClientInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityClientInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityClientInterceptor.java,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -b -r1.3.2.6 -r1.3.2.7
--- SecurityClientInterceptor.java 2 Aug 2005 21:35:53 -0000 1.3.2.6
+++ SecurityClientInterceptor.java 14 Sep 2005 22:20:27 -0000 1.3.2.7
@@ -15,7 +15,7 @@
* The AuthenticationInterceptor authenticates the caller.
*
* @author <a href="bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.3.2.6 $
+ * @version $Revision: 1.3.2.7 $
*/
public final class SecurityClientInterceptor implements org.jboss.aop.advice.Interceptor, java.io.Serializable
{
1.2.2.7 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/SecurityConstructorConfig.java
(In the diff below, changes in quantity of whitespace are not shown.)
1.2.2.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/SecurityContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityContext.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.5 -r1.2.2.6
--- SecurityContext.java 2 Aug 2005 21:35:53 -0000 1.2.2.5
+++ SecurityContext.java 14 Sep 2005 22:20:27 -0000 1.2.2.6
@@ -19,7 +19,7 @@
*
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.2.2.5 $
+ * @version $Revision: 1.2.2.6 $
*/
public class SecurityContext
{
1.2.4.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/SecurityDomain.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SecurityDomain.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityDomain.java,v
retrieving revision 1.2.4.5
retrieving revision 1.2.4.6
diff -u -b -r1.2.4.5 -r1.2.4.6
--- SecurityDomain.java 2 Aug 2005 21:35:53 -0000 1.2.4.5
+++ SecurityDomain.java 14 Sep 2005 22:20:27 -0000 1.2.4.6
@@ -15,7 +15,7 @@
* user/role associtations are stored.
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.2.4.5 $
+ * @version $Revision: 1.2.4.6 $
*
**/
public interface SecurityDomain
1.2.2.7 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/SecurityMethodConfig.java
(In the diff below, changes in quantity of whitespace are not shown.)
1.1.4.6 +0 -0 jboss-aspects/src/main/org/jboss/aspects/security/Unchecked.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Unchecked.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/Unchecked.java,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -b -r1.1.4.5 -r1.1.4.6
--- Unchecked.java 2 Aug 2005 21:35:53 -0000 1.1.4.5
+++ Unchecked.java 14 Sep 2005 22:20:27 -0000 1.1.4.6
@@ -9,7 +9,7 @@
/**
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.1.4.5 $
+ * @version $Revision: 1.1.4.6 $
*/
public interface Unchecked {}
|