From 1cfd8c1fb71957b3977d5ff0b3011bfdd223eb0b Mon Sep 17 00:00:00 2001
From: gregcorbett <gregcorbett@users.noreply.github.com>
Date: Fri, 11 Nov 2022 09:45:16 +0000
Subject: [PATCH 1/3] Allow single quote in user identifiers

- GOCDB has historically allowed single quote characters in DNs,
  so this is needed for useridentifiers (which can be a DN).
  - i.e. A user cannot migrate to using user identifiers if their
    current cert DN is considered an invalid user identifiers
---
 config/gocdb_schema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/gocdb_schema.xml b/config/gocdb_schema.xml
index 18d4ec715..2ec57bce0 100644
--- a/config/gocdb_schema.xml
+++ b/config/gocdb_schema.xml
@@ -493,7 +493,7 @@
 	    <!-- negation regex - allow all chars except negated -->
         <!--Allows most characters, including whitespace. However, no trailing or leading whitespace permitted -->
         <!-- <regex>/^[^`'\"&lt;&gt;\s]+(\s*[^`'\"&lt;&gt;\s]+)*$/</regex> -->
-        <regex>/^[^`'\"&lt;&gt;\s]+(\s*[^`'\"&lt;&gt;\s]+)*$/</regex>
+        <regex>/^[^`\"&lt;&gt;\s]+(\s*[^`\"&lt;&gt;\s]+)*$/</regex>
 	</field>
     </entity>
     <!-- ==========================================================  -->

From 83f38c4177c054ca30e85e308c4bb7ef4240bb39 Mon Sep 17 00:00:00 2001
From: gregcorbett <gregcorbett@users.noreply.github.com>
Date: Tue, 15 Nov 2022 11:11:49 +0000
Subject: [PATCH 2/3] Remove uneeded/duplicate comments

---
 config/gocdb_schema.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/gocdb_schema.xml b/config/gocdb_schema.xml
index 2ec57bce0..e33958d57 100644
--- a/config/gocdb_schema.xml
+++ b/config/gocdb_schema.xml
@@ -486,15 +486,15 @@
         <!-- Allows whitespace in the key, but not trailing or leading -->
         <regex>/^[a-zA-Z0-9@_\-\[\]\+\.]+(\s*[a-zA-Z0-9@_\-\[\]\+\.]+)*$/</regex>
 	</field>
-	<field>
-	    <!-- Identifier key value -->
-	    <fname>VALUE</fname>
-	    <length>255</length>
-	    <!-- negation regex - allow all chars except negated -->
-        <!--Allows most characters, including whitespace. However, no trailing or leading whitespace permitted -->
-        <!-- <regex>/^[^`'\"&lt;&gt;\s]+(\s*[^`'\"&lt;&gt;\s]+)*$/</regex> -->
+    <field>
+        <!-- Identifier key value -->
+        <fname>VALUE</fname>
+        <length>255</length>
+        <!-- Allows most characters, including whitespace.
+             However, no trailing or leading whitespace is permitted.
+          -->
         <regex>/^[^`\"&lt;&gt;\s]+(\s*[^`\"&lt;&gt;\s]+)*$/</regex>
-	</field>
+    </field>
     </entity>
     <!-- ==========================================================  -->
     <entity>

From 1b7d762bd06ca0ebcaf1964a6c638b27b3f39041 Mon Sep 17 00:00:00 2001
From: gregcorbett <gregcorbett@users.noreply.github.com>
Date: Tue, 15 Nov 2022 15:03:46 +0000
Subject: [PATCH 3/3] Version bump to 5.10.1

---
 htdocs/web_portal/static_html/goc5_logo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/web_portal/static_html/goc5_logo.html b/htdocs/web_portal/static_html/goc5_logo.html
index 52670fc13..03c802df8 100644
--- a/htdocs/web_portal/static_html/goc5_logo.html
+++ b/htdocs/web_portal/static_html/goc5_logo.html
@@ -4,7 +4,7 @@
 <!--	<img src="img/Logo-1.6.png" class="logo_image" height="39" style="vertical-align: middle;"/>-->
   <h3    class="Logo_Text Small_Bottom_Margin Standard_Padding"
          style="vertical-align: middle; margin-left: 0.2em;">
-         GOCDB 5.10.0
+         GOCDB 5.10.1
      </h3>
 
 </a>