Merge pull request #106 from iseebi/escape-html-entities

Escape HTML entities in HTML output support
mono0926 · Aug 10, 2019 · 51ec2ea · 51ec2ea
2 parents 3e7e7cf + f983913
commit 51ec2ea
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -55,6 +55,15 @@
           "version": "0.9.0"
         }
       },
+      {
+        "package": "HTMLEntities",
+        "repositoryURL": "https://github.com/IBM-Swift/swift-html-entities.git",
+        "state": {
+          "branch": null,
+          "revision": "3b778b3ab061684db024eaf38c576887b42918aa",
+          "version": "3.0.13"
+        }
+      },
       {
         "package": "Yaml",
         "repositoryURL": "https://github.com/behrang/YamlSwift.git",

diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,9 @@ let package = Package(
         .package(url: "https://github.com/IBM-Swift/HeliumLogger.git",
                  from: "1.8.0"),
         .package(url: "https://github.com/behrang/YamlSwift.git",
-                 from: "3.4.0")
+                 from: "3.4.0"),
+        .package(url: "https://github.com/IBM-Swift/swift-html-entities.git",
+                 from: "3.0.0")
     ],
     targets: [
         .target(
@@ -33,6 +35,7 @@ let package = Package(
                 "APIKit",
                 "Commander",
                 "HeliumLogger",
+                "HTMLEntities",
                 "Yaml"
             ]
         ),

diff --git a/Sources/LicensePlistCore/Entity/LicenseHTMLHolder.swift b/Sources/LicensePlistCore/Entity/LicenseHTMLHolder.swift
@@ -1,5 +1,6 @@
 import Foundation
 import LoggerAPI
+import HTMLEntities
 
 struct LicenseHTMLHolder {
     let html: String
@@ -20,8 +21,8 @@ struct LicenseHTMLHolder {
 """
         licenses.forEach { license in
             html += """
-        <h2>\(license.name(withVersion: options.config.addVersionNumbers))</h2>
-        <pre>\(license.body)</pre>
+        <h2>\(license.name(withVersion: options.config.addVersionNumbers).htmlEscape())</h2>
+        <pre>\(license.body.htmlEscape())</pre>
 
 """
         }