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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/08/01 01:03:33

  Modified:    src/main/org/jboss/seam/security/adapter/jboss 
                        SeamLoginModule.java
  Log:
  initial logout() support
  
  Revision  Changes    Path
  1.3       +65 -54    jboss-seam/src/main/org/jboss/seam/security/adapter/jboss/SeamLoginModule.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamLoginModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/adapter/jboss/SeamLoginModule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SeamLoginModule.java	1 Aug 2006 02:04:54 -0000	1.2
  +++ SeamLoginModule.java	1 Aug 2006 05:03:33 -0000	1.3
  @@ -14,6 +14,7 @@
   import javax.security.auth.callback.NameCallback;
   import javax.security.auth.callback.PasswordCallback;
   import javax.security.auth.callback.UnsupportedCallbackException;
  +import javax.security.auth.login.LoginException;
   import javax.security.auth.spi.LoginModule;
   
   import org.jboss.seam.security.Authentication;
  @@ -27,13 +28,16 @@
    */
   public class SeamLoginModule implements LoginModule
   {
  -  private static final String SIMPLE_PRINCIPAL_CLASS = "org.jboss.security.SimplePrincipal";
  -  private static final String SIMPLE_GROUP_CLASS = "org.jboss.security.SimpleGroup";
  +  private static final String SIMPLE_PRINCIPAL_CLASS =
  +      "org.jboss.security.SimplePrincipal";
  +  private static final String SIMPLE_GROUP_CLASS =
  +      "org.jboss.security.SimpleGroup";
   
     private Constructor simplePrincipalConstructor = null;
     private Constructor simpleGroupConstructor = null;
   
     private Subject subject;
  +
     private CallbackHandler callbackHandler;
   
     private Authentication authentication;
  @@ -89,10 +93,10 @@
        Group roles = null;
        for (Principal principal : principals)
        {
  -       if (!(principal instanceof Group))
  +      if (! (principal instanceof Group))
            continue;
   
  -       if (((Group) principal).getName().equals(name))
  +      if ( ( (Group) principal).getName().equals(name))
          {
            roles = (Group) principal;
            break;
  @@ -184,7 +188,7 @@
       * @param options Map
       */
      public void initialize(Subject subject, CallbackHandler handler,
  -                         Map<String,?> sharedState, Map<String,?> options)
  +                         Map sharedState, Map options)
     {
       this.subject = subject;
       this.callbackHandler = handler;
  @@ -195,9 +199,12 @@
      * @return boolean
      */
     public boolean login()
  +      throws LoginException
     {
  -    AuthenticationContext authCtx = (AuthenticationContext) SecurityConfig.instance()
  -        .getApplicationContext().get("org.jboss.seam.security.AuthenticationContext");
  +    AuthenticationContext authCtx = (AuthenticationContext) SecurityConfig.
  +        instance()
  +        .getApplicationContext().get(
  +        "org.jboss.seam.security.AuthenticationContext");
   
       authentication = authCtx.getAuthentication();
   
  @@ -226,9 +233,13 @@
     /**
      *
      * @return boolean
  +   * @throws LoginException
      */
     public boolean logout()
  +      throws LoginException
     {
  +    Set principals = subject.getPrincipals();
  +    principals.remove(authentication);
       return true;
     }
   }