From ec6148797cfbc054ca193732a898c35a1e1550cb Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@gmail.com>
Date: Sun, 31 May 2020 00:45:59 +0200
Subject: [PATCH] Fix style and add html escaping

---
 Cargo.lock                  |  7 +++++++
 Cargo.toml                  |  3 ++-
 src/format/assets/style.css |  2 --
 src/format/html.rs          | 21 +++++++++++++++------
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97bfbbb..1c77c80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,6 +73,11 @@ dependencies = [
  "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "htmlescape"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -151,6 +156,7 @@ name = "snekdown"
 version = "0.1.0"
 dependencies = [
  "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "minify 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "structopt 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -276,6 +282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hermit-abi 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71"
+"checksum htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
 "checksum minify 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ef7c582bd7587da887914eaf294897e82f2f5c98b741f137f2a918cd26a885b"
diff --git a/Cargo.toml b/Cargo.toml
index 39baf96..fa33728 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,4 +10,5 @@ edition = "2018"
 crossbeam-utils = "0.7.2"
 structopt = "0.3.14"
 termion = "1.5.5"
-minify = "1.1.1"
\ No newline at end of file
+minify = "1.1.1"
+htmlescape = "0.3.1"
\ No newline at end of file
diff --git a/src/format/assets/style.css b/src/format/assets/style.css
index 0f71a73..d51aa15 100644
--- a/src/format/assets/style.css
+++ b/src/format/assets/style.css
@@ -69,8 +69,6 @@ blockquote {
     margin-left: 0
 }
 
-p p, p a, p b,
-
 .quote {
     border-left: 0.3em solid gray;
     border-radius: 0.2em;
diff --git a/src/format/html.rs b/src/format/html.rs
index f14e020..954de9c 100644
--- a/src/format/html.rs
+++ b/src/format/html.rs
@@ -1,4 +1,5 @@
 use crate::elements::*;
+use htmlescape::encode_minimal;
 use minify::html::minify;
 
 macro_rules! combine_with_lb {
@@ -195,7 +196,7 @@ impl ToHtml for Quote {
         if let Some(meta) = self.metadata.clone() {
             format!(
                 "<div class='quote'><blockquote>{}</blockquote><span class='metadata'>{}</span></div>",
-                text, meta.data
+                text, encode_minimal(meta.data.as_str())
             )
         } else {
             format!("<div class='quote'><blockquote>{}</blockquote></div>", text)
@@ -228,8 +229,8 @@ impl ToHtml for Image {
                      </a>\
                      <label class='imageDescription'>{1}</label>\
                      </div>",
-                    self.url.url.clone(),
-                    description
+                    encode_minimal(self.url.url.clone().as_str()),
+                    encode_minimal(description.as_str())
                 )
                 .as_str(),
             )
@@ -272,15 +273,23 @@ impl ToHtml for MonospaceText {
 impl ToHtml for Url {
     fn to_html(&self) -> String {
         if let Some(description) = self.description.clone() {
-            format!("<a href='{}'>{}</a>", self.url.clone(), description)
+            format!(
+                "<a href='{}'>{}</a>",
+                self.url.clone(),
+                encode_minimal(description.as_str())
+            )
         } else {
-            format!("<a href='{}'>{}</a>", self.url.clone(), self.url.clone())
+            format!(
+                "<a href='{}'>{}</a>",
+                self.url.clone(),
+                encode_minimal(self.url.clone().as_str())
+            )
         }
     }
 }
 
 impl ToHtml for PlainText {
     fn to_html(&self) -> String {
-        self.value.clone()
+        encode_minimal(self.value.clone().as_str())
     }
 }