Merge pull request #2819 from UltimateHackingKeyboard/fix-escape-macro-name

fix: escape some html content

Author: mondalaci

packages/uhk-web/src/app/components/device/firmware/device-firmware.component.html

@@ -10,7 +10,7 @@ <h1>
             <ul class="list-unstyled">
                 <li *ngFor="let state of firmwareUpgradeStates.modules; trackBy:firmwareUpgradeStateTrackByFn;">
                     <ng-template #htmlTooltipTemplate>
-                        <div [innerHTML]="state.checksumTooltip | safeHtml"></div>
+                        <div [innerHTML]="state.checksumTooltip | escapeHtml | safeHtml"></div>
                     </ng-template>
                     <span class="upgrading"
                           [ngbTooltip]="htmlTooltipTemplate"

packages/uhk-web/src/app/store/index.ts

@@ -57,6 +57,7 @@ import {
 import { PrivilagePageSate } from '../models/privilage-page-sate';
 import { SelectOptionData } from '../models/select-option-data';
 import { defaultUhkThemeColors } from '../util/default-uhk-theme-colors';
+import { escapeHtml } from '../util/escape-html';
 import { parseStatusBuffer } from '../util/status-buffer-parser';
 import { addMissingModuleConfigs } from './reducers/add-missing-module-configs';
 
@@ -769,7 +770,7 @@ export const upgradeAgentTooltip = createSelector(
             return '';
         }
 
-        return `rightHalf.firmware.userConfigVersion ${hardwareModules.rightModuleInfo.userConfigVersion} minor version is larger than agent.userConfigVersion ${VERSIONS.userConfigVersion}. <br /> <br /> rightHalf.flashedUserConfigVersion: ${newUserConfiguration.newUserConfigurationVersion}`;
+        return `rightHalf.firmware.userConfigVersion ${escapeHtml(hardwareModules.rightModuleInfo.userConfigVersion)} minor version is larger than agent.userConfigVersion ${VERSIONS.userConfigVersion}. <br /> <br /> rightHalf.flashedUserConfigVersion: ${escapeHtml(newUserConfiguration.newUserConfigurationVersion)}`;
     });
 export const upgradeFirmwareTooltip = createSelector(
     getHardwareModules,

packages/uhk-web/src/app/util/status-buffer-parser.ts

@@ -67,7 +67,7 @@ function transformToErrorBlock(macros: Macro[], block: string): any {
     }
 
     const url = `#/macro/${macro.id}?actionIndex=${macroActionIndex}&lineNr=${lineNr}&columnNr=${columnNr}&inlineEdit=true`;
-    const newLine2 = `${line1Result[1]}<a href="${url}">${escapeHtml(line1Result[2])}</a>`;
+    const newLine2 = `${escapeHtml(line1Result[1])}<a href="${url}">${escapeHtml(line1Result[2])}</a>`;
 
-    return `${lines[0]}\n${newLine2}\n${lines[2]}\n`;
+    return `${escapeHtml(lines[0])}\n${newLine2}\n${escapeHtml(lines[2])}\n`;
 }