Add HTTP header well known type and C++ UUID

README.md

@@ -398,6 +398,12 @@ Check the [constraint rule comparison matrix](rule_comparison.md) for language-s
 
   // x must be a valid UUID (via RFC 4122)
   string x = 1 [(validate.rules).string.uuid = true];
+
+  // x must be a valid HTTP header name (via RFC 7230)
+  string x = 1 [(validate.rules).string.http_header_name = true];
+
+  // x must be a valid HTTP header value (via RFC 7230)
+  string x = 1 [(validate.rules).string.http_header_value = true];
   ```
 
 ### Bytes

java/pgv-java-stub/src/main/java/io/envoyproxy/pgv/StringValidation.java

@@ -19,6 +19,8 @@ public final class StringValidation {
     private static final int UUID_DASH_3 = 18;
     private static final int UUID_DASH_4 = 23;
     private static final int UUID_LEN = 36;
+    private static final Pattern HTTP_HEADER_NAME_PATTERN = Pattern.compile("^:?[0-9a-zA-Z!#$%&'*+-.^_|~\u002C]+$");
+    private static final Pattern HTTP_HEADER_VALUE_PATTERN = Pattern.compile("^[ \t]*(?:[\u0020-\u007E\u0080-\u00FF](?:[ \t]+[\u0020-\u007E\u0080-\u00FF])?)*[ \t]*$");
 
     private StringValidation() {
         // Intentionally left blank.
@@ -208,6 +210,22 @@ public static void uuid(final String field, final String value) throws Validatio
         throw new ValidationException(field, enquote(value), "invalid UUID string");
     }
 
+  public static void httpHeaderName(final String field, final String value) throws ValidationException {
+    if (!HTTP_HEADER_NAME_PATTERN.matches(value)) {
+      throw new ValidationException(field, enquote(value), "invalid HTTP header name string");
+    }
+
+    return;
+  }
+
+  public static void httpHeaderValue(final String field, final String value) throws ValidationException {
+    if (!HTTP_HEADER_VALUE_PATTERN.matches(value)) {
+      throw new ValidationException(field, enquote(value), "invalid HTTP header value string");
+    }
+
+    return;
+  }
+
     private static String enquote(String value) {
         return "\"" + value + "\"";
     }

java/pgv-java-stub/src/test/java/io/envoyproxy/pgv/StringValidationTest.java

@@ -253,4 +253,34 @@ public void uuidWorks() throws ValidationException {
         assertValidationException(() -> uuid("4_dash_at_22", "00000000-0000-0000-000-0000000000000"));
         assertValidationException(() -> uuid("4_dash_at_24", "00000000-0000-0000-00000-00000000000"));
     }
+
+    @Test
+    public void httpHeaderNameWorks() throws ValidationException {
+        // Match
+        StringValidation.httpHeaderName("x", "cluster.name");
+        StringValidation.httpHeaderName("x", ":path");
+        StringValidation.httpHeaderName("x", "clustername");
+        StringValidation.httpHeaderName("x", "!#%&.+");
+
+        // No Match
+        assertThatThrownBy(() -> StringValidation.httpHeaderName("x", "foo\000bar")).isInstanceOf(ValidationException.class);
+        assertThatThrownBy(() -> StringValidation.httpHeaderName("x", "test/long/url")).isInstanceOf(ValidationException.class);
+        assertThatThrownBy(() -> StringValidation.httpHeaderName("x", "cluster name")).isInstanceOf(ValidationException.class);
+        assertThatThrownBy(() -> StringValidation.httpHeaderName("x", "example\r")).isInstanceOf(ValidationException.class);
+        assertThatThrownBy(() -> StringValidation.httpHeaderName("x", ":")).isInstanceOf(ValidationException.class);
+    }
+
+    @Test
+    public void httpHeaderValueWorks() throws ValidationException {
+        // Match
+        StringValidation.httpHeaderValue("x", "cluster.name");
+        StringValidation.httpHeaderValue("x", "/TEST/LONG/URL");
+        StringValidation.httpHeaderValue("x", "cluster name");
+        StringValidation.httpHeaderValue("x", "!#%&./+");
+
+        // No Match
+        assertThatThrownBy(() -> StringValidation.httpHeaderValue("x", "foo\000bar")).isInstanceOf(ValidationException.class);
+        assertThatThrownBy(() -> StringValidation.httpHeaderValue("x", "example\r")).isInstanceOf(ValidationException.class);
+    }
+
 }

rule_comparison.md

@@ -32,9 +32,11 @@
 | ip                     |✅|✅|✅|✅|✅|
 | ipv4                   |✅|✅|✅|✅|✅|
 | ipv6                   |✅|✅|✅|✅|✅|
-| uri                    |✅|✅|✅|✅|✅|
-| uri_ref                |✅|✅|✅|✅|✅|
-| uuid                   |✅|✅|❌|✅|✅|
+| uri                    |✅|✅|❌|✅|✅|
+| uri_ref                |✅|✅|❌|✅|✅|
+| uuid                   |✅|✅|✅|✅|✅|
+| http_header_name       |✅|✅|✅|✅|✅|
+| http_header_value      |✅|✅|✅|✅|✅|
 
 ## Bytes
 | Constraint Rule | Go | GoGo | C++ | Java | Python |

templates/cc/file.go

@@ -18,6 +18,15 @@ namespace protobuf_wkt = google::protobuf;
 namespace validate {
 using std::string;
 
+// define the regex for a UUID once up-front
+const re2::RE2 _uuidPattern("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
+
+// define the regex for an HTTP header name once up-front
+const re2::RE2 _httpHeaderName("^:?[0-9a-zA-Z!#$%&'*+-.^_|~\x2C]+$");
+
+// define the regex for an HTTP header value once up-front
+const re2::RE2 _httpHeaderValue("^[ \t]*(?:[\x20-\x7E\u0080-\u00FF](?:[ \t]+[\x20-\x7E\u0080-\u00FF])?)*[ \t]*$");
+
 {{ range .AllMessages }}
 {{- if not (disabled .) -}}
 

templates/cc/string.go

@@ -176,11 +176,20 @@ const strTpl = `
 		}
 		*/}}
 	{{ else if $r.GetUuid }}
-		{{ unimplemented "C++ UUID validation is not implemented" }}
-		{{/* TODO(akonradi) implement UUID constraints
-                if err := m._validateUuid({{ accessor . }}); err != nil {
-                        return {{ errCause . "err" "value must be a valid UUID" }}
+                if (!RE2::FullMatch(re2::StringPiece({{ accessor . }}), pgv::validate::_uuidPattern)) {
+                        {{ err . "value must be a valid UUID" }}
                 }
-		*/}}
+	{{ else if $r.GetHttpHeaderName }}
+        {
+                if (!RE2::FullMatch(re2::StringPiece({{ accessor . }}), pgv::validate::_httpHeaderName)) {
+                        {{ err . "value must be a valid HTTP Header Name" }}
+                }
+        }
+	{{ else if $r.GetHttpHeaderValue }}
+        {
+                if (!RE2::FullMatch(re2::StringPiece({{ accessor . }}), pgv::validate::_httpHeaderValue)) {
+                        {{ err . "value must be a valid HTTP Header Value" }}
+                }
+        }
 	{{ end }}
 `

templates/go/file.go

@@ -46,6 +46,13 @@ var (
 // define the regex for a UUID once up-front
 var _{{ snakeCase .File.InputPath.BaseName }}_uuidPattern = regexp.MustCompile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
 
+// define the regex for an HTTP header name once up-front
+var _{{ snakeCase .File.InputPath.BaseName }}_httpHeaderName = regexp.MustCompile("^:?[0-9a-zA-Z!#$%&'*+-.^_|~\x2C]+$")
+
+// define the regex for an HTTP header value once up-front
+var _{{ snakeCase .File.InputPath.BaseName }}_httpHeaderValue = regexp.MustCompile("^[ \t]*(?:[\x20-\x7E\u0080-\u00FF](?:[ \t]+[\x20-\x7E\u0080-\u00FF])?)*[ \t]*$")
+
+
 {{ range .AllMessages }}
 	{{ template "msg" . }}
 {{ end }}

templates/gogo/file.go

@@ -15,6 +15,7 @@ import (
 	"regexp"
 	"strings"
 	"time"
+        "unicode"
 	"unicode/utf8"
 
 	"github.com/gogo/protobuf/types"
@@ -37,6 +38,7 @@ var (
 	_ = (*url.URL)(nil)
 	_ = (*mail.Address)(nil)
 	_ = types.DynamicAny{}
+        _ = unicode.IsControl
 
 	{{ range (externalEnums .) }}
 		_ = {{ pkg . }}.{{ name . }}(0)
@@ -46,6 +48,12 @@ var (
 // define the regex for a UUID once up-front
 var _{{ snakeCase .File.InputPath.BaseName }}_uuidPattern = regexp.MustCompile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
 
+// define the regex for an HTTP header name once up-front
+var _{{ snakeCase .File.InputPath.BaseName }}_httpHeaderName = regexp.MustCompile("^:?[0-9a-zA-Z!#$%&'*+-.^_|~\x2C]+$")
+
+// define the regex for an HTTP header value once up-front
+var _{{ snakeCase .File.InputPath.BaseName }}_httpHeaderValue = regexp.MustCompile("^[ \t]*(?:[\x20-\x7E\u0080-\u00FF](?:[ \t]+[\x20-\x7E\u0080-\u00FF])?)*[ \t]*$")
+
 {{ range .AllMessages }}
 	{{ template "msg" . }}
 {{ end }}

templates/goshared/known.go

@@ -63,3 +63,23 @@ const uuidTpl = `
 		return nil
 	}
 `
+
+const httpHeaderNameTpl = `
+	func (m {{ (msgTyp .).Pointer }}) _validateHttpHeaderName(hdr string) error {
+                if matched := _{{ snakeCase .File.InputPath.BaseName }}_httpHeaderName.MatchString(hdr); !matched {
+			return errors.New("invalid HTTP header name format")
+		}
+
+		return nil
+	}
+`
+
+const httpHeaderValueTpl = `
+	func (m {{ (msgTyp .).Pointer }}) _validateHttpHeaderValue(hdr string) error {
+                if matched := _{{ snakeCase .File.InputPath.BaseName }}_httpHeaderValue.MatchString(hdr); !matched {
+			return errors.New("invalid HTTP header name format")
+		}
+
+		return nil
+	}
+`

templates/goshared/msg.go

@@ -42,6 +42,10 @@ func (m {{ (msgTyp .).Pointer }}) Validate() error {
 
 {{ if needs . "uuid" }}{{ template "uuid" . }}{{ end }}
 
+{{ if needs . "httpheadername" }}{{ template "httpheadername" . }}{{ end }}
+
+{{ if needs . "httpheadervalue" }}{{ template "httpheadervalue" . }}{{ end }}
+
 {{ cmt (errname .) " is the validation error returned by " (msgTyp .) ".Validate if the designated constraints aren't met." -}}
 type {{ errname . }} struct {
 	field  string

templates/goshared/register.go

@@ -21,7 +21,7 @@ func Register(tpl *template.Template, params pgs.Parameters) {
 	tpl.Funcs(map[string]interface{}{
 		"accessor":      fns.accessor,
 		"byteStr":       fns.byteStr,
-		"snakeCase":	 fns.snakeCase,
+		"snakeCase":     fns.snakeCase,
 		"cmt":           pgs.C80,
 		"durGt":         fns.durGt,
 		"durLit":        fns.durLit,
@@ -76,6 +76,8 @@ func Register(tpl *template.Template, params pgs.Parameters) {
 	template.Must(tpl.New("hostname").Parse(hostTpl))
 	template.Must(tpl.New("address").Parse(hostTpl))
 	template.Must(tpl.New("uuid").Parse(uuidTpl))
+	template.Must(tpl.New("httpheadername").Parse(httpHeaderNameTpl))	
+	template.Must(tpl.New("httpheadervalue").Parse(httpHeaderValueTpl))
 
 	template.Must(tpl.New("enum").Parse(enumTpl))
 	template.Must(tpl.New("repeated").Parse(repTpl))

templates/goshared/string.go

@@ -120,8 +120,15 @@ const strTpl = `
 		if err := m._validateUuid({{ accessor . }}); err != nil {
 			return {{ errCause . "err" "value must be a valid UUID" }}
 		}
+	{{ else if $r.GetHttpHeaderName }}
+		if err := m._validateHttpHeaderName({{ accessor . }}); err != nil {
+			return {{ errCause . "err" "value must be a valid HTTP header name" }}
+		}
+	{{ else if $r.GetHttpHeaderValue }}
+		if err := m._validateHttpHeaderValue({{ accessor . }}); err != nil {
+			return {{ errCause . "err" "value must be a valid HTTP header value" }}
+		}
 	{{ end }}
-
 	{{ if $r.Pattern }}
 	if !{{ lookup $f "Pattern" }}.MatchString({{ accessor . }}) {
 		return {{ err . "value does not match regex pattern " (lit $r.GetPattern) }}

templates/java/string.go

@@ -89,4 +89,10 @@ const stringTpl = `{{ $f := .Field }}{{ $r := .Rules -}}
 {{- if $r.GetUuid }}
 			io.envoyproxy.pgv.StringValidation.uuid("{{ $f.FullyQualifiedName }}", {{ accessor . }});
 {{- end -}}
+{{- if $r.GetHttpHeaderName }}
+			io.envoyproxy.pgv.StringValidation.httpHeaderName("{{ $f.FullyQualifiedName }}", {{ accessor . }});
+{{- end -}}
+{{- if $r.GetHttpHeaderValue }}
+			io.envoyproxy.pgv.StringValidation.httpHeaderValue("{{ $f.FullyQualifiedName }}", {{ accessor . }});
+{{- end -}}
 `

templates/shared/well_known.go

@@ -8,9 +8,11 @@ import (
 type WellKnown string
 
 const (
-	Email    WellKnown = "email"
-	Hostname WellKnown = "hostname"
-	UUID     WellKnown = "uuid"
+	Email           WellKnown = "email"
+	Hostname        WellKnown = "hostname"
+	UUID            WellKnown = "uuid"
+	HttpHeaderName  WellKnown = "httpheadername"
+	HttpHeaderValue WellKnown = "httpheadervalue"
 )
 
 // Needs returns true if a well-known string validator is needed for this
@@ -61,6 +63,14 @@ func strRulesNeeds(rules *validate.StringRules, wk WellKnown) bool {
 		if rules.GetUuid() {
 			return true
 		}
+	case HttpHeaderName:
+		if rules.GetHttpHeaderName() {
+			return true
+		}
+	case HttpHeaderValue:
+		if rules.GetHttpHeaderValue() {
+			return true
+		}
 	}
 
 	return false

tests/harness/cases/strings.proto

@@ -34,3 +34,5 @@ message StringIPv6           { string val = 1 [(validate.rules).string.ipv6 = tr
 message StringURI            { string val = 1 [(validate.rules).string.uri = true]; }
 message StringURIRef         { string val = 1 [(validate.rules).string.uri_ref = true]; }
 message StringUUID           { string val = 1 [(validate.rules).string.uuid = true]; }
+message StringHttpHeaderName { string val = 1 [(validate.rules).string.http_header_name = true]; }
+message StringHttpHeaderValue     { string val = 1 [(validate.rules).string.http_header_value = true]; }

tests/harness/executor/cases.go

@@ -864,6 +864,27 @@ var stringCases = []TestCase{
 	{"string - UUID - valid (v5 - case-insensitive)", &cases.StringUUID{Val: "A6EDC906-2F9F-5FB2-A373-EFAC406F0EF2"}, true},
 	{"string - UUID - invalid", &cases.StringUUID{Val: "foobar"}, false},
 	{"string - UUID - invalid (bad UUID)", &cases.StringUUID{Val: "ffffffff-ffff-ffff-ffff-fffffffffffff"}, false},
+
+	{"string - http header name - valid", &cases.StringHttpHeaderName{Val: "clustername"}, true},
+	{"string - http header name - valid", &cases.StringHttpHeaderName{Val: ":path"}, true},
+	{"string - http header name - valid (nums)", &cases.StringHttpHeaderName{Val: "cluster-123"}, true},
+	{"string - http header name - valid (special token)", &cases.StringHttpHeaderName{Val: "!+#&.%"}, true},
+	{"string - http header name - valid (period)", &cases.StringHttpHeaderName{Val: "CLUSTER.NAME"}, true},
+	{"string - http header name - invalid", &cases.StringHttpHeaderName{Val: ":"}, false},
+	{"string - http header name - invalid", &cases.StringHttpHeaderName{Val: ":path:"}, false},
+	{"string - http header name - invalid (space)", &cases.StringHttpHeaderName{Val: "cluster name"}, false},
+	{"string - http header name - invalid (return)", &cases.StringHttpHeaderName{Val: "example\r"}, false},
+	{"string - http header name - invalid (tab)", &cases.StringHttpHeaderName{Val: "example\t"}, false},
+	{"string - http header name - invalid (slash)", &cases.StringHttpHeaderName{Val: "/test/long/url"}, false},
+
+	{"string - http header value - valid", &cases.StringHttpHeaderValue{Val: "cluster.name.123"}, true},
+	{"string - http header value - valid (uppercase)", &cases.StringHttpHeaderValue{Val: "/TEST/LONG/URL"}, true},
+	{"string - http header value - valid (spaces)", &cases.StringHttpHeaderValue{Val: "cluster name"}, true},
+	{"string - http header value - valid (tab)", &cases.StringHttpHeaderValue{Val: "example\t"}, true},
+	{"string - http header value - valid (special token)", &cases.StringHttpHeaderValue{Val: "!#%&./+"}, true},
+	{"string - http header value - invalid (NUL)", &cases.StringHttpHeaderValue{Val: "foo\000bar"}, false},
+	{"string - http header value - invalid (DEL)", &cases.StringHttpHeaderValue{Val: "\x7f"}, false},
+	{"string - http header value - invalid", &cases.StringHttpHeaderValue{Val: "example\r"}, false},
 }
 
 var bytesCases = []TestCase{