Merge branch 'master' into 3438-inputs-height

heyxkhoa · Aug 16, 2021 · a049feb · a049feb
2 parents 7035339 + 42b2c3a
commit a049feb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/client/src/actions/index.js b/client/src/actions/index.js
@@ -638,7 +638,11 @@ export const toggleBlocking = (
 };
 
 export const toggleBlockingForClient = (type, domain, client) => {
-    const baseRule = `||${domain}^$client='${client.replace(/'/g, '/\'')}'`;
+    const escapedClientName = client.replace(/'/g, '\\\'')
+        .replace(/"/g, '\\"')
+        .replace(/,/g, '\\,')
+        .replace(/\|/g, '\\|');
+    const baseRule = `||${domain}^$client='${escapedClientName}'`;
     const baseUnblocking = `@@${baseRule}`;
 
     return toggleBlocking(type, domain, baseRule, baseUnblocking);