From d1777c016d1e963b06869775becdc38a4a00ecb8 Mon Sep 17 00:00:00 2001
From: Tim Wilkinson <tim.j.wilkinson@gmail.com>
Date: Mon, 19 Feb 2024 17:33:41 -0800
Subject: [PATCH] Correctly escape characters in the mailto: urls (#1099)

---
 files/usr/lib/lua/aredn/http.lua | 3 +++
 files/www/cgi-bin/vpn            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/files/usr/lib/lua/aredn/http.lua b/files/usr/lib/lua/aredn/http.lua
index f49fabe1..c04addc2 100755
--- a/files/usr/lib/lua/aredn/http.lua
+++ b/files/usr/lib/lua/aredn/http.lua
@@ -94,3 +94,6 @@ function parsecgi(str)
 end
 -- Written by RiciLake -- END
 
+function encode_uri_component(str)
+  return str:gsub(" ", "%%20"):gsub("%+", "%%2B"):gsub("=", "%%3D")
+end
diff --git a/files/www/cgi-bin/vpn b/files/www/cgi-bin/vpn
index 0cd29946..10adee43 100755
--- a/files/www/cgi-bin/vpn
+++ b/files/www/cgi-bin/vpn
@@ -753,7 +753,7 @@ do
         html.print("<td rowspan='2' class='tun_client_center_item'><input type=submit name=wgclient_add value=Add title='Add this client'></td>")
     else
         html.print("<td rowspan='2' class='tun_client_center_item tun_client_mailto' id=wgclient" .. val .. "_email>")
-        html.print("<a href='mailto:?subject=AREDN%20Tunnel%20Connection&body=Your%20connection%20details:%0D%0AName:%20" .. name .. "%0D%0APassword:%20" .. (server_pub .. client_priv .. client_pub) .. "%0D%0ANetwork:%20" .. fullnet .. "%0D%0AServer%20address:%20" .. dns .. "' target='_blank'>")
+        html.print("<a href='mailto:?subject=AREDN%20Tunnel%20Connection&body=Your%20connection%20details:%0D%0AName:%20" ..encode_uri_component(name) .. "%0D%0APassword:%20" .. encode_uri_component(server_pub .. client_priv .. client_pub) .. "%0D%0ANetwork:%20" .. encode_uri_component(fullnet) .. "%0D%0AServer%20address:%20" .. encode_uri_component(dns) .. "' target='_blank'>")
         html.print("<img class='tun_client_mailto_img' src='/email.png' title='Email details' /></a></td>")
     end
     html.print("</tr><tr class='tun_client_list1 tun_client_row tun_loading_css_comment'><td colspan='2' align='right'>Contact Info/Comment (Optional): <input type=text maxlength='50' size=40 name=wgclient" .. val .. "_contact value='" .. (contact or "") .."'")