SidebarWidget: List identities as sidebar items

7 files changed, 105 insertions, 23 deletions

diff --git a/src/app.c b/src/app.c
index 31be06fd..5bcbfc29 100644
--- a/src/app.c
+++ b/src/app.c
@@ -537,7 +537,8 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
 }
 
 static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
-    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {
+    iApp *d = &app_;
+    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {        
         if (equal_Command(cmd, "ident.accept")) {
             const iString *commonName   = text_InputWidget (findChild_Widget(dlg, "ident.common"));
             const iString *userId       = text_InputWidget (findChild_Widget(dlg, "ident.userid"));
@@ -584,7 +585,10 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
                     }
                 }
             }
-
+            /* The input seems fine. */
+            newIdentity_GmCerts(d->certs, isTemp ? temporary_GmIdentityFlag : 0,
+                                until, commonName, userId, organization, country);
+            postCommand_App("idents.changed");
         }
         destroy_Widget(dlg);
         return iTrue;
diff --git a/src/gmcerts.c b/src/gmcerts.c
index e13e9a8d..2624eb4d 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -125,6 +125,7 @@ static iBool isValid_GmIdentity_(const iGmIdentity *d) {
 static void setCertificate_GmIdentity_(iGmIdentity *d, iTlsCertificate *cert) {
     delete_TlsCertificate(d->cert);
     d->cert = cert;
+    set_Block(&d->fingerprint, collect_Block(fingerprint_TlsCertificate(cert)));
 }
 
 static const iString *readFile_(const iString *path) {
@@ -249,7 +250,6 @@ static void loadIdentityFromCertificate_GmCerts_(iGmCerts *d, const iString *crt
     iGmIdentity *ident = findIdentity_GmCerts_(d, finger);
     if (!ident) {
         ident = new_GmIdentity();
-        set_Block(&ident->fingerprint, finger);
         iDate today;
         initCurrent_Date(&today);
         set_String(&ident->notes, collect_String(format_Date(&today, "Imported on %b %d, %Y")));
@@ -387,9 +387,9 @@ iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const
     const iTlsCertificateName names[] = {
         { issuerCommonName_TlsCertificateNameType,    collectNewCStr_String("fi.skyjake.Lagrange") },
         { subjectCommonName_TlsCertificateNameType,   commonName },
-        { subjectUserId_TlsCertificateNameType,       userId },
-        { subjectOrganization_TlsCertificateNameType, org },
-        { subjectCountry_TlsCertificateNameType,      country },
+        { subjectUserId_TlsCertificateNameType,       !isEmpty_String(userId) ? userId : NULL },
+        { subjectOrganization_TlsCertificateNameType, !isEmpty_String(org) ? org : NULL },
+        { subjectCountry_TlsCertificateNameType,      !isEmpty_String(country) ? country : NULL },
         { 0, NULL }
     };
     iGmIdentity *id = new_GmIdentity();
@@ -398,17 +398,22 @@ iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const
     if (~flags & temporary_GmIdentityFlag) {
         const char *finger = cstrCollect_String(hexEncode_Block(&id->fingerprint));
         if (!writeTextFile_(
-                collect_String(concatCStr_Path(&d->saveDir, format_CStr("%s.crt", finger))),
+                collect_String(concatCStr_Path(&d->saveDir, format_CStr("idents/%s.crt", finger))),
                 collect_String(pem_TlsCertificate(id->cert)))) {
             delete_GmIdentity(id);
             return NULL;
         }
         if (!writeTextFile_(
-                collect_String(concatCStr_Path(&d->saveDir, format_CStr("%s.key", finger))),
+                collect_String(concatCStr_Path(&d->saveDir, format_CStr("idents/%s.key", finger))),
                 collect_String(privateKeyPem_TlsCertificate(id->cert)))) {
             delete_GmIdentity(id);
             return NULL;
         }
     }
+    pushBack_PtrArray(&d->idents, id);
     return id;
 }
+
+const iPtrArray *identities_GmCerts(const iGmCerts *d) {
+    return &d->idents;
+}
diff --git a/src/gmcerts.h b/src/gmcerts.h
index 6f34e5dd..32a383be 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -22,6 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
+#include <the_Foundation/ptrarray.h>
 #include <the_Foundation/tlsrequest.h>
 
 iDeclareType(GmIdentity)
@@ -49,6 +50,19 @@ iBool               checkTrust_GmCerts      (iGmCerts *, iRangecc domain, const
 
 const iGmIdentity * identityForUrl_GmCerts  (const iGmCerts *, const iString *url);
 
+/**
+ * Create a new self-signed TLS client certificate for identifying the user.
+ * @a commonName and the other name parameters are inserted in the subject field
+ * of the certificate.
+ *
+ * @param flags       Identity flags. A temporary identity is not saved persistently and
+ *                    will be erased when the application is shut down.
+ * @param validUntil  Expiration date. Must be in the future.
+ *
+ * @returns Created identity. GmCerts retains ownership of returned object.
+ */
 iGmIdentity *       newIdentity_GmCerts     (iGmCerts *, int flags, iDate validUntil,
                                              const iString *commonName, const iString *userId,
                                              const iString *org, const iString *country);
+
+const iPtrArray *   identities_GmCerts      (const iGmCerts *);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 82efb04e..aa2e185d 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -22,11 +22,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "sidebarwidget.h"
 
-#include "../gmdocument.h"
 #include "app.h"
 #include "bookmarks.h"
 #include "command.h"
 #include "documentwidget.h"
+#include "gmcerts.h"
+#include "gmdocument.h"
 #include "inputwidget.h"
 #include "labelwidget.h"
 #include "paint.h"
@@ -216,6 +217,33 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 }, 6);
             break;
         }
+        case identities_SidebarMode: {
+            iConstForEach(PtrArray, i, identities_GmCerts(certs_App())) {
+                const iGmIdentity *ident = i.ptr;
+                /* icon, common name, used URLs, expiration, isTemp, free-form notes */
+                iSidebarItem item;
+                init_SidebarItem(&item);
+                item.icon = ident->icon;
+                set_String(&item.label, collect_String(subject_TlsCertificate(ident->cert)));
+                iDate until;
+                validUntil_TlsCertificate(ident->cert, &until);
+                set_String(
+                    &item.meta,
+                    collectNewFormat_String(
+                        "%s \u2014 %s\n%s",
+                        isEmpty_SortedArray(&ident->useUrls)
+                            ? "Not used"
+                            : format_CStr("Used on %zu URLs", size_SortedArray(&ident->useUrls)),
+                        ident->flags & temporary_GmIdentityFlag
+                            ? "Temporary"
+                            : cstrCollect_String(format_Date(&until, "Expires %b %d, %Y")),
+                        cstr_String(&ident->notes)));
+                pushBack_Array(&d->items, &item);
+            }
+            /* menu: set icon, edit notes, view urls, reveal files, delete, activate on this page,
+             * deactivate on this page, deactivate everywhere  */
+            break;
+        }
         default:
             break;
     }
@@ -247,7 +275,7 @@ void setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
     for (enum iSidebarMode i = 0; i < max_SidebarMode; i++) {
         setFlags_Widget(as_Widget(d->modeButtons[i]), selected_WidgetFlag, i == d->mode);
     }
-    const float heights[max_SidebarMode] = { 1.333f, 1.333f, 2.5f, 1.2f };
+    const float heights[max_SidebarMode] = { 1.333f, 1.333f, 3.0f, 1.2f };
     d->itemHeight = heights[mode] * lineHeight_Text(uiContent_FontId);
     invalidate_SidebarWidget_(d);
     /* Restore previous scroll position. */
@@ -529,7 +557,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "bookmarks.changed")) {
+        else if (equal_Command(cmd, "bookmarks.changed") && d->mode == bookmarks_SidebarMode) {
+            updateItems_SidebarWidget_(d);
+        }
+        else if (equal_Command(cmd, "idents.changed") && d->mode == identities_SidebarMode) {
             updateItems_SidebarWidget_(d);
         }
         else if (equal_Command(cmd, "history.delete")) {
@@ -661,6 +692,9 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
                 const iSidebarItem *item     = constAt_Array(&d->items, i);
                 const iRect         itemRect = { pos, init_I2(width_Rect(bufBounds), d->itemHeight) };
                 const iBool         isHover  = (d->hoverItem == i);
+                const int           iconColor =
+                    isHover ? (isPressing ? uiTextPressed_ColorId : uiIconHover_ColorId)
+                            : uiIcon_ColorId;
                 setClip_Paint(&p, intersect_Rect(itemRect, bufBounds));
                 if (isHover && !item->isSeparator) {
                     fillRect_Paint(&p,
@@ -691,8 +725,7 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
                         font,
                         iconArea,
                         iTrue,
-                        isHover ? (isPressing ? uiTextPressed_ColorId : uiIconHover_ColorId)
-                                : uiIcon_ColorId,
+                        iconColor,
                         "%s",
                         cstr_String(&str));
                     deinit_String(&str);
@@ -737,6 +770,25 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
                     }
                     iEndCollect();
                 }
+                else if (d->mode == identities_SidebarMode) {
+                    const int fg = isHover ? (isPressing ? uiTextPressed_ColorId
+                                                         : uiTextFramelessHover_ColorId)
+                                           : uiText_ColorId;
+                    iString icon;
+                    initUnicodeN_String(&icon, &item->icon, 1);
+                    drawRange_Text(font, add_I2(topLeft_Rect(itemRect), init_I2(3 * gap_UI, 0)),
+                                   iconColor, range_String(&icon));
+                    deinit_String(&icon);
+                    drawRange_Text(font, add_I2(topLeft_Rect(itemRect), init_I2(10 * gap_UI, 0)),
+                                   fg, range_String(&item->label));
+                    drawRange_Text(
+                        font,
+                        add_I2(topLeft_Rect(itemRect), init_I2(3 * gap_UI, lineHeight_Text(font))),
+                        isHover
+                            ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
+                            : uiAnnotation_ColorId,
+                        range_String(&item->meta));
+                }
                 unsetClip_Paint(&p);
                 pos.y += d->itemHeight;
             }
diff --git a/src/ui/util.c b/src/ui/util.c
index b3178e34..e6067ab9 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -689,9 +689,11 @@ iWidget *makeQuestion_Widget(const char *title,
 }
 
 void setToggle_Widget(iWidget *d, iBool active) {
-    setFlags_Widget(d, selected_WidgetFlag, active);
-    updateText_LabelWidget((iLabelWidget *) d,
-                           collectNewFormat_String("%s", isSelected_Widget(d) ? "YES" : "NO"));
+    if (d) {
+        setFlags_Widget(d, selected_WidgetFlag, active);
+        updateText_LabelWidget((iLabelWidget *) d,
+                               collectNewFormat_String("%s", isSelected_Widget(d) ? "YES" : "NO"));
+    }
 }
 
 static iBool toggleHandler_(iWidget *d, const char *cmd) {
diff --git a/src/ui/widget.c b/src/ui/widget.c
index f187bb82..b5ea3b0f 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -637,7 +637,7 @@ iBool isHover_Widget(const iWidget *d) {
 }
 
 iBool isSelected_Widget(const iWidget *d) {
-    return (d->flags & selected_WidgetFlag) != 0;
+    return d && (d->flags & selected_WidgetFlag) != 0;
 }
 
 iBool equalWidget_Command(const char *cmd, const iWidget *widget, const char *checkCommand) {
diff --git a/src/ui/window.c b/src/ui/window.c
index fad87f08..709fc0e0 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -102,6 +102,8 @@ static const iMenuItem navMenuItems[] = {
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
     { "---", 0, 0, NULL },
     { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
+    { "Help", 0, 0, "!open url:about:help" },
+    { "Release Notes", 0, 0, "!open url:about:version" },
     { "---", 0, 0, NULL },
     { "Quit Lagrange", 'q', KMOD_PRIMARY, "quit" }
 };
@@ -121,10 +123,6 @@ static const iMenuItem editMenuItems[] = {
     { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
 };
 
-static const iMenuItem identityMenuItems[] = {
-    { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
-};
-
 static const iMenuItem viewMenuItems[] = {
     { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 show:1" },
     { "Show History", '2', KMOD_PRIMARY, "sidebar.mode arg:1 show:1" },
@@ -147,6 +145,10 @@ static const iMenuItem helpMenuItems[] = {
 };
 #endif
 
+static const iMenuItem identityMenuItems[] = {
+    { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
+};
+
 static const char *reloadCStr_ = "\U0001f503";
 static const char *stopCStr_   = uiTextCaution_ColorEscape "\U0001f310";
 
@@ -312,8 +314,11 @@ static void setupUserInterface_Window(iWindow *d) {
         setId_Widget(
             addChild_Widget(navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
             "reload");
-        addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f464", 0, 0, "cert.client")));
-
+        iLabelWidget *idMenu =
+            makeMenuButton_LabelWidget("\U0001f464", identityMenuItems, iElemCount(identityMenuItems));
+        setAlignVisually_LabelWidget(idMenu, iTrue);
+        addChild_Widget(navBar, iClob(idMenu));
+        //addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f464", 0, 0, "cert.client")));
 #if !defined (iHaveNativeMenus)
         iLabelWidget *navMenu =
             makeMenuButton_LabelWidget("\U0001d362", navMenuItems, iElemCount(navMenuItems));