upgrade base64

Author: syphar

Cargo.lock

@@ -56,7 +56,7 @@ zstd = "0.12.0"
 hostname = "0.3.1"
 path-slash = "0.2.0"
 once_cell = { version = "1.4.0", features = ["parking_lot"] }
-base64 = "0.20"
+base64 = "0.21"
 strum = { version = "0.24.0", features = ["derive"] }
 lol_html = "0.3"
 font-awesome-as-a-crate = { path = "crates/font-awesome-as-a-crate" }

Cargo.toml

@@ -6,6 +6,7 @@ use crate::index::api::{CrateData, CrateOwner, ReleaseData};
 use crate::storage::{rustdoc_archive_path, source_archive_path, Storage};
 use crate::utils::{Dependency, MetadataPackage, Target};
 use anyhow::Context;
+use base64::{engine::general_purpose::STANDARD as b64, Engine};
 use chrono::{DateTime, Utc};
 use postgres::Client;
 use std::collections::{HashMap, HashSet};
@@ -439,7 +440,7 @@ impl FakeGithubStats {
         let existing_count: i64 = conn
             .query_one("SELECT COUNT(*) FROM repositories;", &[])?
             .get(0);
-        let host_id = base64::encode(format!("FAKE ID {existing_count}"));
+        let host_id = b64.encode(format!("FAKE ID {existing_count}"));
 
         let data = conn.query_one(
             "INSERT INTO repositories (host, host_id, name, description, last_commit, stars, forks, issues, updated_at)

src/test/fakes.rs

@@ -2,6 +2,7 @@ use crate::config::Config;
 use axum::{
     http::Request as AxumHttpRequest, middleware::Next, response::Response as AxumResponse,
 };
+use base64::{engine::general_purpose::STANDARD as b64, Engine};
 use std::{
     fmt::Write,
     sync::{
@@ -23,7 +24,7 @@ impl Csp {
         getrandom::getrandom(&mut random).expect("failed to generate a nonce");
 
         Self {
-            nonce: base64::encode(random),
+            nonce: b64.encode(random),
             suppress: AtomicBool::new(false),
         }
     }

src/web/csp.rs

@@ -18,6 +18,7 @@ use axum::{
     extract::{Extension, Path, Query},
     response::{IntoResponse, Response as AxumResponse},
 };
+use base64::{engine::general_purpose::STANDARD as b64, Engine};
 use chrono::{DateTime, NaiveDate, Utc};
 use postgres::Client;
 use serde::{Deserialize, Serialize};
@@ -560,7 +561,7 @@ pub(crate) async fn search_handler(
     }
 
     let search_result = if let Some(paginate) = params.get("paginate") {
-        let decoded = base64::decode(paginate.as_bytes()).map_err(|e| {
+        let decoded = b64.decode(paginate.as_bytes()).map_err(|e| {
             warn!(
                 "error when decoding pagination base64 string \"{}\": {:?}",
                 paginate, e
@@ -609,10 +610,10 @@ pub(crate) async fn search_handler(
         search_query: Some(executed_query),
         next_page_link: search_result
             .next_page
-            .map(|params| format!("/releases/search?paginate={}", base64::encode(params))),
+            .map(|params| format!("/releases/search?paginate={}", b64.encode(params))),
         previous_page_link: search_result
             .prev_page
-            .map(|params| format!("/releases/search?paginate={}", base64::encode(params))),
+            .map(|params| format!("/releases/search?paginate={}", b64.encode(params))),
         ..Default::default()
     }
     .into_response())
@@ -932,14 +933,14 @@ mod tests {
                 other_search_links[0],
                 format!(
                     "/releases/search?paginate={}",
-                    base64::encode("?and=the&parameters=for&the=previouspage"),
+                    b64.encode("?and=the&parameters=for&the=previouspage"),
                 )
             );
             assert_eq!(
                 other_search_links[1],
                 format!(
                     "/releases/search?paginate={}",
-                    base64::encode("?some=parameters&that=cratesio&might=return")
+                    b64.encode("?some=parameters&that=cratesio&might=return")
                 )
             );
 
@@ -954,7 +955,7 @@ mod tests {
                 .frontend()
                 .get(&format!(
                     "/releases/search?paginate={}",
-                    base64::encode("something_that_doesnt_start_with_?")
+                    b64.encode("something_that_doesnt_start_with_?")
                 ))
                 .send()?;
             assert_eq!(response.status(), StatusCode::NOT_FOUND);
@@ -1016,7 +1017,7 @@ mod tests {
             let links = get_release_links(
                 &format!(
                     "/releases/search?paginate={}",
-                    base64::encode("?some=dummy&pagination=parameters")
+                    b64.encode("?some=dummy&pagination=parameters")
                 ),
                 web,
             )?;