From: Paul Yang <yang.yang@baishancloud.com>
Date: Wed, 21 Jun 2017 15:02:12 +0000 (+0800)
Subject: Check directory is able to create files for various -out option
X-Git-Tag: OpenSSL_1_1_1-pre3~217
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=555c94a0db9661428da0a45cb32b9f002324eefd;p=oweals%2Fopenssl.git

Check directory is able to create files for various -out option

This is to address issue #3404, only works in Unix-like platforms

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3709)
---

diff --git a/apps/apps.c b/apps/apps.c
index 0438bdb9bf..3b713f4acc 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2340,6 +2340,73 @@ int app_isdir(const char *name)
 }
 #endif
 
+/* app_dirname section */
+
+/*
+ * This exactly follows what POSIX's
+ * dirname does, but is implemented
+ * in a more platform independent way.
+ *
+ * path        dirname
+ * /usr/lib    /usr
+ * /usr/       /
+ * usr         .
+ * /           /
+ * .           .
+ * ..          .
+ * ""          .
+ *
+ * Note: this function also keeps the
+ * possibility of modifying the 'path'
+ * string same as POSIX dirname.
+ */
+static char *posix_dirname(char *path)
+{
+    size_t l;
+    char *ret = ".";
+
+    l = strlen(path);
+    if (l == 0)
+        goto out;
+    if (strcmp(path, ".") == 0)
+        goto out;
+    if (strcmp(path, "..") == 0)
+        goto out;
+    if (strcmp(path, "/") == 0) {
+        ret = "/";
+        goto out;
+    }
+    if (path[l - 1] == '/') {
+        /* /usr/ */
+        path[l - 1] = '\0';
+    }
+    if ((ret = strrchr(path, '/')) == NULL) {
+        /* usr */
+        ret = ".";
+    } else if (ret == path) {
+        /* /usr */
+        *++ret = '\0';
+        ret = path;
+    } else {
+        /* /usr/lib */
+        *ret = '\0';
+        ret = path;
+    }
+ out:
+    return ret;
+}
+
+/*
+ * TODO: implement app_dirname for Windows
+ * and VMS.
+ */
+#if !defined(_WIN32) && !defined(__VMS)
+char *app_dirname(char *path)
+{
+    return posix_dirname(path);
+}
+#endif
+
 /* raw_read|write section */
 #if defined(__VMS)
 # include "vms_term_sock.h"
diff --git a/apps/apps.h b/apps/apps.h
index daaef369bc..3086f09f8c 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -594,6 +594,7 @@ void store_setup_crl_download(X509_STORE *st);
 
 int app_isdir(const char *);
 int app_access(const char *, int flag);
+char *app_dirname(char *path);
 int fileno_stdin(void);
 int fileno_stdout(void);
 int raw_read_stdin(void *, int);
diff --git a/apps/opt.c b/apps/opt.c
index a9d163a480..a47451c94f 100644
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -613,13 +613,17 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
  */
 int opt_next(void)
 {
-    char *p;
+    char *p, *estr;
     const OPTIONS *o;
     int ival;
     long lval;
     unsigned long ulval;
     ossl_intmax_t imval;
     ossl_uintmax_t umval;
+#if !defined(_WIN32) && !defined(__VMS)
+    char *c;
+    int oerrno;
+#endif
 
     /* Look at current arg; at end of the list? */
     arg = NULL;
@@ -676,13 +680,13 @@ int opt_next(void)
             /* Just a string. */
             break;
         case '/':
-            if (app_isdir(arg) >= 0)
+            if (app_isdir(arg) > 0)
                 break;
             BIO_printf(bio_err, "%s: Not a directory: %s\n", prog, arg);
             return -1;
         case '<':
             /* Input file. */
-            if (strcmp(arg, "-") == 0 || app_access(arg, R_OK) >= 0)
+            if (strcmp(arg, "-") == 0 || app_access(arg, R_OK) == 0)
                 break;
             BIO_printf(bio_err,
                        "%s: Cannot open input file %s, %s\n",
@@ -690,11 +694,38 @@ int opt_next(void)
             return -1;
         case '>':
             /* Output file. */
-            if (strcmp(arg, "-") == 0 || app_access(arg, W_OK) >= 0 || errno == ENOENT)
+#if !defined(_WIN32) && !defined(__VMS)
+            c = OPENSSL_strdup(arg);
+            if (c == NULL) {
+                BIO_printf(bio_err,
+                           "%s: Memory allocation failure\n", prog);
+                return -1;
+            }
+            oerrno = errno;
+            errno = 0;
+            if (strcmp(arg, "-") == 0
+                || (app_access(app_dirname(c), W_OK) == 0
+                    && app_isdir(arg) <= 0
+                    && (app_access(arg, W_OK) == 0 || errno == ENOENT))) {
+                OPENSSL_free(c);
                 break;
+            }
+            OPENSSL_free(c);
+            if (errno == 0)
+                /* only possible if 'arg' is a directory */
+                estr = "is a directory";
+            else
+                estr = strerror(errno);
+            errno = oerrno;
+#else
+            if (strcmp(arg, "-") == 0 || app_access(arg, W_OK) == 0
+                || errno == ENOENT)
+                break;
+            estr = strerror(errno);
+#endif
             BIO_printf(bio_err,
                        "%s: Cannot open output file %s, %s\n",
-                       prog, arg, strerror(errno));
+                       prog, arg, estr);
             return -1;
         case 'p':
         case 'n':