# HG changeset patch

# User Edênis Freindorfer Azevedo <edenisfa@gmail.com>

# Date 1547073505 -39600

#      Thu Jan 10 09:38:25 2019 +1100

# Node ID da45424cb9a0b4d8e45e5040e2e3b574d994e254

# Parent  f7187a33fad7b9cafe0c2947c6d48618fdda57e4

Bug 818686 - XDG Base Directory Specification support with fallback, r=mt

Summary:

We check if $HOME/.pki and $HOME/.pki/nssdb exist; if they do, then we use

this path. Otherwise, use ${XDG_DATA_HOME:-$HOME/.local/share}/pki/nssdb

Test Plan:

Create dummy empty dir and set HOME to it. Then, check if getUserDb returns:

1. $HOME/.pki/nssdb when this path exists;

2. $HOME/.local/share/pki/nssdb when $HOME/.pki/nssdb does not and XDG_DATA_HOME is not defined;

3. $XDG_DATA_HOME/pki/nssdb when $HOME/.pki/nssdb does not exist and XDG_DATA_HOME is defined.

Reviewers: mt

Reviewed By: mt

Bug #: 818686

Differential Revision: https://phabricator.services.mozilla.com/D14007

diff --git a/lib/sysinit/nsssysinit.c b/lib/sysinit/nsssysinit.c

--- a/lib/sysinit/nsssysinit.c

+++ b/lib/sysinit/nsssysinit.c

@@ -37,9 +37,41 @@ testdir(char *dir)

     return S_ISDIR(buf.st_mode);

 }

+/**

+ * Append given @dir to @path and creates the directory with mode @mode.

+ * Returns 0 if successful, -1 otherwise.

+ * Assumes that the allocation for @path has sufficient space for @dir

+ * to be added.

+ */

+static int

+appendDirAndCreate(char *path, char *dir, mode_t mode)

+{

+    PORT_Strcat(path, dir);

+    if (!testdir(path)) {

+        if (mkdir(path, mode)) {

+            return -1;

+        }

+    }

+    return 0;

+}

+

+#define XDG_NSS_USER_PATH1 "/.local"

+#define XDG_NSS_USER_PATH2 "/share"

+#define XDG_NSS_USER_PATH3 "/pki"

+

 #define NSS_USER_PATH1 "/.pki"

 #define NSS_USER_PATH2 "/nssdb"

-static char *

+

+/**

+ * Return the path to user's NSS database.

+ * We search in the following dirs in order:

+ * (1) $HOME/.pki/nssdb;

+ * (2) $XDG_DATA_HOME/pki/nssdb if XDG_DATA_HOME is set;

+ * (3) $HOME/.local/share/pki/nssdb (default XDG_DATA_HOME value).

+ * If (1) does not exist, then the returned dir will be set to either

+ * (2) or (3), depending if XDG_DATA_HOME is set.

+ */

+char *

 getUserDB(void)

 {

     char *userdir = PR_GetEnvSecure("HOME");

@@ -50,22 +82,47 @@ getUserDB(void)

     }

     nssdir = PORT_Alloc(strlen(userdir) + sizeof(NSS_USER_PATH1) + sizeof(NSS_USER_PATH2));

+    PORT_Strcpy(nssdir, userdir);

+    PORT_Strcat(nssdir, NSS_USER_PATH1 NSS_USER_PATH2);

+    if (testdir(nssdir)) {

+        /* $HOME/.pki/nssdb exists */

+        return nssdir;

+    } else {

+        /* either $HOME/.pki or $HOME/.pki/nssdb does not exist */

+        PORT_Free(nssdir);

+    }

+    int size = 0;

+    char *xdguserdatadir = PR_GetEnvSecure("XDG_DATA_HOME");

+    if (xdguserdatadir) {

+        size = strlen(xdguserdatadir);

+    } else {

+        size = strlen(userdir) + sizeof(XDG_NSS_USER_PATH1) + sizeof(XDG_NSS_USER_PATH2);

+    }

+    size += sizeof(XDG_NSS_USER_PATH3) + sizeof(NSS_USER_PATH2);

+

+    nssdir = PORT_Alloc(size);

     if (nssdir == NULL) {

         return NULL;

     }

-    PORT_Strcpy(nssdir, userdir);

-    /* verify it exists */

-    if (!testdir(nssdir)) {

-        PORT_Free(nssdir);

-        return NULL;

+

+    if (xdguserdatadir) {

+        PORT_Strcpy(nssdir, xdguserdatadir);

+        if (!testdir(nssdir)) {

+            PORT_Free(nssdir);

+            return NULL;

+        }

+

+    } else {

+        PORT_Strcpy(nssdir, userdir);

+        if (appendDirAndCreate(nssdir, XDG_NSS_USER_PATH1, 0755) ||

+            appendDirAndCreate(nssdir, XDG_NSS_USER_PATH2, 0755)) {

+            PORT_Free(nssdir);

+            return NULL;

+        }

     }

-    PORT_Strcat(nssdir, NSS_USER_PATH1);

-    if (!testdir(nssdir) && mkdir(nssdir, 0760)) {

-        PORT_Free(nssdir);

-        return NULL;

-    }

-    PORT_Strcat(nssdir, NSS_USER_PATH2);

-    if (!testdir(nssdir) && mkdir(nssdir, 0760)) {

+    /* ${XDG_DATA_HOME:-$HOME/.local/share}/pki/nssdb */

+    if (appendDirAndCreate(nssdir, XDG_NSS_USER_PATH3, 0760) ||

+        appendDirAndCreate(nssdir, NSS_USER_PATH2, 0760)) {

         PORT_Free(nssdir);

         return NULL;

     }