From e2ad244102f4d249bf33b571814a939b9b32bb53 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Mon, 29 Apr 2019 16:58:18 +0100 Subject: [PATCH] feat: escape HTML and columns on home page License: MIT Signed-off-by: Henrique Dias --- bin/index.js | 1 + lib/helpers.js | 11 +++++++++++ lib/html.js | 16 ++++++++++------ package.json | 1 + 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/bin/index.js b/bin/index.js index 2f6a5ca..1f73098 100644 --- a/bin/index.js +++ b/bin/index.js @@ -113,6 +113,7 @@ async function run () { added = added.sort((a, b) => a.num - b.num) await fs.copyFile(join(__dirname, '../node_modules/tachyons/css/tachyons.min.css'), join(argv.dir, 'tachyons.css')) + await fs.copyFile(join(__dirname, '../node_modules/tachyons-columns/css/tachyons-columns.min.css'), join(argv.dir, 'tachyons-columns.css')) await fs.outputFile(join(argv.dir, 'index.html'), homePage(added)) } diff --git a/lib/helpers.js b/lib/helpers.js index a137568..f23c45b 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -9,7 +9,18 @@ const pad = (str, max) => { return str.length < max ? pad('0' + str, max) : str } +const tagsToReplace = { + '&': '&', + '<': '<', + '>': '>' +} + +const escapeHtml = (html) => { + html.replace(/[&<>]/g, tag => tagsToReplace[tag] || tag) +} + module.exports = { progress, + escapeHtml, pad } diff --git a/lib/html.js b/lib/html.js index 478b999..5738396 100644 --- a/lib/html.js +++ b/lib/html.js @@ -1,7 +1,7 @@ const { basename } = require('path') -const { pad } = require('./helpers') +const { pad, escapeHtml } = require('./helpers') -const credits = '

This work is licensed under a Creative Commons Attribution-NonCommercial 2.5 License.
Originally from xkcd.com.

' +const credits = '

This work is licensed under a Creative Commons Attribution-NonCommercial 2.5 License.
Originally from xkcd.com.

' const comicPage = ({ alt, title, transcript, num, img }) => { const btnClass = 'dib navy mh2 pa2 bg-light-blue hover-bg-lightest-blue br2 ba bw1 b--navy no-underline' @@ -12,6 +12,7 @@ const comicPage = ({ alt, title, transcript, num, img }) => { +

${title} #${num}

@@ -23,7 +24,7 @@ const comicPage = ({ alt, title, transcript, num, img }) => { -

${transcript}

+

${escapeHtml(transcript)}

${credits} ` @@ -35,12 +36,15 @@ const homePage = (list) => ` + - +

XKCD

-