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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/02 07:11:23

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  JBSEAM-742
  
  Revision  Changes    Path
  1.45      +23 -12    jboss-seam/src/main/org/jboss/seam/security/Identity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Identity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/Identity.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -b -r1.44 -r1.45
  --- Identity.java	2 Feb 2007 05:41:56 -0000	1.44
  +++ Identity.java	2 Feb 2007 12:11:23 -0000	1.45
  @@ -65,6 +65,8 @@
      
      private WorkingMemory securityContext;
      
  +   private String jaasConfigName = null;
  +   
      @Override
      protected String getCookieName()
      {
  @@ -203,11 +205,14 @@
   
      protected LoginContext getLoginContext() throws LoginException
      {
  +      if (getJaasConfigName() != null)
  +      {
  +         return new LoginContext(getJaasConfigName(), subject, 
  +                  getDefaultCallbackHandler());
  +      }
  +      
         return new LoginContext(Configuration.DEFAULT_JAAS_CONFIG_NAME, 
  -            subject, 
  -            getCallbackHandler(username, password), 
  -            Configuration.instance()
  -         );
  +            subject, getDefaultCallbackHandler(), Configuration.instance());
      }
      
      public void logout()
  @@ -317,12 +322,9 @@
      
      /**
       * Creates a callback handler that can handle a standard username/password
  -    * callback, using the specified username and password parameters.
  -    * 
  -    * @param username The username to provide for a NameCallback
  -    * @param password The password to provide for a PasswordCallback
  +    * callback, using the username and password properties.
       */
  -   protected CallbackHandler getCallbackHandler(final String username, final String password)
  +   protected CallbackHandler getDefaultCallbackHandler()
      {
         return new CallbackHandler() 
         {
  @@ -333,12 +335,12 @@
               {
                  if (callbacks[i] instanceof NameCallback)
                  {
  -                  ( (NameCallback) callbacks[i] ).setName(username);
  +                  ( (NameCallback) callbacks[i] ).setName(getUsername());
                  }
                  else if (callbacks[i] instanceof PasswordCallback)
                  {
  -                  ( (PasswordCallback) callbacks[i] ).setPassword( password != null ? 
  -                           password.toCharArray() : null );
  +                  ( (PasswordCallback) callbacks[i] ).setPassword( getPassword() != null ? 
  +                           getPassword().toCharArray() : null );
                  }
                  else
                  {
  @@ -468,4 +470,13 @@
         setCookieEnabled(remember);
      }
      
  +   public String getJaasConfigName()
  +   {
  +      return jaasConfigName;
  +   }
  +   
  +   public void setJaasConfigName(String jaasConfigName)
  +   {
  +      this.jaasConfigName = jaasConfigName;
  +   }   
   }