amyroh 2003/09/21 16:08:15
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
Log:
Do not allow duplicate port connector creation - fix bugtraq 4924866.
Revision Changes Path
1.9 +10 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SaveConnectorAction.java 29 Aug 2003 02:40:51 -0000 1.8
+++ SaveConnectorAction.java 21 Sep 2003 23:08:15 -0000 1.9
@@ -182,6 +182,9 @@
StringBuffer sb = new StringBuffer(domain);
sb.append(TomcatTreeBuilder.CONNECTOR_TYPE);
sb.append(",port=" + cform.getPortText());
+
+ ObjectName search = new ObjectName(sb.toString()+",*");
+
String address = cform.getAddress();
if ((address!=null) && (address.length()>0) &&
(!address.equalsIgnoreCase(" "))) {
@@ -191,8 +194,9 @@
}
ObjectName oname = new ObjectName(sb.toString());
- // Ensure that the requested connector name is unique
- if (mBServer.isRegistered(oname)) {
+ // Ensure that the requested connector name and port is unique
+ if (mBServer.isRegistered(oname) ||
+ (!mBServer.queryNames(search, null).isEmpty())) {
ActionErrors errors = new ActionErrors();
errors.add("connectorName",
new ActionError("error.connectorName.exists"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
