From 80edd2c93c00175468b693eda62aefa41c214a6b Mon Sep 17 00:00:00 2001
From: Santiago Revilla <spr@jpos.org>
Date: Fri, 22 Feb 2019 15:14:52 -0300
Subject: [PATCH] Allow : in URLs. Fix SysConfig id validation pattern

---
 modules/qi-core/src/main/java/org/jpos/qi/QINavigator.java | 2 +-
 modules/testbed/src/dist/deploy/00_qi.xml                  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/qi-core/src/main/java/org/jpos/qi/QINavigator.java b/modules/qi-core/src/main/java/org/jpos/qi/QINavigator.java
index 2876d662e3..b3af3af415 100644
--- a/modules/qi-core/src/main/java/org/jpos/qi/QINavigator.java
+++ b/modules/qi-core/src/main/java/org/jpos/qi/QINavigator.java
@@ -38,7 +38,7 @@
 import java.util.regex.Pattern;
 
 public class QINavigator extends Navigator {
-    private static String URL_PATTERN_STRING = "^[\\w\\s.\\-\\/\\?\\=]{0,255}$";
+    private static String URL_PATTERN_STRING = "^[\\w\\s.\\-\\/\\?\\=\\:]{0,255}$";
     private static Pattern ROUTE_PATTERN = Pattern.compile("^\\/(\\w+)\\/*.*");
     public Validator validator;
     QI app;
diff --git a/modules/testbed/src/dist/deploy/00_qi.xml b/modules/testbed/src/dist/deploy/00_qi.xml
index c1de2f49c2..aac9af3bf4 100644
--- a/modules/testbed/src/dist/deploy/00_qi.xml
+++ b/modules/testbed/src/dist/deploy/00_qi.xml
@@ -5,6 +5,7 @@
         <!ENTITY TEXT_EXTENDED_PATTERN "^[\w\s.,\-\'():]*$">
         <!ENTITY WORD_PATTERN "^[\w.\-]*$">
         <!ENTITY ACCT_CODE_PATTERN "^[\w.]*$">
+        <!ENTITY SYSCONFIG_ID_PATTERN "^[\w\s.\-\/\?\=\:]{0,255}$">
         ]>
 
 <xml-config name="QI" logger="Q2">
@@ -64,7 +65,7 @@
   </view>
   <view route="sysconfig" class="org.jpos.qi.sysconfig.SysConfigView" perm="sysconfig" sidebar="system">
     <property name="entityName" value="sysconfig"/>
-    <attribute name="id" required="true" read-only="true" regex="&WORD_PATTERN;" length="64" expand-ratio="1" />
+    <attribute name="id" required="true" read-only="true" regex="&SYSCONFIG_ID_PATTERN;" length="64" expand-ratio="1" />
     <attribute name="value" regex="&TEXT_PATTERN;" required="true" expand-ratio="4"/>
   </view>
   <!--<view route="permissions" class="org.jpos.qi.sysconfig.PermissionView" perm="sysadmin" sidebar="system">-->
@@ -77,7 +78,7 @@
     <property name="entityName" value="permission"/>
     <property name="prefix" value="perm." />
     <property name="title" value="Permissions" />
-    <attribute name="id" required="true" read-only="true" regex="&WORD_PATTERN;" length="64" expand-ratio="1" />
+    <attribute name="id" required="true" read-only="true" regex="&SYSCONFIG_ID_PATTERN;" length="64" expand-ratio="1" />
     <attribute name="value" regex="&TEXT_PATTERN;" required="true" expand-ratio="4"/>
   </view>