Merge pull request #8494 from mandy-chessell/oak2024

SafeRegEx check should allow invlid RegExs
odpi · Nov 15, 2024 · aea88e9 · aea88e9
2 parents 0d6a30d + 1e08463
commit aea88e9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/...adata/adapters/repositoryservices/postgres/repositoryconnector/database/QueryBuilder.java b/...adata/adapters/repositoryservices/postgres/repositoryconnector/database/QueryBuilder.java
@@ -141,7 +141,7 @@ private String getSearchStringClause() throws RepositoryErrorException
     private String getSafeRegex(Object suppliedSearchString) throws RepositoryErrorException
     {
         final String methodName = "getSafeRegex";
-        final String tester     = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\\E\\Q1234567890";
+        final String tester     = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 
         if (suppliedSearchString != null)
         {
@@ -152,7 +152,17 @@ private String getSafeRegex(Object suppliedSearchString) throws RepositoryErrorE
              */
             Date currentTime      = new Date();
             Date maxExecutionTime = new Date(currentTime.getTime() + 500);
-            tester.matches(strippedSearchString);
+            try
+            {
+                tester.matches(strippedSearchString);
+            }
+            catch (Exception badRegex)
+            {
+                // This is not a problem as we are not necessarily expecting it to be a regex.
+                // If it is supposed to be a regex, and it is ill-formed, PostgreSQL will throw it out.
+                // This test is just to catch valid RegEx's that take a long time to execute.
+            }
+
             Date completionTime = new Date();
 
             if (completionTime.after(maxExecutionTime))

diff --git a/open-metadata-implementation/admin-services/Egeria-admin-services-server-configuration.http b/open-metadata-implementation/admin-services/Egeria-admin-services-server-configuration.http
@@ -168,8 +168,8 @@ Content-Type: application/json
 
 {
   "supportedSeverities" : ["Error", "Exception", "Activity", "Action", "Decision"],
-  "databaseURL": "~{postgreSQLDatabaseURL}~?currentSchema=auditlog_active_metadata_store",
-  "databaseSchema": "auditlog_active_metadata_store",
+  "databaseURL": "~{postgreSQLDatabaseURL}~?currentSchema=audit_logs",
+  "databaseSchema": "audit_logs",
   "secretsStore": "~{secretsStore}~",
   "secretsCollectionName": "~{postgreSQLServerCollectionName}~"
 }

diff --git a/...rk/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/refdata/FileExtension.java b/...rk/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/refdata/FileExtension.java
@@ -126,6 +126,11 @@ public enum FileExtension
      */
     MD_FILE("md",        new FileType[]{FileType.MARKDOWN_FILE}),
 
+    /**
+     * A formal diagram in Mermaid Markdown format.
+     */
+    MMD_FILE("mmd",        new FileType[]{FileType.MERMAID_FILE}),
+
     /**
      * A free-form text document.
      */

diff --git a/...amework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/refdata/FileType.java b/...amework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/refdata/FileType.java
@@ -127,6 +127,15 @@ public enum FileType
                 DeployedImplementationType.DOCUMENT,
                 "A document of words and linked to diagrams in Markdown format that describes the other files in the same directory (folder)."),
 
+    /**
+     * A formal diagram in Mermaid Markdown format.
+     */
+    MERMAID_FILE("Mermaid Markdown Document",
+                 "Mermaid Markdown",
+                 OpenMetadataType.DOCUMENT.typeName,
+                 DeployedImplementationType.DOCUMENT,
+                "A formal diagram in Mermaid Markdown format."),
+
     /**
      * A text file with comma-separated values.
      */