Move Base64

Author: ryanmcdermott

devserver/BUILD

@@ -6,6 +6,7 @@ filegroup(
         "argparse/argparse.h", 
         "json/json.h",
         "md5/md5.h",
+        "base64/base64.h",
     ]),
     visibility = ["//visibility:public"],
 )

devserver/base64/LICENSE

@@ -0,0 +1,11 @@
+Copyright 2005-2011, Jouni Malinen
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

devserver/base64/base64.h

@@ -0,0 +1,63 @@
+/*
+ * Base64 encoding/decoding (RFC1341)
+ * Copyright (c) 2005-2011, Jouni Malinen <[email protected]>
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+// 2016-12-12 - Gaspard Petit : Slightly modified to return a std::string
+// instead of a buffer allocated with malloc.
+
+#include <string>
+
+static const unsigned char base64_table[65] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/**
+ * base64_encode - Base64 encode
+ * @src: Data to be encoded
+ * @len: Length of the data to be encoded
+ * @out_len: Pointer to output length variable, or %NULL if not used
+ * Returns: Allocated buffer of out_len bytes of encoded data,
+ * or empty string on failure
+ */
+std::string base64_encode(const unsigned char *src, size_t len) {
+  unsigned char *out, *pos;
+  const unsigned char *end, *in;
+
+  size_t olen;
+
+  olen = 4 * ((len + 2) / 3); /* 3-byte blocks to 4-byte */
+
+  if (olen < len) return std::string(); /* integer overflow */
+
+  std::string outStr;
+  outStr.resize(olen);
+  out = (unsigned char *)&outStr[0];
+
+  end = src + len;
+  in = src;
+  pos = out;
+  while (end - in >= 3) {
+    *pos++ = base64_table[in[0] >> 2];
+    *pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
+    *pos++ = base64_table[((in[1] & 0x0f) << 2) | (in[2] >> 6)];
+    *pos++ = base64_table[in[2] & 0x3f];
+    in += 3;
+  }
+
+  if (end - in) {
+    *pos++ = base64_table[in[0] >> 2];
+    if (end - in == 1) {
+      *pos++ = base64_table[(in[0] & 0x03) << 4];
+      *pos++ = '=';
+    } else {
+      *pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
+      *pos++ = base64_table[(in[1] & 0x0f) << 2];
+    }
+    *pos++ = '=';
+  }
+
+  return outStr;
+}

devserver/devserver_loader.js

@@ -1,5 +1,3 @@
-console.log("inside devserver_loader.js");
-
 setInterval(() => {
     fetch("/devserver/manifest")
         .then(function (response) {

devserver/main.cc

@@ -5,8 +5,10 @@
 // #include "external/rules_devserver/devserver/httplib/httplib.h"
 // #include "external/rules_devserver/devserver/json/json.h"
 // #include "external/rules_devserver/devserver/md5/md5.h"
+// #include "external/rules_devserver/devserver/base64/base64.h"
 
 #include "devserver/argparse/argparse.h"
+#include "devserver/base64/base64.h"
 #include "devserver/httplib/httplib.h"
 #include "devserver/json/json.h"
 #include "devserver/md5/md5.h"
@@ -27,70 +29,6 @@ constexpr char kWorkspaceName[] = "rules_devserver";
 constexpr int kDefaultPort = 8080;
 constexpr char kHost[] = "localhost";
 
-/*
- * Base64 encoding/decoding (RFC1341)
- * Copyright (c) 2005-2011, Jouni Malinen <[email protected]>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-// 2016-12-12 - Gaspard Petit : Slightly modified to return a std::string
-// instead of a buffer allocated with malloc.
-
-#include <string>
-
-static const unsigned char base64_table[65] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/**
- * base64_encode - Base64 encode
- * @src: Data to be encoded
- * @len: Length of the data to be encoded
- * @out_len: Pointer to output length variable, or %NULL if not used
- * Returns: Allocated buffer of out_len bytes of encoded data,
- * or empty string on failure
- */
-std::string base64_encode(const unsigned char *src, size_t len) {
-  unsigned char *out, *pos;
-  const unsigned char *end, *in;
-
-  size_t olen;
-
-  olen = 4 * ((len + 2) / 3); /* 3-byte blocks to 4-byte */
-
-  if (olen < len) return std::string(); /* integer overflow */
-
-  std::string outStr;
-  outStr.resize(olen);
-  out = (unsigned char *)&outStr[0];
-
-  end = src + len;
-  in = src;
-  pos = out;
-  while (end - in >= 3) {
-    *pos++ = base64_table[in[0] >> 2];
-    *pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
-    *pos++ = base64_table[((in[1] & 0x0f) << 2) | (in[2] >> 6)];
-    *pos++ = base64_table[in[2] & 0x3f];
-    in += 3;
-  }
-
-  if (end - in) {
-    *pos++ = base64_table[in[0] >> 2];
-    if (end - in == 1) {
-      *pos++ = base64_table[(in[0] & 0x03) << 4];
-      *pos++ = '=';
-    } else {
-      *pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
-      *pos++ = base64_table[(in[1] & 0x0f) << 2];
-    }
-    *pos++ = '=';
-  }
-
-  return outStr;
-}
-
 struct Arguments {
   int32_t port;
   std::string static_file;
@@ -109,16 +47,17 @@ json ComputeManifest(const std::map<Path, FileContents> &path_to_contents) {
   json manifest;
 
   for (const auto &path_and_contents : path_to_contents) {
-    Path path = path_and_contents.first;
-    FileContents contents = path_and_contents.second;
+    const Path path = path_and_contents.first;
+    const FileContents contents = path_and_contents.second;
 
     picohash_ctx_t ctx;
     char digest[PICOHASH_MD5_DIGEST_LENGTH];
 
     picohash_init_md5(&ctx);
     picohash_update(&ctx, contents.c_str(), contents.size());
     picohash_final(&ctx, digest);
-    std::string digest_str(base64_encode(digest, PICOHASH_MD5_DIGEST_LENGTH));
+    const std::string digest_str(
+        base64_encode(digest, PICOHASH_MD5_DIGEST_LENGTH));
     manifest[path] = digest_str;
   }
 
@@ -230,7 +169,7 @@ int main(int argc, char **argv) {
   const std::map<std::string, std::string> path_to_contents = {
       {"/", static_file_contents}};
   json manifest = ComputeManifest(path_to_contents);
-  std::cout << "manifest: " << manifest.dump() << std::endl;
+  DEBUG_LOG("manifest: " << manifest.dump() << "\n\n");
 
   svr.Get("/", [&static_file_contents](const httplib::Request &req,
                                        httplib::Response &res) {