-
Notifications
You must be signed in to change notification settings - Fork 210
Limit the size of served files #834
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
e864615
sized_buffer: add buffer that limits the size of its content
pietroalbini 2ef20c3
storage: require a maximum size when retrieving a file
pietroalbini c7d58a9
storage: add support for compressing with a custom algorithm
pietroalbini 8a7fd3e
storage: ensure the decompressed content doesn't exceed the max size
pietroalbini d0f5708
storage: ensure downloads from s3 don't exceed the max size
pietroalbini 4560081
storage: ensure downloads from the database don't exceed the max size
pietroalbini 3d6a029
storage: cover more cases in ctest_decompression_too_big
pietroalbini 6914673
storage: reduce number of database queries
pietroalbini 95ed95d
sized_buffer: use reserve instead of reserve_exact when possible
pietroalbini 8b07025
set max size to 5MB for html and 50MB for the rest
pietroalbini 5f6b960
add global configuration for docs.rs
pietroalbini 662930b
web: add test for getting files too big
pietroalbini 7d56781
address review nits
pietroalbini 7e37e40
test: update how the configuration is overridden
pietroalbini File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
use failure::{bail, Error, Fail, ResultExt}; | ||
use std::env::VarError; | ||
use std::str::FromStr; | ||
use std::sync::Arc; | ||
|
||
#[derive(Debug)] | ||
pub struct Config { | ||
pub(crate) max_file_size: usize, | ||
pub(crate) max_file_size_html: usize, | ||
} | ||
|
||
impl Config { | ||
pub fn from_env() -> Result<Self, Error> { | ||
Ok(Self { | ||
max_file_size: env("DOCSRS_MAX_FILE_SIZE", 50 * 1024 * 1024)?, | ||
max_file_size_html: env("DOCSRS_MAX_FILE_SIZE_HTML", 5 * 1024 * 1024)?, | ||
}) | ||
} | ||
} | ||
|
||
impl iron::typemap::Key for Config { | ||
type Value = Arc<Config>; | ||
} | ||
|
||
fn env<T>(var: &str, default: T) -> Result<T, Error> | ||
where | ||
T: FromStr, | ||
T::Err: Fail, | ||
{ | ||
match std::env::var(var) { | ||
Ok(content) => Ok(content | ||
.parse::<T>() | ||
.with_context(|_| format!("failed to parse configuration variable {}", var))?), | ||
Err(VarError::NotPresent) => Ok(default), | ||
Err(VarError::NotUnicode(_)) => bail!("configuration variable {} is not UTF-8", var), | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The idea is that over time we'll move more of the environment variables here, instead of being spread out over the codebase? I like it, it makes things much easier to test as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, that's the goal!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I completely support that, having a concrete storage of env vars in one place would be fantastic