saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-25 04:53:58 +00:00
Code Activity

Merge branch 'master' of https://github.com/dani-garcia/bitwarden_rs into totp-timedrift

Browse source
This commit is contained in:
BlackDex 2019-10-11 11:22:13 +02:00
commit d989a19f76
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/api/icons.rs
View file

@ -61,14 +61,7 @@ fn icon(domain: String) -> Content<Vec<u8>> {
return Content(icon_type, FALLBACK_ICON.to_vec());
}
if check_icon_domain_is_blacklisted(&domain) {
warn!("Domain is blacklisted: {:#?}", domain);
return Content(icon_type, FALLBACK_ICON.to_vec());
}
let icon = get_icon(&domain);
Content(icon_type, icon)
Content(icon_type, get_icon(&domain))
}
fn check_icon_domain_is_blacklisted(domain: &str) -> bool {
@ -380,6 +373,10 @@ fn parse_sizes(sizes: Option<String>) -> (u16, u16) {
}
fn download_icon(domain: &str) -> Result<Vec<u8>, Error> {
if check_icon_domain_is_blacklisted(domain) {
err!("Domain is blacklisted", domain)
}
let (iconlist, cookie_str) = get_icon_url(&domain)?;
let mut buffer = Vec::new();