Fix tempfiles

Change tempfile to use window's tmpname(), originally tempfiles were
made in the root of the directory, causing permission denied for
non-admin users (e.g. when installing a rock in user-local tree).

1 files changed, 71 insertions, 75 deletions

diff --git a/libressl.patch b/libressl.patch
index 4602a27..e46d190 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -102,7 +102,7 @@ index 9f1dd67ec..60e1afe99 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..40e1f0ad4 100644
+index 6a64836fb..2f3ff4017 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -1,4 +1,3 @@
@@ -120,7 +120,7 @@ index 6a64836fb..40e1f0ad4 100644
  #if ENABLE_FEATURE_WGET_TIMEOUT
         unsigned timeout_seconds;
         smallint die_if_timed_out;
-@@ -460,6 +462,79 @@ static FILE *open_socket(len_and_sockaddr *lsa)
+@@ -460,6 +462,61 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         return fp;
  }
  
@@ -134,73 +134,55 @@ index 6a64836fb..40e1f0ad4 100644
 +#include <windows.h>
 +#include <fileapi.h>
 +#include <openssl/bio.h>
-+char* gather_certificates(struct tls_config *cfg)
++BIO* gather_certificates(struct tls_config *cfg);
++BIO* gather_certificates(struct tls_config *cfg)
 +{
-+       BIO *pemfile = BIO_new(BIO_s_mem());
-+       /*
-+       FILE *pemfile;
-+       pemfile = tmpfile();
-+       char *tmpfilename = tmpnam(NULL);
-+       if(tmpfilename == NULL)
-+               bb_error_msg_and_die("Failed to get a temp file name.");
-+       printf("Useing tmpfile %s\n",tmpfilename);
-+       pemfile = fopen(tmpfilename, "w+");
-+       */
-+       if(pemfile == NULL)
-+               bb_error_msg_and_die("Failed to open pem tempfile: %s", strerror(errno));
++       SSL_library_init();
++       SSL_load_error_strings();
++       BIO *pemfile;
 +       HCERTSTORE dstore;
++       PCCERT_CONTEXT ctx;
++       char *pemmem;
++       long data_size;
++
++       pemfile = BIO_new(BIO_s_mem());
 +       dstore = CertOpenSystemStore(0,"ROOT");
 +       if(dstore == NULL)
-+               bb_error_msg_and_die("Failed to open system store: %s", GetLastError());
-+       size_t numcerts;
++               bb_error_msg_and_die("Failed to open system store");
 +       if(!dstore)
 +               bb_error_msg_and_die("Error opening 'CA' cert store");
-+       PCCERT_CONTEXT ctx = NULL;
-+       size_t certs_len;
++       ctx = NULL;
 +       for(;;)
 +       {
++               char *dcert;
++               size_t dcert_len;
++               X509 *x509cert;
++
 +               ctx = CertEnumCertificatesInStore(dstore,ctx);
 +               if(!ctx)
 +                       break;
-+               char *dcert = ctx->pbCertEncoded;
-+               size_t dcert_len = ctx->cbCertEncoded;
-+               X509 *x509cert;
++               dcert = ctx->pbCertEncoded;
++               dcert_len = ctx->cbCertEncoded;
 +               x509cert = d2i_X509(NULL,&dcert,dcert_len);
 +               if(x509cert == NULL)
 +                       bb_error_msg_and_die("Failed to convert dcert to x509");
 +               if(x509cert == NULL)
 +                       bb_error_msg_and_die("Failed to convert cert");
-+               //if(!PEM_write_X509(pemfile, x509cert))
 +               if(!PEM_write_bio_X509(pemfile, x509cert))
 +                       bb_error_msg_and_die("Failed to write cert");
 +               X509_free(x509cert);
 +       }
 +       CertCloseStore(dstore, CERT_CLOSE_STORE_CHECK_FLAG);
-+       //size_t pemsize = ftell(pemfile);
-+       size_t pemsize = BIO_tell(pemfile);
-+       char *pemmem = (char*)malloc(pemsize);
-+       if(pemmem == NULL)
-+               bb_error_msg_and_die("out of memory");
-+       //rewind(pemfile);
-+       BIO_seek(pemfile, 0);
-+       if(BIO_read(pemfile, pemmem, pemsize) == 0)
-+               bb_error_msg_and_die("Failed to read ssl bio in memory file");
-+       /*
-+       if(fread(pemmem, sizeof(char), pemsize, pemfile) != pemsize)
-+               bb_error_msg_and_die("Failed to read temp ca pem file");
-+       */
-+       tls_config_set_ca_mem(cfg, pemmem, pemsize);
-+       //fclose(pemfile);
-+       BIO_free(pemfile);
-+       //DeleteFileA(tmpfilename);
-+       return pemmem;
++       data_size = BIO_get_mem_data(pemfile, &pemmem);
++       tls_config_set_ca_mem(cfg, pemmem, data_size);
++       return pemfile;
 +}
 +#endif
 +
  /* We balk at any control chars in other side's messages.
   * This prevents nasty surprises (e.g. ESC sequences) in "Location:" URLs
   * and error messages.
-@@ -689,6 +764,7 @@ static void reset_beg_range_to_zero(void)
+@@ -689,6 +746,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -208,7 +190,7 @@ index 6a64836fb..40e1f0ad4 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -698,7 +774,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -698,7 +756,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         IF_FEATURE_WGET_HTTPS(volatile int child_failed = 0;)
  
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) != 0)
@@ -217,7 +199,7 @@ index 6a64836fb..40e1f0ad4 100644
                 bb_simple_perror_msg_and_die("socketpair");
  
         if (!strchr(host, ':'))
-@@ -709,18 +785,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -709,18 +767,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         fflush_all();
         pid = xvfork();
         if (pid == 0) {
@@ -242,7 +224,7 @@ index 6a64836fb..40e1f0ad4 100644
                 xmove_fd(2, 3);
                 xopen("/dev/null", O_RDWR);
                 memset(&argv, 0, sizeof(argv));
-@@ -729,18 +805,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -729,18 +787,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
                 argv[2] = (char*)"-quiet";
                 argv[3] = (char*)"-connect";
                 argv[4] = (char*)host;
@@ -267,7 +249,7 @@ index 6a64836fb..40e1f0ad4 100644
                         *argp++ = (char*)"-verify";              //[7]
                         *argp++ = (char*)"100";                  //[8]
                         *argp++ = (char*)"-verify_return_error"; //[9]
-@@ -762,10 +838,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -762,10 +820,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # else
                 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
  # endif
@@ -280,7 +262,7 @@ index 6a64836fb..40e1f0ad4 100644
         free(servername);
         free(allocated);
         close(sp[1]);
-@@ -777,6 +853,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +835,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -288,7 +270,15 @@ index 6a64836fb..40e1f0ad4 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1228,9 @@ static void download_one_url(const char *url)
+@@ -1139,6 +1198,7 @@ static void download_one_url(const char *url)
+        bool use_proxy;                 /* Use proxies if env vars are set  */
+        int redir_limit;
+        len_and_sockaddr *lsa;
++       char *sfp_name, *dfp_name;
+        FILE *sfp;                      /* socket to web/ftp server         */
+        FILE *dfp;                      /* socket to ftp server (data)      */
+        char *fname_out_alloc;
+@@ -1151,6 +1211,9 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -298,19 +288,17 @@ index 6a64836fb..40e1f0ad4 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1234,22 +1314,41 @@ static void download_one_url(const char *url)
+@@ -1234,22 +1297,38 @@ static void download_one_url(const char *url)
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
 -                       int fd = spawn_https_helper_openssl(server.host, server.port);
-+                       //int fd = spawn_https_helper_openssl(server.host, server.port);
  # if ENABLE_FEATURE_WGET_HTTPS
 -                       if (fd < 0) { /* no openssl? try internal */
 -                               sfp = open_socket(lsa);
 -                               spawn_ssl_client(server.host, fileno(sfp), /*flags*/ 0);
 -                               goto socket_opened;
 -                       }
-+                       printf("Into section where we config everything\n");
 +                       char *allocated, *servername, *host;
 +                       if(!strchr(server.host, ':'))
 +                               host = allocated = xasprintf("%s:%u", server.host, server.port);
@@ -320,29 +308,28 @@ index 6a64836fb..40e1f0ad4 100644
 +                               bb_error_msg_and_die("Out of memory 1");
 +                       if(tls_configure(ctx,G.tlscfg) != 0)
 +                               bb_error_msg_and_die("Failed to configure client");
-+                       sfp = tmpfile();
++                       sfp_name = _tempnam(NULL,"l4w");
++                       if(sfp_name == NULL)
++                               bb_error_msg_and_die("Failed to generate tmpfile name for sfp");
++                       sfp = fopen(sfp_name, "w+");
 +                       if(sfp == NULL)
 +                               bb_error_msg_and_die("Failed to open source tempfile %d: %s", errno, strerror(errno));
-+                       dfp = tmpfile();
++                       dfp_name = _tempnam(NULL,"l4w");
++                       if(dfp_name == NULL)
++                               bb_error_msg_and_die("Failed to generate tmpfile name for dfp");
++                       dfp = fopen(dfp_name, "w+");
 +                       if(dfp == NULL)
 +                               bb_error_msg_and_die("Failed to open source tempfile %d: %s", errno, strerror(errno));
 +                       if(tls_connect(ctx, servername, NULL) != 0)
 +                               bb_error_msg_and_die("Failed to connect: %s", tls_error(ctx));
 +                       free(allocated);
 +                       free(servername);
-+                       //sfp = fdopen(fd, "r+");
-+                       if (!sfp)
-+                               bb_error_msg_and_die("Error opening fd: %s",strerror(errno));
  # else
                         /* We don't check for exec("openssl") failure in this case */
  # endif
 -                       sfp = fdopen(fd, "r+");
 -                       if (!sfp)
 -                               bb_die_memory_exhausted();
-+                       //sfp = fdopen(fd, "r+");
-+                       //if (!sfp)
-+                       //      bb_die_memory_exhausted();
-+                       printf("Got socket!\n");
                         goto socket_opened;
                 }
 -               sfp = open_socket(lsa);
@@ -350,13 +337,12 @@ index 6a64836fb..40e1f0ad4 100644
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
-@@ -1353,7 +1452,41 @@ static void download_one_url(const char *url)
+@@ -1353,7 +1432,42 @@ static void download_one_url(const char *url)
                         shutdown(fileno(sfp), SHUT_WR);
                 }
  #endif
 -
 +               //How much data did we actually get?
-+               printf("Got to in/out exchange\n");
 +               size_t wlen, bufsize;
 +               wlen = ftell(sfp);
 +               if(wlen < 0)
@@ -388,48 +374,58 @@ index 6a64836fb..40e1f0ad4 100644
 +               if(len == -1)
 +                       bb_error_msg_and_die("tls read error: %s", tls_error(ctx));
 +               rewind(dfp);
++               fclose(sfp);
++               DeleteFile(sfp_name);
++               free(sfp_name);
 +               sfp = dfp;
-+               printf("finished in/out exchange\n");
                 /*
                  * Retrieve HTTP response line and check for "200" status code.
                  */
-@@ -1536,6 +1669,10 @@ However, in real world it was observed that some web servers
+@@ -1475,6 +1589,11 @@ However, in real world it was observed that some web servers
+                                if (--redir_limit == 0)
+                                        bb_simple_error_msg_and_die("too many redirections");
+                                fclose(sfp);
++                               fclose(dfp);
++                               DeleteFile(sfp_name);
++                               DeleteFile(dfp_name);
++                               free(sfp_name);
++                               free(dfp_name);
+                                if (str[0] == '/') {
+                                        free(redirected_path);
+                                        target.path = redirected_path = xstrdup(str + 1);
+@@ -1536,7 +1655,11 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
-+       printf("About to clean up connection\n");
 +       if(ctx != NULL)
 +               tls_close(ctx);
-+       printf("Cleaned up connection\n");
         fclose(sfp);
++       DeleteFile(dfp_name);
++       free(dfp_name);
  
         free(server.allocated);
-@@ -1690,9 +1827,18 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+        free(target.allocated);
+@@ -1690,9 +1813,14 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                         xdup2(G.log_fd, STDERR_FILENO);
                 }
         }
 -
-+       printf("About to config certificates\n");
 +       G.tlscfg = tls_config_new();
 +       if(G.tlscfg == NULL)
 +               bb_error_msg_and_die("Out of memory 2");
-+       char *pemmem = gather_certificates(G.tlscfg);
-+       printf("Got to downloading section\n");
++       BIO *pemmem = gather_certificates(G.tlscfg);
         while (*argv)
                 download_one_url(*argv++);
-+       printf("Finished downloading section\n");
-+       free(pemmem);
++       BIO_free(pemmem);
 +       tls_config_free(G.tlscfg);
-+       printf("Freed everythign\n");
  
         if (G.output_fd >= 0)
                 xclose(G.output_fd);
-@@ -1704,6 +1850,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1704,6 +1832,5 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         free(G.extra_headers);
  #endif
         FINI_G();
 -
-+       printf("Exiting normally\n");
         return EXIT_SUCCESS;
  }
 diff --git a/scripts/trylink b/scripts/trylink