--- /dev/null
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+import java.util.Properties;
+
+/**
+ *
+ * @author fhanik
+ *
+ */
+public class PoolUtilities {
+
+ public static final String PROP_USER = "user";
+
+ public static final String PROP_PASSWORD = "password";
+
+ public static Properties clone(Properties p) {
+ Properties c = new Properties();
+ c.putAll(p);
+ return c;
+ }
+
+ public static Properties cloneWithoutPassword(Properties p) {
+ Properties result = clone(p);
+ result.remove(PROP_PASSWORD);
+ return result;
+ }
+}
*/
private static final Log log = LogFactory.getLog(PooledConnection.class);
- public static final String PROP_USER = "user";
+ public static final String PROP_USER = PoolUtilities.PROP_USER;
- public static final String PROP_PASSWORD = "password";
+ public static final String PROP_PASSWORD = PoolUtilities.PROP_PASSWORD;
/**
* Validate when connection is borrowed flag
* Validate when connection is initialized flag
*/
public static final int VALIDATE_INIT = 4;
-
/**
* The properties for the connection pool
*/
pwd = poolProperties.getPassword();
getAttributes().put(PROP_PASSWORD, pwd);
}
- Properties properties = clone(poolProperties.getDbProperties());
+ Properties properties = PoolUtilities.clone(poolProperties.getDbProperties());
if (usr != null) properties.setProperty(PROP_USER, usr);
if (pwd != null) properties.setProperty(PROP_PASSWORD, pwd);
}
}
- private Properties clone(Properties p) {
- Properties c = new Properties();
- c.putAll(p);
- return c;
- }
-
/**
*
* @return true if connect() was called successfully and disconnect has not yet been called
--- /dev/null
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+import java.lang.management.ManagementFactory;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.management.JMX;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.tomcat.jdbc.pool.ConnectionPool;
+import org.apache.tomcat.jdbc.pool.PoolUtilities;
+import org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean;
+import org.apache.tomcat.jdbc.test.driver.Driver;
+
+public class JmxPasswordTest extends DefaultTestCase{
+ public static final String password = "password";
+ public static final String username = "username";
+ public static ObjectName oname = null;
+
+ public JmxPasswordTest(String s) {
+ super(s);
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ this.datasource.setDriverClassName(Driver.class.getName());
+ this.datasource.setUrl("jdbc:tomcat:test");
+ this.datasource.setPassword(password);
+ this.datasource.setUsername(username);
+ this.datasource.getConnection().close();
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ String domain = "tomcat.jdbc";
+ Hashtable<String,String> properties = new Hashtable<String,String>();
+ properties.put("type", "ConnectionPool");
+ properties.put("class", this.getClass().getName());
+ oname = new ObjectName(domain,properties);
+ ConnectionPool pool = datasource.createPool();
+ org.apache.tomcat.jdbc.pool.jmx.ConnectionPool jmxPool = new org.apache.tomcat.jdbc.pool.jmx.ConnectionPool(pool);
+ mbs.registerMBean(jmxPool, oname);
+
+ }
+
+ public void testPassword() throws Exception {
+ assertEquals("Passwords should match when not using JMX.",password,datasource.getPoolProperties().getPassword());
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ ConnectionPoolMBean mbean = JMX.newMBeanProxy(mbs, oname, ConnectionPoolMBean.class);
+ String jmxPassword = mbean.getPassword();
+ Properties jmxProperties = mbean.getDbProperties();
+ assertFalse("Passwords should not match.", password.equals(jmxPassword));
+ assertEquals("Password property should be missing", jmxProperties.containsKey(PoolUtilities.PROP_PASSWORD));
+ }
+
+}
projects / tomcat7.0 / commitdiff