[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/12 08:25:49

  Modified:    src/main/org/jboss/seam/security  SeamSecurityManager.java
  Log:
  added default permission check for empty @Restrict annotations
  
  Revision  Changes    Path
  1.38      +8 -3      jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamSecurityManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- SeamSecurityManager.java	10 Jan 2007 02:21:34 -0000	1.37
  +++ SeamSecurityManager.java	12 Jan 2007 13:25:49 -0000	1.38
  @@ -15,6 +15,7 @@
   import java.util.List;
   import java.util.Set;
   
  +import javax.faces.context.FacesContext;
   import javax.security.auth.Subject;
   import javax.security.auth.callback.Callback;
   import javax.security.auth.callback.CallbackHandler;
  @@ -48,6 +49,7 @@
   import org.jboss.seam.security.config.SecurityConfiguration.Role;
   import org.jboss.seam.security.rules.PermissionCheck;
   import org.jboss.seam.util.Resources;
  +import org.jboss.seam.util.UnifiedELValueBinding;
   
   /**
    * Holds configuration settings and provides functionality for the security API
  @@ -124,10 +126,13 @@
       * @param expr String The expression to evaluate
       * @return boolean The result of the expression evaluation
       */
  -   public boolean evaluateExpression(String expr)
  +   public boolean evaluateExpression(String expr) throws AuthorizationException
      {
  -      return ((Boolean) Expressions.instance().createValueBinding(expr)
  -            .getValue());
  +      // TODO it seems that neither of the following two methods work with EL Functions
  +      
  +      return (Boolean) new UnifiedELValueBinding(expr).getValue(FacesContext.getCurrentInstance());
  +      //return ((Boolean) Expressions.instance().createValueBinding(expr)
  +            //.getValue());
      }
   
      /**