From dc7a9046c0ed52dad71f5e01f9028d16d48431d0 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 16 Nov 2021 18:02:42 +0530
Subject: [PATCH 01/28] Updated dep versions

---
 Cargo.lock | 507 +++++++++++++++++++++++++++++++----------------------
 Cargo.toml |  34 ++--
 2 files changed, 314 insertions(+), 227 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 225d6e0..b6f7196 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,9 +25,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.42"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486"
+checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7"
 
 [[package]]
 name = "arc-swap"
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "block-buffer"
@@ -110,9 +110,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.7.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
 
 [[package]]
 name = "bytemuck"
@@ -128,9 +128,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "cargo-lock"
@@ -146,9 +146,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.69"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 dependencies = [
  "jobserver",
 ]
@@ -168,7 +168,7 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits",
- "time",
+ "time 0.1.43",
  "winapi",
 ]
 
@@ -180,9 +180,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -190,15 +190,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "cpufeatures"
-version = "0.1.5"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
 dependencies = [
  "libc",
 ]
@@ -256,16 +256,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "crypto-mac"
 version = "0.11.1"
@@ -396,9 +386,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.28"
+version = "0.8.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
 dependencies = [
  "cfg-if",
 ]
@@ -411,9 +401,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "flate2"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
  "cfg-if",
  "crc32fast",
@@ -454,9 +444,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -469,9 +459,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -479,15 +469,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -496,15 +486,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
 dependencies = [
  "autocfg",
  "proc-macro-hack",
@@ -515,21 +505,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
 
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
 
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
 dependencies = [
  "autocfg",
  "futures-channel",
@@ -569,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "gif"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a668f699973d0f573d15749b7002a9ac9e1f9c6b220e7b165601334c173d8de"
+checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b"
 dependencies = [
  "color_quant",
  "weezl",
@@ -579,9 +569,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.13.20"
+version = "0.13.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9831e983241f8c5591ed53f17d874833e2fa82cac2625f3888c50cbfe136cba"
+checksum = "845e007a28f1fcac035715988a234e8ec5458fd825b20a20c7dec74237ef341f"
 dependencies = [
  "bitflags",
  "libc",
@@ -592,9 +582,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.3"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
+checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55"
 dependencies = [
  "bytes",
  "fnv",
@@ -630,33 +620,26 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac 0.10.1",
- "digest",
-]
-
 [[package]]
 name = "hmac"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
 dependencies = [
- "crypto-mac 0.11.1",
+ "crypto-mac",
  "digest",
 ]
 
 [[package]]
 name = "hocon"
-version = "0.5.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b343112b7ebf5f59651daf37533fc623b88b4363111a883ed9448fdc38e0b73"
+checksum = "9ded0fc426537171e361b4f3ce37b4e6d70565a49dec6d0df47a931ce2478e01"
 dependencies = [
+ "aho-corasick",
  "java-properties",
+ "lazy_static",
+ "linked-hash-map",
  "memchr",
  "nom",
  "reqwest",
@@ -668,9 +651,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
 dependencies = [
  "bytes",
  "fnv",
@@ -679,9 +662,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
  "bytes",
  "http",
@@ -690,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
+checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
 
 [[package]]
 name = "httpdate"
@@ -708,9 +691,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.11"
+version = "0.14.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
+checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -730,6 +713,21 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
+dependencies = [
+ "futures-util",
+ "hyper",
+ "log",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+ "webpki",
+]
+
 [[package]]
 name = "hyper-timeout"
 version = "0.4.1"
@@ -797,9 +795,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if",
 ]
@@ -812,9 +810,9 @@ checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "java-properties"
@@ -829,9 +827,9 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5ca711fd837261e14ec9e674f092cbb931d3fa1482b017ae59328ddc6f3212b"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
 dependencies = [
  "libc",
 ]
@@ -847,9 +845,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.52"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752"
+checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -862,15 +860,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.99"
+version = "0.2.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.12.21+1.1.0"
+version = "0.12.25+1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86271bacd72b2b9e854c3dcfb82efd538f15f870e4c11af66900effb462f6825"
+checksum = "8f68169ef08d6519b2fe133ecc637408d933c0174b23b80bb2f79828966fbaab"
 dependencies = [
  "cc",
  "libc",
@@ -898,9 +896,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
 dependencies = [
  "scopeguard",
 ]
@@ -950,9 +948,9 @@ dependencies = [
 
 [[package]]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "md-5"
@@ -967,9 +965,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
@@ -1007,9 +1005,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
 dependencies = [
  "libc",
  "log",
@@ -1056,10 +1054,9 @@ dependencies = [
  "bb8-postgres",
  "built",
  "chrono",
- "crossbeam-deque",
  "dns-lookup",
  "hex",
- "hmac 0.11.0",
+ "hmac",
  "hocon",
  "hyper",
  "hyper-timeout",
@@ -1073,6 +1070,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
+ "time 0.3.5",
  "tokio",
  "tokio-postgres",
  "uuid",
@@ -1162,9 +1160,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.35"
+version = "0.10.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"
+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1182,9 +1180,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.65"
+version = "0.9.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"
+checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf"
 dependencies = [
  "autocfg",
  "cc",
@@ -1195,18 +1193,18 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039f02eb0f69271f26abe3202189275d7aa2258b903cb0281b5de710a2570ff3"
+checksum = "97c9d06878b3a851e8026ef94bf7fef9ba93062cd412601da4d9cf369b1cc62d"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
 name = "parking_lot"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
@@ -1215,9 +1213,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
  "cfg-if",
  "instant",
@@ -1235,18 +1233,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "phf"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+checksum = "b9fc3db1018c4b59d7d582a739436478b6035138b6aecbce989fc91c3e98409f"
 dependencies = [
  "phf_shared",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
  "siphasher",
 ]
@@ -1265,9 +1263,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
 
 [[package]]
 name = "png"
@@ -1283,15 +1281,15 @@ dependencies = [
 
 [[package]]
 name = "postgres-protocol"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff3e0f70d32e20923cabf2df02913be7c1842d4c772db8065c00fcfdd1d1bff3"
+checksum = "b145e6a4ed52cb316a27787fc20fe8a25221cb476479f61e4e0327c15b98d91a"
 dependencies = [
  "base64",
  "byteorder",
  "bytes",
  "fallible-iterator",
- "hmac 0.10.1",
+ "hmac",
  "md-5",
  "memchr",
  "rand",
@@ -1301,9 +1299,9 @@ dependencies = [
 
 [[package]]
 name = "postgres-types"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "430f4131e1b7657b0cd9a2b0c3408d77c9a43a042d300b8c77f981dffcc43a2f"
+checksum = "04619f94ba0cc80999f4fc7073607cb825bc739a883cb6d20900fc5e009d6b0d"
 dependencies = [
  "bytes",
  "chrono",
@@ -1313,9 +1311,9 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
 
 [[package]]
 name = "proc-macro-hack"
@@ -1331,18 +1329,18 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "procfs"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8809e0c18450a2db0f236d2a44ec0b4c1412d0eb936233579f0990faa5d5cd"
+checksum = "95e344cafeaeefe487300c361654bcfc85db3ac53619eeccced29f5ea18c4c70"
 dependencies = [
  "bitflags",
  "byteorder",
@@ -1354,9 +1352,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c"
+checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
 dependencies = [
  "cfg-if",
  "fnv",
@@ -1371,15 +1369,15 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.25.0"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b"
+checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754"
 
 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
 dependencies = [
  "proc-macro2",
 ]
@@ -1492,9 +1490,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.4"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
+checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280"
 dependencies = [
  "base64",
  "bytes",
@@ -1504,19 +1502,21 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "hyper-tls",
+ "hyper-rustls",
  "ipnet",
  "js-sys",
  "lazy_static",
  "log",
  "mime",
- "native-tls",
  "percent-encoding",
  "pin-project-lite",
+ "rustls",
+ "rustls-native-certs",
  "serde",
+ "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-native-tls",
+ "tokio-rustls",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1524,11 +1524,26 @@ dependencies = [
  "winreg",
 ]
 
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "rust-embed"
-version = "6.0.0"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3203eb498314cbc2c6671278c8da3c64a16476d79ad1442bc13e8629706f24f7"
+checksum = "1be44a6694859b7cfc955699935944a6844aa9fe416aeda5d40829e3e38dfee6"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -1537,9 +1552,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "6.0.0"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1c03c7b7b780fdafde5055576641fd6b4d38095e3399cd0588552639aeff432"
+checksum = "f567ca01565c50c67b29e535f5f67b8ea8aeadaeed16a88f10792ab57438b957"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1550,14 +1565,39 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b5f2909061b856ce587f2496fc149a71d576cb2e0842c79f0dc82741622c6d0"
+checksum = "6116e7ab9ea963f60f2f20291d8fcf6c7273192cdd7273b3c80729a9605c97b2"
 dependencies = [
  "sha2",
  "walkdir",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
+dependencies = [
+ "base64",
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
+dependencies = [
+ "openssl-probe",
+ "rustls",
+ "schannel",
+ "security-framework",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -1595,11 +1635,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "sct"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "security-framework"
-version = "2.3.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467"
+checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -1610,9 +1660,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.3.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284"
+checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1629,9 +1679,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.127"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
 dependencies = [
  "serde_derive",
 ]
@@ -1648,9 +1698,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.127"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1659,9 +1709,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.66"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
+checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3"
 dependencies = [
  "itoa",
  "ryu",
@@ -1670,9 +1720,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f6109f0506e20f7e0f910e51a0079acf41da8e0694e6442527c4ddf5a2b158"
+checksum = "d0421d4f173fab82d72d6babf36d57fae38b994ca5c2d78e704260ba6d12118b"
 dependencies = [
  "serde",
 ]
@@ -1691,21 +1741,21 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.17"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
+checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af"
 dependencies = [
  "dtoa",
- "linked-hash-map",
+ "indexmap",
  "serde",
  "yaml-rust",
 ]
 
 [[package]]
 name = "sha2"
-version = "0.9.5"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
+checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
 dependencies = [
  "block-buffer",
  "cfg-if",
@@ -1725,32 +1775,38 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1"
+checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
 
 [[package]]
 name = "slab"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "smallvec"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
 
 [[package]]
 name = "socket2"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
 dependencies = [
  "libc",
  "winapi",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "stringprep"
 version = "0.1.2"
@@ -1769,9 +1825,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1794,18 +1850,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1844,11 +1900,20 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.3.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1861,9 +1926,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.9.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c"
+checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144"
 dependencies = [
  "autocfg",
  "bytes",
@@ -1891,9 +1956,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1912,9 +1977,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-postgres"
-version = "0.7.2"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2b1383c7e4fb9a09e292c7c6afb7da54418d53b045f1c1fac7a911411a2b8b"
+checksum = "4b6c8b33df661b548dcd8f9bf87debb8c56c05657ed291122e1188698c2ece95"
 dependencies = [
  "async-trait",
  "byteorder",
@@ -1933,11 +1998,22 @@ dependencies = [
  "tokio-util",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
+dependencies = [
+ "rustls",
+ "tokio",
+ "webpki",
+]
+
 [[package]]
 name = "tokio-util"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1964,9 +2040,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
 dependencies = [
  "cfg-if",
  "pin-project-lite",
@@ -1975,9 +2051,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.18"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
+checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
 dependencies = [
  "lazy_static",
 ]
@@ -2005,18 +2081,15 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.13.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
+checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
-dependencies = [
- "matches",
-]
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
 
 [[package]]
 name = "unicode-normalization"
@@ -2042,6 +2115,12 @@ dependencies = [
  "traitobject",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
 [[package]]
 name = "url"
 version = "2.2.2"
@@ -2111,21 +2190,19 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.75"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586"
+checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
 dependencies = [
  "cfg-if",
- "serde",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.75"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f"
+checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -2138,9 +2215,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.25"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c"
+checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2150,9 +2227,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.75"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c"
+checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2160,9 +2237,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.75"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f"
+checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2173,20 +2250,30 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.75"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2"
+checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
 
 [[package]]
 name = "web-sys"
-version = "0.3.52"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696"
+checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki"
+version = "0.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "weezl"
 version = "0.1.5"
diff --git a/Cargo.toml b/Cargo.toml
index 45c7cb2..4ac382a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,31 +12,31 @@ built = { version = "0.5", features = ["git2"] }
 hyper = { version = "0.14", features = ["full"] }
 hyper-timeout = "0.4"
 tokio = { version = "1", features = ["full"] }
-log = "0.4.14"
-log4rs = "1.0.0"
-hocon = "0.5.1"
-sha2 = "0.9.5"
-hmac = "0.11.0"
+log = "0.4"
+log4rs = "1"
+hocon = "0.7"
+sha2 = "0.9"
+hmac = "0.11"
 hex = "0.4"
-base64 = "0.13.0"
-hyper-tls = "0.5.0"
+base64 = "0.13"
+hyper-tls = "0.5"
 serde = { version = "1", features = ["derive"] }
-serde_json = "^1.0.59"
+serde_json = "1"
 chrono = "0.4"
 uuid = { version = "0.8", features = ["serde", "v4"] }
-prometheus = { version = "0.12", features = ["process"] }
+prometheus = { version = "0.13", features = ["process"] }
 lazy_static = "1.4"
-bb8 = "0.7.0"
-bb8-postgres = "0.7.0"
-tokio-postgres = { version="0.7.2", features=["with-chrono-0_4"] }
-async-trait = "0.1.50"
+bb8 = "0.7"
+bb8-postgres = "0.7"
+tokio-postgres = { version="0.7", features=["with-chrono-0_4"] }
+async-trait = "0.1"
 image = "0.23"
-dns-lookup = "1.0.7"
-anyhow = "1.0.42"
+dns-lookup = "1"
+anyhow = "1.0"
 rust-embed="6.0.0"
 
-# The following deps are to resolve vulns
-crossbeam-deque ="0.8"
+# Overrides to address vulns
+time = "0.3"
 
 [profile.release]
 lto = true
\ No newline at end of file

From 52ede9c9a66afa4db40575492367dd87b6ed2e47 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 22 Nov 2021 17:11:56 +0530
Subject: [PATCH 02/28] Switched to AWS SDK

---
 Cargo.lock          | 429 +++++++++++++++++++++++++++++++++++++++++++-
 Cargo.toml          |   7 +-
 src/aws/messages.rs |  60 -------
 src/aws/mod.rs      | 149 +++++----------
 src/aws/util.rs     |  21 ---
 5 files changed, 478 insertions(+), 188 deletions(-)
 delete mode 100644 src/aws/messages.rs
 delete mode 100644 src/aws/util.rs

diff --git a/Cargo.lock b/Cargo.lock
index b6f7196..341fe24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,6 +52,312 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
+[[package]]
+name = "aws-config"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1dd74b410b8590b832e0f209af69d15b7882763c844abbc3798b4cb748d46e1"
+dependencies = [
+ "aws-http",
+ "aws-hyper",
+ "aws-sdk-sts",
+ "aws-smithy-async",
+ "aws-smithy-client",
+ "aws-smithy-http",
+ "aws-smithy-http-tower",
+ "aws-smithy-json",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http",
+ "tokio",
+ "tower",
+ "tracing",
+]
+
+[[package]]
+name = "aws-endpoint"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f6541ab010e3902e43b4a71595997ead054901a89b80c7e32e189a30769b9b3"
+dependencies = [
+ "aws-smithy-http",
+ "aws-types",
+ "http",
+ "regex",
+ "tracing",
+]
+
+[[package]]
+name = "aws-http"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb82d09b0b92c79e2a5c8e0a137bddb1602d26d5033b35512986ed10a4eec779"
+dependencies = [
+ "aws-smithy-http",
+ "aws-smithy-types",
+ "aws-types",
+ "http",
+ "lazy_static",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "aws-hyper"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4606b6d25101d069543e40df766ee1edf02e0fd1a16fa5d1a40aa1ebdb589e5b"
+dependencies = [
+ "aws-endpoint",
+ "aws-http",
+ "aws-sig-auth",
+ "aws-smithy-client",
+ "aws-smithy-http",
+ "aws-smithy-http-tower",
+ "aws-smithy-types",
+ "bytes",
+ "fastrand",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "pin-project",
+ "tokio",
+ "tower",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sdk-rekognition"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46edcf55a50ae8a57cd9f40a3eb9864ac532a540f94c543cdcad6cde9ed1eae4"
+dependencies = [
+ "aws-endpoint",
+ "aws-http",
+ "aws-hyper",
+ "aws-sig-auth",
+ "aws-smithy-client",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "aws-sdk-s3"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0541bc3e54f01b72ca789e246b38ad581ff417f60784182a2514c21579293511"
+dependencies = [
+ "aws-endpoint",
+ "aws-http",
+ "aws-hyper",
+ "aws-sig-auth",
+ "aws-sigv4",
+ "aws-smithy-client",
+ "aws-smithy-eventstream",
+ "aws-smithy-http",
+ "aws-smithy-types",
+ "aws-smithy-xml",
+ "aws-types",
+ "bytes",
+ "http",
+ "md5",
+ "tower",
+]
+
+[[package]]
+name = "aws-sdk-sts"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9aea20429c3e4f727a3f096107c162703d2849345ef07c98916bbbfe7ada40"
+dependencies = [
+ "aws-endpoint",
+ "aws-http",
+ "aws-hyper",
+ "aws-sig-auth",
+ "aws-smithy-client",
+ "aws-smithy-http",
+ "aws-smithy-query",
+ "aws-smithy-types",
+ "aws-smithy-xml",
+ "aws-types",
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "aws-sig-auth"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4b1a121117f5c4689087c914240673fd4c1dc94a35e3ef23e195edbc927a122"
+dependencies = [
+ "aws-sigv4",
+ "aws-smithy-eventstream",
+ "aws-smithy-http",
+ "aws-types",
+ "http",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sigv4"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "193366d8458aef46a0470ced4f0f823bf98d79860e9bcdd11c10006092f659cc"
+dependencies = [
+ "aws-smithy-eventstream",
+ "bytes",
+ "chrono",
+ "form_urlencoded",
+ "hex",
+ "http",
+ "once_cell",
+ "percent-encoding",
+ "regex",
+ "ring",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-async"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84ccafad4bbb76fe843e77cc3892108076b2aa5e63574429a8a8a0de12457de1"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "aws-smithy-client"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af398703e14620de67a67362ca797fa1aebcbf8fd53e49336d37441a22a4364"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-http-tower",
+ "aws-smithy-types",
+ "bytes",
+ "fastrand",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "lazy_static",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-eventstream"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe6167a8be20e32110301516b9dc7f910a85f00aaf4b3ca224912dc9b566f4b"
+dependencies = [
+ "aws-smithy-types",
+ "bytes",
+ "crc32fast",
+]
+
+[[package]]
+name = "aws-smithy-http"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "164c273ea75b4b8cb9c6f40391dc2fc493e5eccf64916422ad53b2e1007c2df4"
+dependencies = [
+ "aws-smithy-eventstream",
+ "aws-smithy-types",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http",
+ "http-body",
+ "hyper",
+ "percent-encoding",
+ "pin-project",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-http-tower"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "753a0f40f13ad4e85210bb842dc73aa65b98631b512a4b62b7661819b0a77356"
+dependencies = [
+ "aws-smithy-http",
+ "bytes",
+ "http",
+ "http-body",
+ "pin-project",
+ "tower",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-json"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e84b7c5aada4c5fca583ac48bf8f8d23e37f027bf4dd67d844f8d8e4556e3789"
+dependencies = [
+ "aws-smithy-types",
+]
+
+[[package]]
+name = "aws-smithy-query"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02af12a15f680c50e22c665917cb98deef62039e4535f6d631dfb7f8fe4a7f4c"
+dependencies = [
+ "aws-smithy-types",
+ "urlencoding",
+]
+
+[[package]]
+name = "aws-smithy-types"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfce46b7c4bc8eb726003d463e9b10840c2738545dd2e1125787a683ad5d9aac"
+dependencies = [
+ "chrono",
+ "itoa",
+ "num-integer",
+ "ryu",
+]
+
+[[package]]
+name = "aws-smithy-xml"
+version = "0.28.0-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab1068ddd5c3c3c3ac52e358d52a31e55a0a855d12991b17e8a109f6a3e0fe11"
+dependencies = [
+ "thiserror",
+ "xmlparser",
+]
+
+[[package]]
+name = "aws-types"
+version = "0.0.25-alpha"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "694548ee3090a8c28836a5a640b4066150809d30851520e6455a32d28e14e4ef"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-types",
+ "rustc_version",
+ "zeroize",
+]
+
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -132,6 +438,16 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
+[[package]]
+name = "bytes-utils"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e314712951c43123e5920a446464929adc667a5eade7f8fb3997776c9df6e54"
+dependencies = [
+ "bytes",
+ "either",
+]
+
 [[package]]
 name = "cargo-lock"
 version = "7.0.1"
@@ -266,6 +582,15 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ct-logs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
+dependencies = [
+ "sct",
+]
+
 [[package]]
 name = "deflate"
 version = "0.8.6"
@@ -399,6 +724,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
+[[package]]
+name = "fastrand"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "flate2"
 version = "1.0.22"
@@ -719,10 +1053,12 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
 dependencies = [
+ "ct-logs",
  "futures-util",
  "hyper",
  "log",
  "rustls",
+ "rustls-native-certs",
  "tokio",
  "tokio-rustls",
  "webpki",
@@ -963,6 +1299,12 @@ dependencies = [
  "opaque-debug",
 ]
 
+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
 [[package]]
 name = "memchr"
 version = "2.4.1"
@@ -1049,6 +1391,10 @@ version = "1.3.0"
 dependencies = [
  "anyhow",
  "async-trait",
+ "aws-config",
+ "aws-sdk-rekognition",
+ "aws-sdk-s3",
+ "aws-types",
  "base64",
  "bb8",
  "bb8-postgres",
@@ -1056,7 +1402,6 @@ dependencies = [
  "chrono",
  "dns-lookup",
  "hex",
- "hmac",
  "hocon",
  "hyper",
  "hyper-timeout",
@@ -1249,6 +1594,26 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pin-project"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.7"
@@ -1573,6 +1938,15 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -2032,6 +2406,28 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "tower"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00e500fff5fa1131c866b246041a6bf96da9c965f8fe4128cb1421f23e93c00"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
+
 [[package]]
 name = "tower-service"
 version = "0.3.1"
@@ -2045,10 +2441,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
 dependencies = [
  "cfg-if",
+ "log",
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.21"
@@ -2133,6 +2542,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb"
+
 [[package]]
 name = "uuid"
 version = "0.8.2"
@@ -2320,6 +2735,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "xmlparser"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8"
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
@@ -2328,3 +2749,9 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
+
+[[package]]
+name = "zeroize"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
diff --git a/Cargo.toml b/Cargo.toml
index 4ac382a..7dc5682 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,6 @@ log = "0.4"
 log4rs = "1"
 hocon = "0.7"
 sha2 = "0.9"
-hmac = "0.11"
 hex = "0.4"
 base64 = "0.13"
 hyper-tls = "0.5"
@@ -35,6 +34,12 @@ dns-lookup = "1"
 anyhow = "1.0"
 rust-embed="6.0.0"
 
+# deps for aws
+aws-config = "0.0.25-alpha"
+aws-sdk-rekognition = "0.0.25-alpha"
+aws-sdk-s3 = "0.0.25-alpha"
+aws-types = "0.0.25-alpha"
+
 # Overrides to address vulns
 time = "0.3"
 
diff --git a/src/aws/messages.rs b/src/aws/messages.rs
deleted file mode 100644
index d767cba..0000000
--- a/src/aws/messages.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use std::collections::HashSet;
-
-use serde::Deserialize;
-
-use crate::moderation::ModerationCategories;
-
-#[derive(Deserialize)]
-#[allow(non_snake_case)]
-pub struct Label {
-    pub Confidence: f32,
-    pub Name: String,
-    pub ParentName: String,
-}
-
-impl Label {
-    pub fn top_category(&self) -> &str {
-        if self.ParentName.is_empty() {
-            &self.Name
-        } else {
-            &self.ParentName
-        }
-    }
-}
-
-#[derive(Deserialize)]
-#[allow(non_snake_case)]
-pub struct RekognitionResponse {
-    pub ModerationLabels: Vec<Label>,
-    pub ModerationModelVersion: String,
-}
-
-impl RekognitionResponse {
-    pub fn get_labels(&self) -> Vec<ModerationCategories> {
-        let labels: HashSet<String> = self
-            .ModerationLabels
-            .iter()
-            .map(|l| l.top_category().to_owned())
-            .collect();
-        labels
-            .iter()
-            .map(|l| RekognitionResponse::normalize_category(l))
-            .collect()
-    }
-
-    fn normalize_category(input: &str) -> ModerationCategories {
-        match input {
-            "Explicit Nudity" => ModerationCategories::ExplicitNudity,
-            "Suggestive" => ModerationCategories::Suggestive,
-            "Violence" => ModerationCategories::Violence,
-            "Visually Disturbing" => ModerationCategories::VisuallyDisturbing,
-            "Rude" => ModerationCategories::Rude,
-            "Drugs" => ModerationCategories::Drugs,
-            "Tobacco" => ModerationCategories::Tobacco,
-            "Alcohol" => ModerationCategories::Alcohol,
-            "Gambling" => ModerationCategories::Gambling,
-            "Hate" => ModerationCategories::Hate,
-            _ => ModerationCategories::Unknown,
-        }
-    }
-}
diff --git a/src/aws/mod.rs b/src/aws/mod.rs
index 4b40408..c95e5c8 100644
--- a/src/aws/mod.rs
+++ b/src/aws/mod.rs
@@ -1,30 +1,24 @@
-mod messages;
-mod util;
-
 use async_trait::async_trait;
-use base64;
-use chrono::prelude::*;
-use hex;
-use hyper::{Body, Client, Method, Request};
-use hyper_tls::HttpsConnector;
 use log::{debug, error};
-use serde_json::json;
 use std::env;
 
-use messages::RekognitionResponse;
-use util::{get_signature_key, sign};
-
 use crate::{
     document::Document,
-    moderation::{ModerationProvider, ModerationResponse, ModerationService, SupportedMimeTypes},
+    moderation::{
+        ModerationCategories, ModerationProvider, ModerationResponse, ModerationService,
+        SupportedMimeTypes,
+    },
     rpc::error::Errors,
-    utils::sha256,
 };
 
+use aws_sdk_rekognition::error::DetectModerationLabelsError;
+use aws_sdk_rekognition::model::Image;
+use aws_sdk_rekognition::output::DetectModerationLabelsOutput;
+use aws_sdk_rekognition::SdkError;
+use aws_sdk_rekognition::{Blob, Client as ClientRekognition, Region};
+
 pub struct Rekognition {
     pub region: String,
-    pub access_key: String,
-    pub secret_key: String,
 }
 
 #[async_trait]
@@ -36,7 +30,16 @@ impl ModerationProvider for Rekognition {
         debug!("New Rekognition request");
         match self.get_moderation_labels(&document.bytes).await {
             Ok(result) => {
-                let labels = result.get_labels();
+                let labels = result.moderation_labels.unwrap_or_default();
+                let labels = labels
+                    .into_iter()
+                    .filter(|l| l.name.is_some()) // Remove empty labels
+                    .map(|l| {
+                        let name = l.name.unwrap(); // This is safe
+                        Rekognition::normalize_category(name.as_str())
+                    })
+                    .collect();
+
                 debug!(
                     "Moderation labels for id={}, labels={:?}",
                     document.id, labels
@@ -63,104 +66,40 @@ impl ModerationProvider for Rekognition {
 }
 
 impl Rekognition {
-    fn get_host(&self) -> String {
-        format!("rekognition.{}.amazonaws.com", self.region)
-    }
-
-    fn get_url(&self) -> String {
-        format!("https://{}", self.get_host())
-    }
-
     pub async fn get_moderation_labels(
         &self,
         bytes: &hyper::body::Bytes,
-    ) -> Result<RekognitionResponse, Box<dyn std::error::Error + Send + Sync>> {
-        let amz_target = "RekognitionService.DetectModerationLabels";
-        let service = "rekognition";
-        let content_type = "application/x-amz-json-1.1";
-        let canonical_uri = "/";
-        let canonical_querystring = "";
-        let utc = Utc::now();
-        let amz_date = utc.format("%Y%m%dT%H%M%SZ").to_string();
-        let date_stamp = utc.format("%Y%m%d").to_string();
-        let canonical_headers = format!(
-            "content-type:{}\nhost:{}\nx-amz-date:{}\nx-amz-target:{}\n",
-            content_type,
-            self.get_host(),
-            amz_date,
-            amz_target
-        );
-        let signed_headers = "content-type;host;x-amz-date;x-amz-target";
-        let algorithm = "AWS4-HMAC-SHA256";
-        let credential_scope = format!("{}/{}/{}/aws4_request", date_stamp, self.region, service);
-        let request_dict = json!({
-            "Image": {
-                "Bytes": base64::encode(bytes.to_vec()),
-            },
-            "MinConfidence": 50.0,
-        });
-        let request_dict_encoded = request_dict.to_string();
-        let payload_hash = sha256(request_dict_encoded.as_bytes());
-        let canonical_request = format!(
-            "{}\n{}\n{}\n{}\n{}\n{}",
-            "POST",
-            canonical_uri,
-            canonical_querystring,
-            canonical_headers,
-            signed_headers,
-            payload_hash
-        );
-        //let canonical_request = format!("{}", canonical_request);
-        let string_to_sign = format!(
-            "{}\n{}\n{}\n{}",
-            algorithm,
-            amz_date,
-            credential_scope,
-            sha256(canonical_request.as_bytes())
-        );
-        let signing_key =
-            get_signature_key(&self.secret_key, &date_stamp[..], &self.region, service);
-        let signature = sign(&signing_key, string_to_sign.as_bytes());
-        let authorization_header = format!(
-            "{} Credential={}/{}, SignedHeaders={}, Signature={}",
-            algorithm,
-            self.access_key,
-            credential_scope,
-            signed_headers,
-            hex::encode(signature)
-        );
-        let req = Request::builder()
-            .method(Method::POST)
-            .uri(self.get_url())
-            .header("Content-Type", content_type)
-            .header("X-Amz-Date", amz_date)
-            .header("X-Amz-Target", amz_target)
-            .header("Authorization", authorization_header)
-            .body(Body::from(request_dict_encoded))?;
-        let https = HttpsConnector::new();
-        let client = Client::builder().build::<_, hyper::Body>(https);
+    ) -> Result<DetectModerationLabelsOutput, SdkError<DetectModerationLabelsError>> {
+        let region = Region::new(self.region.clone());
+        let shared_config = aws_config::from_env().region(region).load().await;
+        let client = ClientRekognition::new(&shared_config);
+        let req = client.detect_moderation_labels();
+        let blob = Blob::new(bytes.as_ref());
+        let img = Image::builder().bytes(blob).build();
+        req.image(img).send().await
+    }
 
-        match client.request(req).await {
-            Ok(response) => {
-                debug!("Rekognition response, status={}", response.status()); //TODO
-                match hyper::body::to_bytes(response.into_body()).await {
-                    Ok(bytes) => match serde_json::from_slice::<RekognitionResponse>(&bytes) {
-                        Ok(r) => Ok(r),
-                        Err(e) => Err(Box::new(e)),
-                    },
-                    Err(e) => Err(Box::new(e)),
-                }
-            }
-            Err(e) => Err(Box::new(e)),
+    pub fn normalize_category(input: &str) -> ModerationCategories {
+        match input {
+            "Explicit Nudity" => ModerationCategories::ExplicitNudity,
+            "Suggestive" => ModerationCategories::Suggestive,
+            "Violence" => ModerationCategories::Violence,
+            "Visually Disturbing" => ModerationCategories::VisuallyDisturbing,
+            "Rude" => ModerationCategories::Rude,
+            "Drugs" => ModerationCategories::Drugs,
+            "Tobacco" => ModerationCategories::Tobacco,
+            "Alcohol" => ModerationCategories::Alcohol,
+            "Gambling" => ModerationCategories::Gambling,
+            "Hate" => ModerationCategories::Hate,
+            _ => ModerationCategories::Unknown,
         }
     }
 
     pub fn new(aws_region: &str) -> Result<Self, Box<dyn std::error::Error + Send + Sync>> {
+        env::var("AWS_ACCESS_KEY_ID").expect("AWS_ACCESS_KEY_ID key not set");
+        env::var("AWS_SECRET_ACCESS_KEY").expect("AWS_SECRET_ACCESS_KEY key not set");
         Ok(Rekognition {
             region: aws_region.to_string(),
-            access_key: env::var("AWS_ACCESS_KEY_ID").expect("AWS_ACCESS_KEY_ID key not set"),
-            secret_key: env::var("AWS_SECRET_ACCESS_KEY")
-                .expect("AWS_SECRET_ACCESS_KEY key not set"),
         })
     }
 }
diff --git a/src/aws/util.rs b/src/aws/util.rs
deleted file mode 100644
index 44cd689..0000000
--- a/src/aws/util.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use hmac::{Hmac, Mac, NewMac};
-use sha2::Sha256;
-
-pub fn sign(key: &[u8], msg: &[u8]) -> Vec<u8> {
-    let hmac = Hmac::<Sha256>::new_from_slice(key);
-    if let Ok(mut hmac) = hmac {
-        hmac.update(msg);
-        let result = hmac.finalize();
-        result.into_bytes().to_vec()
-    } else {
-        Vec::new()
-    }
-}
-
-pub fn get_signature_key(key: &str, date_stamp: &str, region: &str, service: &str) -> Vec<u8> {
-    let kdate = sign(format!("AWS4{}", key).as_bytes(), date_stamp.as_bytes());
-    let kregion = sign(&kdate, region.as_bytes());
-    let kservice = sign(&kregion, service.as_bytes());
-    let signing_key = sign(&kservice, "aws4_request".as_bytes());
-    signing_key.to_vec()
-}

From 396a04457018d1800f37ced59b9bfa77eaf0768f Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 22 Nov 2021 17:36:44 +0530
Subject: [PATCH 03/28] Added metric for status code from http client

---
 src/http/mod.rs | 10 ++++------
 src/metrics.rs  |  6 +++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/http/mod.rs b/src/http/mod.rs
index 9b91363..90d4b3f 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -146,7 +146,7 @@ impl HttpClient {
                         metrics::DOCUMENT_SIZE
                             .with_label_values(&["size_bytes"])
                             .observe(bytes.len() as f64);
-
+                        metrics::HTTP_CLIENT_CODES.with_label_values(&["200"]).inc();
                         Ok(Document {
                             id: *req_id,
                             content_type,
@@ -155,14 +155,12 @@ impl HttpClient {
                             url: url.to_string(),
                         })
                     }
-                    hyper::StatusCode::NOT_FOUND => {
-                        metrics::DOCUMENT.with_label_values(&["fetch_error"]).inc();
-                        error!("Document not found on remote, id={}", req_id);
-                        Err(Errors::NotFound)
-                    }
 
                     e => {
                         metrics::DOCUMENT.with_label_values(&["fetch_error"]).inc();
+                        metrics::HTTP_CLIENT_CODES
+                            .with_label_values(&[e.as_str()])
+                            .inc();
                         error!(
                             "Unable to fetch document, id={}, response_code={}, url={}",
                             req_id, e, url
diff --git a/src/metrics.rs b/src/metrics.rs
index 5d903dc..bad11cf 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -44,6 +44,11 @@ lazy_static! {
         &["method"]
     )
     .unwrap();
+    pub static ref HTTP_CLIENT_CODES: IntCounterVec = IntCounterVec::new(
+        Opts::new("http_client_codes", "HTTP Client status codes"),
+        &["status_code"]
+    )
+    .unwrap();
     pub static ref DOCUMENT: IntCounterVec = IntCounterVec::new(
         Opts::new("document", "Document stats by status"),
         &["status"]
@@ -82,7 +87,6 @@ pub fn init_registry() {
         .register(Box::new(URI_FILTER_BLOCKED.clone()))
         .unwrap();
 
-    
     #[cfg(not(target_os = "macos"))]
     let pc = ProcessCollector::for_self();
     #[cfg(not(target_os = "macos"))]

From 64680efc1fbe347fd1d5c7c1f029f35c37bc3183 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 22 Nov 2021 17:52:44 +0530
Subject: [PATCH 04/28] Added logging

---
 src/rpc/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index 5818f86..2d93b85 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -69,6 +69,7 @@ pub async fn fetch(
 
     if params.force {
         metrics::DOCUMENT.with_label_values(&["forced"]).inc();
+        info!("Document id={} has forced flag enabled.", req_id);
     }
 
     let urls = vec![params.url.clone()];

From d69727e0b7fd9ee1f1671d8ddc225f28583de070 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 22 Nov 2021 23:09:44 +0530
Subject: [PATCH 05/28] Jemallocator is now default

---
 Cargo.lock  | 28 ++++++++++++++++++++++++++++
 Cargo.toml  |  7 ++++++-
 src/main.rs | 10 ++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 341fe24..6c02925 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -776,6 +776,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+
 [[package]]
 name = "futures"
 version = "0.3.17"
@@ -1161,6 +1167,27 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "jemalloc-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
+dependencies = [
+ "cc",
+ "fs_extra",
+ "libc",
+]
+
+[[package]]
+name = "jemallocator"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
+dependencies = [
+ "jemalloc-sys",
+ "libc",
+]
+
 [[package]]
 name = "jobserver"
 version = "0.1.24"
@@ -1407,6 +1434,7 @@ dependencies = [
  "hyper-timeout",
  "hyper-tls",
  "image",
+ "jemallocator",
  "lazy_static",
  "log",
  "log4rs",
diff --git a/Cargo.toml b/Cargo.toml
index 7dc5682..79f22a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,6 +33,7 @@ image = "0.23"
 dns-lookup = "1"
 anyhow = "1.0"
 rust-embed="6.0.0"
+jemallocator = { version = "0.3", optional = true }
 
 # deps for aws
 aws-config = "0.0.25-alpha"
@@ -44,4 +45,8 @@ aws-types = "0.0.25-alpha"
 time = "0.3"
 
 [profile.release]
-lto = true
\ No newline at end of file
+lto = true
+
+[features]
+default = ["jemalloc"]
+jemalloc = ["jemallocator"]
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 6ea37c8..5ff377b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,6 +21,9 @@ use std::{
     sync::Arc,
 };
 
+#[cfg(feature = "jemalloc")]
+use jemallocator::Jemalloc;
+
 use hyper::{
     service::{make_service_fn, service_fn},
     Server,
@@ -39,6 +42,10 @@ pub mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
 }
 
+#[cfg(feature = "jemalloc")]
+#[global_allocator]
+static GLOBAL: Jemalloc = Jemalloc;
+
 pub async fn run(config: Configuration) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let addr = SocketAddr::new(IpAddr::V4(config.bind_address), config.port);
     let proxy = Arc::new(Context::new(config).await?);
@@ -69,6 +76,9 @@ fn main() {
         built_info::GIT_VERSION.unwrap()
     );
 
+    #[cfg(feature = "jemalloc")]
+    info!("Using Jemallocator for memory allocations");
+
     info!("Loading configuration file");
     let config = Configuration::load().unwrap();
 

From cd99d73879b3f07a21c079dfc3247802a3c76747 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 22 Nov 2021 23:10:06 +0530
Subject: [PATCH 06/28] bumped version number

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c02925..0a8c7af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1414,7 +1414,7 @@ dependencies = [
 
 [[package]]
 name = "nft_image_proxy"
-version = "1.3.0"
+version = "1.4.0"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 79f22a3..5eff2c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nft_image_proxy"
-version = "1.3.0"
+version = "1.4.0"
 authors = ["Cryptonomic Inc."]
 edition = "2018"
 build = "build.rs"

From 64e2dceaa10a1c1b305afc80eecffaaea22ce6d9 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 23 Nov 2021 11:04:42 +0530
Subject: [PATCH 07/28] Added custome status codes for OS errors to http status
 code metric

---
 src/http/mod.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/http/mod.rs b/src/http/mod.rs
index 90d4b3f..f28e343 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -173,11 +173,13 @@ impl HttpClient {
                     if let Some(err_ref) = e.source() {
                         if let Some(err) = err_ref.downcast_ref::<std::io::Error>() {
                             if let ErrorKind::TimedOut = err.kind() {
+                                metrics::HTTP_CLIENT_CODES.with_label_values(&["991"]).inc();
                                 error!("Unable to fetch document, connection/response/request to the server timed out, id={}", req_id);
                                 return Err(Errors::TimedOut);
                             }
                         }
                     }
+                    metrics::HTTP_CLIENT_CODES.with_label_values(&["990"]).inc();
                     error!(
                         "Unable to fetch document, id={}, reason={}, url={}",
                         req_id, e, url

From 899c84f9c459d82792dcb182965d1c6b0ab6a483 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 23 Nov 2021 11:23:09 +0530
Subject: [PATCH 08/28] Removed metric active_clients as it was broken

---
 src/metrics.rs | 3 ---
 src/proxy.rs   | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/metrics.rs b/src/metrics.rs
index bad11cf..4eb5cea 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -24,8 +24,6 @@ lazy_static! {
         50000.0 * 1024_f64,
     ];
     pub static ref REGISTRY: Registry = Registry::new();
-    pub static ref ACTIVE_CLIENTS: IntGauge =
-        IntGauge::new("active_clients", "Active clients").unwrap();
     pub static ref ERRORS: IntCounter = IntCounter::new("errors", "Total errors").unwrap();
     pub static ref HITS: IntCounter = IntCounter::new("hits", "Total hits").unwrap();
     pub static ref CACHE_METRICS: IntGaugeVec = IntGaugeVec::new(
@@ -71,7 +69,6 @@ lazy_static! {
 }
 
 pub fn init_registry() {
-    REGISTRY.register(Box::new(ACTIVE_CLIENTS.clone())).unwrap();
     REGISTRY.register(Box::new(HITS.clone())).unwrap();
     REGISTRY.register(Box::new(MODERATION.clone())).unwrap();
     REGISTRY.register(Box::new(API_REQUESTS.clone())).unwrap();
diff --git a/src/proxy.rs b/src/proxy.rs
index 56071c0..088a29a 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -60,9 +60,9 @@ impl Context {
             config.ipfs.clone(),
             config.max_document_size,
             uri_filters,
-            config.timeout
+            config.timeout,
         );
-        Ok(Context{
+        Ok(Context {
             config: config.clone(),
             database,
             moderation_provider,
@@ -87,7 +87,6 @@ pub fn authenticate(api_keys: &[String], req: &Request<Body>) -> bool {
 
 pub async fn route(ctx: Arc<Context>, req: Request<Body>) -> Result<Response<Body>, GenericError> {
     metrics::HITS.inc();
-    metrics::ACTIVE_CLIENTS.inc();
     let response_time_start = Utc::now().timestamp_millis();
     let proxy_config = ctx.config.clone();
     let response = match (req.method(), req.uri().path()) {
@@ -145,7 +144,6 @@ pub async fn route(ctx: Arc<Context>, req: Request<Body>) -> Result<Response<Bod
     metrics::API_RESPONSE_TIME
         .with_label_values(&["overall"])
         .observe((Utc::now().timestamp_millis() - response_time_start) as f64);
-    metrics::ACTIVE_CLIENTS.dec();
 
     response.or_else(|e| {
         metrics::ERRORS.inc();

From caf20b66a2dca2aebc564e7944bcc593d2fa15e1 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 29 Nov 2021 12:59:39 +0530
Subject: [PATCH 09/28] Refactored http module to support multiple http client
 providers

---
 src/http/hyper_client.rs |  95 +++++++++++++++++++
 src/http/mod.rs          | 199 +++++++++++++++------------------------
 src/metrics.rs           |   8 +-
 src/proxy.rs             |   8 +-
 src/rpc/error.rs         |   5 +-
 src/rpc/mod.rs           |   2 +-
 6 files changed, 186 insertions(+), 131 deletions(-)
 create mode 100644 src/http/hyper_client.rs

diff --git a/src/http/hyper_client.rs b/src/http/hyper_client.rs
new file mode 100644
index 0000000..1826c9d
--- /dev/null
+++ b/src/http/hyper_client.rs
@@ -0,0 +1,95 @@
+use std::error::Error;
+use std::io::ErrorKind;
+use std::time::Duration;
+
+use async_trait::async_trait;
+use hyper::client::HttpConnector;
+use hyper::Client;
+use hyper::{body::to_bytes, Uri};
+use hyper_timeout::TimeoutConnector;
+use hyper_tls::HttpsConnector;
+use log::error;
+
+use hyper::client::connect::dns::GaiResolver;
+use hyper::Body;
+use uuid::Uuid;
+
+use super::{HttpClientProvider, StatusCode, CODE_CONNECTION_ERROR, CODE_IO_ERROR, CODE_TIMEOUT};
+use crate::document::Document;
+
+pub struct HyperHttpClient {
+    client: Client<TimeoutConnector<HttpsConnector<HttpConnector<GaiResolver>>>, Body>,
+    _max_document_size: Option<u64>,
+}
+
+impl HyperHttpClient {
+    pub fn new(max_document_size: Option<u64>, timeout: u64) -> Self {
+        let https = HttpsConnector::new();
+        let mut connector = TimeoutConnector::new(https);
+
+        connector.set_connect_timeout(Some(Duration::from_secs(timeout)));
+        connector.set_read_timeout(Some(Duration::from_secs(timeout)));
+        connector.set_write_timeout(Some(Duration::from_secs(timeout)));
+
+        let client = Client::builder().build::<_, hyper::Body>(connector);
+        HyperHttpClient {
+            client,
+            _max_document_size: max_document_size,
+        }
+    }
+}
+
+#[async_trait]
+impl HttpClientProvider for HyperHttpClient {
+    async fn fetch(&self, req_id: &Uuid, uri: &Uri) -> Result<Document, StatusCode> {
+        let response = self.client.get(uri.clone()).await.map_err(|error| {
+            error!(
+                "Unable to fetch document, id={}, reason={}, url={}",
+                req_id, error, uri
+            );
+            if let Some(err_ref) = error.source() {
+                if let Some(err) = err_ref.downcast_ref::<std::io::Error>() {
+                    if let ErrorKind::TimedOut = err.kind() {
+                        return CODE_TIMEOUT;
+                    }
+                }
+            }
+            CODE_CONNECTION_ERROR
+        })?;
+        match response.status() {
+            hyper::StatusCode::OK => {
+                let headers = response.headers().clone();
+                let bytes = to_bytes(response.into_body()).await.map_err(|error| {
+                    error!(
+                        "Unable to fetch document, id={}, reason={}, url={}",
+                        req_id, error, uri
+                    );
+                    CODE_IO_ERROR
+                })?;
+                let content_length = headers
+                    .get(hyper::header::CONTENT_LENGTH)
+                    .map(|h| {
+                        String::from_utf8(h.as_bytes().to_vec())
+                            .map(|s| s.parse::<u64>().ok())
+                            .ok()
+                    })
+                    .flatten()
+                    .flatten()
+                    .unwrap_or(bytes.len() as u64);
+                let content_type = headers
+                    .get(hyper::header::CONTENT_TYPE)
+                    .map(|h| String::from_utf8(h.as_bytes().to_vec()).ok())
+                    .flatten()
+                    .unwrap_or_default();
+                Ok(Document {
+                    id: *req_id,
+                    content_type,
+                    content_length,
+                    bytes,
+                    url: uri.to_string(),
+                })
+            }
+            status_code => Err(status_code.as_u16()),
+        }
+    }
+}
diff --git a/src/http/mod.rs b/src/http/mod.rs
index f28e343..77ff9db 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -1,67 +1,40 @@
-use std::borrow::Borrow;
-use std::time::Duration;
-
-use std::error::Error as StdError;
-use std::io::ErrorKind;
-
-use hyper::client::HttpConnector;
+use async_trait::async_trait;
 use hyper::http::uri::Scheme;
-use hyper::Client;
-use hyper::{body::to_bytes, Uri};
-use hyper_timeout::TimeoutConnector;
-use hyper_tls::HttpsConnector;
-use log::error;
-use log::info;
-use log::{debug, warn};
+use hyper::Uri;
+use log::{debug, error, info, warn};
 use uuid::Uuid;
 
 use crate::config::Host;
 use crate::document::Document;
+use crate::http::hyper_client::HyperHttpClient;
 use crate::metrics;
 use crate::rpc::error::Errors;
 
-use hyper::client::connect::dns::GaiResolver;
-use hyper::Body;
-
 use self::filters::UriFilter;
 
 pub mod filters;
+pub mod hyper_client;
 
-pub struct HttpClient {
-    client: Client<TimeoutConnector<HttpsConnector<HttpConnector<GaiResolver>>>, Body>,
-    _max_document_size: Option<u64>,
-    ipfs_config: Host,
-    uri_filters: Vec<Box<dyn UriFilter + Send + Sync>>,
-}
+type StatusCode = u16;
 
-impl HttpClient {
-    pub fn new(
-        ipfs_config: Host,
-        max_document_size: Option<u64>,
-        uri_filters: Vec<Box<dyn UriFilter + Send + Sync>>,
-        timeout: u64,
-    ) -> HttpClient {
-        let https = HttpsConnector::new();
-        let mut connector = TimeoutConnector::new(https);
+const CODE_CONNECTION_ERROR: StatusCode = 900_u16;
+const CODE_TIMEOUT: StatusCode = 901_u16;
+const CODE_IO_ERROR: StatusCode = 901_u16;
 
-        connector.set_connect_timeout(Some(Duration::from_secs(timeout)));
-        connector.set_read_timeout(Some(Duration::from_secs(timeout)));
-        connector.set_write_timeout(Some(Duration::from_secs(timeout)));
+#[async_trait]
+pub trait HttpClientProvider {
+    // TODO: Not happy with this signature, need something better
+    async fn fetch(&self, req_id: &Uuid, url: &Uri) -> Result<Document, StatusCode>;
+}
 
-        let client = Client::builder().build::<_, hyper::Body>(connector);
-        assert!(
-            !uri_filters.is_empty(),
-            "No URI filters provided. This is insecure, check code. Exiting..."
-        );
-        HttpClient {
-            client,
-            _max_document_size: max_document_size,
-            ipfs_config,
-            uri_filters,
-        }
-    }
+pub struct HttpClientWrapper {
+    client: Box<dyn HttpClientProvider + Send + Sync>,
+    ipfs_config: Host,
+    uri_filters: Vec<Box<dyn UriFilter + Send + Sync>>,
+}
 
-    fn to_uri(ipfs_config: &Host, url: &str) -> Result<Uri, Errors> {
+impl HttpClientWrapper {
+    fn to_uri(&self, url: &str) -> Result<Uri, Errors> {
         let uri = url.parse::<Uri>().map_err(|e| {
             error!("Error parsing url={}, reason={}", url, e);
             Errors::InvalidUri
@@ -75,15 +48,16 @@ impl HttpClient {
                     .or_else(|| url.strip_prefix("IPFS://"))
                 {
                     Some(ipfs_path) => {
-                        let ipfs_path_prefix = ipfs_config
+                        let ipfs_path_prefix = self
+                            .ipfs_config
                             .path
                             .strip_prefix('/')
-                            .unwrap_or(&ipfs_config.path);
+                            .unwrap_or(&self.ipfs_config.path);
                         let gateway_url = format!(
                             "{}://{}:{}/{}/{}",
-                            ipfs_config.protocol,
-                            ipfs_config.host,
-                            ipfs_config.port,
+                            self.ipfs_config.protocol,
+                            self.ipfs_config.host,
+                            self.ipfs_config.port,
                             ipfs_path_prefix,
                             ipfs_path
                         );
@@ -102,87 +76,43 @@ impl HttpClient {
 
     pub async fn fetch(&self, req_id: &Uuid, url: &str) -> Result<Document, Errors> {
         info!("Fetching document for id:{}, url:{}", req_id, url);
-        let uri = HttpClient::to_uri(&self.ipfs_config, &url.to_string())?;
+        let uri = self.to_uri(&url.to_string())?;
 
         let filter_results = self
             .uri_filters
             .iter()
-            .map(|f| f.filter(uri.borrow()))
+            .map(|f| f.filter(&uri))
             .reduce(|a, b| a & b);
 
         match filter_results {
-            Some(true) => match self.client.get(uri).await {
-                Ok(response) => match response.status() {
-                    hyper::StatusCode::OK => {
-                        let headers = response.headers().clone();
-                        let content_length = headers
-                            .get(hyper::header::CONTENT_LENGTH)
-                            .map(|h| {
-                                String::from_utf8(h.as_bytes().to_vec())
-                                    .map(|s| s.parse::<u64>().ok())
-                                    .ok()
-                            })
-                            .flatten()
-                            .flatten()
-                            .unwrap_or(0);
-                        let content_type = headers
-                            .get(hyper::header::CONTENT_TYPE)
-                            .map(|h| String::from_utf8(h.as_bytes().to_vec()).ok())
-                            .flatten()
-                            .unwrap_or_default();
-                        let bytes = to_bytes(response.into_body()).await.map_err(|e| {
-                            error!("Error retrieving document body, reason={}", e);
-                            Errors::FetchFailed
-                        })?;
-
-                        info!(
-                            "Document fetched for id={}, content_length={:?}, content_type={:?}",
-                            req_id, content_length, content_type
-                        );
-                        metrics::DOCUMENT.with_label_values(&["fetched"]).inc();
-                        metrics::TRAFFIC
-                            .with_label_values(&["fetched"])
-                            .inc_by(bytes.len() as u64);
-                        metrics::DOCUMENT_SIZE
-                            .with_label_values(&["size_bytes"])
-                            .observe(bytes.len() as f64);
-                        metrics::HTTP_CLIENT_CODES.with_label_values(&["200"]).inc();
-                        Ok(Document {
-                            id: *req_id,
-                            content_type,
-                            content_length,
-                            bytes,
-                            url: url.to_string(),
-                        })
-                    }
+            Some(true) => match self.client.fetch(req_id, &uri).await {
+                Ok(document) => {
+                    info!(
+                        "Document fetched for id={}, content_length={:?}, content_type={:?}",
+                        req_id, document.content_length, document.content_type
+                    );
+                    metrics::DOCUMENT.with_label_values(&["fetched"]).inc();
+                    metrics::DOCUMENT_TYPE
+                        .with_label_values(&[document.content_type.as_str()])
+                        .inc();
+                    metrics::TRAFFIC
+                        .with_label_values(&["fetched"])
+                        .inc_by(document.bytes.len() as u64);
+                    metrics::DOCUMENT_SIZE
+                        .with_label_values(&["size_bytes"])
+                        .observe(document.bytes.len() as f64);
+                    metrics::HTTP_CLIENT_CODES.with_label_values(&["200"]).inc();
+                    Ok(document)
+                }
 
-                    e => {
-                        metrics::DOCUMENT.with_label_values(&["fetch_error"]).inc();
-                        metrics::HTTP_CLIENT_CODES
-                            .with_label_values(&[e.as_str()])
-                            .inc();
-                        error!(
-                            "Unable to fetch document, id={}, response_code={}, url={}",
-                            req_id, e, url
-                        );
-                        Err(Errors::FetchFailed)
-                    }
-                },
-                Err(e) => {
+                Err(code) => {
                     metrics::DOCUMENT.with_label_values(&["fetch_error"]).inc();
-                    if let Some(err_ref) = e.source() {
-                        if let Some(err) = err_ref.downcast_ref::<std::io::Error>() {
-                            if let ErrorKind::TimedOut = err.kind() {
-                                metrics::HTTP_CLIENT_CODES.with_label_values(&["991"]).inc();
-                                error!("Unable to fetch document, connection/response/request to the server timed out, id={}", req_id);
-                                return Err(Errors::TimedOut);
-                            }
-                        }
-                    }
-                    metrics::HTTP_CLIENT_CODES.with_label_values(&["990"]).inc();
+                    metrics::HTTP_CLIENT_CODES
+                        .with_label_values(&[code.to_string().as_str()])
+                        .inc();
                     error!(
-                        "Unable to fetch document, id={}, reason={}, url={}",
-                        req_id, e, url
+                        "Unable to fetch document, id={}, response_code={}, url={}",
+                        req_id, code, url
                     );
                     Err(Errors::FetchFailed)
                 }
@@ -200,3 +130,24 @@ impl HttpClient {
         }
     }
 }
+
+pub struct HttpClientFactory {}
+
+impl HttpClientFactory {
+    pub fn get_provider(
+        ipfs_config: Host,
+        max_document_size: Option<u64>,
+        uri_filters: Vec<Box<dyn UriFilter + Send + Sync>>,
+        timeout: u64,
+    ) -> HttpClientWrapper {
+        assert!(
+            !uri_filters.is_empty(),
+            "No URI filters provided. This is insecure, check code. Exiting..."
+        );
+        HttpClientWrapper {
+            client: Box::new(HyperHttpClient::new(max_document_size, timeout)),
+            ipfs_config,
+            uri_filters,
+        }
+    }
+}
diff --git a/src/metrics.rs b/src/metrics.rs
index 4eb5cea..5b47f06 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -4,7 +4,7 @@ use lazy_static::lazy_static;
 #[cfg(not(target_os = "macos"))]
 use prometheus::process_collector::ProcessCollector;
 use prometheus::{
-    HistogramOpts, HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec, Opts, Registry,
+    HistogramOpts, HistogramVec, IntCounter, IntCounterVec, IntGaugeVec, Opts, Registry,
 };
 
 lazy_static! {
@@ -52,6 +52,11 @@ lazy_static! {
         &["status"]
     )
     .unwrap();
+    pub static ref DOCUMENT_TYPE: IntCounterVec = IntCounterVec::new(
+        Opts::new("document_type", "Document types by mime"),
+        &["mime_types"]
+    )
+    .unwrap();
     pub static ref TRAFFIC: IntCounterVec =
         IntCounterVec::new(Opts::new("traffic", "Traffic stats in bytes"), &["metric"]).unwrap();
     pub static ref MODERATION: IntCounterVec =
@@ -77,6 +82,7 @@ pub fn init_registry() {
         .unwrap();
     REGISTRY.register(Box::new(DOCUMENT_SIZE.clone())).unwrap();
     REGISTRY.register(Box::new(DOCUMENT.clone())).unwrap();
+    REGISTRY.register(Box::new(DOCUMENT_TYPE.clone())).unwrap();
     REGISTRY.register(Box::new(ERRORS.clone())).unwrap();
     REGISTRY.register(Box::new(CACHE_METRICS.clone())).unwrap();
     REGISTRY.register(Box::new(TRAFFIC.clone())).unwrap();
diff --git a/src/proxy.rs b/src/proxy.rs
index 088a29a..8496d82 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -4,10 +4,10 @@ extern crate tokio_postgres;
 use crate::cache::{get_cache, Cache};
 use crate::dns::StandardDnsResolver;
 use crate::document::Document;
-use crate::http::HttpClient;
 
 use crate::http::filters::private_network::PrivateNetworkFilter;
 use crate::http::filters::UriFilter;
+use crate::http::{HttpClientFactory, HttpClientWrapper};
 use crate::metrics;
 use crate::metrics::REGISTRY;
 use crate::rpc::*;
@@ -44,7 +44,7 @@ pub struct Context {
     pub config: Configuration,
     pub database: Database,
     pub moderation_provider: Box<dyn ModerationProvider + Send + Sync>,
-    pub http_client: HttpClient,
+    pub http_client_provider: HttpClientWrapper,
     pub cache: Option<Box<dyn Cache<String, Document> + Send + Sync>>,
 }
 
@@ -56,7 +56,7 @@ impl Context {
         //TODO: Add more filters here
         let uri_filters: Vec<Box<dyn UriFilter + Send + Sync>> =
             vec![Box::new(PrivateNetworkFilter::new(Box::new(dns_resolver)))];
-        let http_client = HttpClient::new(
+        let http_client = HttpClientFactory::get_provider(
             config.ipfs.clone(),
             config.max_document_size,
             uri_filters,
@@ -66,7 +66,7 @@ impl Context {
             config: config.clone(),
             database,
             moderation_provider,
-            http_client,
+            http_client_provider: http_client,
             cache: get_cache(&config.cache_config),
         })
     }
diff --git a/src/rpc/error.rs b/src/rpc/error.rs
index b48ef92..078a39c 100644
--- a/src/rpc/error.rs
+++ b/src/rpc/error.rs
@@ -45,7 +45,10 @@ impl Errors {
             Errors::InvalidOrBlockedHost => {
                 (110, "Invalid or blocked destination host".to_string())
             }
-            Errors::TimedOut => (111, "Connection/Request/Response from the destination timed out".to_string())
+            Errors::TimedOut => (
+                111,
+                "Connection/Request/Response from the destination timed out".to_string(),
+            ),
         };
 
         RpcError {
diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index 2d93b85..0bc7574 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -42,7 +42,7 @@ async fn fetch_document(
     if let Some(doc) = cached_doc {
         Ok(doc)
     } else {
-        let document = Arc::new(ctx.http_client.fetch(req_id, url).await?);
+        let document = Arc::new(ctx.http_client_provider.fetch(req_id, url).await?);
         if SupportedMimeTypes::from_string(&document.content_type)
             == SupportedMimeTypes::Unsupported
         {

From 1d273b6e54833b051c685f1e458c44d377b33ab6 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 29 Nov 2021 14:07:47 +0530
Subject: [PATCH 10/28] API keys are now named and exposed via metrics. Old
 style key config is deprecated.

---
 proxy.conf     | 25 ++++++++++++++++---------
 src/config.rs  | 13 ++++++++++++-
 src/metrics.rs |  6 ++++++
 src/proxy.rs   | 22 +++++++++++++++++-----
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/proxy.conf b/proxy.conf
index ef6f3c3..1de4ab2 100644
--- a/proxy.conf
+++ b/proxy.conf
@@ -4,7 +4,7 @@
         "protocol": "https"
         "host": "cloudflare-ipfs.com"
         "port": 443
-        "path": "/ipfs"        
+        "path": "/ipfs"
     }
 
     # Network address to bind the server to,
@@ -16,27 +16,34 @@
     "cors": {
         "origin": "*"
     }
-    
+
     # The default number of workers. This is application wide
     "workers": 16,
 
     # Exposes the prometheus metrics endpoint
     "metrics_enabled": false
 
+    # Enables the react dashboard
     "dashboard_enabled": false
+
     # Maximum image size the proxy attempt to fetch in bytes.
     # Omit this entry if want to support any size imageas
     "max_document_size": 26214400
 
     # Time out in seconds for request,response and connecting to a url
     "timeout": 100
-    
-    # Api access keys. Random ones provided below for testing, replace with your
-    # list. 
-    "api_keys": [ "134472c4dd9118dbff1ed4e5fc7f1d056a0d690c9b6cc47c5c2453a011f57127",
-                  "4901ef6e7a8baea9d10ad4997cbfbc0b7fa65c7816c0279d20bd745626a96690",
-                  "e67b309d4587e57e93070ba49e5d33aaa09a9e6da4af9654f0708df6c738aabd" 
-                ]
+
+    "security" : {
+        # Api access keys. Random ones provided below for testing, replace with your
+        # list. Note that if metrics is enabled, key usage stats will be displayed
+        # on the metrics endpoint. While the key itself will not be exposed, names
+        # will be. Pick names appropriately. 
+        "api_keys": [ 
+                        { "name": "test_key_1", "key": "134472c4dd9118dbff1ed4e5fc7f1d056a0d690c9b6cc47c5c2453a011f57127" },
+                        { "name": "test_key_2", "key": "4901ef6e7a8baea9d10ad4997cbfbc0b7fa65c7816c0279d20bd745626a96690" },
+                        { "name": "test_key_3", "key": "e67b309d4587e57e93070ba49e5d33aaa09a9e6da4af9654f0708df6c738aabd" } 
+                    ]
+    }
 
     "moderation": {
         # Moderation provider, Only AWS is supported
diff --git a/src/config.rs b/src/config.rs
index 6b4ffd9..3aaf1cb 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -43,6 +43,17 @@ pub struct ModerationConfig {
     pub labels: Vec<String>, //TODO
 }
 
+#[derive(Deserialize, Clone, Debug)]
+pub struct ApiKey {
+    pub name: String,
+    pub key: String,
+}
+
+#[derive(Deserialize, Clone)]
+pub struct SecurityConfig {
+    pub api_keys: Vec<ApiKey>,
+}
+
 #[derive(Deserialize, Clone)]
 #[allow(dead_code)]
 pub struct Configuration {
@@ -55,7 +66,7 @@ pub struct Configuration {
     pub metrics_enabled: bool,
     pub dashboard_enabled: bool,
     pub max_document_size: Option<u64>,
-    pub api_keys: Vec<String>,
+    pub security: SecurityConfig,
     pub database: DatabaseConfig,
     pub moderation: ModerationConfig,
     pub cache_config: CacheConfig,
diff --git a/src/metrics.rs b/src/metrics.rs
index 5b47f06..f8be30d 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -42,6 +42,11 @@ lazy_static! {
         &["method"]
     )
     .unwrap();
+    pub static ref API_KEY_USAGE: IntCounterVec = IntCounterVec::new(
+        Opts::new("api_key_usage", "Api key usage metrics by descriptive name"),
+        &["api_key_name"]
+    )
+    .unwrap();
     pub static ref HTTP_CLIENT_CODES: IntCounterVec = IntCounterVec::new(
         Opts::new("http_client_codes", "HTTP Client status codes"),
         &["status_code"]
@@ -80,6 +85,7 @@ pub fn init_registry() {
     REGISTRY
         .register(Box::new(API_RESPONSE_TIME.clone()))
         .unwrap();
+    REGISTRY.register(Box::new(API_KEY_USAGE.clone())).unwrap();
     REGISTRY.register(Box::new(DOCUMENT_SIZE.clone())).unwrap();
     REGISTRY.register(Box::new(DOCUMENT.clone())).unwrap();
     REGISTRY.register(Box::new(DOCUMENT_TYPE.clone())).unwrap();
diff --git a/src/proxy.rs b/src/proxy.rs
index 8496d82..b830e9c 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -2,6 +2,7 @@ extern crate bb8_postgres;
 extern crate tokio_postgres;
 
 use crate::cache::{get_cache, Cache};
+use crate::config::SecurityConfig;
 use crate::dns::StandardDnsResolver;
 use crate::document::Document;
 
@@ -27,7 +28,7 @@ use crate::{
 use chrono::Utc;
 
 use hyper::{Body, Method, Request, Response, StatusCode};
-use log::error;
+use log::{debug, error};
 use prometheus::Encoder;
 use rust_embed::RustEmbed;
 use serde::de;
@@ -72,10 +73,21 @@ impl Context {
     }
 }
 
-pub fn authenticate(api_keys: &[String], req: &Request<Body>) -> bool {
+pub fn authenticate(security_config: &SecurityConfig, req: &Request<Body>, req_id: &Uuid) -> bool {
     match req.headers().get("apikey") {
         Some(h) => match String::from_utf8(h.as_bytes().to_vec()) {
-            Ok(key) => api_keys.contains(&key),
+            Ok(key) => {
+                if let Some(api_key) = security_config.api_keys.iter().find(|k| k.key.eq(&key)) {
+                    metrics::API_KEY_USAGE
+                        .with_label_values(&[api_key.name.as_str()])
+                        .inc();
+                    debug!("Authorized key_name={}, req_id={}", &api_key.name, req_id);
+                    true
+                } else {
+                    debug!("Authorization failed for req_id={}", req_id);
+                    false
+                }
+            }
             Err(e) => {
                 error!("Unable to convert api key header to string, reason={}", e);
                 false
@@ -89,10 +101,10 @@ pub async fn route(ctx: Arc<Context>, req: Request<Body>) -> Result<Response<Bod
     metrics::HITS.inc();
     let response_time_start = Utc::now().timestamp_millis();
     let proxy_config = ctx.config.clone();
+    let req_id = Uuid::new_v4();
     let response = match (req.method(), req.uri().path()) {
         (&Method::POST, "/") => {
-            if authenticate(&ctx.config.api_keys.clone(), req.borrow()) {
-                let req_id = Uuid::new_v4();
+            if authenticate(&ctx.config.security, req.borrow(), &req_id) {
                 rpc(ctx, req, req_id).await.or_else(|e| {
                     metrics::ERRORS.inc();
                     Ok(e.to_response(&req_id, &proxy_config))

From 8eac143d4e14a4fd0f2ff66170469399637a6f1e Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 29 Nov 2021 16:51:47 +0530
Subject: [PATCH 11/28] Added unit test for authenticate fn

---
 src/proxy.rs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/proxy.rs b/src/proxy.rs
index b830e9c..1259b7a 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -257,3 +257,49 @@ async fn rpc(
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::config::ApiKey;
+
+    use super::*;
+
+    fn build_request(key: &str) -> Request<Body> {
+        Request::builder()
+            .header("apikey", key)
+            .body(Body::from(""))
+            .unwrap()
+    }
+
+    #[test]
+    fn test_authenticate_fn() {
+        let api_keys = vec![
+            ApiKey {
+                name: "test_key1".to_string(),
+                key: "1234".to_string(),
+            },
+            ApiKey {
+                name: "test_key2".to_string(),
+                key: "abcd".to_string(),
+            },
+        ];
+        let security_config = SecurityConfig { api_keys };
+        let req_id = Uuid::new_v4();
+
+        // Key in api_key list
+        let req = build_request("1234");
+        assert!(authenticate(&security_config, &req, &req_id));
+
+        // Key in api_key list
+        let req = build_request("abcd");
+        assert!(authenticate(&security_config, &req, &req_id));
+
+        // Key not in api_key list
+        let req = build_request("0000");
+        assert!(!authenticate(&security_config, &req, &req_id));
+
+        // No header specified
+        let req = Request::builder().body(Body::from("")).unwrap();
+        assert!(!authenticate(&security_config, &req, &req_id));
+    }
+}

From 78ef2871783f29d5916797019e5c02764ad50673 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 29 Nov 2021 17:08:03 +0530
Subject: [PATCH 12/28] Refactored db module to support multiple db providers

---
 src/db/mod.rs                 | 68 +++++++++++++++++++++++++++++++++++
 src/{db.rs => db/postgres.rs} | 46 ++++++++++--------------
 src/proxy.rs                  | 10 +++---
 3 files changed, 90 insertions(+), 34 deletions(-)
 create mode 100644 src/db/mod.rs
 rename src/{db.rs => db/postgres.rs} (87%)

diff --git a/src/db/mod.rs b/src/db/mod.rs
new file mode 100644
index 0000000..d468696
--- /dev/null
+++ b/src/db/mod.rs
@@ -0,0 +1,68 @@
+use self::postgres::PostgresDatabase;
+use crate::{
+    config::DatabaseConfig,
+    moderation::{ModerationCategories, ModerationService},
+};
+use async_trait::async_trait;
+use chrono::{DateTime, Utc};
+use uuid::Uuid;
+
+mod postgres;
+
+type GenericError = Box<dyn std::error::Error + Send + Sync>;
+type Result<T> = std::result::Result<T, GenericError>;
+
+pub struct DbModerationRow {
+    pub blocked: bool,
+    pub categories: Vec<ModerationCategories>,
+    pub provider: ModerationService,
+    pub url: String,
+}
+
+pub struct DbReportRow {
+    pub id: String,
+    pub url: String,
+    pub categories: Vec<ModerationCategories>,
+    pub updated_at: DateTime<Utc>,
+}
+
+#[async_trait]
+pub trait DatabaseProvider {
+    async fn add_report(
+        &self,
+        id: &Uuid,
+        url: &str,
+        categories: &[ModerationCategories],
+    ) -> Result<()>;
+
+    async fn get_reports(&self) -> Result<Vec<DbReportRow>>;
+
+    async fn update_moderation_result(
+        &self,
+        url: &str,
+        provider: ModerationService,
+        blocked: bool,
+        categories: &[ModerationCategories],
+    ) -> Result<()>;
+
+    async fn add_moderation_result(
+        &self,
+        url: &str,
+        provider: ModerationService,
+        blocked: bool,
+        categories: &[ModerationCategories],
+    ) -> Result<()>;
+
+    async fn get_moderation_result(&self, url: &[String]) -> Result<Vec<DbModerationRow>>;
+}
+
+pub struct DatabaseFactory;
+
+impl DatabaseFactory {
+    pub async fn get_provider(
+        config: &DatabaseConfig,
+    ) -> Result<Box<dyn DatabaseProvider + Send + Sync>> {
+        let db = PostgresDatabase::new(config).await?;
+        Ok(Box::new(db))
+    }
+}
diff --git a/src/db.rs b/src/db/postgres.rs
similarity index 87%
rename from src/db.rs
rename to src/db/postgres.rs
index ef01fc5..0e5881b 100644
--- a/src/db.rs
+++ b/src/db/postgres.rs
@@ -1,42 +1,29 @@
-use std::time::Duration;
-
 use crate::{
     config::DatabaseConfig,
     moderation::{ModerationCategories, ModerationService},
     utils::sha256,
 };
+use async_trait::async_trait;
 use bb8::Pool;
 use bb8_postgres::PostgresConnectionManager;
 use chrono::{DateTime, Utc};
 use log::debug;
+use std::time::Duration;
 use tokio_postgres::NoTls;
-
 use uuid::Uuid;
 
+use super::{DatabaseProvider, DbModerationRow, DbReportRow};
+
 type GenericError = Box<dyn std::error::Error + Send + Sync>;
 type Result<T> = std::result::Result<T, GenericError>;
 
 #[derive(Clone)]
-pub struct Database {
+pub struct PostgresDatabase {
     pool: Pool<PostgresConnectionManager<NoTls>>,
 }
 
-pub struct DocumentCacheRow {
-    pub blocked: bool,
-    pub categories: Vec<ModerationCategories>,
-    pub provider: ModerationService,
-    pub url: String,
-}
-
-pub struct ReportRow {
-    pub id: String,
-    pub url: String,
-    pub categories: Vec<ModerationCategories>,
-    pub updated_at: DateTime<Utc>,
-}
-
-impl Database {
-    pub async fn new(config: &DatabaseConfig) -> Result<Database> {
+impl PostgresDatabase {
+    pub async fn new(config: &DatabaseConfig) -> Result<PostgresDatabase> {
         let connection_string = format!(
             "postgresql://{}:{}@{}:{}",
             config.username, config.password, config.host, config.port
@@ -47,7 +34,7 @@ impl Database {
         )
         .unwrap();
 
-        Ok(Database {
+        Ok(PostgresDatabase {
             pool: Pool::builder()
                 .connection_timeout(Duration::new(config.pool_connection_timeout, 0))
                 .min_idle(Some(config.pool_idle_connections))
@@ -57,8 +44,11 @@ impl Database {
                 .unwrap(),
         })
     }
+}
 
-    pub async fn add_report(
+#[async_trait]
+impl DatabaseProvider for PostgresDatabase {
+    async fn add_report(
         &self,
         id: &Uuid,
         url: &str,
@@ -81,7 +71,7 @@ impl Database {
         Ok(())
     }
 
-    pub async fn get_reports(&self) -> Result<Vec<ReportRow>> {
+    async fn get_reports(&self) -> Result<Vec<DbReportRow>> {
         let conn = self.pool.get().await?;
         let results = conn
             .query("SELECT id, url, categories, updated_at from report;", &[])
@@ -96,7 +86,7 @@ impl Database {
                 let categories = serde_json::from_str::<Vec<ModerationCategories>>(categories)
                     .unwrap_or_default();
                 let updated_at: DateTime<Utc> = r.get("updated_at");
-                ReportRow {
+                DbReportRow {
                     id: String::from(id),
                     url: String::from(url),
                     categories,
@@ -106,7 +96,7 @@ impl Database {
             .collect())
     }
 
-    pub async fn update_moderation_result(
+    async fn update_moderation_result(
         &self,
         url: &str,
         provider: ModerationService,
@@ -133,7 +123,7 @@ impl Database {
         Ok(())
     }
 
-    pub async fn add_moderation_result(
+    async fn add_moderation_result(
         &self,
         url: &str,
         provider: ModerationService,
@@ -155,7 +145,7 @@ impl Database {
         Ok(())
     }
 
-    pub async fn get_moderation_result(&self, url: &[String]) -> Result<Vec<DocumentCacheRow>> {
+    async fn get_moderation_result(&self, url: &[String]) -> Result<Vec<DbModerationRow>> {
         let url_hashes: Vec<String> = url.iter().map(|u| sha256(u.as_bytes())).collect();
         let conn = self.pool.get().await?;
         let results = conn
@@ -183,7 +173,7 @@ impl Database {
                     .unwrap_or_default();
                 let provider = serde_json::from_str::<ModerationService>(provider)
                     .unwrap_or(ModerationService::Unknown);
-                DocumentCacheRow {
+                DbModerationRow {
                     blocked,
                     categories,
                     provider,
diff --git a/src/proxy.rs b/src/proxy.rs
index 1259b7a..7ff2394 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -3,6 +3,7 @@ extern crate tokio_postgres;
 
 use crate::cache::{get_cache, Cache};
 use crate::config::SecurityConfig;
+use crate::db::{DatabaseFactory, DatabaseProvider};
 use crate::dns::StandardDnsResolver;
 use crate::document::Document;
 
@@ -11,6 +12,7 @@ use crate::http::filters::UriFilter;
 use crate::http::{HttpClientFactory, HttpClientWrapper};
 use crate::metrics;
 use crate::metrics::REGISTRY;
+use crate::moderation::{ModerationProvider, ModerationService};
 use crate::rpc::*;
 use crate::{built_info, rpc::error::Errors};
 use crate::{
@@ -20,10 +22,6 @@ use crate::{
         responses::Info,
     },
 };
-use crate::{
-    db::Database,
-    moderation::{ModerationProvider, ModerationService},
-};
 
 use chrono::Utc;
 
@@ -43,7 +41,7 @@ struct Asset;
 
 pub struct Context {
     pub config: Configuration,
-    pub database: Database,
+    pub database: Box<dyn DatabaseProvider + Send + Sync>,
     pub moderation_provider: Box<dyn ModerationProvider + Send + Sync>,
     pub http_client_provider: HttpClientWrapper,
     pub cache: Option<Box<dyn Cache<String, Document> + Send + Sync>>,
@@ -51,7 +49,7 @@ pub struct Context {
 
 impl Context {
     pub async fn new(config: Configuration) -> Result<Context, GenericError> {
-        let database = Database::new(&config.database).await?;
+        let database = DatabaseFactory::get_provider(&config.database).await?;
         let moderation_provider = ModerationService::get_provider(&config)?;
         let dns_resolver = StandardDnsResolver {};
         //TODO: Add more filters here

From 422b8e225fadfbf156bdad1be202f77d4d048528 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Mon, 29 Nov 2021 17:41:48 +0530
Subject: [PATCH 13/28] updated grCov config to include all files

---
 .github/actions-rs/grcov.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/actions-rs/grcov.yml b/.github/actions-rs/grcov.yml
index 6ec44a5..ec89ea7 100644
--- a/.github/actions-rs/grcov.yml
+++ b/.github/actions-rs/grcov.yml
@@ -1,6 +1,5 @@
 branch: true
 ignore-not-existing: true
 llvm: true
-filter: covered
 output-type: lcov
 output-path: ./lcov.info
\ No newline at end of file

From 9c0202c5189dcbd6cd692974bbf608ff411b4ac4 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 30 Nov 2021 06:10:15 +0530
Subject: [PATCH 14/28] Added unit test in http module

---
 src/http/mod.rs  | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 src/rpc/error.rs |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/http/mod.rs b/src/http/mod.rs
index 77ff9db..274b2cf 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -151,3 +151,50 @@ impl HttpClientFactory {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::dns::StandardDnsResolver;
+    use filters::private_network::PrivateNetworkFilter;
+
+    #[test]
+    fn test_to_uri_fn() {
+        let ipfs_config = Host {
+            protocol: "https".to_string(),
+            host: "localhost".to_string(),
+            port: 1337,
+            path: "/ipfs".to_string(),
+        };
+        let uri_filters: Vec<Box<dyn UriFilter + Send + Sync>> = vec![Box::new(
+            PrivateNetworkFilter::new(Box::new(StandardDnsResolver {})),
+        )];
+        let wrapper = HttpClientFactory::get_provider(ipfs_config, None, uri_filters, 10_u64);
+
+        // Valid https url
+        let result = wrapper.to_uri("https://localhost:3422/image.png");
+        assert!(result.is_ok());
+        assert_eq!(
+            result.unwrap().to_string(),
+            "https://localhost:3422/image.png"
+        );
+
+        // Valid ipfs url
+        let result = wrapper.to_uri("ipfs://CID");
+        assert!(result.is_ok());
+        assert_eq!(
+            result.unwrap().to_string(),
+            "https://localhost:1337/ipfs/CID"
+        );
+
+        // Invalid url
+        let result = wrapper.to_uri("ipfs:/CID");
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), Errors::InvalidUri);
+
+        // Unsupported url scheme
+        let result = wrapper.to_uri("sftp://localhost/image.png");
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), Errors::UnsupportedUriScheme);
+    }
+}
diff --git a/src/rpc/error.rs b/src/rpc/error.rs
index 078a39c..0d77a4e 100644
--- a/src/rpc/error.rs
+++ b/src/rpc/error.rs
@@ -13,7 +13,7 @@ pub struct RpcError {
     pub request_id: Uuid,
 }
 
-#[derive(Serialize)]
+#[derive(std::fmt::Debug, PartialEq, Serialize)]
 pub enum Errors {
     InvalidRpcVersionError,
     InvalidRpcMethodError,

From c5a523e3b993a86c541ea00016ab29e0a15996cd Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 30 Nov 2021 06:17:33 +0530
Subject: [PATCH 15/28] Clean up old coverage files

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d7d6470..65c900c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,9 @@ jobs:
           target
         key: ${{ runner.os }}-test-cache-${{ hashFiles('Cargo.lock') }}
         restore-keys: ${{ runner.os }}-build-cache
+    - name: Clean up old files
+      run: |
+        find . -name "*.gcda" -print0 | xargs -0 rm
     - name: Run test
       run: |
         cargo test --workspace --all-features --no-fail-fast --verbose

From d671c1756641578d74de88b94c0c2597288bdcac Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 30 Nov 2021 06:59:24 +0530
Subject: [PATCH 16/28] Removed dead code

---
 src/error.rs | 74 ----------------------------------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 src/error.rs

diff --git a/src/error.rs b/src/error.rs
deleted file mode 100644
index 753aee3..0000000
--- a/src/error.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use hyper::{Body, Response};
-use serde::Serialize;
-use uuid::Uuid;
-
-use crate::rpc::{
-    responses::{ErrorResponse, RpcStatus},
-    VERSION,
-};
-
-#[derive(Serialize)]
-pub struct RpcError {
-    pub code: u8,
-    pub reason: String,
-    pub request_id: Uuid,
-}
-
-#[derive(Serialize)]
-pub enum Errors {
-    InvalidRpcVersionError,
-    InvalidRpcMethodError,
-    JsonDecodeError,
-    InternalError,
-    FetchFailed,
-    NotFound,
-    ModerationFailed,
-    UnsupportedImageType,
-    UnsupportedUriScheme,
-    InvalidUri,
-    InvalidOrBlockedHost,
-    TimedOut,
-}
-
-impl Errors {
-    fn to_rpc_error(&self, request_id: &Uuid) -> RpcError {
-        let (code, reason) = match *self {
-            Errors::InvalidRpcVersionError => (100, "Invalid RPC version".to_string()),
-            Errors::InvalidRpcMethodError => (101, "Invalid RPC method".to_string()),
-            Errors::JsonDecodeError => (102, "Invalid JSON supplied".to_string()),
-            Errors::InternalError => (103, "Internal Error".to_string()),
-            Errors::FetchFailed => (104, "Fetch Failed".to_string()),
-            Errors::NotFound => (105, "Image not found".to_string()),
-            Errors::ModerationFailed => (106, "Image moderation failed".to_string()),
-            Errors::UnsupportedImageType => (107, "Image type unsupported".to_string()),
-            Errors::UnsupportedUriScheme => (108, "Uri scheme unsupported".to_string()),
-            Errors::InvalidUri => (109, "Invalid Uri".to_string()),
-            Errors::InvalidOrBlockedHost => {
-                (110, "Invalid or blocked destination host".to_string())
-            }
-            Errors::TimedOut => (111, "Connection/Request/Response from the destination timed out".to_string()),
-        };
-
-        RpcError {
-            code,
-            reason,
-            request_id: *request_id,
-        }
-    }
-
-    pub fn to_response(&self, request_id: &Uuid) -> Response<Body> {
-        let error = self.to_rpc_error(request_id);
-
-        let body = serde_json::to_string_pretty(&ErrorResponse {
-            jsonrpc: VERSION.to_string(),
-            rpc_status: RpcStatus::Err,
-            error,
-        })
-        .unwrap_or_default();
-        Response::builder()
-            .status(hyper::StatusCode::OK)
-            .header(hyper::header::CONTENT_TYPE, "application/json")
-            .body(Body::from(body))
-            .unwrap_or_default()
-    }
-}

From e01448f9a654e315b198477dce9627f0bc544580 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 30 Nov 2021 07:14:23 +0530
Subject: [PATCH 17/28] Added metrics to track protocol and domain when
 fetching content

---
 src/http/mod.rs | 28 +++++++++++++++++++++++++---
 src/metrics.rs  | 20 +++++++++++++++++++-
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/http/mod.rs b/src/http/mod.rs
index 274b2cf..7169d75 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -41,8 +41,21 @@ impl HttpClientWrapper {
         })?;
 
         match uri.scheme() {
-            Some(s) if s.eq(&Scheme::HTTP) | s.eq(&Scheme::HTTPS) => Ok(uri),
+            Some(s) if s.eq(&Scheme::HTTP) | s.eq(&Scheme::HTTPS) => {
+                metrics::URI_DESTINATION_PROTOCOL
+                    .with_label_values(&[s.to_string().to_ascii_lowercase().as_str()])
+                    .inc();
+                if let Some(hostname) = uri.host() {
+                    metrics::URI_DESTINATION_HOST
+                        .with_label_values(&[hostname])
+                        .inc();
+                }
+                Ok(uri)
+            }
             Some(s) if s.to_string().eq_ignore_ascii_case("ipfs") => {
+                metrics::URI_DESTINATION_PROTOCOL
+                    .with_label_values(&["ipfs"])
+                    .inc();
                 match url
                     .strip_prefix("ipfs://")
                     .or_else(|| url.strip_prefix("IPFS://"))
@@ -62,10 +75,14 @@ impl HttpClientWrapper {
                             ipfs_path
                         );
                         debug!("Ipfs gateway path: {}", gateway_url);
-                        gateway_url.parse::<Uri>().map_err(|e| {
+                        let ipfs_uri = gateway_url.parse::<Uri>().map_err(|e| {
                             error!("Error parsing url={}, reason={}", url, e);
                             Errors::InvalidUri
-                        })
+                        });
+                        metrics::URI_DESTINATION_HOST
+                            .with_label_values(&[self.ipfs_config.host.as_str()])
+                            .inc();
+                        ipfs_uri
                     }
                     None => Err(Errors::InvalidUri),
                 }
@@ -192,6 +209,11 @@ mod tests {
         assert!(result.is_err());
         assert_eq!(result.unwrap_err(), Errors::InvalidUri);
 
+        // Relative urls are not valid
+        let result = wrapper.to_uri("/CID/image.png");
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), Errors::UnsupportedUriScheme);
+
         // Unsupported url scheme
         let result = wrapper.to_uri("sftp://localhost/image.png");
         assert!(result.is_err());
diff --git a/src/metrics.rs b/src/metrics.rs
index f8be30d..516619a 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -76,6 +76,16 @@ lazy_static! {
         "Number of times the filter blocked a host"
     )
     .unwrap();
+    pub static ref URI_DESTINATION_HOST: IntCounterVec = IntCounterVec::new(
+        Opts::new("uri_source", "Counts requests by destination hostname"),
+        &["hostname"]
+    )
+    .unwrap();
+    pub static ref URI_DESTINATION_PROTOCOL: IntCounterVec = IntCounterVec::new(
+        Opts::new("uri_protocol", "Counts requests by protocol scheme"),
+        &["protocol"]
+    )
+    .unwrap();
 }
 
 pub fn init_registry() {
@@ -86,6 +96,9 @@ pub fn init_registry() {
         .register(Box::new(API_RESPONSE_TIME.clone()))
         .unwrap();
     REGISTRY.register(Box::new(API_KEY_USAGE.clone())).unwrap();
+    REGISTRY
+        .register(Box::new(HTTP_CLIENT_CODES.clone()))
+        .unwrap();
     REGISTRY.register(Box::new(DOCUMENT_SIZE.clone())).unwrap();
     REGISTRY.register(Box::new(DOCUMENT.clone())).unwrap();
     REGISTRY.register(Box::new(DOCUMENT_TYPE.clone())).unwrap();
@@ -95,7 +108,12 @@ pub fn init_registry() {
     REGISTRY
         .register(Box::new(URI_FILTER_BLOCKED.clone()))
         .unwrap();
-
+    REGISTRY
+        .register(Box::new(URI_DESTINATION_HOST.clone()))
+        .unwrap();
+    REGISTRY
+        .register(Box::new(URI_DESTINATION_PROTOCOL.clone()))
+        .unwrap();
     #[cfg(not(target_os = "macos"))]
     let pc = ProcessCollector::for_self();
     #[cfg(not(target_os = "macos"))]

From 8928ab57bf72b3cd4600c6c20622cbdda0baa77c Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 30 Nov 2021 08:52:45 +0530
Subject: [PATCH 18/28] Fixed invalid response bug when doc is blocked and the
 response type is Raw

---
 src/rpc/mod.rs       |  8 +++++++-
 src/rpc/requests.rs  |  2 +-
 src/rpc/responses.rs | 18 +++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index 0bc7574..0adca28 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -122,6 +122,12 @@ pub async fn fetch(
             let blocked = !mod_response.categories.is_empty();
             let mod_status: ModerationStatus = blocked.into();
 
+            let document = if !blocked || params.force {
+                Some(document)
+            } else {
+                None
+            };
+
             if blocked {
                 metrics::DOCUMENT.with_label_values(&["blocked"]).inc();
             }
@@ -142,7 +148,7 @@ pub async fn fetch(
                     error!("Database not updated for id={}, reason={}", req_id, e)
                 }
             };
-            (mod_status, categories, Some(document.clone()))
+            (mod_status, categories, document)
         }
     };
 
diff --git a/src/rpc/requests.rs b/src/rpc/requests.rs
index 4c9a976..b60c421 100644
--- a/src/rpc/requests.rs
+++ b/src/rpc/requests.rs
@@ -26,7 +26,7 @@ pub struct MethodHeader {
 }
 
 // Fetch method struct
-#[derive(Deserialize)]
+#[derive(Deserialize, PartialEq)]
 pub enum ResponseType {
     Json,
     Raw,
diff --git a/src/rpc/responses.rs b/src/rpc/responses.rs
index a6d4dfc..14fc809 100644
--- a/src/rpc/responses.rs
+++ b/src/rpc/responses.rs
@@ -132,9 +132,8 @@ impl FetchResponse {
         config: &Configuration,
     ) -> Response<Body> {
         match response_type {
-            ResponseType::Raw => document.map_or_else(
-                || Errors::InternalError.to_response(req_id, config),
-                |doc| {
+            ResponseType::Raw => {
+                if let Some(doc) = document {
                     metrics::TRAFFIC
                         .with_label_values(&["served"])
                         .inc_by(doc.bytes.len() as u64);
@@ -144,8 +143,17 @@ impl FetchResponse {
                         .header(hyper::header::CONTENT_LENGTH, doc.bytes.len())
                         .body(Body::from(doc.bytes.clone()))
                         .unwrap_or_default()
-                },
-            ),
+                } else {
+                    FetchResponse::to_response(
+                        &ResponseType::Json,
+                        None,
+                        moderation_status,
+                        categories,
+                        req_id,
+                        config,
+                    )
+                }
+            }
             ResponseType::Json => {
                 let result = FetchResponse {
                     jsonrpc: String::from(VERSION),

From 50d577e9ddf6552cd33dc2f74a5a8e54fe4387cf Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 30 Nov 2021 08:53:12 +0530
Subject: [PATCH 19/28] Removed granular mod categories appearing as unknown
 due to lack of mapping

---
 src/aws/mod.rs    | 6 +++++-
 src/moderation.rs | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/aws/mod.rs b/src/aws/mod.rs
index c95e5c8..dc7da52 100644
--- a/src/aws/mod.rs
+++ b/src/aws/mod.rs
@@ -38,6 +38,7 @@ impl ModerationProvider for Rekognition {
                         let name = l.name.unwrap(); // This is safe
                         Rekognition::normalize_category(name.as_str())
                     })
+                    .filter(|l| *l != ModerationCategories::Unknown)
                     .collect();
 
                 debug!(
@@ -91,7 +92,10 @@ impl Rekognition {
             "Alcohol" => ModerationCategories::Alcohol,
             "Gambling" => ModerationCategories::Gambling,
             "Hate" => ModerationCategories::Hate,
-            _ => ModerationCategories::Unknown,
+            _ => {
+                error!("Unknown moderation category encountered, cat={}", input);
+                ModerationCategories::Unknown
+            }
         }
     }
 
diff --git a/src/moderation.rs b/src/moderation.rs
index 0e4b42d..f3f240f 100644
--- a/src/moderation.rs
+++ b/src/moderation.rs
@@ -29,7 +29,7 @@ impl SupportedMimeTypes {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum ModerationCategories {
     ExplicitNudity,
     Suggestive,

From 3c573c11b4c938162d553e86f15a3bfcc3985a58 Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Wed, 1 Dec 2021 12:54:29 +0530
Subject: [PATCH 20/28] Updated deps to address vuln

---
 Cargo.lock | 304 ++++++++++++++++++++++++++++++++---------------------
 Cargo.toml |  10 +-
 2 files changed, 189 insertions(+), 125 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a8c7af..a05d2ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,9 +25,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.45"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7"
+checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
 
 [[package]]
 name = "arc-swap"
@@ -54,9 +54,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "aws-config"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1dd74b410b8590b832e0f209af69d15b7882763c844abbc3798b4cb748d46e1"
+checksum = "f072f0d08f62093e2a38603307e368bf90d5acd3e3b54b60292cba4698bba38b"
 dependencies = [
  "aws-http",
  "aws-hyper",
@@ -77,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "aws-endpoint"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f6541ab010e3902e43b4a71595997ead054901a89b80c7e32e189a30769b9b3"
+checksum = "4b4d939891f640c013bbae11180e767470d75c9d61b48d85008fbd19a46e6a46"
 dependencies = [
  "aws-smithy-http",
  "aws-types",
@@ -90,24 +90,23 @@ dependencies = [
 
 [[package]]
 name = "aws-http"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb82d09b0b92c79e2a5c8e0a137bddb1602d26d5033b35512986ed10a4eec779"
+checksum = "f685b9441c4e99d478b4e70cd0993ed178029534c296143ae9d37f2a424dde82"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
  "aws-types",
  "http",
  "lazy_static",
- "thiserror",
  "tracing",
 ]
 
 [[package]]
 name = "aws-hyper"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4606b6d25101d069543e40df766ee1edf02e0fd1a16fa5d1a40aa1ebdb589e5b"
+checksum = "b5f0a1a3500ec4b07ba95b56df754dd1a3b0555b1f27f71592bbfa3ee4a8e2a7"
 dependencies = [
  "aws-endpoint",
  "aws-http",
@@ -121,7 +120,7 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "hyper-rustls",
+ "hyper-rustls 0.22.1",
  "pin-project",
  "tokio",
  "tower",
@@ -130,14 +129,15 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-rekognition"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46edcf55a50ae8a57cd9f40a3eb9864ac532a540f94c543cdcad6cde9ed1eae4"
+checksum = "c67b33e3db0f9e6d466512cb2c3f1d95c14e88a7e2e8815652f913166fc98e3a"
 dependencies = [
  "aws-endpoint",
  "aws-http",
  "aws-hyper",
  "aws-sig-auth",
+ "aws-smithy-async",
  "aws-smithy-client",
  "aws-smithy-http",
  "aws-smithy-json",
@@ -149,15 +149,16 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0541bc3e54f01b72ca789e246b38ad581ff417f60784182a2514c21579293511"
+checksum = "8787be2f5db0c01ec5b4e89d159cd0d25b536172173c2145463aac669ad2142b"
 dependencies = [
  "aws-endpoint",
  "aws-http",
  "aws-hyper",
  "aws-sig-auth",
  "aws-sigv4",
+ "aws-smithy-async",
  "aws-smithy-client",
  "aws-smithy-eventstream",
  "aws-smithy-http",
@@ -172,14 +173,15 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9aea20429c3e4f727a3f096107c162703d2849345ef07c98916bbbfe7ada40"
+checksum = "2b8858771f3809ff70b1c9ebc464b86bf2d7c6ce50a0c2f153484abe45ca76f9"
 dependencies = [
  "aws-endpoint",
  "aws-http",
  "aws-hyper",
  "aws-sig-auth",
+ "aws-smithy-async",
  "aws-smithy-client",
  "aws-smithy-http",
  "aws-smithy-query",
@@ -192,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sig-auth"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4b1a121117f5c4689087c914240673fd4c1dc94a35e3ef23e195edbc927a122"
+checksum = "469d7527fc24e3edc32e5edf1b046d7d7c778ed6c4f9c51f869725bb01c101db"
 dependencies = [
  "aws-sigv4",
  "aws-smithy-eventstream",
@@ -207,13 +209,12 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193366d8458aef46a0470ced4f0f823bf98d79860e9bcdd11c10006092f659cc"
+checksum = "cb7d4888513285ec13c9b02c9bf8a3cf264251fc4c51270ca35239e39b18cb57"
 dependencies = [
  "aws-smithy-eventstream",
  "bytes",
- "chrono",
  "form_urlencoded",
  "hex",
  "http",
@@ -221,14 +222,15 @@ dependencies = [
  "percent-encoding",
  "regex",
  "ring",
+ "time 0.3.5",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-async"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ccafad4bbb76fe843e77cc3892108076b2aa5e63574429a8a8a0de12457de1"
+checksum = "34b323275f9a5118ce0c61c1f509d89d97008f4d6e376826bc744b43b553bf33"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -236,9 +238,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-client"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af398703e14620de67a67362ca797fa1aebcbf8fd53e49336d37441a22a4364"
+checksum = "eda35ddfd69ad9623dbb66aeaac1b85bc03974fdb4054fcd05cdb4ce1a78bf12"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -249,7 +251,7 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "hyper-rustls",
+ "hyper-rustls 0.22.1",
  "lazy_static",
  "pin-project",
  "pin-project-lite",
@@ -260,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe6167a8be20e32110301516b9dc7f910a85f00aaf4b3ca224912dc9b566f4b"
+checksum = "8773ed74ad621f35faac419d0f93778da5b0893780ae8a674aec9d27850335ff"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -271,9 +273,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164c273ea75b4b8cb9c6f40391dc2fc493e5eccf64916422ad53b2e1007c2df4"
+checksum = "c8068bb0c3d2f512ec2ff6c4e74e639266f89bb4bd492f747c4290fe41d17a6e"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-types",
@@ -292,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http-tower"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "753a0f40f13ad4e85210bb842dc73aa65b98631b512a4b62b7661819b0a77356"
+checksum = "7beb34a340675391abe55d5ab2619ef2b1c85995126ba1706ba2657ccd602be3"
 dependencies = [
  "aws-smithy-http",
  "bytes",
@@ -307,18 +309,18 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-json"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e84b7c5aada4c5fca583ac48bf8f8d23e37f027bf4dd67d844f8d8e4556e3789"
+checksum = "721176eec47b71d3226d61ccaa40cebe83ddc644c8981c7c3b34547a62808eb3"
 dependencies = [
  "aws-smithy-types",
 ]
 
 [[package]]
 name = "aws-smithy-query"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02af12a15f680c50e22c665917cb98deef62039e4535f6d631dfb7f8fe4a7f4c"
+checksum = "ef0c0dc09c61921a2104e1487810bd32274d8b57dd00d878895ebc51e2068d85"
 dependencies = [
  "aws-smithy-types",
  "urlencoding",
@@ -326,21 +328,21 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfce46b7c4bc8eb726003d463e9b10840c2738545dd2e1125787a683ad5d9aac"
+checksum = "a422c3740103fe67102ecbedffe8318dd6a03a209f7e097d1e00a1f3f4d186ac"
 dependencies = [
- "chrono",
  "itoa",
  "num-integer",
  "ryu",
+ "time 0.3.5",
 ]
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.28.0-alpha"
+version = "0.30.0-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab1068ddd5c3c3c3ac52e358d52a31e55a0a855d12991b17e8a109f6a3e0fe11"
+checksum = "5c884d1dc27ccf45763d42b9f58425493b6cd563a95922f92b87a5d92c4060d4"
 dependencies = [
  "thiserror",
  "xmlparser",
@@ -348,13 +350,14 @@ dependencies = [
 
 [[package]]
 name = "aws-types"
-version = "0.0.25-alpha"
+version = "0.0.26-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "694548ee3090a8c28836a5a640b4066150809d30851520e6455a32d28e14e4ef"
+checksum = "4761c3bc4d965b2a3568eaadbfc85eee3cbaa18ba81665f2f472004cb8bb34e9"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
  "rustc_version",
+ "tracing",
  "zeroize",
 ]
 
@@ -521,9 +524,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
 dependencies = [
  "cfg-if",
 ]
@@ -588,7 +591,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
 dependencies = [
- "sct",
+ "sct 0.6.1",
 ]
 
 [[package]]
@@ -784,9 +787,9 @@ checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
 [[package]]
 name = "futures"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
+checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -799,9 +802,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
+checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -809,15 +812,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
+checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
+checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -826,18 +829,16 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
+checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
+checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
 dependencies = [
- "autocfg",
- "proc-macro-hack",
  "proc-macro2",
  "quote",
  "syn",
@@ -845,23 +846,22 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
+checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
 
 [[package]]
 name = "futures-task"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
+checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
 
 [[package]]
 name = "futures-util"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
+checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
 dependencies = [
- "autocfg",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -871,8 +871,6 @@ dependencies = [
  "memchr",
  "pin-project-lite",
  "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
  "slab",
 ]
 
@@ -1019,9 +1017,9 @@ checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
 
 [[package]]
 name = "httpdate"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "humantime"
@@ -1031,9 +1029,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.14"
+version = "0.14.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b"
+checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1063,11 +1061,24 @@ dependencies = [
  "futures-util",
  "hyper",
  "log",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.19.1",
+ "rustls-native-certs 0.5.0",
  "tokio",
- "tokio-rustls",
- "webpki",
+ "tokio-rustls 0.22.0",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
+dependencies = [
+ "http",
+ "hyper",
+ "rustls 0.20.2",
+ "tokio",
+ "tokio-rustls 0.23.1",
 ]
 
 [[package]]
@@ -1223,9 +1234,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.107"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"
+checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
 
 [[package]]
 name = "libgit2-sys"
@@ -1553,9 +1564,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.70"
+version = "0.9.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf"
+checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73"
 dependencies = [
  "autocfg",
  "cc",
@@ -1708,18 +1719,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.32"
@@ -1883,9 +1882,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280"
+checksum = "07bea77bc708afa10e59905c3d4af7c8fd43c9214251673095ff8b14345fcbc5"
 dependencies = [
  "base64",
  "bytes",
@@ -1895,7 +1894,7 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "hyper-rustls",
+ "hyper-rustls 0.23.0",
  "ipnet",
  "js-sys",
  "lazy_static",
@@ -1903,13 +1902,14 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.20.2",
+ "rustls-native-certs 0.6.1",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.23.1",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1934,9 +1934,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "6.2.0"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be44a6694859b7cfc955699935944a6844aa9fe416aeda5d40829e3e38dfee6"
+checksum = "d40377bff8cceee81e28ddb73ac97f5c2856ce5522f0b260b763f434cdfae602"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -1945,9 +1945,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "6.1.0"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f567ca01565c50c67b29e535f5f67b8ea8aeadaeed16a88f10792ab57438b957"
+checksum = "94e763e24ba2bf0c72bc6be883f967f794a019fafd1b86ba1daff9c91a7edd30"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1958,9 +1958,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "7.0.0"
+version = "7.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6116e7ab9ea963f60f2f20291d8fcf6c7273192cdd7273b3c80729a9605c97b2"
+checksum = "ad22c7226e4829104deab21df575e995bfbc4adfad13a595e387477f238c1aec"
 dependencies = [
  "sha2",
  "walkdir",
@@ -1984,8 +1984,20 @@ dependencies = [
  "base64",
  "log",
  "ring",
- "sct",
- "webpki",
+ "sct 0.6.1",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84"
+dependencies = [
+ "log",
+ "ring",
+ "sct 0.7.0",
+ "webpki 0.22.0",
 ]
 
 [[package]]
@@ -1995,16 +2007,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
 dependencies = [
  "openssl-probe",
- "rustls",
+ "rustls 0.19.1",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
  "schannel",
  "security-framework",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
+dependencies = [
+ "base64",
+]
+
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
 
 [[package]]
 name = "same-file"
@@ -2047,6 +2080,16 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.4.2"
@@ -2111,9 +2154,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.70"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3"
+checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
 dependencies = [
  "itoa",
  "ryu",
@@ -2227,9 +2270,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
+checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2406,9 +2449,20 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
- "rustls",
+ "rustls 0.19.1",
+ "tokio",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689"
+dependencies = [
+ "rustls 0.20.2",
  "tokio",
- "webpki",
+ "webpki 0.22.0",
 ]
 
 [[package]]
@@ -2436,9 +2490,9 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00e500fff5fa1131c866b246041a6bf96da9c965f8fe4128cb1421f23e93c00"
+checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -2717,6 +2771,16 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "weezl"
 version = "0.1.5"
diff --git a/Cargo.toml b/Cargo.toml
index 5eff2c8..ace2935 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,14 +32,14 @@ async-trait = "0.1"
 image = "0.23"
 dns-lookup = "1"
 anyhow = "1.0"
-rust-embed="6.0.0"
+rust-embed="6.3"
 jemallocator = { version = "0.3", optional = true }
 
 # deps for aws
-aws-config = "0.0.25-alpha"
-aws-sdk-rekognition = "0.0.25-alpha"
-aws-sdk-s3 = "0.0.25-alpha"
-aws-types = "0.0.25-alpha"
+aws-config = "0.0.26-alpha"
+aws-sdk-rekognition = "0.0.26-alpha"
+aws-sdk-s3 = "0.0.26-alpha"
+aws-types = "0.0.26-alpha"
 
 # Overrides to address vulns
 time = "0.3"

From 53bf465032224c63371af98dbdeafcc26a3a02fc Mon Sep 17 00:00:00 2001
From: Bhaskar Kishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Wed, 1 Dec 2021 13:17:08 +0530
Subject: [PATCH 21/28] fix gh action step which breaks in the absence of input
 files

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 65c900c..4c35de2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
         restore-keys: ${{ runner.os }}-build-cache
     - name: Clean up old files
       run: |
-        find . -name "*.gcda" -print0 | xargs -0 rm
+        (find . -name "*.gcda" -print0 | xargs -0 rm) || true
     - name: Run test
       run: |
         cargo test --workspace --all-features --no-fail-fast --verbose

From 5b74c9066498f3c8e3dc3b19013b8e385b3420ef Mon Sep 17 00:00:00 2001
From: bhaskarkishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Thu, 2 Dec 2021 09:43:51 +0000
Subject: [PATCH 22/28] Updated aws crates to version 0.2

---
 Cargo.lock | 84 +++++++++++++++++++++++++++---------------------------
 Cargo.toml |  8 +++---
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a05d2ed..c3a803c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,9 +54,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "aws-config"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f072f0d08f62093e2a38603307e368bf90d5acd3e3b54b60292cba4698bba38b"
+checksum = "b14ae9e658d7c4920a1ea2873ba86afbcd285c5bf627fde9b2af295488f702bc"
 dependencies = [
  "aws-http",
  "aws-hyper",
@@ -77,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "aws-endpoint"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b4d939891f640c013bbae11180e767470d75c9d61b48d85008fbd19a46e6a46"
+checksum = "0d3862993d16ce409bbc9beb16744e1e906130c8071ca75e84d967f7ea590eeb"
 dependencies = [
  "aws-smithy-http",
  "aws-types",
@@ -90,9 +90,9 @@ dependencies = [
 
 [[package]]
 name = "aws-http"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f685b9441c4e99d478b4e70cd0993ed178029534c296143ae9d37f2a424dde82"
+checksum = "21902b7009bb5290acab8a297d8c3287b990bdf1c57bb72f331dfaa171854416"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
@@ -104,9 +104,9 @@ dependencies = [
 
 [[package]]
 name = "aws-hyper"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5f0a1a3500ec4b07ba95b56df754dd1a3b0555b1f27f71592bbfa3ee4a8e2a7"
+checksum = "5be61f82810771f547ed72fe9db7e087f555ce1612908ea23b58977272eb2da1"
 dependencies = [
  "aws-endpoint",
  "aws-http",
@@ -129,9 +129,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-rekognition"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c67b33e3db0f9e6d466512cb2c3f1d95c14e88a7e2e8815652f913166fc98e3a"
+checksum = "7d552c550b44f80a01a9ad41309291f5b7e043a8f7b7ab8841c28132b1c4e9ba"
 dependencies = [
  "aws-endpoint",
  "aws-http",
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8787be2f5db0c01ec5b4e89d159cd0d25b536172173c2145463aac669ad2142b"
+checksum = "0dd39e7e35ae6abe15a7fbe9bf8048ce2e7780026c287f8d43dc5e73b8c0074a"
 dependencies = [
  "aws-endpoint",
  "aws-http",
@@ -173,9 +173,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8858771f3809ff70b1c9ebc464b86bf2d7c6ce50a0c2f153484abe45ca76f9"
+checksum = "74056f7f75eabfb600311f45bdcaae17b29a6f413af1f9c43aca6c486bdeb7af"
 dependencies = [
  "aws-endpoint",
  "aws-http",
@@ -194,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sig-auth"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469d7527fc24e3edc32e5edf1b046d7d7c778ed6c4f9c51f869725bb01c101db"
+checksum = "7a16b8c9818854a3a3bba85e970f59d7f09ca0985ff10c9031bb03c95b291323"
 dependencies = [
  "aws-sigv4",
  "aws-smithy-eventstream",
@@ -209,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7d4888513285ec13c9b02c9bf8a3cf264251fc4c51270ca35239e39b18cb57"
+checksum = "f7f531763d106b1f050421d8256ce5d585e75e861d466fe8920157a004d28bf0"
 dependencies = [
  "aws-smithy-eventstream",
  "bytes",
@@ -228,9 +228,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b323275f9a5118ce0c61c1f509d89d97008f4d6e376826bc744b43b553bf33"
+checksum = "969717af8b7eb7424b67fce3f3c8539b0cf72322f909a30d7ea9e8c5ed2bf929"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -238,9 +238,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-client"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda35ddfd69ad9623dbb66aeaac1b85bc03974fdb4054fcd05cdb4ce1a78bf12"
+checksum = "97ffd13190653d37833cf403f7b2963bdd903166933db231a13bdc48ba3fd237"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -262,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8773ed74ad621f35faac419d0f93778da5b0893780ae8a674aec9d27850335ff"
+checksum = "9d1c450819c3918ad7ee8c768a0304edf1f2c53645e0f6b73368bdbbcf540dad"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -273,9 +273,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8068bb0c3d2f512ec2ff6c4e74e639266f89bb4bd492f747c4290fe41d17a6e"
+checksum = "d4b5992632c561f03699f25d1deda4c73b70be7c9acc0fc3626b270d3cb9a987"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-types",
@@ -294,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http-tower"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7beb34a340675391abe55d5ab2619ef2b1c85995126ba1706ba2657ccd602be3"
+checksum = "aaff953c819ed72da79b302ce7ca4464881af23eadc7e5762e9244c90ae6b708"
 dependencies = [
  "aws-smithy-http",
  "bytes",
@@ -309,18 +309,18 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-json"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721176eec47b71d3226d61ccaa40cebe83ddc644c8981c7c3b34547a62808eb3"
+checksum = "1656c19cedeaf2d9b2b42cfebf76d1cae7c7d69c454bd2ab2e0b55b7dfa4442c"
 dependencies = [
  "aws-smithy-types",
 ]
 
 [[package]]
 name = "aws-smithy-query"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0c0dc09c61921a2104e1487810bd32274d8b57dd00d878895ebc51e2068d85"
+checksum = "504c2b89119b68cec24e8ef6d9e2e2b8566a358faf096b4c78fdcf99732b0839"
 dependencies = [
  "aws-smithy-types",
  "urlencoding",
@@ -328,9 +328,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a422c3740103fe67102ecbedffe8318dd6a03a209f7e097d1e00a1f3f4d186ac"
+checksum = "6371c45cde03dc11814f63496366367dacd19af6bfc089c27582bad0c7384fab"
 dependencies = [
  "itoa",
  "num-integer",
@@ -340,9 +340,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.30.0-alpha"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c884d1dc27ccf45763d42b9f58425493b6cd563a95922f92b87a5d92c4060d4"
+checksum = "167c7e63beace20d29d94143c5a6dd6f4d24142c97ef6c36d8bc7fbf9475c93b"
 dependencies = [
  "thiserror",
  "xmlparser",
@@ -350,9 +350,9 @@ dependencies = [
 
 [[package]]
 name = "aws-types"
-version = "0.0.26-alpha"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4761c3bc4d965b2a3568eaadbfc85eee3cbaa18ba81665f2f472004cb8bb34e9"
+checksum = "2d3d5fa5c7fba8b0e9b743ba3da17a14c9f2e882f775d5ed198b602fb331b670"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -907,9 +907,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.13.24"
+version = "0.13.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "845e007a28f1fcac035715988a234e8ec5458fd825b20a20c7dec74237ef341f"
+checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
 dependencies = [
  "bitflags",
  "libc",
@@ -1240,9 +1240,9 @@ checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.12.25+1.3.0"
+version = "0.12.26+1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68169ef08d6519b2fe133ecc637408d933c0174b23b80bb2f79828966fbaab"
+checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index ace2935..43318cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,10 +36,10 @@ rust-embed="6.3"
 jemallocator = { version = "0.3", optional = true }
 
 # deps for aws
-aws-config = "0.0.26-alpha"
-aws-sdk-rekognition = "0.0.26-alpha"
-aws-sdk-s3 = "0.0.26-alpha"
-aws-types = "0.0.26-alpha"
+aws-config = "0.2"
+aws-sdk-rekognition = "0.2"
+aws-sdk-s3 = "0.2"
+aws-types = "0.2"
 
 # Overrides to address vulns
 time = "0.3"

From 42f4411abdbcde382f90ac53603113fcc9d79445 Mon Sep 17 00:00:00 2001
From: bhaskarkishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Thu, 2 Dec 2021 19:21:03 +0530
Subject: [PATCH 23/28] Added dummy database for testing

---
 src/db/dummy_db.rs | 164 +++++++++++++++++++++++++++++++++++++++++++++
 src/db/mod.rs      |   3 +
 src/db/postgres.rs |   5 +-
 src/moderation.rs  |   2 +-
 4 files changed, 169 insertions(+), 5 deletions(-)
 create mode 100644 src/db/dummy_db.rs

diff --git a/src/db/dummy_db.rs b/src/db/dummy_db.rs
new file mode 100644
index 0000000..c9f3bf7
--- /dev/null
+++ b/src/db/dummy_db.rs
@@ -0,0 +1,164 @@
+use crate::{
+    moderation::{ModerationCategories, ModerationService},
+    utils::sha256,
+};
+use async_trait::async_trait;
+use std::{collections::HashMap, sync::Mutex};
+use uuid::Uuid;
+
+use super::{DatabaseProvider, DbModerationRow, DbReportRow, Result};
+
+pub struct DummyDatabase {
+    report_store: Mutex<HashMap<String, DbReportRow>>,
+    moderation_store: Mutex<HashMap<String, DbModerationRow>>,
+}
+
+impl DummyDatabase {
+    #[allow(dead_code)]
+    pub fn new() -> Self {
+        DummyDatabase {
+            report_store: Mutex::new(HashMap::new()),
+            moderation_store: Mutex::new(HashMap::new()),
+        }
+    }
+}
+
+#[async_trait]
+impl DatabaseProvider for DummyDatabase {
+    async fn add_report(
+        &self,
+        id: &Uuid,
+        url: &str,
+        categories: &[ModerationCategories],
+    ) -> Result<()> {
+        let url_hash = sha256(url.as_bytes());
+        let updated_at = chrono::Utc::now();
+        let row = DbReportRow {
+            id: id.to_string(),
+            url: String::from(url),
+            categories: Vec::from(categories),
+            updated_at,
+        };
+
+        let mut report_store = self.report_store.lock().unwrap();
+        report_store.insert(url_hash, row);
+        Ok(())
+    }
+
+    async fn get_reports(&self) -> Result<Vec<DbReportRow>> {
+        let report_store = self.report_store.lock().unwrap();
+        let values: Vec<DbReportRow> = report_store
+            .iter()
+            .map(|(_, value)| value.clone())
+            .collect();
+        Ok(values)
+    }
+
+    async fn update_moderation_result(
+        &self,
+        url: &str,
+        provider: ModerationService,
+        blocked: bool,
+        categories: &[ModerationCategories],
+    ) -> Result<()> {
+        self.add_moderation_result(url, provider, blocked, categories)
+            .await
+    }
+
+    async fn add_moderation_result(
+        &self,
+        url: &str,
+        provider: ModerationService,
+        blocked: bool,
+        categories: &[ModerationCategories],
+    ) -> Result<()> {
+        let url_hash = sha256(url.as_bytes());
+        let row = DbModerationRow {
+            blocked,
+            categories: Vec::from(categories),
+            provider,
+            url: String::from(url),
+        };
+
+        let mut moderation_store = self.moderation_store.lock().unwrap();
+        moderation_store.insert(url_hash, row);
+        Ok(())
+    }
+
+    async fn get_moderation_result(&self, url: &[String]) -> Result<Vec<DbModerationRow>> {
+        let moderation_store = self.moderation_store.lock().unwrap();
+        let url_hash = sha256(url[0].as_bytes());
+        let row = moderation_store.get(&url_hash);
+        let result: Vec<DbModerationRow> = if row.is_some() {
+            vec![row.unwrap().clone()]
+        } else {
+            vec![]
+        };
+        Ok(result)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[tokio::test]
+    async fn test_moderation_fns() {
+        let db = DummyDatabase::new();
+        let url = "http://localhost/test.png".to_string();
+        let result = db.get_moderation_result(&[url.clone()]).await.unwrap();
+        assert_eq!(result.len(), 0);
+
+        let _ = db
+            .add_moderation_result(
+                url.as_str(),
+                ModerationService::Unknown,
+                true,
+                &[ModerationCategories::Alcohol],
+            )
+            .await;
+        let result = db.get_moderation_result(&[url.clone()]).await.unwrap();
+        assert_eq!(result.len(), 1);
+        let row = result.get(0).unwrap();
+        assert!(row.blocked);
+        assert_eq!(row.categories[0], ModerationCategories::Alcohol);
+        assert_eq!(row.url, url);
+        assert_eq!(row.provider, ModerationService::Unknown);
+
+        let _ = db
+            .update_moderation_result(
+                url.as_str(),
+                ModerationService::Unknown,
+                true,
+                &[ModerationCategories::Alcohol, ModerationCategories::Drugs],
+            )
+            .await;
+
+        let result = db.get_moderation_result(&[url.clone()]).await.unwrap();
+        assert_eq!(result.len(), 1);
+        let row = result.get(0).unwrap();
+        assert!(row.blocked);
+        assert_eq!(row.categories.len(), 2);
+        assert_eq!(row.categories[0], ModerationCategories::Alcohol);
+        assert_eq!(row.categories[1], ModerationCategories::Drugs);
+        assert_eq!(row.url, url);
+        assert_eq!(row.provider, ModerationService::Unknown);
+    }
+
+    #[tokio::test]
+    async fn test_report_fns() {
+        let db = DummyDatabase::new();
+        let url = "http://localhost/test.png".to_string();
+        let id = Uuid::new_v4();
+        let result = db.get_reports().await.unwrap();
+        assert_eq!(result.len(), 0);
+
+        let _ = db
+            .add_report(&id, url.as_str(), &[ModerationCategories::Alcohol])
+            .await;
+        let result = db.get_reports().await.unwrap();
+        assert_eq!(result.len(), 1);
+        let row = result.get(0).unwrap();
+        assert_eq!(row.url, url);
+        assert_eq!(row.categories[0], ModerationCategories::Alcohol);
+    }
+}
diff --git a/src/db/mod.rs b/src/db/mod.rs
index d468696..4b4b879 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -7,11 +7,13 @@ use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use uuid::Uuid;
 
+mod dummy_db;
 mod postgres;
 
 type GenericError = Box<dyn std::error::Error + Send + Sync>;
 type Result<T> = std::result::Result<T, GenericError>;
 
+#[derive(Clone)]
 pub struct DbModerationRow {
     pub blocked: bool,
     pub categories: Vec<ModerationCategories>,
@@ -19,6 +21,7 @@ pub struct DbModerationRow {
     pub url: String,
 }
 
+#[derive(Clone)]
 pub struct DbReportRow {
     pub id: String,
     pub url: String,
diff --git a/src/db/postgres.rs b/src/db/postgres.rs
index 0e5881b..5597c14 100644
--- a/src/db/postgres.rs
+++ b/src/db/postgres.rs
@@ -12,10 +12,7 @@ use std::time::Duration;
 use tokio_postgres::NoTls;
 use uuid::Uuid;
 
-use super::{DatabaseProvider, DbModerationRow, DbReportRow};
-
-type GenericError = Box<dyn std::error::Error + Send + Sync>;
-type Result<T> = std::result::Result<T, GenericError>;
+use super::{DatabaseProvider, DbModerationRow, DbReportRow, Result};
 
 #[derive(Clone)]
 pub struct PostgresDatabase {
diff --git a/src/moderation.rs b/src/moderation.rs
index f3f240f..78d4337 100644
--- a/src/moderation.rs
+++ b/src/moderation.rs
@@ -78,7 +78,7 @@ impl ModerationProvider for NullProvider {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, Clone)]
+#[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
 pub enum ModerationService {
     Aws,
     Unknown,

From 3240171d974d69e32fe0a1695cbd3dbf3ffae1b7 Mon Sep 17 00:00:00 2001
From: bhaskarkishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Fri, 3 Dec 2021 12:32:16 +0530
Subject: [PATCH 24/28] Unified CORS handling to single place in code

---
 src/proxy.rs         | 52 ++++++++++++++++++++------------------------
 src/rpc/error.rs     |  7 +-----
 src/rpc/mod.rs       |  6 ++---
 src/rpc/responses.rs | 29 +++++-------------------
 4 files changed, 32 insertions(+), 62 deletions(-)

diff --git a/src/proxy.rs b/src/proxy.rs
index 7ff2394..eb90ae7 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -2,7 +2,7 @@ extern crate bb8_postgres;
 extern crate tokio_postgres;
 
 use crate::cache::{get_cache, Cache};
-use crate::config::SecurityConfig;
+use crate::config::{Cors, SecurityConfig};
 use crate::db::{DatabaseFactory, DatabaseProvider};
 use crate::dns::StandardDnsResolver;
 use crate::document::Document;
@@ -25,6 +25,7 @@ use crate::{
 
 use chrono::Utc;
 
+use hyper::header::HeaderValue;
 use hyper::{Body, Method, Request, Response, StatusCode};
 use log::{debug, error};
 use prometheus::Encoder;
@@ -95,17 +96,28 @@ pub fn authenticate(security_config: &SecurityConfig, req: &Request<Body>, req_i
     }
 }
 
+fn with_cors(
+    cors_config: &Cors,
+    mut response: Response<Body>,
+) -> Result<Response<Body>, GenericError> {
+    let cors_origin: HeaderValue = cors_config.origin.to_owned().parse()?;
+    response
+        .headers_mut()
+        .insert(hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN, cors_origin);
+    Ok(response)
+}
+
 pub async fn route(ctx: Arc<Context>, req: Request<Body>) -> Result<Response<Body>, GenericError> {
     metrics::HITS.inc();
     let response_time_start = Utc::now().timestamp_millis();
-    let proxy_config = ctx.config.clone();
+    let cors_config = ctx.config.cors.clone();
     let req_id = Uuid::new_v4();
-    let response = match (req.method(), req.uri().path()) {
+    let result = match (req.method(), req.uri().path()) {
         (&Method::POST, "/") => {
             if authenticate(&ctx.config.security, req.borrow(), &req_id) {
                 rpc(ctx, req, req_id).await.or_else(|e| {
                     metrics::ERRORS.inc();
-                    Ok(e.to_response(&req_id, &proxy_config))
+                    Ok(e.to_response(&req_id))
                 })
             } else {
                 Ok(Response::builder()
@@ -118,35 +130,23 @@ pub async fn route(ctx: Arc<Context>, req: Request<Body>) -> Result<Response<Bod
             .status(StatusCode::OK)
             .body(Body::default())
             .unwrap_or_default()),
-        (&Method::GET, "/info") => info(&ctx.config).await,
+        (&Method::GET, "/info") => info().await,
         (&Method::GET, "/metrics") if ctx.config.metrics_enabled => metrics(ctx).await,
         (&Method::GET, path) if ctx.config.dashboard_enabled => {
             let file = Asset::get(&path[1..]);
             match file {
                 Some(f) => Ok(Response::builder()
                     .status(StatusCode::OK)
-                    .header(
-                        hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-                        &ctx.config.cors.origin.to_owned(),
-                    )
                     .body(Body::from(f.data.into_owned()))
                     .unwrap()),
                 None => Ok(Response::builder()
                     .status(StatusCode::NOT_FOUND)
-                    .header(
-                        hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-                        &ctx.config.cors.origin.to_owned(),
-                    )
                     .body(Body::default())
                     .unwrap_or_default()),
             }
         }
         _ => Ok(Response::builder()
             .status(StatusCode::NOT_FOUND)
-            .header(
-                hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-                &ctx.config.cors.origin.to_owned(),
-            )
             .body(Body::default())
             .unwrap_or_default()),
     };
@@ -155,14 +155,16 @@ pub async fn route(ctx: Arc<Context>, req: Request<Body>) -> Result<Response<Bod
         .with_label_values(&["overall"])
         .observe((Utc::now().timestamp_millis() - response_time_start) as f64);
 
-    response.or_else(|e| {
+    let response = result.unwrap_or_else(|e| {
         metrics::ERRORS.inc();
         error!("Unknown error, reason:{}", e);
-        Ok(Errors::InternalError.to_response(&Uuid::new_v4(), &proxy_config))
-    })
+        Errors::InternalError.to_response(&Uuid::new_v4())
+    });
+
+    with_cors(&cors_config, response)
 }
 
-async fn info(config: &Configuration) -> Result<Response<Body>, GenericError> {
+async fn info() -> Result<Response<Body>, GenericError> {
     let info = Info {
         package_version: built_info::PKG_VERSION,
         git_version: built_info::GIT_VERSION.unwrap_or("unknown"),
@@ -171,10 +173,6 @@ async fn info(config: &Configuration) -> Result<Response<Body>, GenericError> {
     Ok(Response::builder()
         .status(hyper::StatusCode::OK)
         .header(hyper::header::CONTENT_TYPE, "application/json")
-        .header(
-            hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-            &config.cors.origin,
-        )
         .body(Body::from(result))
         .unwrap_or_default())
 }
@@ -198,10 +196,6 @@ async fn metrics(ctx: Arc<Context>) -> Result<Response<Body>, GenericError> {
     let output = String::from_utf8(buffer.clone());
     buffer.clear();
     Ok(Response::builder()
-        .header(
-            hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-            &ctx.config.cors.origin,
-        )
         .body(Body::from(output.unwrap_or_default()))
         .unwrap_or_else(|_| {
             Response::builder()
diff --git a/src/rpc/error.rs b/src/rpc/error.rs
index 0d77a4e..9056c61 100644
--- a/src/rpc/error.rs
+++ b/src/rpc/error.rs
@@ -4,7 +4,6 @@ use uuid::Uuid;
 
 use super::responses::*;
 use super::VERSION;
-use crate::config::Configuration;
 
 #[derive(Serialize)]
 pub struct RpcError {
@@ -58,7 +57,7 @@ impl Errors {
         }
     }
 
-    pub fn to_response(&self, request_id: &Uuid, config: &Configuration) -> Response<Body> {
+    pub fn to_response(&self, request_id: &Uuid) -> Response<Body> {
         let error = self.to_rpc_error(request_id);
 
         let body = serde_json::to_string_pretty(&ErrorResponse {
@@ -70,10 +69,6 @@ impl Errors {
         Response::builder()
             .status(hyper::StatusCode::OK)
             .header(hyper::header::CONTENT_TYPE, "application/json")
-            .header(
-                hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-                &config.cors.origin,
-            )
             .body(Body::from(body))
             .unwrap_or_default()
     }
diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index 0adca28..ab032f4 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -203,7 +203,6 @@ pub async fn describe(
                 RpcStatus::Ok,
                 describe_results,
                 req_id,
-                &ctx.config,
             ))
         }
         Err(e) => {
@@ -228,7 +227,6 @@ pub async fn report(
             RpcStatus::Ok,
             &params.url,
             req_id,
-            &ctx.config,
         )),
         Err(e) => {
             error!("Database not updated for id={}, reason={}", req_id, e);
@@ -254,7 +252,6 @@ pub async fn describe_report(ctx: Arc<Context>, req_id: &Uuid) -> Result<Respons
                 RpcStatus::Ok,
                 results,
                 req_id,
-                &ctx.config,
             ))
         }
         Err(e) => {
@@ -263,3 +260,6 @@ pub async fn describe_report(ctx: Arc<Context>, req_id: &Uuid) -> Result<Respons
         }
     }
 }
+
+#[cfg(test)]
+mod tests {}
diff --git a/src/rpc/responses.rs b/src/rpc/responses.rs
index 14fc809..ea6c355 100644
--- a/src/rpc/responses.rs
+++ b/src/rpc/responses.rs
@@ -176,7 +176,7 @@ impl FetchResponse {
                         .unwrap_or_default(),
                     Err(e) => {
                         error!("Error serializing fetch response, reason={}", e);
-                        Errors::InternalError.to_response(req_id, config)
+                        Errors::InternalError.to_response(req_id)
                     }
                 }
             }
@@ -189,7 +189,6 @@ impl DescribeResponse {
         rpc_status: RpcStatus,
         describe_results: Vec<DescribeResult>,
         req_id: &Uuid,
-        config: &Configuration,
     ) -> Response<Body> {
         let result = DescribeResponse {
             jsonrpc: String::from(VERSION),
@@ -201,27 +200,18 @@ impl DescribeResponse {
             Ok(body) => Response::builder()
                 .status(hyper::StatusCode::OK)
                 .header(hyper::header::CONTENT_TYPE, "application/json")
-                .header(
-                    hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-                    config.cors.origin.to_owned(),
-                )
                 .body(Body::from(body))
                 .unwrap_or_default(),
             Err(e) => {
                 error!("Error serializing fetch response, reason={}", e);
-                Errors::InternalError.to_response(req_id, config)
+                Errors::InternalError.to_response(req_id)
             }
         }
     }
 }
 
 impl ReportResponse {
-    pub fn to_response(
-        rpc_status: RpcStatus,
-        url: &str,
-        req_id: &Uuid,
-        config: &Configuration,
-    ) -> Response<Body> {
+    pub fn to_response(rpc_status: RpcStatus, url: &str, req_id: &Uuid) -> Response<Body> {
         let result = ReportResponse {
             jsonrpc: String::from(VERSION),
             rpc_status,
@@ -235,15 +225,11 @@ impl ReportResponse {
             Ok(body) => Response::builder()
                 .status(hyper::StatusCode::OK)
                 .header(hyper::header::CONTENT_TYPE, "application/json")
-                .header(
-                    hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-                    config.cors.origin.to_owned(),
-                )
                 .body(Body::from(body))
                 .unwrap_or_default(),
             Err(e) => {
                 error!("Error serializing fetch response, reason={}", e);
-                Errors::InternalError.to_response(req_id, config)
+                Errors::InternalError.to_response(req_id)
             }
         }
     }
@@ -254,7 +240,6 @@ impl ReportDescribeResponse {
         rpc_status: RpcStatus,
         results: Vec<ReportDescribeResult>,
         req_id: &Uuid,
-        config: &Configuration,
     ) -> Response<Body> {
         let result = ReportDescribeResponse {
             jsonrpc: String::from(VERSION),
@@ -266,15 +251,11 @@ impl ReportDescribeResponse {
             Ok(body) => Response::builder()
                 .status(hyper::StatusCode::OK)
                 .header(hyper::header::CONTENT_TYPE, "application/json")
-                .header(
-                    hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN,
-                    config.cors.origin.to_owned(),
-                )
                 .body(Body::from(body))
                 .unwrap_or_default(),
             Err(e) => {
                 error!("Error serializing fetch response, reason={}", e);
-                Errors::InternalError.to_response(req_id, config)
+                Errors::InternalError.to_response(req_id)
             }
         }
     }

From deac48ff700a5ce72c24771720eea094042a7c81 Mon Sep 17 00:00:00 2001
From: bhaskarkishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Fri, 3 Dec 2021 13:54:12 +0530
Subject: [PATCH 25/28] Refactoring away configuration object

---
 src/main.rs          | 11 ++++---
 src/proxy.rs         | 76 +++++++++++++++++++-------------------------
 src/rpc/mod.rs       |  1 -
 src/rpc/responses.rs |  3 --
 4 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 5ff377b..1b26923 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,13 +48,16 @@ static GLOBAL: Jemalloc = Jemalloc;
 
 pub async fn run(config: Configuration) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let addr = SocketAddr::new(IpAddr::V4(config.bind_address), config.port);
-    let proxy = Arc::new(Context::new(config).await?);
+    let config = Arc::new(config);
+    let context = Arc::new(Context::new(config.clone()).await?);
     let service = make_service_fn(move |_| {
-        let proxy = proxy.clone();
+        let context = context.clone();
+        let config = config.clone();
         async move {
             Ok::<_, Infallible>(service_fn(move |req| {
-                let proxy = proxy.to_owned();
-                route(proxy, req)
+                let context = context.to_owned();
+                let config = config.to_owned();
+                route(context, config, req)
             }))
         }
     });
diff --git a/src/proxy.rs b/src/proxy.rs
index eb90ae7..c14c42f 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -41,7 +41,6 @@ type GenericError = Box<dyn std::error::Error + Send + Sync>;
 struct Asset;
 
 pub struct Context {
-    pub config: Configuration,
     pub database: Box<dyn DatabaseProvider + Send + Sync>,
     pub moderation_provider: Box<dyn ModerationProvider + Send + Sync>,
     pub http_client_provider: HttpClientWrapper,
@@ -49,7 +48,7 @@ pub struct Context {
 }
 
 impl Context {
-    pub async fn new(config: Configuration) -> Result<Context, GenericError> {
+    pub async fn new(config: Arc<Configuration>) -> Result<Context, GenericError> {
         let database = DatabaseFactory::get_provider(&config.database).await?;
         let moderation_provider = ModerationService::get_provider(&config)?;
         let dns_resolver = StandardDnsResolver {};
@@ -63,7 +62,6 @@ impl Context {
             config.timeout,
         );
         Ok(Context {
-            config: config.clone(),
             database,
             moderation_provider,
             http_client_provider: http_client,
@@ -97,9 +95,10 @@ pub fn authenticate(security_config: &SecurityConfig, req: &Request<Body>, req_i
 }
 
 fn with_cors(
-    cors_config: &Cors,
     mut response: Response<Body>,
+    cors_config: &Cors,
 ) -> Result<Response<Body>, GenericError> {
+    // TODO: Cors header configs should be validated at startup
     let cors_origin: HeaderValue = cors_config.origin.to_owned().parse()?;
     response
         .headers_mut()
@@ -107,61 +106,60 @@ fn with_cors(
     Ok(response)
 }
 
-pub async fn route(ctx: Arc<Context>, req: Request<Body>) -> Result<Response<Body>, GenericError> {
+fn empty_response(code: StatusCode) -> Result<Response<Body>, GenericError> {
+    Ok(Response::builder()
+        .status(code)
+        .body(Body::default())
+        .unwrap_or_default())
+}
+
+pub async fn route(
+    ctx: Arc<Context>,
+    config: Arc<Configuration>,
+    req: Request<Body>,
+) -> Result<Response<Body>, GenericError> {
     metrics::HITS.inc();
     let response_time_start = Utc::now().timestamp_millis();
-    let cors_config = ctx.config.cors.clone();
+    let cors_config = config.cors.clone();
     let req_id = Uuid::new_v4();
     let result = match (req.method(), req.uri().path()) {
         (&Method::POST, "/") => {
-            if authenticate(&ctx.config.security, req.borrow(), &req_id) {
+            if authenticate(&config.security, req.borrow(), &req_id) {
                 rpc(ctx, req, req_id).await.or_else(|e| {
                     metrics::ERRORS.inc();
                     Ok(e.to_response(&req_id))
                 })
             } else {
-                Ok(Response::builder()
-                    .status(StatusCode::FORBIDDEN)
-                    .body(Body::default())
-                    .unwrap_or_default())
+                empty_response(StatusCode::FORBIDDEN)
             }
         }
-        (&Method::GET, "/") => Ok(Response::builder()
-            .status(StatusCode::OK)
-            .body(Body::default())
-            .unwrap_or_default()),
+        (&Method::GET, "/") => empty_response(StatusCode::OK),
         (&Method::GET, "/info") => info().await,
-        (&Method::GET, "/metrics") if ctx.config.metrics_enabled => metrics(ctx).await,
-        (&Method::GET, path) if ctx.config.dashboard_enabled => {
+        (&Method::GET, "/metrics") if config.metrics_enabled => metrics(ctx).await,
+        (&Method::GET, path) if config.dashboard_enabled => {
             let file = Asset::get(&path[1..]);
             match file {
                 Some(f) => Ok(Response::builder()
                     .status(StatusCode::OK)
                     .body(Body::from(f.data.into_owned()))
                     .unwrap()),
-                None => Ok(Response::builder()
-                    .status(StatusCode::NOT_FOUND)
-                    .body(Body::default())
-                    .unwrap_or_default()),
+                None => empty_response(StatusCode::NOT_FOUND),
             }
         }
-        _ => Ok(Response::builder()
-            .status(StatusCode::NOT_FOUND)
-            .body(Body::default())
-            .unwrap_or_default()),
+        _ => empty_response(StatusCode::OK),
     };
 
     metrics::API_RESPONSE_TIME
         .with_label_values(&["overall"])
         .observe((Utc::now().timestamp_millis() - response_time_start) as f64);
 
-    let response = result.unwrap_or_else(|e| {
-        metrics::ERRORS.inc();
-        error!("Unknown error, reason:{}", e);
-        Errors::InternalError.to_response(&Uuid::new_v4())
-    });
-
-    with_cors(&cors_config, response)
+    result
+        .or_else(|e| {
+            metrics::ERRORS.inc();
+            error!("Unknown error, reason:{}", e);
+            Ok(Errors::InternalError.to_response(&Uuid::new_v4()))
+        })
+        .and_then(|r| with_cors(r, &cors_config))
 }
 
 async fn info() -> Result<Response<Body>, GenericError> {
@@ -187,22 +185,14 @@ async fn metrics(ctx: Arc<Context>) -> Result<Response<Body>, GenericError> {
 
     let encode_result = encoder.encode(&REGISTRY.gather(), &mut buffer);
     if encode_result.is_err() {
-        return Ok(Response::builder()
-            .status(StatusCode::INTERNAL_SERVER_ERROR)
-            .body(String::default().into())
-            .unwrap_or_default());
+        return empty_response(StatusCode::INTERNAL_SERVER_ERROR);
     }
 
     let output = String::from_utf8(buffer.clone());
     buffer.clear();
-    Ok(Response::builder()
+    Response::builder()
         .body(Body::from(output.unwrap_or_default()))
-        .unwrap_or_else(|_| {
-            Response::builder()
-                .status(StatusCode::INTERNAL_SERVER_ERROR)
-                .body(String::default().into())
-                .unwrap_or_default()
-        }))
+        .or_else(|_| empty_response(StatusCode::INTERNAL_SERVER_ERROR))
 }
 
 fn decode<T: de::DeserializeOwned>(body: &[u8]) -> Result<T, Errors> {
diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index ab032f4..d3f1a22 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -158,7 +158,6 @@ pub async fn fetch(
         moderation_status,
         categories,
         req_id,
-        &ctx.config,
     ))
 }
 
diff --git a/src/rpc/responses.rs b/src/rpc/responses.rs
index ea6c355..b8570d9 100644
--- a/src/rpc/responses.rs
+++ b/src/rpc/responses.rs
@@ -10,7 +10,6 @@ use super::{
     requests::ResponseType,
 };
 use crate::{
-    config::Configuration,
     document::Document,
     metrics,
     moderation::{ModerationCategories, ModerationService},
@@ -129,7 +128,6 @@ impl FetchResponse {
         moderation_status: ModerationStatus,
         categories: Vec<ModerationCategories>,
         req_id: &Uuid,
-        config: &Configuration,
     ) -> Response<Body> {
         match response_type {
             ResponseType::Raw => {
@@ -150,7 +148,6 @@ impl FetchResponse {
                         moderation_status,
                         categories,
                         req_id,
-                        config,
                     )
                 }
             }

From d7f7038cde6aa3a9cb2b4254ec24ae2403d651bd Mon Sep 17 00:00:00 2001
From: bhaskarkishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Sat, 4 Dec 2021 12:25:45 +0530
Subject: [PATCH 26/28] Refactored rpc methods to return structs instead of
 http response

---
 src/proxy.rs         | 59 ++++++++++++++++++++++++++++++++++----------
 src/rpc/mod.rs       | 52 ++++++++++++++------------------------
 src/rpc/responses.rs |  3 +++
 3 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/src/proxy.rs b/src/proxy.rs
index c14c42f..df4494b 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -13,6 +13,9 @@ use crate::http::{HttpClientFactory, HttpClientWrapper};
 use crate::metrics;
 use crate::metrics::REGISTRY;
 use crate::moderation::{ModerationProvider, ModerationService};
+use crate::rpc::responses::{
+    DescribeResponse, FetchResponse, ReportDescribeResponse, ReportResponse, RpcStatus,
+};
 use crate::rpc::*;
 use crate::{built_info, rpc::error::Errors};
 use crate::{
@@ -122,6 +125,7 @@ pub async fn route(
     let response_time_start = Utc::now().timestamp_millis();
     let cors_config = config.cors.clone();
     let req_id = Uuid::new_v4();
+
     let result = match (req.method(), req.uri().path()) {
         (&Method::POST, "/") => {
             if authenticate(&config.security, req.borrow(), &req_id) {
@@ -183,16 +187,21 @@ async fn metrics(ctx: Arc<Context>) -> Result<Response<Body>, GenericError> {
         cache.gather_metrics(&metrics::CACHE_METRICS);
     }
 
-    let encode_result = encoder.encode(&REGISTRY.gather(), &mut buffer);
-    if encode_result.is_err() {
-        return empty_response(StatusCode::INTERNAL_SERVER_ERROR);
+    match encoder.encode(&REGISTRY.gather(), &mut buffer) {
+        Ok(_) => match String::from_utf8(buffer) {
+            Ok(output) => Response::builder()
+                .body(Body::from(output))
+                .or_else(|_| empty_response(StatusCode::INTERNAL_SERVER_ERROR)),
+            Err(e) => {
+                error!("Unable to covert metrics to string, reason={}", e);
+                empty_response(StatusCode::INTERNAL_SERVER_ERROR)
+            }
+        },
+        Err(e) => {
+            error!("Unable to encode metrics, reason={}", e);
+            empty_response(StatusCode::INTERNAL_SERVER_ERROR)
+        }
     }
-
-    let output = String::from_utf8(buffer.clone());
-    buffer.clear();
-    Response::builder()
-        .body(Body::from(output.unwrap_or_default()))
-        .or_else(|_| empty_response(StatusCode::INTERNAL_SERVER_ERROR))
 }
 
 fn decode<T: de::DeserializeOwned>(body: &[u8]) -> Result<T, Errors> {
@@ -217,17 +226,41 @@ async fn rpc(
                 match method {
                     RpcMethods::img_proxy_fetch => {
                         let params = decode::<FetchRequest>(&body)?;
-                        fetch(ctx, &req_id, &params.params).await
+                        let result = fetch(ctx, &req_id, &params.params).await?;
+                        Ok(FetchResponse::to_response(
+                            &params.params.response_type,
+                            result.document,
+                            result.moderation_status,
+                            result.categories,
+                            &req_id,
+                        ))
                     }
                     RpcMethods::img_proxy_describe => {
                         let params = decode::<DescribeRequest>(&body)?;
-                        describe(ctx, &req_id, &params.params).await
+                        let result = describe(ctx, &req_id, &params.params).await?;
+                        Ok(DescribeResponse::to_response(
+                            RpcStatus::Ok,
+                            result,
+                            &req_id,
+                        ))
                     }
                     RpcMethods::img_proxy_report => {
                         let params = decode::<ReportRequest>(&body)?;
-                        report(ctx, &req_id, &params.params).await
+                        let _ = report(ctx, &req_id, &params.params).await?;
+                        Ok(ReportResponse::to_response(
+                            RpcStatus::Ok,
+                            &params.params.url,
+                            &req_id,
+                        ))
+                    }
+                    RpcMethods::img_proxy_describe_report => {
+                        let results = describe_report(ctx, &req_id).await?;
+                        Ok(ReportDescribeResponse::to_response(
+                            RpcStatus::Ok,
+                            results,
+                            &req_id,
+                        ))
                     }
-                    RpcMethods::img_proxy_describe_report => describe_report(ctx, &req_id).await,
                 }
             }
             Ok(_) => Err(Errors::InvalidRpcVersionError),
diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index d3f1a22..26460f2 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -4,8 +4,6 @@ pub mod responses;
 
 use std::sync::Arc;
 
-use hyper::Body;
-use hyper::Response;
 use log::{debug, error, info};
 use uuid::Uuid;
 
@@ -61,7 +59,7 @@ pub async fn fetch(
     ctx: Arc<Context>,
     req_id: &Uuid,
     params: &FetchRequestParams,
-) -> Result<Response<Body>, Errors> {
+) -> Result<ModerationResult, Errors> {
     info!(
         "New fetch request, id={}, force={}, url={}",
         req_id, params.force, params.url
@@ -152,20 +150,21 @@ pub async fn fetch(
         }
     };
 
-    Ok(FetchResponse::to_response(
-        &params.response_type,
-        document,
+    let result = ModerationResult {
         moderation_status,
         categories,
-        req_id,
-    ))
+        data: String::default(), //TODO: This smells, refactor away without breaking API
+        document,
+    };
+
+    Ok(result)
 }
 
 pub async fn describe(
     ctx: Arc<Context>,
     req_id: &Uuid,
     params: &DescribeRequestParams,
-) -> Result<Response<Body>, Errors> {
+) -> Result<Vec<DescribeResult>, Errors> {
     info!(
         "New describe request, id={}, urls={:?}",
         req_id, params.urls
@@ -198,11 +197,7 @@ pub async fn describe(
                     },
                 })
                 .collect();
-            Ok(DescribeResponse::to_response(
-                RpcStatus::Ok,
-                describe_results,
-                req_id,
-            ))
+            Ok(describe_results)
         }
         Err(e) => {
             error!("Error querying database for id={}, reason={}", req_id, e);
@@ -215,26 +210,21 @@ pub async fn report(
     ctx: Arc<Context>,
     req_id: &Uuid,
     params: &ReportRequestParams,
-) -> Result<Response<Body>, Errors> {
+) -> Result<(), Errors> {
     info!("New report request, id={}, url={}", req_id, params.url);
-    match ctx
-        .database
+    ctx.database
         .add_report(req_id, &params.url, &params.categories)
         .await
-    {
-        Ok(_) => Ok(ReportResponse::to_response(
-            RpcStatus::Ok,
-            &params.url,
-            req_id,
-        )),
-        Err(e) => {
+        .map_err(|e| {
             error!("Database not updated for id={}, reason={}", req_id, e);
-            Err(Errors::InternalError)
-        }
-    }
+            Errors::InternalError
+        })
 }
 
-pub async fn describe_report(ctx: Arc<Context>, req_id: &Uuid) -> Result<Response<Body>, Errors> {
+pub async fn describe_report(
+    ctx: Arc<Context>,
+    req_id: &Uuid,
+) -> Result<Vec<ReportDescribeResult>, Errors> {
     info!("New report describe request, id={}", req_id);
     match ctx.database.get_reports().await {
         Ok(rows) => {
@@ -247,11 +237,7 @@ pub async fn describe_report(ctx: Arc<Context>, req_id: &Uuid) -> Result<Respons
                     updated_at: r.updated_at.to_string(),
                 })
                 .collect();
-            Ok(ReportDescribeResponse::to_response(
-                RpcStatus::Ok,
-                results,
-                req_id,
-            ))
+            Ok(results)
         }
         Err(e) => {
             error!("Database not updated for id={}, reason={}", req_id, e);
diff --git a/src/rpc/responses.rs b/src/rpc/responses.rs
index b8570d9..104c717 100644
--- a/src/rpc/responses.rs
+++ b/src/rpc/responses.rs
@@ -50,6 +50,8 @@ pub struct ModerationResult {
     pub moderation_status: ModerationStatus,
     pub categories: Vec<ModerationCategories>,
     pub data: String,
+    #[serde(skip_serializing)]
+    pub document: Option<Arc<Document>>,
 }
 
 #[derive(Serialize)]
@@ -159,6 +161,7 @@ impl FetchResponse {
                         moderation_status,
                         categories,
                         data: document.map(|doc| doc.to_url()).unwrap_or_default(),
+                        document: None,
                     },
                 };
                 metrics::TRAFFIC

From f5bd1c1793499bf714916d21c36b687c18b8737c Mon Sep 17 00:00:00 2001
From: bhaskarkishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Sat, 4 Dec 2021 13:16:48 +0530
Subject: [PATCH 27/28] Added metric to track rpc specific error counts

---
 src/metrics.rs   | 6 ++++++
 src/proxy.rs     | 4 ++++
 src/rpc/error.rs | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/metrics.rs b/src/metrics.rs
index 516619a..0c3ebd3 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -25,6 +25,11 @@ lazy_static! {
     ];
     pub static ref REGISTRY: Registry = Registry::new();
     pub static ref ERRORS: IntCounter = IntCounter::new("errors", "Total errors").unwrap();
+    pub static ref ERRORS_RPC: IntCounterVec = IntCounterVec::new(
+        Opts::new("errors_rpc", "Count of rpc errors by type"),
+        &["errors_rpc"]
+    )
+    .unwrap();
     pub static ref HITS: IntCounter = IntCounter::new("hits", "Total hits").unwrap();
     pub static ref CACHE_METRICS: IntGaugeVec = IntGaugeVec::new(
         Opts::new("cache_metrics", "Cache metics by cache type"),
@@ -103,6 +108,7 @@ pub fn init_registry() {
     REGISTRY.register(Box::new(DOCUMENT.clone())).unwrap();
     REGISTRY.register(Box::new(DOCUMENT_TYPE.clone())).unwrap();
     REGISTRY.register(Box::new(ERRORS.clone())).unwrap();
+    REGISTRY.register(Box::new(ERRORS_RPC.clone())).unwrap();
     REGISTRY.register(Box::new(CACHE_METRICS.clone())).unwrap();
     REGISTRY.register(Box::new(TRAFFIC.clone())).unwrap();
     REGISTRY
diff --git a/src/proxy.rs b/src/proxy.rs
index df4494b..e241f8e 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -131,6 +131,10 @@ pub async fn route(
             if authenticate(&config.security, req.borrow(), &req_id) {
                 rpc(ctx, req, req_id).await.or_else(|e| {
                     metrics::ERRORS.inc();
+                    let rpc_error = e.to_rpc_error(&req_id);
+                    metrics::ERRORS_RPC
+                        .with_label_values(&[rpc_error.code.to_string().as_str()])
+                        .inc();
                     Ok(e.to_response(&req_id))
                 })
             } else {
diff --git a/src/rpc/error.rs b/src/rpc/error.rs
index 9056c61..b89f9c7 100644
--- a/src/rpc/error.rs
+++ b/src/rpc/error.rs
@@ -29,7 +29,7 @@ pub enum Errors {
 }
 
 impl Errors {
-    fn to_rpc_error(&self, request_id: &Uuid) -> RpcError {
+    pub fn to_rpc_error(&self, request_id: &Uuid) -> RpcError {
         let (code, reason) = match *self {
             Errors::InvalidRpcVersionError => (100, "Invalid RPC version".to_string()),
             Errors::InvalidRpcMethodError => (101, "Invalid RPC method".to_string()),

From 81f7e5f2e13aef77bf7e0d2a330ebf4c6e082a00 Mon Sep 17 00:00:00 2001
From: bhaskarkishore <50350646+bhaskarkishore@users.noreply.github.com>
Date: Tue, 14 Dec 2021 18:31:30 +0530
Subject: [PATCH 28/28] Fix clippy warnings

---
 src/http/hyper_client.rs |  6 ++----
 src/rpc/mod.rs           | 12 ++++--------
 src/utils.rs             |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/http/hyper_client.rs b/src/http/hyper_client.rs
index 1826c9d..fe48437 100644
--- a/src/http/hyper_client.rs
+++ b/src/http/hyper_client.rs
@@ -68,18 +68,16 @@ impl HttpClientProvider for HyperHttpClient {
                 })?;
                 let content_length = headers
                     .get(hyper::header::CONTENT_LENGTH)
-                    .map(|h| {
+                    .and_then(|h| {
                         String::from_utf8(h.as_bytes().to_vec())
                             .map(|s| s.parse::<u64>().ok())
                             .ok()
                     })
                     .flatten()
-                    .flatten()
                     .unwrap_or(bytes.len() as u64);
                 let content_type = headers
                     .get(hyper::header::CONTENT_TYPE)
-                    .map(|h| String::from_utf8(h.as_bytes().to_vec()).ok())
-                    .flatten()
+                    .and_then(|h| String::from_utf8(h.as_bytes().to_vec()).ok())
                     .unwrap_or_default();
                 Ok(Document {
                     id: *req_id,
diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
index 26460f2..a9dd5a0 100644
--- a/src/rpc/mod.rs
+++ b/src/rpc/mod.rs
@@ -28,14 +28,10 @@ async fn fetch_document(
     url: &str,
 ) -> Result<Arc<Document>, Errors> {
     let cache_key = sha256(url.as_bytes());
-    let cached_doc = ctx
-        .cache
-        .as_ref()
-        .map(|cache| {
-            debug!("Fetched document from cache, url:{}", url);
-            cache.get(&cache_key)
-        })
-        .flatten();
+    let cached_doc = ctx.cache.as_ref().and_then(|cache| {
+        debug!("Fetched document from cache, url:{}", url);
+        cache.get(&cache_key)
+    });
 
     if let Some(doc) = cached_doc {
         Ok(doc)
diff --git a/src/utils.rs b/src/utils.rs
index 670e6c6..2a79540 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -18,6 +18,6 @@ pub fn print_banner() {
     ░█░█░█▀▀░░█░░░░░█░░█░█░█▀█░█░█░█▀▀░░░█▀▀░█▀▄░█░█░▄▀▄░░█░
     ░▀░▀░▀░░░░▀░░░░▀▀▀░▀░▀░▀░▀░▀▀▀░▀▀▀░░░▀░░░▀░▀░▀▀▀░▀░▀░░▀░
     "
-    .replace(" ", "");
+    .replace(' ', "");
     println!("{}", banner);
 }