Merge "Completing set of validation for Upload Validator" into stable-3.3
diff --git a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/BlockedKeywordValidator.java b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/BlockedKeywordValidator.java
index b69fa04..4f5954b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/BlockedKeywordValidator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/BlockedKeywordValidator.java
@@ -84,8 +84,8 @@
// These keys are used for turning on specific validation elements.
// i.e. enableSkipValidation = blockedKeyword will enabled skipRef and skipGroup checks
// i.e. disabledValidation = blockedKeywordComments will disable the comment blocked keyword check
- private static final String KEY_CHECK_BLOCKED_KEYWORD = "blockedKeyword";
- private static final String KEY_CHECK_COMMENT_BLOCKED_KEYWORD = "blockedKeywordComments";
+ public static final String KEY_CHECK_BLOCKED_KEYWORD = "blockedKeyword";
+ public static final String KEY_CHECK_COMMENT_BLOCKED_KEYWORD = "blockedKeywordComments";
private static final String KEY_CHECK_BLOCKED_KEYWORD_PATTERN =
KEY_CHECK_BLOCKED_KEYWORD + "Pattern";
diff --git a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/PluginConfigValidator.java b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/PluginConfigValidator.java
index d9cc872..61a47b7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/PluginConfigValidator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/PluginConfigValidator.java
@@ -136,6 +136,14 @@
validationMessages.addAll(
validateRegex(fileName, cfg, ChangeEmailValidator.KEY_ALLOWED_COMMITTER_EMAIL_PATTERN));
validationMessages.addAll(
+ validateRegex(fileName, cfg, ContentTypeValidator.KEY_BLOCKED_CONTENT_TYPE));
+ validationMessages.addAll(
+ validateRegex(fileName, cfg, BlockedKeywordValidator.KEY_CHECK_BLOCKED_KEYWORD));
+ validationMessages.addAll(
+ validateRegex(fileName, cfg, BlockedKeywordValidator.KEY_CHECK_COMMENT_BLOCKED_KEYWORD));
+ validationMessages.addAll(
+ validateRegex(fileName, cfg, InvalidFilenameValidator.KEY_INVALID_FILENAME));
+ validationMessages.addAll(
validateInteger(fileName, cfg, MaxPathLengthValidator.KEY_MAX_PATH_LENGTH));
return validationMessages.build();
}
