cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/security BaseSecurityService.java

[jvanzyl]

jvanzyl     01/06/14 07:43:33

  Modified:    src/java/org/apache/turbine/services/security
                        BaseSecurityService.java
  Log:
  - updating service as per notes.
  
  Revision  Changes    Path
  1.24      +27 -23    
jakarta-turbine/src/java/org/apache/turbine/services/security/BaseSecurityService.java
  
  Index: BaseSecurityService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/BaseSecurityService.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- BaseSecurityService.java  2001/05/30 22:31:31     1.23
  +++ BaseSecurityService.java  2001/06/14 14:43:33     1.24
  @@ -54,10 +54,6 @@
    * <http://www.apache.org/>.
    */
   
  -import javax.servlet.ServletConfig;
  -
  -import org.apache.turbine.util.Log;
  -import org.apache.turbine.util.RunData;
   import org.apache.turbine.util.db.Criteria;
   import org.apache.turbine.om.security.User;
   import org.apache.turbine.om.security.Group;
  @@ -65,9 +61,8 @@
   import org.apache.turbine.om.security.Permission;
   import org.apache.turbine.om.security.peer.UserPeer;
   
  -import org.apache.turbine.services.TurbineBaseService;
  +import org.apache.turbine.services.BaseService;
   import org.apache.turbine.services.InitializationException;
  -import org.apache.turbine.services.resources.TurbineResources;
   import org.apache.turbine.services.security.UserManager;
   import org.apache.turbine.util.security.GroupSet;
   import org.apache.turbine.util.security.RoleSet;
  @@ -101,10 +96,11 @@
    * </ul>
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
  - * @version $Id: BaseSecurityService.java,v 1.23 2001/05/30 22:31:31 jmcnally Exp $
  + * @version $Id: BaseSecurityService.java,v 1.24 2001/06/14 14:43:33 jvanzyl Exp $
    */
   public abstract class BaseSecurityService 
  -    extends TurbineBaseService implements SecurityService
  +    extends BaseService 
  +    implements SecurityService
   {
       // management of Groups/Role/Permissions
   
  @@ -146,13 +142,18 @@
       public String encryptPassword( String password )
       {
           if(password == null)
  +        {
               return null;
  -        String secure = getProperties().getProperty(
  +        }                        
  +        
  +        String secure = getConfiguration().getString(
               SecurityService.SECURE_PASSWORDS_KEY, 
               SecurityService.SECURE_PASSWORDS_DEFAULT).toLowerCase();
  -        String algorithm = getProperties().getProperty(
  +        
  +        String algorithm = getConfiguration().getString(
               SecurityService.SECURE_PASSWORDS_ALGORITHM_KEY,
               SecurityService.SECURE_PASSWORDS_ALGORITHM_DEFAULT);
  +        
           if (secure.equals("true") || secure.equals("yes"))
           {
               try
  @@ -161,19 +162,24 @@
                   // We need to use unicode here, to be independent of platform's
                   // default encoding. Thanks to SGawin for spotting this.
                   byte[] digest = md.digest(password.getBytes("UTF-8"));
  -                ByteArrayOutputStream bas = new ByteArrayOutputStream(digest.length 
+ digest.length / 3 + 1);
  +                
  +                ByteArrayOutputStream bas = new ByteArrayOutputStream(
  +                    digest.length + digest.length / 3 + 1);
  +                
                   OutputStream encodedStream = MimeUtility.encode(bas, "base64");
                   encodedStream.write(digest);
                   return bas.toString();
               }
               catch (Exception e)
               {
  -                Log.error("Unable to encrypt password."+e.getMessage());
  -                Log.error(e);
  +                getCategory().error("Unable to encrypt password."+e.getMessage());
  +                getCategory().error(e);
               
                   return null;
               }
  -        } else {
  +        } 
  +        else 
  +        {
               return password;
           }
       }
  @@ -183,14 +189,14 @@
        *
        * @param config a ServletConfig, to enforce early initialization
        */
  -    public void init(ServletConfig config)
  +    public void init() 
           throws InitializationException
       {
  -        String userManagerClassName = getProperties().getProperty(
  +        String userManagerClassName = getConfiguration().getString(
               SecurityService.USER_MANAGER_KEY,
               SecurityService.USER_MANAGER_DEFAULT);
   
  -        String userClassName = getProperties().getProperty(
  +        String userClassName = getConfiguration().getString(
               SecurityService.USER_CLASS_KEY,
               SecurityService.USER_CLASS_DEFAULT);
   
  @@ -212,13 +218,11 @@
           }
           catch(Exception e)
           {
  -            throw new InitializationException("BaseSecurityService.init: Failed to 
instantiate UserManager" ,e);
  +            throw new InitializationException(
  +                "BaseSecurityService.init: Failed to instantiate UserManager" ,e);
           }
  -
       }
   
  -
  -
       /**
        * Return a Class object representing the system's chosen implementation of
        * of User interface.
  @@ -526,8 +530,8 @@
                       }
                       catch (DataBackendException e)
                       {
  -                        Log.error("Failed to retrieve global group object");
  -                        Log.error(e);
  +                        getCategory().error("Failed to retrieve global group 
object");
  +                        getCategory().error(e);
                       }
                   }
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]