Merge pull request sandstorm-io#2941 from sandstorm-io/kj-encoding

Delete code: Use new KJ encoding library.

Author: kentonv

src/sandstorm/app-index/indexer.c++

@@ -20,6 +20,7 @@
 #include <sandstorm/id-to-text.h>
 #include <sandstorm/appid-replacements.h>
 #include <capnp/serialize.h>
+#include <kj/encoding.h>
 #include <stdlib.h>
 #include <map>
 #include <sodium/crypto_generichash_blake2b.h>
@@ -198,7 +199,7 @@ class DataHandler: public capnp::JsonCodec::Handler<capnp::Data> {
 public:
   void encode(const capnp::JsonCodec& codec, capnp::Data::Reader input,
               capnp::JsonValue::Builder output) const override {
-    output.setString(base64Encode(input, false));
+    output.setString(kj::encodeBase64(input, false));
   }
 
   capnp::Orphan<capnp::Data> decode(
@@ -453,7 +454,7 @@ kj::String Indexer::writeImage(kj::ArrayPtr<const byte> data, kj::StringPtr exte
   crypto_generichash_blake2b(hash, sizeof(hash), data.begin(), data.size(), nullptr, 0);
 
   // Write if not already present.
-  auto basename = kj::str(hexEncode(hash), extension);
+  auto basename = kj::str(kj::encodeHex(hash), extension);
   auto filename = kj::str("/var/www/images/", basename);
 
   if (access(filename.cStr(), F_OK) < 0) {

src/sandstorm/bridge-proxy.c++

@@ -20,6 +20,7 @@
 #include <sandstorm/bridge-proxy.capnp.h>
 #include <capnp/compat/json.h>
 #include <kj/debug.h>
+#include <kj/encoding.h>
 #include "util.h"
 
 namespace sandstorm {
@@ -127,7 +128,7 @@ public:
             (capnp::Response<SandstormApi<BridgeObjectId>::SaveResults>&& claim) {
           capnp::MallocMessageBuilder builder(64);
           auto root = builder.initRoot<ProxyClaimRequestResponse>();
-          root.setCap(base64Encode(claim.getToken(), false));
+          root.setCap(kj::encodeBase64(claim.getToken(), false));
 
           capnp::JsonCodec json;
           kj::String text = json.encode(root);
@@ -221,7 +222,7 @@ private:
       auto cap = capnp::Capability::Client(
           kj::heap<CapRedirector>([sandstormApi=sandstormApi,token=kj::str(token)]() mutable {
         auto req = sandstormApi.restoreRequest();
-        req.setToken(base64Decode(token));
+        req.setToken(kj::decodeBase64(token));
         return req.send().getCap();
       })).castAs<ApiSession>();
 

src/sandstorm/id-to-text.c++

@@ -16,6 +16,7 @@
 
 #include "id-to-text.h"
 #include "util.h"
+#include <kj/encoding.h>
 
 namespace sandstorm {
 
@@ -188,7 +189,7 @@ kj::String packageIdString(spk::PackageId::Reader packageId) {
 
 kj::String packageIdString(kj::ArrayPtr<const kj::byte> packageId) {
   KJ_ASSERT(packageId.size() == PACKAGE_ID_BYTE_SIZE);
-  return hexEncode(packageId);
+  return kj::encodeHex(packageId);
 }
 
 bool tryParsePackageId(kj::StringPtr in, spk::PackageId::Builder out) {

src/sandstorm/run-bundle.c++

@@ -19,6 +19,7 @@
 #include <kj/io.h>
 #include <kj/parse/common.h>
 #include <kj/parse/char.h>
+#include <kj/encoding.h>
 #include <capnp/schema.h>
 #include <capnp/dynamic.h>
 #include <capnp/serialize.h>
@@ -954,7 +955,7 @@ public:
     // Get 20 random bytes for token.
     kj::byte bytes[20];
     randombytes_buf(bytes, sizeof(bytes));
-    auto hexString = hexEncode(bytes);
+    auto hexString = kj::encodeHex(bytes);
 
     auto config = readConfig();
 
@@ -2883,7 +2884,7 @@ private:
       call.setFunction("BinData");
       auto params = call.initParams(2);
       params[0].setNumber(0);
-      params[1].setString(base64Encode(input, false));
+      params[1].setString(kj::encodeBase64(input, false));
     }
 
     capnp::Orphan<capnp::Data> decode(

src/sandstorm/sandstorm-http-bridge.c++

@@ -25,6 +25,7 @@
 #include <kj/async-io.h>
 #include <kj/async-unix.h>
 #include <kj/io.h>
+#include <kj/encoding.h>
 #include <capnp/rpc-twoparty.h>
 #include <capnp/rpc.capnp.h>
 #include <capnp/schema.h>
@@ -70,7 +71,7 @@ kj::Array<byte> toBytes(kj::StringPtr text, kj::ArrayPtr<const byte> data = null
 kj::String textIdentityId(capnp::Data::Reader id) {
   // We truncate to 128 bits to be a little more wieldy. Still 32 chars, though.
   KJ_ASSERT(id.size() == 32, "Identity ID not a SHA-256?");
-  return hexEncode(id.slice(0, kj::min(id.size(), 16)));
+  return kj::encodeHex(id.slice(0, kj::min(id.size(), 16)));
 }
 
 struct HttpStatusInfo {
@@ -1227,7 +1228,7 @@ private:
     buf[n] = '\0';
 
     auto req = apiCap.restoreRequest();
-    req.setToken(percentDecode(buf));
+    req.setToken(kj::decodeBinaryUriComponent(buf));
 
     return req.send().getCap().castAs<Identity>();
   }
@@ -1241,7 +1242,7 @@ private:
     req.initLabel().setDefaultText("user identity");
     tasks.add(req.send().then([this,textId](auto result) -> void {
       // Sandstorm tokens are primarily text but use percent-encoding to be safe.
-      auto tokenText = percentEncode(result.getToken());
+      auto tokenText = kj::encodeUriComponent(result.getToken());
 
       // Clean up any existing symlink.
       dropIdentity(textId);
@@ -1271,7 +1272,7 @@ private:
       KJ_SYSCALL(renameat(identitiesDir, symlink.cStr(), trashDir, trashSymlink.cStr()));
 
       auto req = apiCap.dropRequest();
-      req.setToken(percentDecode(buf));
+      req.setToken(kj::decodeBinaryUriComponent(buf));
       tasks.add(req.send().then([KJ_MVCAP(trashSymlink), this](auto response) -> void {
         KJ_SYSCALL(unlinkat(trashDir, trashSymlink.cStr(), 0));
       }));
@@ -1297,7 +1298,7 @@ public:
         bridgeContext(bridgeContext),
         sessionId(kj::mv(sessionId)),
         tabId(kj::mv(tabId)),
-        userDisplayName(percentEncode(userInfo.getDisplayName().getDefaultText())),
+        userDisplayName(kj::encodeUriComponent(userInfo.getDisplayName().getDefaultText())),
         userHandle(kj::heapString(userInfo.getPreferredHandle())),
         userPicture(kj::heapString(userInfo.getPictureUrl())),
         userPronouns(userInfo.getPronouns()),
@@ -2025,7 +2026,7 @@ private:
     addHeader(lines, "Content-Id", attachment.getContentId());
     lines.add(nullptr);
 
-    lines.add(base64Encode(attachment.getContent(), true));
+    lines.add(kj::encodeBase64(attachment.getContent(), true));
   }
 };
 
@@ -2252,7 +2253,7 @@ public:
       UiSession::Client session =
         kj::heap<WebSessionImpl>(serverAddress, userInfo, params.getContext(),
                                  bridgeContext, kj::str(sessionIdCounter++),
-                                 hexEncode(params.getTabId()),
+                                 kj::encodeHex(params.getTabId()),
                                  kj::heapString(sessionParams.getBasePath()),
                                  kj::heapString(sessionParams.getUserAgent()),
                                  kj::strArray(sessionParams.getAcceptableLanguages(), ","),
@@ -2275,7 +2276,7 @@ public:
       UiSession::Client session =
         kj::heap<WebSessionImpl>(serverAddress, userInfo, params.getContext(),
                                  bridgeContext, kj::str(sessionIdCounter++),
-                                 hexEncode(params.getTabId()),
+                                 kj::encodeHex(params.getTabId()),
                                  kj::heapString(""), kj::heapString(""), kj::heapString(""),
                                  kj::heapString(config.getApiPath()),
                                  bridgeContext.formatPermissions(userPermissions),

src/sandstorm/spk.c++

@@ -19,6 +19,7 @@
 #include "spk.h"
 #include <kj/debug.h>
 #include <kj/io.h>
+#include <kj/encoding.h>
 #include <capnp/serialize.h>
 #include <capnp/serialize-packed.h>
 #include <capnp/compat/json.h>
@@ -86,7 +87,7 @@ public:
     } else {
       auto call = output.initCall();
       call.setFunction("Base64");
-      call.initParams(1)[0].setString(base64Encode(input, false));
+      call.initParams(1)[0].setString(kj::encodeBase64(input, false));
     }
   }
 

src/sandstorm/util-test.c++

@@ -22,67 +22,6 @@
 namespace sandstorm {
 namespace {
 
-KJ_TEST("base64 encoding/decoding") {
-  {
-    auto encoded = base64Encode(kj::StringPtr("foo").asBytes(), false);
-    KJ_EXPECT(encoded == "Zm9v", encoded, encoded.size());
-    KJ_EXPECT(kj::heapString(base64Decode(encoded).asChars()) == "foo");
-  }
-
-  {
-    auto encoded = base64Encode(kj::StringPtr("corge").asBytes(), false);
-    KJ_EXPECT(encoded == "Y29yZ2U=", encoded);
-    KJ_EXPECT(kj::heapString(base64Decode(encoded).asChars()) == "corge");
-  }
-
-  KJ_EXPECT(kj::heapString(base64Decode("Y29yZ2U").asChars()) == "corge");
-  KJ_EXPECT(kj::heapString(base64Decode("Y\n29y Z@2U=\n").asChars()) == "corge");
-
-  {
-    auto encoded = base64Encode(kj::StringPtr("corge").asBytes(), true);
-    KJ_EXPECT(encoded == "Y29yZ2U=\n", encoded);
-  }
-
-  kj::StringPtr fullLine = "012345678901234567890123456789012345678901234567890123";
-  {
-    auto encoded = base64Encode(fullLine.asBytes(), false);
-    KJ_EXPECT(
-        encoded == "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIz",
-        encoded);
-  }
-  {
-    auto encoded = base64Encode(fullLine.asBytes(), true);
-    KJ_EXPECT(
-        encoded == "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIz\n",
-        encoded);
-  }
-
-  kj::String multiLine = kj::str(fullLine, "456");
-  {
-    auto encoded = base64Encode(multiLine.asBytes(), false);
-    KJ_EXPECT(
-        encoded == "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2",
-        encoded);
-  }
-  {
-    auto encoded = base64Encode(multiLine.asBytes(), true);
-    KJ_EXPECT(
-        encoded == "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIz\n"
-                   "NDU2\n",
-        encoded);
-  }
-}
-
-KJ_TEST("percent encoding/decoding") {
-  KJ_EXPECT(percentEncode("foo") == "foo");
-  KJ_EXPECT(percentEncode("foo bar") == "foo%20bar");
-  KJ_EXPECT(percentEncode("\xab\xba") == "%ab%ba");
-  KJ_EXPECT(percentEncode(kj::StringPtr("foo\0bar", 7)) == "foo%00bar");
-
-  KJ_EXPECT(kj::str(percentDecode("foo%20bar").asChars()) == "foo bar");
-  KJ_EXPECT(kj::str(percentDecode("%ab%BA").asChars()) == "\xab\xba");
-}
-
 KJ_TEST("HeaderWhitelist") {
   const char* WHITELIST[] = {
     "bar-baz",