10 files changed, 82 insertions, 60 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de97bf0a..c6a8c666 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,8 @@ set (SOURCES
     src/main.c
     src/app.c
     src/app.h
-    src/gemini.h
+    src/gmcerts.c
+    src/gmcerts.h
     src/gmdocument.c
     src/gmdocument.h
     src/gmrequest.c
diff --git a/src/app.c b/src/app.c
index 5d29da5b..46235206 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1,5 +1,6 @@
 #include "app.h"
 #include "embedded.h"
+#include "gmcerts.h"
 #include "history.h"
 #include "ui/command.h"
 #include "ui/window.h"
@@ -51,6 +52,7 @@ struct Impl_App {
     iWindow *    window;
     iSortedArray tickers;
     iBool        pendingRefresh;
+    iGmCerts *   certs;
     iHistory *   history;
     /* Preferences: */
     iBool        retainWindowSize;
@@ -144,6 +146,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->window           = NULL;
     d->retainWindowSize = iTrue;
     d->pendingRefresh   = iFalse;
+    d->certs            = new_GmCerts(dataDir_App_);
     d->history          = new_History();
     loadPrefs_App_(d);
     load_History(d->history, dataDir_App_);
@@ -165,6 +168,7 @@ static void deinit_App(iApp *d) {
     savePrefs_App_(d);
     save_History(d->history, dataDir_App_);
     delete_History(d->history);
+    delete_GmCerts(d->certs);
     deinit_SortedArray(&d->tickers);
     delete_Window(d->window);
     d->window = NULL;
diff --git a/src/app.h b/src/app.h
index 777692b0..23e30ea5 100644
--- a/src/app.h
+++ b/src/app.h
@@ -5,8 +5,9 @@
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
 
-iDeclareType(Window)
+iDeclareType(GmCerts)
 iDeclareType(History)
+iDeclareType(Window)
 
 enum iAppEventMode {
     waitForNewEvents_AppEventMode,
@@ -25,6 +26,7 @@ void        processEvents_App   (enum iAppEventMode mode);
 iBool       handleCommand_App   (const char *cmd);
 void        refresh_App         (void);
 
+iGmCerts *      certs_App       (void);
 const iHistory *history_App     (void);
 
 iAny *      findWidget_App      (const char *id);
diff --git a/src/gemini.h b/src/gemini.h
deleted file mode 100644
index 564de65b..00000000
--- a/src/gemini.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <the_Foundation/string.h>
-
-/* Response status codes. */
-enum iGmStatusCode {
-    clientSide_GmStatusCode = -100, /* clientside status codes */
-    invalidRedirect_GmStatusCode,
-    invalidHeader_GmStatusCode,
-    unsupportedMimeType_GmStatusCode,
-    failedToOpenFile_GmStatusCode,
-    unknownStatusCode_GmStatusCode,
-    none_GmStatusCode                      = 0,
-    input_GmStatusCode                     = 10,
-    sensitiveInput_GmStatusCode            = 11,
-    success_GmStatusCode                   = 20,
-    redirectTemporary_GmStatusCode         = 30,
-    redirectPermanent_GmStatusCode         = 31,
-    temporaryFailure_GmStatusCode          = 40,
-    serverUnavailable_GmStatusCode         = 41,
-    cgiError_GmStatusCode                  = 42,
-    proxyError_GmStatusCode                = 43,
-    slowDown_GmStatusCode                  = 44,
-    permanentFailure_GmStatusCode          = 50,
-    notFound_GmStatusCode                  = 51,
-    gone_GmStatusCode                      = 52,
-    proxyRequestRefused_GmStatusCode       = 53,
-    badRequest_GmStatusCode                = 59,
-    clientCertificateRequired_GmStatusCode = 60,
-    certificateNotAuthorized_GmStatusCode  = 61,
-    certificateNotValid_GmStatusCode       = 62,
-};
-
-iDeclareType(GmError)
-
-struct Impl_GmError {
-    iChar icon;
-    const char *title;
-    const char *info;
-};
-
-iBool               isDefined_GmError   (enum iGmStatusCode code);
-const iGmError *    get_GmError         (enum iGmStatusCode code);
diff --git a/src/gmcerts.c b/src/gmcerts.c
new file mode 100644
index 00000000..cb4d8477
--- /dev/null
+++ b/src/gmcerts.c
@@ -0,0 +1,15 @@
+#include "gmcerts.h"
+
+struct Impl_GmCerts {
+    iString saveDir;
+};
+
+iDefineTypeConstructionArgs(GmCerts, (const char *saveDir), saveDir)
+
+void init_GmCerts(iGmCerts *d, const char *saveDir) {
+    initCStr_String(&d->saveDir, saveDir);
+}
+
+void deinit_GmCerts(iGmCerts *d) {
+    deinit_String(&d->saveDir);
+}
diff --git a/src/gmcerts.h b/src/gmcerts.h
new file mode 100644
index 00000000..1990463c
--- /dev/null
+++ b/src/gmcerts.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <the_Foundation/tlsrequest.h>
+
+iDeclareType(GmCerts)
+iDeclareTypeConstructionArgs(GmCerts, const char *saveDir)
diff --git a/src/gmrequest.c b/src/gmrequest.c
index f43e4220..32b386b2 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -20,6 +20,7 @@ struct Impl_GmRequest {
     iObject object;
     iMutex mutex;
     enum iGmRequestState state;
+    enum iGmRequestCertification certState;
     iString url;
     iTlsRequest *req;
     enum iGmStatusCode code;
@@ -37,6 +38,7 @@ iDefineAudienceGetter(GmRequest, finished)
 void init_GmRequest(iGmRequest *d) {
     init_Mutex(&d->mutex);
     d->state = initialized_GmRequestState;
+    d->certState = notApplicable_GmRequestCertification;
     init_String(&d->url);
     d->req = NULL;
     d->code = none_GmStatusCode;
@@ -166,6 +168,7 @@ static void requestFinished_GmRequest_(iAnyObject *obj) {
     d->state = finished_GmRequestState;
 #if 1
     /* Check the server certificate. */ {
+        d->certState = invalid_GmRequestCertification; /* check trust */
         const iTlsCertificate *cert = serverCertificate_TlsRequest(d->req);
         printf("Server certificate:\n%s\n", cstrLocal_String(pem_TlsCertificate(cert)));
         iBlock *sha = fingerprint_TlsCertificate(cert);
@@ -208,6 +211,7 @@ void submit_GmRequest(iGmRequest *d) {
             /* TODO: Check supported file types: images, audio */
             /* TODO: Detect text files based on contents? E.g., is the content valid UTF-8. */
             d->code = success_GmStatusCode;
+            d->certState = notApplicable_GmRequestCertification;
             if (endsWithCase_String(path, ".gmi")) {
                 setCStr_String(&d->header, "text/gemini; charset=utf-8");
             }
@@ -235,11 +239,13 @@ void submit_GmRequest(iGmRequest *d) {
         }
         iRelease(f);
         d->state = finished_GmRequestState;
+        d->certState = notApplicable_GmRequestCertification;
         iNotifyAudience(d, finished, GmRequestFinished);
         return;
     }
     else if (equalCase_Rangecc(&url.protocol, "data")) {
         d->code = success_GmStatusCode;
+        d->certState = notApplicable_GmRequestCertification;
         iString *src = collectNewCStr_String(url.protocol.start + 5);
         iRangecc header = { constBegin_String(src), constBegin_String(src) };
         while (header.end < constEnd_String(src) && *header.end != ',') {
diff --git a/src/gmrequest.h b/src/gmrequest.h
index 270f976a..37f324eb 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -16,6 +16,13 @@ iDeclareAudienceGetter(GmRequest, finished)
 void    setUrl_GmRequest    (iGmRequest *, const iString *url);
 void    submit_GmRequest    (iGmRequest *);
 
+enum iGmRequestCertification {
+    notApplicable_GmRequestCertification,
+    invalid_GmRequestCertification,
+    valid_GmRequestCertification,
+    expired_GmRequestCertification,
+};
+
 iBool               isFinished_GmRequest    (const iGmRequest *);
 enum iGmStatusCode  status_GmRequest        (const iGmRequest *);
 const iString *     meta_GmRequest          (const iGmRequest *);
diff --git a/src/gmutil.h b/src/gmutil.h
index 4a1fdee9..3342b262 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -3,8 +3,47 @@
 #include <the_Foundation/range.h>
 #include <the_Foundation/string.h>
 
+iDeclareType(GmError)
 iDeclareType(Url)
 
+/* Response status codes. */
+enum iGmStatusCode {
+    clientSide_GmStatusCode = -100, /* clientside status codes */
+    invalidRedirect_GmStatusCode,
+    invalidHeader_GmStatusCode,
+    unsupportedMimeType_GmStatusCode,
+    failedToOpenFile_GmStatusCode,
+    unknownStatusCode_GmStatusCode,
+    none_GmStatusCode                      = 0,
+    input_GmStatusCode                     = 10,
+    sensitiveInput_GmStatusCode            = 11,
+    success_GmStatusCode                   = 20,
+    redirectTemporary_GmStatusCode         = 30,
+    redirectPermanent_GmStatusCode         = 31,
+    temporaryFailure_GmStatusCode          = 40,
+    serverUnavailable_GmStatusCode         = 41,
+    cgiError_GmStatusCode                  = 42,
+    proxyError_GmStatusCode                = 43,
+    slowDown_GmStatusCode                  = 44,
+    permanentFailure_GmStatusCode          = 50,
+    notFound_GmStatusCode                  = 51,
+    gone_GmStatusCode                      = 52,
+    proxyRequestRefused_GmStatusCode       = 53,
+    badRequest_GmStatusCode                = 59,
+    clientCertificateRequired_GmStatusCode = 60,
+    certificateNotAuthorized_GmStatusCode  = 61,
+    certificateNotValid_GmStatusCode       = 62,
+};
+
+struct Impl_GmError {
+    iChar       icon;
+    const char *title;
+    const char *info;
+};
+
+iBool               isDefined_GmError   (enum iGmStatusCode code);
+const iGmError *    get_GmError         (enum iGmStatusCode code);
+
 struct Impl_Url {
     iRangecc protocol;
     iRangecc host;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f8a2e330..954ded0c 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -145,21 +145,6 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
     SDL_FreeCursor(d->handCursor);
 }
 
-#if 0
-static iString *cleanUrl_(const iString *url) {
-    iString *clean = copy_String(url);
-    if (startsWith_String(url, "//")) {
-        prependCStr_String(clean, "gemini:");
-    }
-    else if (indexOfCStr_String(url, "://") == iInvalidPos && !startsWithCase_String(url, "gemini:")
-             && !startsWithCase_String(url, "data:")) {
-        /* Prepend default protocol. */
-        prependCStr_String(clean, "gemini://");
-    }
-    return clean;
-}
-#endif
-
 static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
     const iWidget *w = constAs_Widget(d);
     const iRect bounds = bounds_Widget(w);