Ensure that index_prefix is lower case

Fixes #3476
Graylog2 · Feb 16, 2017 · 37cf0a5 · 37cf0a5
1 parent af1a258
commit 37cf0a5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/indexset/IndexSetConfig.java b/graylog2-server/src/main/java/org/graylog2/indexer/indexset/IndexSetConfig.java
@@ -32,6 +32,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import java.time.ZonedDateTime;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
@@ -45,6 +46,7 @@
 public abstract class IndexSetConfig implements Comparable<IndexSetConfig> {
     public static final String FIELD_INDEX_PREFIX = "index_prefix";
     public static final String FIELD_CREATION_DATE = "creation_date";
+    public static final String INDEX_PREFIX_REGEX = "^[a-z0-9][a-z0-9_+-]*$";
 
     @JsonProperty("id")
     @Nullable
@@ -65,6 +67,7 @@ public abstract class IndexSetConfig implements Comparable<IndexSetConfig> {
 
     @JsonProperty(FIELD_INDEX_PREFIX)
     @NotBlank
+    @Pattern(regexp = INDEX_PREFIX_REGEX)
     public abstract String indexPrefix();
 
     @JsonProperty("index_match_pattern")
@@ -123,7 +126,7 @@ public static IndexSetConfig create(@Id @ObjectId @JsonProperty("_id") @Nullable
                                         @JsonProperty("title") @NotBlank String title,
                                         @JsonProperty("description") @Nullable String description,
                                         @JsonProperty("writable") @Nullable Boolean isWritable,
-                                        @JsonProperty(FIELD_INDEX_PREFIX) @NotBlank String indexPrefix,
+                                        @JsonProperty(FIELD_INDEX_PREFIX) @Pattern(regexp = INDEX_PREFIX_REGEX) String indexPrefix,
                                         @JsonProperty("index_match_pattern") @Nullable String indexMatchPattern,
                                         @JsonProperty("index_wildcard") @Nullable String indexWildcard,
                                         @JsonProperty("shards") @Min(1) int shards,

diff --git a/...r/src/main/java/org/graylog2/rest/resources/system/indexer/responses/IndexSetSummary.java b/...r/src/main/java/org/graylog2/rest/resources/system/indexer/responses/IndexSetSummary.java
@@ -29,6 +29,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import java.time.ZonedDateTime;
 
 @AutoValue
@@ -54,7 +55,7 @@ public abstract class IndexSetSummary {
     public abstract boolean isWritable();
 
     @JsonProperty("index_prefix")
-    @NotBlank
+    @Pattern(regexp = IndexSetConfig.INDEX_PREFIX_REGEX)
     public abstract String indexPrefix();
 
     @JsonProperty("shards")
@@ -102,7 +103,7 @@ public static IndexSetSummary create(@JsonProperty("id") @Nullable String id,
                                          @JsonProperty("description") @Nullable String description,
                                          @JsonProperty("default") boolean isDefault,
                                          @JsonProperty("writable") boolean isWritable,
-                                         @JsonProperty("index_prefix") @NotBlank String indexPrefix,
+                                         @JsonProperty("index_prefix") @Pattern(regexp = IndexSetConfig.INDEX_PREFIX_REGEX) String indexPrefix,
                                          @JsonProperty("shards") @Min(1) int shards,
                                          @JsonProperty("replicas") @Min(0) int replicas,
                                          @JsonProperty("rotation_strategy_class") @NotNull String rotationStrategyClass,

diff --git a/graylog2-web-interface/src/components/indices/IndexSetConfigurationForm.jsx b/graylog2-web-interface/src/components/indices/IndexSetConfigurationForm.jsx
@@ -35,7 +35,7 @@ const IndexSetConfigurationForm = React.createClass({
   _validateIndexPrefix(event) {
     const value = event.target.value;
 
-    if (value.match(/^[A-Za-z0-9][A-Za-z0-9_\-+]*$/)) {
+    if (value.match(/^[a-z0-9][a-z0-9_\-+]*$/)) {
       if (this.state.validationErrors[event.target.name]) {
         const nextValidationErrors = Object.assign({}, this.state.validationErrors);
         delete nextValidationErrors[event.target.name];
@@ -47,6 +47,8 @@ const IndexSetConfigurationForm = React.createClass({
         nextValidationErrors[event.target.name] = 'Invalid index prefix: cannot be empty';
       } else if (value.indexOf('_') === 0 || value.indexOf('-') === 0 || value.indexOf('+') === 0) {
         nextValidationErrors[event.target.name] = 'Invalid index prefix: must start with a letter or number';
+      } else if (value.toLowerCase() !== value) {
+        nextValidationErrors[event.target.name] = 'Invalid index prefix: must be lower case';
       } else {
         nextValidationErrors[event.target.name] = 'Invalid index prefix: must only contain letters, numbers, \'_\', \'-\' and \'+\'';
       }