add checks to verify key is set and not empty string for getting and deleting files

leafo · leafo · commit 6d84658657c6 · 2022-04-01T13:19:06.000-07:00
diff --git a/cloud_storage/google.lua b/cloud_storage/google.lua
@@ -287,15 +287,19 @@ do
       return self:_get("/" .. tostring(bucket))
     end,
     get_file = function(self, bucket, key, opts)
+      assert(type(key) == "string" and key ~= "", "Invalid key (missing or empty string)")
       return self:_get("/" .. tostring(bucket) .. "/" .. tostring(url.escape(key)), nil, opts and opts.headers)
     end,
     delete_file = function(self, bucket, key)
+      assert(type(key) == "string" and key ~= "", "Invalid key for deletion (missing or empty string)")
       return self:_delete("/" .. tostring(bucket) .. "/" .. tostring(url.escape(key)))
     end,
     head_file = function(self, bucket, key)
+      assert(type(key) == "string" and key ~= "", "Invalid key (missing or empty string)")
       return self:_head("/" .. tostring(bucket) .. "/" .. tostring(url.escape(key)))
     end,
     put_file_acl = function(self, bucket, key, acl)
+      assert(type(key) == "string" and key ~= "", "Invalid key (missing or empty string)")
       return self:_put("/" .. tostring(bucket) .. "/" .. tostring(url.escape(key)) .. "?acl", "", {
         ["Content-length"] = 0,
         ["x-goog-acl"] = acl
@@ -309,7 +313,7 @@ do
       if type(data) == "table" then
         error("put_file_string interface has changed: key is now the second argument")
       end
-      assert(key, "missing key")
+      assert(type(key) == "string" and key ~= "", "Invalid key (missing or empty string)")
       assert(type(data) == "string", "expected string for data")
       return self:_put("/" .. tostring(bucket) .. "/" .. tostring(key), data, extend({
         ["Content-length"] = #data,
diff --git a/cloud_storage/google.moon b/cloud_storage/google.moon
@@ -182,13 +182,20 @@ class CloudStorage
   get_bucket: (bucket) => @_get "/#{bucket}"
 
   get_file: (bucket, key, opts) =>
+    assert type(key) == "string" and key != "", "Invalid key (missing or empty string)"
     @_get "/#{bucket}/#{url.escape key}", nil, opts and opts.headers
 
-  delete_file: (bucket, key) => @_delete "/#{bucket}/#{url.escape key}"
-  head_file: (bucket, key) => @_head "/#{bucket}/#{url.escape key}"
+  delete_file: (bucket, key) =>
+    assert type(key) == "string" and key != "", "Invalid key for deletion (missing or empty string)"
+    @_delete "/#{bucket}/#{url.escape key}"
+
+  head_file: (bucket, key) =>
+    assert type(key) == "string" and key != "", "Invalid key (missing or empty string)"
+    @_head "/#{bucket}/#{url.escape key}"
 
   -- sets predefined acl
   put_file_acl: (bucket, key, acl) =>
+    assert type(key) == "string" and key != "", "Invalid key (missing or empty string)"
     @_put "/#{bucket}/#{url.escape key}?acl", "", {
       "Content-length": 0
       "x-goog-acl": acl
@@ -199,7 +206,7 @@ class CloudStorage
     if type(data) == "table"
       error "put_file_string interface has changed: key is now the second argument"
 
-    assert key, "missing key"
+    assert type(key) == "string" and key != "", "Invalid key (missing or empty string)"
     assert type(data) == "string", "expected string for data"
 
     @_put "/#{bucket}/#{key}", data, extend {
diff --git a/spec/cloud_storage_spec.moon b/spec/cloud_storage_spec.moon
@@ -169,6 +169,20 @@ describe "cloud_storage", ->
           }
         }, http_requests
 
+      it "get_file fails with empty key", ->
+        assert.has_error(
+          -> storage\get_file "mybucket", ""
+          "Invalid key (missing or empty string)"
+        )
+        assert.same { }, http_requests
+
+      it "get_file fails with missing key", ->
+        assert.has_error(
+          -> storage\get_file "mybucket"
+          "Invalid key (missing or empty string)"
+        )
+        assert.same { }, http_requests
+
       it "copy_file", ->
         storage\copy_file "from_bucket", "input/a.txt", "to_bucket", "output/b.txt", {
           acl: "private"
@@ -189,6 +203,36 @@ describe "cloud_storage", ->
           }
         }, http_requests
 
+      it "delete_file", ->
+        storage\delete_file "mybucket", "source/my-pic..png"
+        assert.same {
+          {
+            url: "https://storage.googleapis.com/mybucket/source%2fmy%2dpic%2e%2epng"
+            method: "DELETE"
+            headers: {
+              "x-goog-api-version": 2
+              "x-goog-project-id": "111111111111"
+              Authorization: "OAuth my-fake-access-token"
+            }
+          }
+        }, http_requests
+
+      it "delete_file fails with empty string key", ->
+        assert.has_error(
+          -> storage\delete_file "mybucket", ""
+          "Invalid key for deletion (missing or empty string)"
+        )
+
+        assert.same {}, http_requests
+
+      it "delete_file fails with missing string key", ->
+        assert.has_error(
+          -> storage\delete_file "mybucket"
+          "Invalid key for deletion (missing or empty string)"
+        )
+
+        assert.same {}, http_requests
+
   describe "with storage from json key", ->
     local storage
 
