Avoid implicit whitespace normalization during attribute validation

Unless "string" is explicitly specified, token matching is used, which
will normalize whitespace before validation. Since we tend to do exact
string comparisons against DOM attributes in the model itself, this can
lead to tricky situations where the validated input is not as expected.

5 files changed, 19 insertions, 18 deletions

diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 3026c386fd4..c9dd2c0239d 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -64,12 +64,12 @@ HttpServer =  element server {
 }
 
 AccessLog = element accesslog {
-    attribute type { "yapache" | "vespa" | "disabled" }? &
+    attribute type { string "yapache" | string "vespa" | string "disabled" }? &
     attribute fileNamePattern { string }? &
     attribute symlinkName { string }? &
 
     attribute rotationInterval { string }? &
-    attribute rotationScheme { "date" | "sequence" }?
+    attribute rotationScheme { string "date" | string "sequence" }?
 }
 
 # REST-API:
diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc
index 1c20acdc0bd..38258a0ae63 100644
--- a/config-model/src/main/resources/schema/content.rnc
+++ b/config-model/src/main/resources/schema/content.rnc
@@ -7,7 +7,7 @@ Redundancy = element redundancy {
 }
 
 DistributionType = element distribution {
-    attribute type { "strict" | "loose" | "legacy" }
+    attribute type { string "strict" | string "loose" | string "legacy" }
 }
 
 BucketSplitting = element bucket-splitting {
@@ -37,16 +37,17 @@ VisitorTuning = element visitors {
 Maintenance = element maintenance {
     attribute start { xsd:string { pattern = "[0-9]{2}:[0-9]{2}" } },
     attribute stop { xsd:string { pattern = "[0-9]{2}:[0-9]{2}" } },
-    attribute high { "monday" | "tuesday" | "wednesday" | "thursday" |
-                     "friday" | "saturday" | "sunday" }
+    attribute high { string "monday" | string "tuesday" | string "wednesday" |
+                     string "thursday" | string "friday" | string "saturday" |
+                     string "sunday" }
 }
 
 PersistenceThread = element thread {
   ## The lowest priority this thread should handle.
-  attribute lowest-priority { "HIGHEST" | "VERY_HIGH" | "HIGH_1" |
-        "HIGH_2" | "HIGH_3" | "NORMAL_1" | "NORMAL_2" | "NORMAL_3" |
-        "NORMAL_4" | "NORMAL_5" | "NORMAL_6" | "LOW_1" |
-        "LOW_2" | "LOW_3" | "VERY_LOW" }? &
+  attribute lowest-priority { string "HIGHEST" | string "VERY_HIGH" | string "HIGH_1" |
+        string "HIGH_2" | string "HIGH_3" | string "NORMAL_1" | string "NORMAL_2" |
+        string "NORMAL_3" | string "NORMAL_4" | string "NORMAL_5" | string "NORMAL_6" |
+        string "LOW_1" | string "LOW_2" | string "LOW_3" | string "VERY_LOW" }? &
   ## The number of threads of this type to create
   attribute count { xsd:integer }?
 }
@@ -75,10 +76,10 @@ ClusterControllerTuning = element cluster-controller {
 
 DispatchTuning = element dispatch {
     element max-hits-per-partition { xsd:nonNegativeInteger }? &
-    element dispatch-policy { "round-robin" | "random" }? &
+    element dispatch-policy { string "round-robin" | string "random" }? &
     element min-group-coverage { xsd:double }? &
     element min-active-docs-coverage { xsd:double }? &
-    element use-local-node { "true" | "false" }?
+    element use-local-node { string "true" | string "false" }?
 }
 
 ClusterTuning = element tuning {
@@ -185,7 +186,7 @@ Documents = element documents {
         GenericConfig* &
         attribute type { xsd:string } &
         attribute selection { xsd:string }? &
-        attribute mode { "index" | "streaming" | "store-only" }
+        attribute mode { string "index" | string "streaming" | string "store-only" }
     }+
 }
 
diff --git a/config-model/src/main/resources/schema/federation.rnc b/config-model/src/main/resources/schema/federation.rnc
index 81933cc0622..acc3dc8946b 100644
--- a/config-model/src/main/resources/schema/federation.rnc
+++ b/config-model/src/main/resources/schema/federation.rnc
@@ -68,6 +68,6 @@ FederationSearcher =
             ComponentDefinition
         }? &
         element source-set {
-          attribute inherits {"default"}
+          attribute inherits { string "default" }
         }?
     }
diff --git a/config-model/src/main/resources/schema/routing.rnc b/config-model/src/main/resources/schema/routing.rnc
index 2ba8f11bbf3..f2812f168f1 100644
--- a/config-model/src/main/resources/schema/routing.rnc
+++ b/config-model/src/main/resources/schema/routing.rnc
@@ -4,7 +4,7 @@
 Routing = element routing {
    attribute version { "1.0" } &
    element routingtable {
-      attribute protocol { "document" } &
+      attribute protocol { string "document" } &
       attribute verify { xsd:boolean }? &
       element hop {
          attribute name { text } &
@@ -20,7 +20,7 @@ Routing = element routing {
       }*
    }* &
    element services {
-      attribute protocol { "document" } &
+      attribute protocol { string "document" } &
       element service {
          attribute name { text }
       }*
diff --git a/config-model/src/main/resources/schema/storage.rnc b/config-model/src/main/resources/schema/storage.rnc
index e31e503fe69..538cea14301 100644
--- a/config-model/src/main/resources/schema/storage.rnc
+++ b/config-model/src/main/resources/schema/storage.rnc
@@ -119,8 +119,8 @@ Disk = element disk {
 GarbageCollect = element garbagecollect {
     attribute start { xsd:string { pattern = "[0-9]{2}:[0-9]{2}" } },
     attribute stop { xsd:string { pattern = "[0-9]{2}:[0-9]{2}" } },
-    attribute full { "monday" | "tuesday" | "wednesday" | "thursday" |
-                     "friday" | "saturday" | "sunday" }
+    attribute full { string "monday" | string "tuesday" | string "wednesday" |
+                     string "thursday" | string "friday" | string "saturday" | string "sunday" }
 }
 
 DeadLockDetector = element deadlockdetector {
@@ -151,7 +151,7 @@ FleetControllerStats.attlist =
 
 # v3.0 definitions
 Storage30 = element storage {
-   attribute version { "3.0" } &
+   attribute version { string "3.0" } &
    GenericConfig* &
    element cluster {
       # name defaults to 'storage'