Automate UI dependabot security fixes (#8301)

* Upgraded moment to latest (#8271) Signed-off-by: Sunanda-Boorla <[email protected]> * Updated prismjs version to latest (#8260) * updated prismjs version and moved to devDependencies Signed-off-by: Sunanda-Boorla <[email protected]> * moved back to depedencies Signed-off-by: Sunanda-Boorla <[email protected]> --------- Signed-off-by: Sunanda-Boorla <[email protected]> * CHEF-7047: update RRule lib (#8270) Signed-off-by: anees-progress <[email protected]> * CHEF-7067: Updated D3 lib (#8272) Signed-off-by: anees-progress <[email protected]> Signed-off-by: Sunanda-Boorla <[email protected]> Co-authored-by: Sunanda Boorla <[email protected]> * Removed bypass security and added sanitization in it (#8289) Signed-off-by: AadeshNichite <[email protected]> --------- Signed-off-by: Sunanda-Boorla <[email protected]> Signed-off-by: anees-progress <[email protected]> Signed-off-by: AadeshNichite <[email protected]> Co-authored-by: Sunanda Boorla <[email protected]> Co-authored-by: anees-progress <[email protected]> Co-authored-by: AadeshNichite <[email protected]>
chef · Nov 30, 2023 · 7bf766a · 7bf766a
1 parent e3a6c4f
commit 7bf766a
Show file tree

Hide file tree

Showing 8 changed files with 421 additions and 381 deletions.
diff --git a/components/automate-ui/package-lock.json b/components/automate-ui/package-lock.json
diff --git a/components/automate-ui/package.json b/components/automate-ui/package.json
@@ -48,7 +48,7 @@
     "broadcast-channel": "^3.7.0",
     "classlist.js": "^1.1.20150312",
     "core-js": "^3.9.1",
-    "d3": "^6.6.0",
+    "d3": "^7.8.5",
     "diff2html": "^3.4.0",
     "express": "^4.17.1",
     "file-saver": "^2.0.5",
@@ -57,13 +57,13 @@
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "minimist": "^1.2.7",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
     "ngx-cookie": "^5.0.2",
     "ngx-infinite-scroll": "^10.0.1",
     "path": "^0.12.7",
     "process": "^0.11.10",
     "protractor": "^7.0.0",
-    "rrule": "2.4.1",
+    "rrule": "2.7.2",
     "rxjs": "^6.6.6",
     "sniffr": "^1.2.0",
     "tslib": "^2.1.0",

diff --git a/...onents/automate-ui/src/app/modules/infra-proxy/select-box/src/lib/select-box.component.ts b/...onents/automate-ui/src/app/modules/infra-proxy/select-box/src/lib/select-box.component.ts
@@ -208,7 +208,7 @@ export class SelectBoxComponent implements OnInit, OnChanges, OnDestroy, AfterVi
     const value = list.replace(
       searchText, `<span class='highlight-text'>${searchText}</span>` );
 
-    return this.sanitizer.bypassSecurityTrustHtml(value);
+    return this.sanitizer.sanitize(1,value);
   }
 
   moveItemUp(): void {

diff --git a/components/automate-ui/src/app/page-components/delta-viewer/delta-viewer.component.ts b/components/automate-ui/src/app/page-components/delta-viewer/delta-viewer.component.ts
@@ -14,7 +14,7 @@ export class DeltaViewerComponent {
   get diffHtml(): SafeHtml {
     const str = this.delta.split('\\n').join('\n');
     const html = Diff2Html.html(str);
-    return this.sanitizer.bypassSecurityTrustHtml(html);
+    return this.sanitizer.sanitize(1,html);
   }
 
   constructor(private sanitizer: DomSanitizer) {}

diff --git a/components/automate-ui/src/app/pages/job-add/job-add.component.ts b/components/automate-ui/src/app/pages/job-add/job-add.component.ts
@@ -371,7 +371,8 @@ export class JobAddComponent implements OnDestroy , OnInit {
       ruleOpts['interval'] = repeat.interval;
     }
 
-    return RRule.optionsToString(ruleOpts);
+
+    return RRule.optionsToString(ruleOpts).replace("\nRRULE:", ";").replace(":", "=");
   }
 
   public nodeFiltersFor(managerGroup) {

diff --git a/components/automate-ui/src/app/pages/job-edit/job-edit.component.ts b/components/automate-ui/src/app/pages/job-edit/job-edit.component.ts
@@ -364,7 +364,7 @@ export class JobEditComponent implements OnDestroy {
       ruleOpts['interval'] = repeat.interval;
     }
 
-    return RRule.optionsToString(ruleOpts);
+    return RRule.optionsToString(ruleOpts).replace("\nRRULE:", ";").replace(":", "=");
   }
 
   public nodeFiltersFor(managerGroup) {