Skip to content

Remove incorrect double-encoding of ImageUrl #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove incorrect double-encoding of ImageUrl #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc65751
Remove incorrect double-encoding of ImageUrl
andersk Sep 1, 2023
e23b638
Upgrade md-5 and url dependencies
andersk Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ keywords = [
license = "BSD-3-Clause"

[dependencies]
md-5 = "0.8.0"
url = "1.7.2"
md-5 = "0.10.5"
url = "2.4.1"
12 changes: 4 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ extern crate md5;
extern crate url;

use md5::{Digest, Md5};
use url::percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET};
use url::Url;

/// The default image to display if the user's email does not have a Gravatar.
Expand Down Expand Up @@ -162,10 +161,9 @@ impl Gravatar {
/// Returns the image URL of the user's Gravatar with all specified parameters.
pub fn image_url(self: &Self) -> Url {
// Generate MD5 hash of email
let digest = Md5::new()
.chain(&self.email.trim().to_ascii_lowercase())
.result();
let hash = format!("{:x}", digest);
let mut hasher = Md5::new();
hasher.update(&self.email.trim().to_ascii_lowercase());
let hash = format!("{:x}", hasher.finalize());

// Create base URL using the hash
let mut url = Url::parse(&format!(
Expand All @@ -185,9 +183,7 @@ impl Gravatar {

if let Some(ref d) = self.default {
let val = match d {
Default::ImageUrl(ref u) => {
utf8_percent_encode(u.as_str(), DEFAULT_ENCODE_SET).to_string()
}
Default::ImageUrl(ref u) => u.to_string(),
Default::Http404 => "404".to_string(),
Default::MysteryMan => "mm".to_string(),
Default::Identicon => "identicon".to_string(),
Expand Down
4 changes: 2 additions & 2 deletions tests/gravatar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ fn test_default() {
fn test_default_url() {
let mut g = Gravatar::new("[email protected]");
g.set_default(Some(Default::ImageUrl(
Url::parse("http://example.org/im age").unwrap(),
Url::parse("http://example.org/im age?").unwrap(),
)));
assert_eq!(
g.image_url().as_str(),
"https://secure.gravatar.com/avatar/5658ffccee7f0ebfda2b226238b1eb6e?d=http%3A%2F%2Fexample.org%2Fim%2520age"
"https://secure.gravatar.com/avatar/5658ffccee7f0ebfda2b226238b1eb6e?d=http%3A%2F%2Fexample.org%2Fim%2520age%3F"
)
}

Expand Down