summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2013-04-03 11:50:36 +0000
committerAlex Rudyy <orudyy@apache.org>2013-04-03 11:50:36 +0000
commit45fc3b612fe45ec01db5e6e6e65661b5d8898f1b (patch)
treefb8e07e544de7ea2168926b4ed7dda714f632e20 /qpid/java/broker-plugins
parent24b2431ab0f4cdb639122a3f1d54d66a657ecbc7 (diff)
downloadqpid-python-45fc3b612fe45ec01db5e6e6e65661b5d8898f1b.tar.gz
QPID-4695: Add validation of configured object names and IDs
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1463933 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html2
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html2
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html2
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html2
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html2
5 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
index f164ece082..90dd1f1090 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
@@ -25,7 +25,7 @@
<tr>
<td class="tableContainer-labelCell" style="width: 300px;">Name*:</td>
<td class="tableContainer-valueCell"><input type="text" required="true" name="name"
- id="formAddAuthenticationProvider.name" placeholder="Name"
+ id="formAddAuthenticationProvider.name" placeholder="Name" regexp="^[\x20-\x2e\x30-\x7F]{1,255}$"
dojoType="dijit.form.ValidationTextBox" missingMessage="A name must be supplied" /></div></td>
</tr>
</table>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
index 10ac5388ff..4a59cd2cbc 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
@@ -26,7 +26,7 @@
<td valign="top"><strong>Exchange Name*: </strong></td>
<td><input type="text" required="true" name="name" id="formAddExchange.name" placeholder="Exchange Name"
dojoType="dijit.form.ValidationTextBox" missingMessage="A name must be supplied"
- data-dojo-props="regExp:'^(?!qpid\.|amq\.|\<\<default\>\>).*$', invalidMessage:'Reserved exchange name!'"/></td>
+ data-dojo-props="regExp:'^(?!qpid\.|amq\.|\<\<default\>\>)[\x20-\x2e\x30-\x7F]{1,255}$', invalidMessage:'Illegal or reserved exchange name!'"/></td>
</tr>
<tr>
<td valign="top"><strong>Durable? </strong></td>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
index 11acccb2ac..c37b879bd5 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
@@ -25,7 +25,7 @@
<div id="formAddPort:fields">
<input type="text" required="true" name="name" id="formAddPort.name" placeholder="Name"
data-dojo-props="label: 'Name*:'" dojoType="dijit.form.ValidationTextBox"
- missingMessage="A name must be supplied" />
+ missingMessage="A name must be supplied" regexp="^[\x20-\x2e\x30-\x7F]{1,255}$"/>
<input data-dojo-type="dijit.form.NumberSpinner" id="formAddPort.port" required="true" data-dojo-props="label: 'Port Number*:'"
name="port" smallDelta="1" constraints="{min:1,max:65535,places:0, pattern: '#####'}"
missingMessage="A port number must be supplied" />
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index d396f28877..950809d5fc 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -25,7 +25,7 @@
<tr>
<td valign="top"><strong>Queue Name*: </strong></td>
<td><input type="text" required="true" name="name" id="formAddQueue.name" placeholder="Queue Name"
- dojoType="dijit.form.ValidationTextBox" missingMessage="A name must be supplied" /></td>
+ dojoType="dijit.form.ValidationTextBox" missingMessage="A name must be supplied" regexp="^[\x20-\x2e\x30-\x7F]{1,255}$"/></td>
</tr>
<tr>
<td valign="top"><strong>Durable? </strong></td>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
index d66e0e1b03..9b492ef26d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
@@ -27,7 +27,7 @@
<td class="tableContainer-valueCell">
<input type="text" required="true" name="name" id="formAddVirtualHost.name"
placeholder="Virtual Host Name" dojoType="dijit.form.ValidationTextBox"
- missingMessage="A name must be supplied" />
+ missingMessage="A name must be supplied" regexp="^[\x20-\x2e\x30-\x7F]{1,255}$"/>
</td>
</tr>
</table>