@oneuptime/common 10.0.35 → 10.0.36

package/Server/Infrastructure/Postgres/SchemaMigrations/{1773761409952-MigrationName.ts → 1774000000001-MigrationName.ts}

@@ -1,7 +1,7 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-export class MigrationName1773761409952 implements MigrationInterface {
-  public name = "MigrationName1773761409952";
+export class MigrationName1774000000001 implements MigrationInterface {
+  public name = "MigrationName1774000000001";
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -267,7 +267,7 @@ import { MigrationName1773344537755 } from "./1773344537755-MigrationName";
 import { MigrationName1773402621107 } from "./1773402621107-MigrationName";
 import { MigrationName1773676206197 } from "./1773676206197-MigrationName";
 import { MigrationName1774000000000 } from "./1774000000000-MigrationName";
-import { MigrationName1773761409952 } from "./1773761409952-MigrationName";
+import { MigrationName1774000000001 } from "./1774000000001-MigrationName";
 
 export default [
   InitialMigration,
@@ -539,5 +539,5 @@ export default [
   MigrationName1773402621107,
   MigrationName1773676206197,
   MigrationName1774000000000,
-  MigrationName1773761409952,
+  MigrationName1774000000001,
 ];

package/Server/Types/Markdown.ts

@@ -79,9 +79,6 @@ export default class Markdown {
     markdown: string,
     contentType: MarkdownContentType,
   ): Promise<string> {
-    // Basic sanitization: neutralize script tags but preserve markdown syntax like '>' for blockquotes.
-    markdown = markdown.replace(/<script/gi, "&lt;script");
-
     let renderer: Renderer | null = null;
 
     if (contentType === MarkdownContentType.Blog) {
@@ -96,6 +93,17 @@ export default class Markdown {
       renderer = this.getEmailRenderer();
     }
 
+    /*
+     * Escape raw HTML tokens in the markdown source to prevent XSS.
+     * This only affects raw HTML that users type directly (e.g. <img onerror=...>),
+     * not HTML generated by the renderer methods (headings, paragraphs, etc.).
+     */
+    if (renderer) {
+      renderer.html = (html: string): string => {
+        return Markdown.escapeHtml(html);
+      };
+    }
+
     const htmlBody: string = await marked(markdown, {
       renderer: renderer,
     });

package/Server/Utils/Monitor/MonitorCriteriaEvaluator.ts

@@ -447,7 +447,10 @@ ${contextBlock}
       }
     }
 
-    if (input.monitor.monitorType === MonitorType.Metrics) {
+    if (
+      input.monitor.monitorType === MonitorType.Metrics ||
+      input.monitor.monitorType === MonitorType.Kubernetes
+    ) {
       const metricMonitorResult: string | null =
         await MetricMonitorCriteria.isMonitorInstanceCriteriaFilterMet({
           dataToProcess: input.dataToProcess,

package/Types/Code/CodeType.ts

@@ -6,7 +6,7 @@ enum CodeType {
   Markdown = "markdown",
   SQL = "sql",
   Text = "text",
-  // TODO add more mime types.
+  YAML = "yaml",
 }
 
 export default CodeType;

package/Types/Metrics/MetricQueryConfigData.ts

@@ -16,4 +16,5 @@ export default interface MetricQueryConfigData {
   metricQueryData: MetricQueryData;
   getSeries?: ((data: AggregatedModel) => ChartSeries) | undefined;
   chartType?: MetricChartType | undefined;
+  yAxisValueFormatter?: ((value: number) => string) | undefined;
 }

package/Types/Monitor/CriteriaFilter.ts

@@ -226,6 +226,25 @@ export class CriteriaFilterUtil {
     ];
   }
 
+  public static getInverseFilterType(filterType: FilterType): FilterType {
+    switch (filterType) {
+      case FilterType.GreaterThan:
+        return FilterType.LessThanOrEqualTo;
+      case FilterType.LessThan:
+        return FilterType.GreaterThanOrEqualTo;
+      case FilterType.GreaterThanOrEqualTo:
+        return FilterType.LessThan;
+      case FilterType.LessThanOrEqualTo:
+        return FilterType.GreaterThan;
+      case FilterType.EqualTo:
+        return FilterType.NotEqualTo;
+      case FilterType.NotEqualTo:
+        return FilterType.EqualTo;
+      default:
+        return filterType;
+    }
+  }
+
   public static isEvaluateOverTimeFilter(checkOn: CheckOn): boolean {
     return (
       checkOn === CheckOn.ResponseStatusCode ||