Commits

Sebastian Sdorra committed 04ca643

improve jenkins url validation, to allow localhost as hostname

  • Participants
  • Parent commits ea4c1ac

Comments (0)

Files changed (4)

File src/main/resources/META-INF/scm/plugin.xml

     register the javascript file src/main/resources/sonia/scm/sonia.jenkins.globalconfigpanel.js
    -->
   <resources>
+    <script>/sonia/scm/sonia.jenkins.js</script>
     <script>/sonia/scm/sonia.jenkins.globalconfigpanel.js</script>
   </resources>
 

File src/main/resources/sonia/scm/sonia.jenkins.configpanel.js

          */
         property: 'jenkins.url',
         // validation of the field
-        vtype: 'url',
+        vtype: 'jenkinsUrl',
         // help text
         helpText: this.urlHelpText
       },{

File src/main/resources/sonia/scm/sonia.jenkins.globalconfigpanel.js

         xtype : 'textfield',
         fieldLabel : this.urlText,
         name : 'url',
-        vtype: 'url',
+        vtype: 'jenkinsUrl',
         allowBlank : true,
         helpText: this.urlHelpText
       },{

File src/main/resources/sonia/scm/sonia.jenkins.js

+/* *
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * http://bitbucket.org/sdorra/scm-manager
+ * 
+ */
+
+
+Ext.apply(Ext.form.VTypes, {
+  
+  jenkinsUrl: function(url){
+    return /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/.test(url);
+  },
+          
+  jenkinsUrlText: 'The url is malformed.'
+  
+});