Mirrors/vaultwarden
2
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-11-22 20:03:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jjlin-icons' into main

Browse source
This commit is contained in:
Daniel García 2022-01-23 23:43:30 +01:00
commit 65dad5a9d1
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.env.template
View file

@ -144,10 +144,11 @@
## Icon redirect code ## Icon redirect code
## The HTTP status code to use for redirects to an external icon service. ## The HTTP status code to use for redirects to an external icon service.
## The supported codes are 307 (temporary) and 308 (permanent). ## The supported codes are 301 (legacy permanent), 302 (legacy temporary), 307 (temporary), and 308 (permanent).
## Temporary redirects are useful while testing different icon services, but once a service ## Temporary redirects are useful while testing different icon services, but once a service
## has been decided on, consider using permanent redirects for cacheability. ## has been decided on, consider using permanent redirects for cacheability. The legacy codes
# ICON_REDIRECT_CODE=307 ## are currently better supported by the Bitwarden clients.
# ICON_REDIRECT_CODE=302
## Disable icon downloading ## Disable icon downloading
## Set to true to disable icon downloading in the internal icon service. ## Set to true to disable icon downloading in the internal icon service.

4
src/api/icons.rs
View file

@ -72,8 +72,10 @@ fn icon_redirect(domain: &str, template: &str) -> Option<Redirect> {
let url = template.replace("{}", domain); let url = template.replace("{}", domain);
match CONFIG.icon_redirect_code() { match CONFIG.icon_redirect_code() {
308 => Some(Redirect::permanent(url)), 301 => Some(Redirect::moved(url)), // legacy permanent redirect
302 => Some(Redirect::found(url)), // legacy temporary redirect
307 => Some(Redirect::temporary(url)), 307 => Some(Redirect::temporary(url)),
308 => Some(Redirect::permanent(url)),
_ => { _ => {
error!("Unexpected redirect code {}", CONFIG.icon_redirect_code()); error!("Unexpected redirect code {}", CONFIG.icon_redirect_code());
None None

11
src/config.rs
View file

@ -458,10 +458,11 @@ make_config! {
/// corresponding icon at the external service. /// corresponding icon at the external service.
icon_service: String, false, def, "internal".to_string(); icon_service: String, false, def, "internal".to_string();
/// Icon redirect code |> The HTTP status code to use for redirects to an external icon service. /// Icon redirect code |> The HTTP status code to use for redirects to an external icon service.
/// The supported codes are 307 (temporary) and 308 (permanent). /// The supported codes are 301 (legacy permanent), 302 (legacy temporary), 307 (temporary), and 308 (permanent).
/// Temporary redirects are useful while testing different icon services, but once a service /// Temporary redirects are useful while testing different icon services, but once a service
/// has been decided on, consider using permanent redirects for cacheability. /// has been decided on, consider using permanent redirects for cacheability. The legacy codes
icon_redirect_code: u32, true, def, 307; /// are currently better supported by the Bitwarden clients.
icon_redirect_code: u32, true, def, 302;
/// Positive icon cache expiry |> Number of seconds to consider that an already cached icon is fresh. After this period, the icon will be redownloaded /// Positive icon cache expiry |> Number of seconds to consider that an already cached icon is fresh. After this period, the icon will be redownloaded
icon_cache_ttl: u64, true, def, 2_592_000; icon_cache_ttl: u64, true, def, 2_592_000;
/// Negative icon cache expiry |> Number of seconds before trying to download an icon that failed again. /// Negative icon cache expiry |> Number of seconds before trying to download an icon that failed again.
@ -700,8 +701,8 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
// Check if the icon redirect code is valid // Check if the icon redirect code is valid
match cfg.icon_redirect_code { match cfg.icon_redirect_code {
307 | 308 => (), 301 | 302 | 307 | 308 => (),
_ => err!("Only HTTP 307/308 redirects are supported"), _ => err!("Only HTTP 301/302 and 307/308 redirects are supported"),
} }
Ok(()) Ok(())