Punycode domains when setting trust

3 files changed, 31 insertions, 26 deletions

diff --git a/src/gmcerts.c b/src/gmcerts.c
index cf4d7d2d..6a1ba98c 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -21,6 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "gmcerts.h"
+#include "gmutil.h"
 #include "defs.h"
 
 #include <the_Foundation/file.h>
@@ -420,7 +421,8 @@ iBool checkTrust_GmCerts(iGmCerts *d, iRangecc domain, const iTlsCertificate *ce
 
 void setTrusted_GmCerts(iGmCerts *d, iRangecc domain, const iBlock *fingerprint,
                         const iDate *validUntil) {
-    iString *key = collect_String(newRange_String(domain));
+    iString *key = collectNew_String();
+    punyEncodeDomain_Rangecc(domain, key);
     lock_Mutex(d->mtx);
     iTrustEntry *trust = value_StringHash(d->trusted, key);
     if (trust) {
diff --git a/src/gmutil.c b/src/gmutil.c
index e3121b1f..ed6ef551 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -331,36 +331,38 @@ static iBool equalPuny_(const iString *d, iRangecc orig) {
     return iCmpStrN(cstr_String(d), orig.start, size_Range(&orig)) == 0;
 }
 
-void punyEncodeUrlHost_String(iString *d) {
-    /* `d` should be an absolute URL. */
+void punyEncodeDomain_Rangecc(iRangecc domain, iString *encoded_out) {
+    /* The domain name needs to be split into labels. */
+    iRangecc label   = iNullRange;
+    iBool    isFirst = iTrue;
+    while (nextSplit_Rangecc(domain, ".", &label)) {
+        if (!isFirst) {
+            appendChar_String(encoded_out, '.');
+        }
+        isFirst       = iFalse;
+        iString *puny = punyEncode_Rangecc(label);
+        if (!isEmpty_String(puny) && !equalPuny_(puny, label)) {
+            appendCStr_String(encoded_out, "xn--");
+            append_String(encoded_out, puny);
+        }
+        else {
+            appendRange_String(encoded_out, label);
+        }
+        delete_String(puny);
+    }
+}
+
+void punyEncodeUrlHost_String(iString *absoluteUrl) {
     iUrl url;
-    init_Url(&url, d);
+    init_Url(&url, absoluteUrl);
     if (isEmpty_Range(&url.host)) {
         return;
     }
     iString *encoded = new_String();
     setRange_String(encoded, (iRangecc){ url.scheme.start, url.host.start });
-    /* The domain name needs to be split into labels. */ {
-        iRangecc label   = iNullRange;
-        iBool    isFirst = iTrue;
-        while (nextSplit_Rangecc(url.host, ".", &label)) {
-            if (!isFirst) {
-                appendChar_String(encoded, '.');
-            }
-            isFirst = iFalse;
-            iString *puny = punyEncode_Rangecc(label);
-            if (!isEmpty_String(puny) && !equalPuny_(puny, label)) {
-                appendCStr_String(encoded, "xn--");
-                append_String(encoded, puny);
-            }
-            else {
-                appendRange_String(encoded, label);
-            }
-            delete_String(puny);
-        }
-    }
-    appendRange_String(encoded, (iRangecc){ url.host.end, constEnd_String(d) });
-    set_String(d, encoded);
+    punyEncodeDomain_Rangecc(url.host, encoded);
+    appendRange_String(encoded, (iRangecc){ url.host.end, constEnd_String(absoluteUrl) });
+    set_String(absoluteUrl, encoded);
     delete_String(encoded);
 }
 
diff --git a/src/gmutil.h b/src/gmutil.h
index b2cee61a..64c015b8 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -107,7 +107,8 @@ iRangecc        urlUser_String          (const iString *);
 iRangecc        urlRoot_String          (const iString *);
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
 iBool           isLikelyUrl_String      (const iString *);
-void            punyEncodeUrlHost_String(iString *);
+void            punyEncodeDomain_Rangecc(iRangecc domain, iString *encoded_out);
+void            punyEncodeUrlHost_String(iString *absoluteUrl);
 void            stripDefaultUrlPort_String(iString *);
 const iString * urlFragmentStripped_String(const iString *);
 void            urlDecodePath_String    (iString *);