continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1092028 - in /continuum/trunk/continuum-webapp/src/main/resources/org/apache: continuum/web/action/admin/ maven/continuum/web/action/admin/
Date Thu, 14 Apr 2011 07:23:08 GMT
Author: ctan
Date: Thu Apr 14 07:23:08 2011
New Revision: 1092028

URL: http://svn.apache.org/viewvc?rev=1092028&view=rev
Log:
[CONTINUUM-2620] more prevention of XSS attacks

Added:
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml
  (with props)
Removed:
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveProfile-validation.xml
Modified:
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml
Thu Apr 14 07:23:08 2011
@@ -26,14 +26,13 @@
     <field-validator type="requiredstring">
       <message key="buildAgent.url.required"/>
     </field-validator>
-    <field-validator type="regex">
-      <param name="expression"><![CDATA[[A-Za-z0-9_.@:/-]*]]></param>
+    <field-validator type="url">
       <message key="buildAgent.url.invalid"/>
     </field-validator>
   </field>
   <field name="buildAgent.description">
     <field-validator type="regex">
-      <param name="expression"><![CDATA[[A-Za-z0-9_.\s-]*]]></param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
       <message key="buildAgent.description.invalid"/>
     </field-validator>
   </field>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
Thu Apr 14 07:23:08 2011
@@ -27,7 +27,7 @@
       <message key="repository.name.required"/>
     </field-validator>
     <field-validator type="regex">
-      <param name="expression"><![CDATA[[A-Za-z0-9_.\s-]*]]></param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
       <message key="repository.name.invalid"/>
     </field-validator>
   </field>
@@ -36,7 +36,7 @@
       <message key="repository.location.required"/>
     </field-validator>
     <field-validator type="regex">
-      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s-]*]]></param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
       <message key="repository.location.invalid"/>
     </field-validator>
   </field>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
Thu Apr 14 07:23:08 2011
@@ -36,7 +36,7 @@
   </field>
   <field name="description">
     <field-validator type="regex">
-      <param name="expression"><![CDATA[[A-Za-z0-9_.\s-]*]]></param>
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
       <message key="purgeConfig.description.invalid"/>
     </field-validator>
   </field>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionAsTemplate-validation.xml
Thu Apr 14 07:23:08 2011
@@ -24,12 +24,32 @@
 <validators>
   <field name="buildDefinition.buildFile">
     <field-validator type="requiredstring">
-      <message key="buildDefintion.buildFile.required"/>
+      <message key="buildDefinition.buildFile.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\-]*]]></param>
+      <message key="buildDefinition.buildFile.invalid"/>
     </field-validator>
   </field>
   <field name="buildDefinition.description">
     <field-validator type="requiredstring">
-      <message key="buildDefintion.description.required"/>
+      <message key="buildDefinition.description.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="buildDefinition.description.invalid"/>
+    </field-validator>
+  </field>
+  <field name="buildDefinition.goals">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_:\s\-]*]]></param>
+      <message key="buildDefinition.goals.invalid"/>
     </field-validator>
-  </field>  
+  </field>
+  <field name="buildDefinition.arguments">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\\/=,":\s\-]*]]></param>
+      <message key="buildDefinition.arguments.invalid"/>
+    </field-validator>
+  </field>
 </validators>
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction-saveBuildDefinitionTemplate-validation.xml
Thu Apr 14 07:23:08 2011
@@ -24,7 +24,11 @@
 <validators>
   <field name="buildDefinitionTemplate.name">
     <field-validator type="requiredstring">
-      <message key="buildDefintionTemplate.name.required"/>
+      <message key="buildDefinitionTemplate.name.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="buildDefinitionTemplate.name.invalid"/>
     </field-validator>
   </field>
 </validators>
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties
Thu Apr 14 07:23:08 2011
@@ -16,7 +16,12 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.exists = Name already exists
-buildDefintionTemplate.name.required = Name is required
-buildDefintion.buildFile.required = BuildFile is required
-buildDefintion.description.required = Description is required
+buildDefinitionTemplate.name.exists = Name already exists
+buildDefinitionTemplate.name.required = Name is required
+buildDefinitionTemplate.name.invalid = Name contains invalid characters
+buildDefinition.buildFile.required = BuildFile is required
+buildDefinition.buildFile.invalid = BuildFile contains invalid characters
+buildDefinition.description.required = Description is required
+buildDefinition.description.invalid = Description contains invalid characters
+buildDefinition.goals.invalid = Goals contain invalid characters
+buildDefinition.arguments.invalid = Arguments contain invalid characters
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_de.properties
Thu Apr 14 07:23:08 2011
@@ -16,6 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.required = Es mu\u00DF ein Name angegeben werden.
-buildDefintion.buildFile.required = Es mu\u00DF eine Projektdatei angegeben werden.
-buildDefintion.description.required = Es mu\u00DF eine Beschreibung angegeben werden.
+buildDefinitionTemplate.name.required = Es mu\u00DF ein Name angegeben werden.
+buildDefinition.buildFile.required = Es mu\u00DF eine Projektdatei angegeben werden.
+buildDefinition.description.required = Es mu\u00DF eine Beschreibung angegeben werden.

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_fr.properties
Thu Apr 14 07:23:08 2011
@@ -16,6 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.required = le nom est obligatoire
-buildDefintion.buildFile.required = le fichier de construction est obligatoire
-buildDefintion.description.required = la description est obligatoire
+buildDefinitionTemplate.name.required = le nom est obligatoire
+buildDefinition.buildFile.required = le fichier de construction est obligatoire
+buildDefinition.description.required = la description est obligatoire

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction_pt_BR.properties
Thu Apr 14 07:23:08 2011
@@ -16,6 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-buildDefintionTemplate.name.required = Nome é obrigatório
-buildDefintion.buildFile.required = Arquivo de Build é obrigatório
-buildDefintion.description.required = Descrição é obrigatória
\ No newline at end of file
+buildDefinitionTemplate.name.required = Nome é obrigatório
+buildDefinition.buildFile.required = Arquivo de Build é obrigatório
+buildDefinition.description.required = Descrição é obrigatória
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction-saveBuildQueue-validation.xml
Thu Apr 14 07:23:08 2011
@@ -26,5 +26,9 @@
     <field-validator type="requiredstring">
       <message key="buildqueue.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="buildqueue.name.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildQueueAction.properties
Thu Apr 14 07:23:08 2011
@@ -18,3 +18,4 @@
 #
 
 buildqueue.name.required = You must define a name.
+buildqueue.name.invalid = Build queue name contains invalid characters.
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml
Thu Apr 14 07:23:08 2011
@@ -26,11 +26,19 @@
     <field-validator type="requiredstring">
       <message key="configuration.workingDirectory.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.workingDirectory.invalid"/>
+    </field-validator>
   </field>
   <field name="buildOutputDirectory">
     <field-validator type="requiredstring">
       <message key="configuration.buildOutputDirectory.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.buildOutputDirectory.invalid"/>
+    </field-validator>
   </field>
   <field name="baseUrl">
     <field-validator type="requiredstring" short-circuit="true">
@@ -40,4 +48,16 @@
       <message key="configuration.baseUrl.invalid"/>
     </field-validator>
   </field>
+  <field name="releaseOutputDirectory">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.releaseOutputDirectory.invalid"/>
+    </field-validator>
+  </field>
+  <field name="deploymentRepositoryDirectory">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:\\/\s\-]*]]></param>
+      <message key="configuration.deploymentRepositoryDirectory.invalid"/>
+    </field-validator>
+  </field>
 </validators>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction.properties
Thu Apr 14 07:23:08 2011
@@ -18,6 +18,10 @@
 #
 
 configuration.workingDirectory.required = You must define a working directory.
+configuration.workingDirectory.invalid = Working directory contains invalid characters.
 configuration.buildOutputDirectory.required = You must define a build output directory.
+configuration.buildOutputDirectory.invalid = Build output directory contains invalid characters.
 configuration.baseUrl.required = You must define a URL.
-configuration.baseUrl.invalid = You must define a valid URL.
\ No newline at end of file
+configuration.baseUrl.invalid = You must define a valid URL.
+configuration.releaseOutputDirectory.invalid = Release output directory contains invalid
characters.
+configuration.deploymentRepositoryDirectory.invalid = Deployment repository directory contains
invalid characters.
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction-validation.xml
Thu Apr 14 07:23:08 2011
@@ -45,10 +45,18 @@
     <field-validator type="requiredstring">
       <message key="appearance.groupId.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9.]*]]></param>
+      <message key="appearance.groupId.invalid"/>
+    </field-validator>
   </field>
   <field name="companyPom.artifactId">
     <field-validator type="requiredstring">
       <message key="appearance.artifactId.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9.]*]]></param>
+      <message key="appearance.artifactId.invalid"/>
+    </field-validator>
   </field>
 </validators>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.properties
Thu Apr 14 07:23:08 2011
@@ -18,5 +18,7 @@
 #
 
 appearance.groupId.required = You must define a group identifier.
+appearance.groupId.invalid = Group identifier is invalid.
 appearance.artifactId.required = You must define an artifact identifier.
+appearance.artifactId.invalid = Artifact identifier is invalid.
 

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction-saveInstallation-validation.xml
Thu Apr 14 07:23:08 2011
@@ -26,16 +26,27 @@
     <field-validator type="requiredstring">
       <message key="installation.name.required"/>
     </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="installation.name.invalid"/>
+    </field-validator>
+  </field>
+  <field name="installation.varName">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z][A-Za-z0-9_]*]]></param>
+      <message key="installation.varName.invalid"/>
+    </field-validator>
   </field>
   <field name="installation.varValue">
     <field-validator type="requiredstring">
       <message key="installation.varValue.required"/>
     </field-validator>
-  </field>  
-  <field name="installation.varValue">
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.:=\\/\s\-]*]]></param>
+      <message key="installation.varValue.invalid"/>
+    </field-validator>
     <field-validator type="installationValidator">
       <message key="installation.varValue.version.failed"/>
     </field-validator>
-  </field>    
-    
+  </field>
 </validators>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/InstallationAction.properties
Thu Apr 14 07:23:08 2011
@@ -18,5 +18,8 @@
 #
 
 installation.name.required = You must define a name.
+installation.name.invalid = Installation name contains invalid characters.
 installation.varValue.required = You must define a value.
+installation.varValue.invalid = Installation value contains invalid characters.
 installation.varValue.version.failed = Failed to validate installation, check server log.

+installation.varName.invalid = Environment variable name contains invalid characters.
\ No newline at end of file

Added: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml?rev=1092028&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml
(added)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml
Thu Apr 14 07:23:08 2011
@@ -0,0 +1,34 @@
+<!--
+  ~ 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.
+  -->
+
+<!DOCTYPE validators PUBLIC
+    "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+    "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+  <field name="profile.name">
+    <field-validator type="requiredstring">
+      <message key="profile.name.required"/>
+    </field-validator>
+    <field-validator type="regex">
+      <param name="expression"><![CDATA[[A-Za-z0-9_.\s\-]*]]></param>
+      <message key="profile.name.invalid"/>
+    </field-validator>
+  </field>
+</validators>
\ No newline at end of file

Propchange: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction-saveBuildEnv-validation.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties?rev=1092028&r1=1092027&r2=1092028&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ProfileAction.properties
Thu Apr 14 07:23:08 2011
@@ -18,3 +18,4 @@
 #
 
 profile.name.required = You must define a name.
+profile.name.invalid = Build environment name contains invalid characters.
\ No newline at end of file



Mime
View raw message