Merge pull request #145 from cloudflare/harris/revert-kv-header-injec…

…tion Revert "Add an ability to inject an arbitrary set of headers to KV re…
cloudflare · Oct 31, 2022 · 8564da6 · 8564da6
2 parents 9c92cae + d605365
commit 8564da6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/src/workerd/api/kv.c++ b/src/workerd/api/kv.c++
@@ -102,9 +102,6 @@ jsg::Promise<KvNamespace::GetWithMetadataResult> KvNamespace::getWithMetadata(
   auto urlStr = url.toString(kj::Url::Context::HTTP_PROXY_REQUEST);
   auto headers = kj::HttpHeaders(context.getHeaderTable());
   headers.add(FLPROD_405_HEADER, kj::str(urlStr));
-  for (const auto& header: additionalHeaders) {
-    headers.add(header.name.asPtr(), header.value.asPtr());
-  }
 
   return context.awaitIo(js,
       client->request(kj::HttpMethod::GET, urlStr, headers).response,
@@ -214,9 +211,6 @@ jsg::Promise<jsg::Value> KvNamespace::list(
   auto urlStr = url.toString(kj::Url::Context::HTTP_PROXY_REQUEST);
   auto headers = kj::HttpHeaders(context.getHeaderTable());
   headers.add(FLPROD_405_HEADER, kj::str(urlStr));
-  for (const auto& header: additionalHeaders) {
-    headers.add(header.name.asPtr(), header.value.asPtr());
-  }
 
   return context.awaitIo(js,
       client->request(kj::HttpMethod::GET, urlStr, headers).response,
@@ -317,9 +311,6 @@ jsg::Promise<void> KvNamespace::put(
 
   auto urlStr = url.toString(kj::Url::Context::HTTP_PROXY_REQUEST);
   headers.add(FLPROD_405_HEADER, kj::str(urlStr));
-  for (const auto& header: additionalHeaders) {
-    headers.add(header.name.asPtr(), header.value.asPtr());
-  }
 
   auto promise = context.waitForOutputLocks()
       .then([&context, client = kj::mv(client), urlStr = kj::mv(urlStr), headers = kj::mv(headers),
@@ -376,13 +367,9 @@ jsg::Promise<void> KvNamespace::delete_(jsg::Lock& js, kj::String name) {
   auto client = context.getHttpClient(subrequestChannel, true, nullptr, "kv_delete"_kj);
   auto urlStr = kj::str("https://fake-host/", kj::encodeUriComponent(name), "?urlencoded=true");
   auto promise = context.waitForOutputLocks()
-      .then([this, &context, client = kj::mv(client), urlStr = kj::mv(urlStr)]() mutable {
+      .then([&context, client = kj::mv(client), urlStr = kj::mv(urlStr)]() mutable {
     auto headers = kj::HttpHeaders(context.getHeaderTable());
     headers.add(FLPROD_405_HEADER, kj::str(urlStr));
-    for (const auto& header: additionalHeaders) {
-      headers.add(header.name.asPtr(), header.value.asPtr());
-    }
-
     return client->request(kj::HttpMethod::DELETE, urlStr, headers,
                           uint64_t(0))
         .response.then([](kj::HttpClient::Response&& response) mutable {

diff --git a/src/workerd/api/kv.h b/src/workerd/api/kv.h
@@ -13,16 +13,9 @@ class KvNamespace: public jsg::Object {
   // A capability to a KV namespace.
 
 public:
-  struct AdditionalHeader {
-    kj::String name;
-    kj::String value;
-  };
-
-  explicit KvNamespace(kj::Array<AdditionalHeader> additionalHeaders, uint subrequestChannel)
-      : additionalHeaders(kj::mv(additionalHeaders)), subrequestChannel(subrequestChannel) {}
+  explicit KvNamespace(uint subrequestChannel): subrequestChannel(subrequestChannel) {}
   // `subrequestChannel` is what to pass to IoContext::getHttpClient() to get an HttpClient
   // representing this namespace.
-  // `additionalHeaders` is what gets appended to every outbound request.
 
   struct GetOptions {
     jsg::Optional<kj::String> type;
@@ -97,7 +90,6 @@ class KvNamespace: public jsg::Object {
   }
 
 private:
-  kj::Array<AdditionalHeader> additionalHeaders;
   uint subrequestChannel;
 };
 

diff --git a/src/workerd/server/workerd-api.c++ b/src/workerd/server/workerd-api.c++
@@ -450,8 +450,7 @@ void WorkerdApiIsolate::compileGlobals(
       }
 
       KJ_CASE_ONEOF(ns, Global::KvNamespace) {
-        value = lock.wrap(context, jsg::alloc<api::KvNamespace>(
-            kj::Array<api::KvNamespace::AdditionalHeader>{}, ns.subrequestChannel));
+        value = lock.wrap(context, jsg::alloc<api::KvNamespace>(ns.subrequestChannel));
       }
 
       KJ_CASE_ONEOF(r2, Global::R2Bucket) {