From 35a227e9382856220fb08a82e863da7e67fe5463 Mon Sep 17 00:00:00 2001
From: Luna D <cod7777@yandex.ru>
Date: Thu, 16 Sep 2021 21:04:15 +0200
Subject: [PATCH] use gocamo

---
 native/philomena/Cargo.lock  |  8 +-------
 native/philomena/Cargo.toml  |  2 +-
 native/philomena/src/camo.rs | 10 ++++------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/native/philomena/Cargo.lock b/native/philomena/Cargo.lock
index 45c701b5..21599c7f 100644
--- a/native/philomena/Cargo.lock
+++ b/native/philomena/Cargo.lock
@@ -43,12 +43,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
-[[package]]
-name = "base16"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d27c3610c36aee21ce8ac510e6224498de4228ad772a171ed65643a24693a5a8"
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -489,7 +483,7 @@ dependencies = [
 name = "philomena"
 version = "0.3.0"
 dependencies = [
- "base16",
+ "base64",
  "comrak",
  "jemallocator",
  "ring",
diff --git a/native/philomena/Cargo.toml b/native/philomena/Cargo.toml
index 2fb77ea9..5851c997 100644
--- a/native/philomena/Cargo.toml
+++ b/native/philomena/Cargo.toml
@@ -14,7 +14,7 @@ comrak = { git = "https://github.com/philomena-dev/comrak", branch = "main" }
 rustler = "0.22"
 jemallocator = "0.3.2"
 ring = "0.16"
-base16 = "0.2"
+base64 = "0.13"
 url = "2.2"
 
 [profile.release]
diff --git a/native/philomena/src/camo.rs b/native/philomena/src/camo.rs
index cdd4d041..882db6fe 100644
--- a/native/philomena/src/camo.rs
+++ b/native/philomena/src/camo.rs
@@ -13,16 +13,14 @@ fn untrusted_host(url: Url, camo_host: String, camo_key: String) -> Option<Strin
     let camo_url = format!("https://{}", camo_host);
     let key = hmac::Key::new(hmac::HMAC_SHA1_FOR_LEGACY_USE_ONLY, camo_key.as_ref());
     let tag = hmac::sign(&key, url.to_string().as_bytes());
-    let encoded = base16::encode_lower(tag.as_ref());
+    let encoded = base64::encode_config(tag.as_ref(), base64::URL_SAFE_NO_PAD);
+    let encoded_url = base64::encode_config(url.as_ref(), base64::URL_SAFE_NO_PAD);
+    let path = format!("{}/{}", encoded, encoded_url);
 
     let mut camo_uri = Url::parse(&camo_url).ok()?;
-    camo_uri.set_path(&encoded);
+    camo_uri.set_path(&path);
     camo_uri.set_port(Some(443)).ok()?;
     camo_uri.set_scheme("https").ok()?;
-    camo_uri
-        .query_pairs_mut()
-        .clear()
-        .append_pair("url", &url.to_string());
 
     Some(camo_uri.to_string())
 }