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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/10/15 20:34:27

  Modified:    src/main/org/jboss/seam/interceptors 
                        SecurityInterceptor.java
  Log:
  Support configuration of default security-related actions
  
  Revision  Changes    Path
  1.3       +3 -6      jboss-seam/src/main/org/jboss/seam/interceptors/SecurityInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SecurityInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/SecurityInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SecurityInterceptor.java	9 Oct 2006 23:27:27 -0000	1.2
  +++ SecurityInterceptor.java	16 Oct 2006 00:34:27 -0000	1.3
  @@ -70,9 +70,7 @@
   
         if (redirectToLogin)
         {
  -        //          return SeamSecurityManager.instance().getConfiguration().getLoginAction();
  -                  /** @todo Get this action from the security config */
  -          return "login";
  +        return SeamSecurityManager.instance().getLoginAction();
         }
   
         // If roles() are specified check them first
  @@ -85,7 +83,7 @@
           }
         }
   
  -      // No roles matched, check permissions
  +      // No roles match, check permissions
         if (sec.permissions().length > 0)
         {
   //        SeamSecurityManager.instance().checkAcls();
  @@ -95,8 +93,7 @@
         if (sec.onfail() != null && !"".equals(sec.onfail()))
           return sec.onfail();
   
  -      /** @todo Get this action from the security config */
  -      return "error";
  +      return SeamSecurityManager.instance().getSecurityErrorAction();
       }
   
       return invocation.proceed();