facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: make config parsing stricter

Browse Source 
Summary:
Disallow unknown fields. They're generally the result of a mis-editing
a file and putting the config in the wrong place, or some incomplete refactor.

Reviewed By: StanislavGlebik

Differential Revision: D15168963

fbshipit-source-id: a9c9658378cda4866e44daf6e2c6bfbdfcdb9f84
This commit is contained in:
Jeremy Fitzhardinge 2019-05-01 15:27:51 -07:00 committed by Facebook Github Bot
parent dd5de99cc3
commit dc7842f569
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/tests/fixtures/BAD-unknown-field/repos/test/server.toml vendored Normal file
View File

@ -0,0 +1,4 @@
repoid = 123
repotype = "blob:files"
path = "/tmp/blobstore"
random_unknown_field = "hello"

12
metaconfig/parser/src/repoconfig.rs
View File

@ -416,6 +416,7 @@ impl RepoConfigs {
}
#[derive(Debug, Deserialize, Clone)]
#[serde(deny_unknown_fields)]
struct RawRepoConfig {
path: Option<PathBuf>,
repotype: RawRepoType,
@ -445,12 +446,14 @@ struct RawRepoConfig {
}
#[derive(Debug, Deserialize, Clone)]
#[serde(deny_unknown_fields)]
struct RawCacheWarmupConfig {
bookmark: String,
commit_limit: Option<usize>,
}
#[derive(Debug, Deserialize, Clone)]
#[serde(deny_unknown_fields)]
struct RawHookManagerParams {
entrylimit: usize,
weightlimit: usize,
@ -463,6 +466,7 @@ struct RawHookManagerParams {
struct RawRegex(#[serde(with = "serde_regex")] Regex);
#[derive(Debug, Deserialize, Clone)]
#[serde(deny_unknown_fields)]
struct RawBookmarkConfig {
/// Either the regex or the name should be provided, not both
regex: Option<RawRegex>,
@ -475,11 +479,13 @@ struct RawBookmarkConfig {
}
#[derive(Debug, Deserialize, Clone)]
#[serde(deny_unknown_fields)]
struct RawBookmarkHook {
hook_name: String,
}
#[derive(Debug, Deserialize, Clone)]
#[serde(deny_unknown_fields)]
struct RawHookConfig {
name: String,
path: Option<String>,
@ -491,6 +497,7 @@ struct RawHookConfig {
}
#[derive(Debug, Deserialize, Clone)]
#[serde(deny_unknown_fields)]
struct RawRemoteBlobstoreConfig {
blobstore_type: RawBlobstoreType,
blobstore_id: BlobstoreId,
@ -508,6 +515,7 @@ struct RawRemoteBlobstoreConfig {
/// Types of repositories supported
#[derive(Clone, Debug, Deserialize)]
#[serde(deny_unknown_fields)]
enum RawRepoType {
#[serde(rename = "blob:files")]
Files,
@ -521,6 +529,7 @@ enum RawRepoType {
/// Types of blobstores supported
#[derive(Clone, Debug, Deserialize)]
#[serde(deny_unknown_fields)]
enum RawBlobstoreType {
#[serde(rename = "manifold")]
Manifold,
@ -531,6 +540,7 @@ enum RawBlobstoreType {
}
#[derive(Clone, Debug, Deserialize)]
#[serde(deny_unknown_fields)]
struct RawPushrebaseParams {
rewritedates: Option<bool>,
recursion_limit: Option<usize>,
@ -542,11 +552,13 @@ struct RawPushrebaseParams {
}
#[derive(Clone, Debug, Deserialize)]
#[serde(deny_unknown_fields)]
struct RawLfsParams {
threshold: Option<u64>,
}
#[derive(Clone, Debug, Deserialize)]
#[serde(deny_unknown_fields)]
struct RawBundle2ReplayParams {
preserve_raw_bundle2: Option<bool>,
}