Update validation for observability notebooks integration

Signed-off-by: Joshua Li <[email protected]>
opensearch-project · Oct 8, 2021 · 957dbdc · 957dbdc
1 parent a238baf
commit 957dbdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dashboards-reports/server/routes/report.ts b/dashboards-reports/server/routes/report.ts
@@ -70,7 +70,7 @@ export default function (router: IRouter, accessInfo: AccessInfoType) {
       // input validation
       try {
         report.report_definition.report_params.core_params.origin =
-          request.headers.origin;
+          request.headers.origin || request.headers.host;
         report = await validateReport(
           context.core.opensearch.legacy.client,
           report,

diff --git a/dashboards-reports/server/utils/validationHelper.ts b/dashboards-reports/server/utils/validationHelper.ts
@@ -37,7 +37,7 @@ import { REPORT_TYPE } from '../../server/routes/utils/constants';
 
 export const isValidRelativeUrl = (relativeUrl: string) => {
   let normalizedRelativeUrl = relativeUrl
-  if (!relativeUrl.includes('notebooks-dashboards')) {
+  if (!relativeUrl.includes('observability#/notebooks')) {
     normalizedRelativeUrl = path.posix.normalize(relativeUrl);
   }
 
@@ -55,7 +55,7 @@ export const isValidRelativeUrl = (relativeUrl: string) => {
 export const regexDuration = /^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/;
 export const regexEmailAddress = /\S+@\S+\.\S+/;
 export const regexReportName = /^[\w\-\s\(\)\[\]\,\_\-+]+$/;
-export const regexRelativeUrl = /^\/(_plugin\/kibana\/|_dashboards\/)?app\/(dashboards|visualize|discover|notebooks-dashboards\?view=output_only)([?&]security_tenant=.+|)#\/(view\/|edit\/)?[^\/]+$/;
+export const regexRelativeUrl = /^\/(_plugin\/kibana\/|_dashboards\/)?app\/(dashboards|visualize|discover|observability)([?&]security_tenant=.+|)#\/(notebooks\/|view\/|edit\/)?[^\/]+$/;
 
 export const validateReport = async (
   client: ILegacyScopedClusterClient,