[jboss-cvs] JBossAS SVN: r69452 - trunk/security/src/main/org/jboss/security/auth/login.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-01-29 12:42:36 -0500 (Tue, 29 Jan 2008)
New Revision: 69452

Modified:
   trunk/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java
Log:
take care of vfs url nuances by using the right mbean for determining the default auth config at conf/login-config.xml

Modified: trunk/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java
===================================================================
--- trunk/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java	2008-01-29 17:41:40 UTC (rev 69451)
+++ trunk/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java	2008-01-29 17:42:36 UTC (rev 69452)
@@ -22,18 +22,18 @@
 package org.jboss.security.auth.login;
 
 import java.net.URL;
-import java.util.Set;
 import java.util.Iterator;
+import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.security.auth.login.AppConfigurationEntry;
 
+import org.jboss.deployment.DeploymentException;
 import org.jboss.mx.util.MBeanProxy;
 import org.jboss.security.config.ApplicationPolicy;
 import org.jboss.security.config.PolicyConfig;
 import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigImplMBean;
-import org.jboss.deployment.DeploymentException;
 
 /** A security config mbean that loads an xml login configuration using the
  XMLLoginConfig.loadConfig(URL config) operation on start, and unloads
@@ -218,7 +218,7 @@
          }
          if( loginConfig != null )
          {
-            validateAuthConfigURL(loginConfig.toExternalForm());
+            validateAuthConfigURL(loginConfig);
             log.debug("Using JAAS AuthConfig: "+loginConfig.toExternalForm());
             MBeanServer server = super.getServer();
             Object[] args = {loginConfig};
@@ -259,23 +259,22 @@
     * @param url
     * @throws Exception
     */
-   private void validateAuthConfigURL(String url) throws Exception
+   private void validateAuthConfigURL(URL url) throws Exception
    {
       String msg = "AuthConfig is defaulting to conf/login-config.xml. " +
             "Please check your archive.";
-      ServerConfigImplMBean mb = null;
+      XMLLoginConfigMBean xmlConfig = null;
       try
       {
-         mb = (ServerConfigImplMBean)MBeanProxy.get(ServerConfigImplMBean.class,
-               ServerConfigImplMBean.OBJECT_NAME, server);
-         URL serverConfigURL = mb.getServerConfigURL();
-         if(url.equalsIgnoreCase(serverConfigURL.toExternalForm() + "login-config.xml"))
+         xmlConfig = (XMLLoginConfigMBean) MBeanProxy.get(XMLLoginConfigMBean.class, 
+               XMLLoginConfigMBean.OBJECT_NAME, server);
+         if(xmlConfig.getConfigURL().sameFile(url))
             throw new IllegalStateException(msg);
       }
       finally
       {
          //Clear the proxy
-         mb = null;
+         xmlConfig = null;
       } 
    }
 }