You've already forked AstralRinth
forked from didirus/AstralRinth
feat(labrinth): allow protected resource and data packs to pass validation (#3792)
* fix(labrinth): return version artifact size exceeded error eagerly Now we don't wait until the result memory buffer has grown to a size greater than the maximum allowed, and instead we return such an error before the buffer is grown with the current chunk, which should reduce memory usage. * fix(labrinth): proper supported game versions range for datapacks * feat(labrinth): allow protected resource and data packs to pass validation
This commit is contained in:
committed by
GitHub
parent
97e4d8e132
commit
fb30c0ba2b
@@ -1,8 +1,8 @@
|
||||
use crate::validate::{
|
||||
SupportedGameVersions, ValidationError, ValidationResult,
|
||||
MaybeProtectedZipFile, PLAUSIBLE_PACK_REGEX, SupportedGameVersions,
|
||||
ValidationError, ValidationResult,
|
||||
};
|
||||
use std::io::Cursor;
|
||||
use zip::ZipArchive;
|
||||
use chrono::DateTime;
|
||||
|
||||
pub struct DataPackValidator;
|
||||
|
||||
@@ -16,19 +16,29 @@ impl super::Validator for DataPackValidator {
|
||||
}
|
||||
|
||||
fn get_supported_game_versions(&self) -> SupportedGameVersions {
|
||||
SupportedGameVersions::All
|
||||
// Time since release of 17w43a, 2017-10-25, which introduced datapacks
|
||||
SupportedGameVersions::PastDate(
|
||||
DateTime::from_timestamp(1508889600, 0).unwrap(),
|
||||
)
|
||||
}
|
||||
|
||||
fn validate(
|
||||
fn validate_maybe_protected_zip(
|
||||
&self,
|
||||
archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
|
||||
file: &mut MaybeProtectedZipFile,
|
||||
) -> Result<ValidationResult, ValidationError> {
|
||||
if archive.by_name("pack.mcmeta").is_err() {
|
||||
return Ok(ValidationResult::Warning(
|
||||
if match file {
|
||||
MaybeProtectedZipFile::Unprotected(archive) => {
|
||||
archive.by_name("pack.mcmeta").is_ok()
|
||||
}
|
||||
MaybeProtectedZipFile::MaybeProtected { data, .. } => {
|
||||
PLAUSIBLE_PACK_REGEX.is_match(data)
|
||||
}
|
||||
} {
|
||||
Ok(ValidationResult::Pass)
|
||||
} else {
|
||||
Ok(ValidationResult::Warning(
|
||||
"No pack.mcmeta present for datapack file. Tip: Make sure pack.mcmeta is in the root directory of your datapack!",
|
||||
));
|
||||
))
|
||||
}
|
||||
|
||||
Ok(ValidationResult::Pass)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user