mirror of
https://github.com/pi-hole/web.git
synced 2025-12-20 02:38:28 +00:00
Merge commit from fork
HTML escape adlist URL and non-domain entried before printing it in gravity stream
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
* This file is copyright under the latest version of the EUPL.
|
||||
* Please see LICENSE file for your rights under this license. */
|
||||
|
||||
/* global apiFailure:false */
|
||||
/* global apiFailure:false, utils:false */
|
||||
|
||||
"use strict";
|
||||
|
||||
@@ -89,9 +89,11 @@ function parseLines(outputElement, text) {
|
||||
const lines = text.split(/(?=\r)/g);
|
||||
|
||||
for (let line of lines) {
|
||||
// Escape HTML to prevent XSS attacks (both in adlist URL and non-domain entries)
|
||||
line = utils.escapeHtml(line);
|
||||
if (line[0] === "\r") {
|
||||
// This line starts with the "OVER" sequence. Replace them with "\n" before print
|
||||
line = line.replaceAll("\r[K", "\n").replaceAll("\r", "\n");
|
||||
line = line.replaceAll("\r\u001B[K", "\n").replaceAll("\r", "\n");
|
||||
|
||||
// Last line from the textarea will be overwritten, so we remove it
|
||||
const lastLineIndex = outputElement.innerHTML.lastIndexOf("\n");
|
||||
|
||||
Reference in New Issue
Block a user