From fb3341f5c6254db89145ed81256cfe85ae21ab30 Mon Sep 17 00:00:00 2001
From: Papyxulo <110495450+Papyxulo@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:20:50 +0100
Subject: [PATCH] Fix for the #399 (broken url reference links)

fix for https://github.com/pwndoc-ng/pwndoc-ng/issues/399
- Fixed the issue with URL's in the reference field not being correctly generated in the docx file (tested in libreoffice and office 365)
- Removed odd shading that was being generated in the reference field links (it was displayed in office 365)
---
 backend/src/lib/report-generator.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/backend/src/lib/report-generator.js b/backend/src/lib/report-generator.js
index 851437e..d189cff 100644
--- a/backend/src/lib/report-generator.js
+++ b/backend/src/lib/report-generator.js
@@ -300,14 +300,24 @@ expressions.filters.lines = function(input) {
 
 // Creates a hyperlink: {@input | linkTo: 'https://example.com' | p}
 expressions.filters.linkTo = function(input, url) {
-    var encodedUrl = encodeURIComponent(url); // fix breaking word with special characters in reference
-    var encodedInput = encodeURIComponent(input); // fix breaking word with special characters in reference
-    return `<w:r><w:fldChar w:fldCharType="begin"/></w:r>
-        <w:r><w:instrText xml:space="preserve"> HYPERLINK "${encodedUrl}" </w:instrText></w:r>
-        <w:r><w:fldChar w:fldCharType="separate"/></w:r>
-        <w:r><w:rPr><w:rStyle w:val="Hyperlink"/></w:rPr>
-        <w:t>${encodedInput}</w:t>
-        </w:r><w:r><w:fldChar w:fldCharType="end"/></w:r>`;
+
+    // fix breaking word with special characters in reference
+    var entityencodedurl = url.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;'); // encode to prevent xml issues
+    var entityencodedinput = input.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;'); // encode to prevent xml issues
+    var encodedUrl = encodeURI(entityencodedurl); // encode the uri
+    var encodedInput = encodeURI(entityencodedinput); // encode the uri
+    
+    return `<w:r>
+    <w:fldChar w:fldCharType="begin"/></w:r><w:r>
+    <w:instrText xml:space="preserve"> HYPERLINK "${encodedUrl}" </w:instrText>
+</w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r>
+<w:r><w:rPr><w:rStyle w:val="Hyperlink"/>
+        <w:shd w:val="clear" w:color="auto" w:fill="auto"/> <!-- Remove any shading -->
+        <w:u w:val="single"/> <!-- Add underline -->
+        <w:color w:val="0000FF"/> <!-- Set text color to blue -->
+    </w:rPr><w:t>${encodedInput}</w:t></w:r><w:r><w:fldChar w:fldCharType="end"/>
+</w:r>`;
+        
 }
 
 // Loop over the input object, providing acccess to its keys and values: {#findings | loopObject}{key}{value.title}{/findings | loopObject}