WIP response header validation: resolve request

attilakreiner · attilakreiner · commit 78aca8612e3d · 2024-01-18T18:39:05.000+01:00
diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpBindingConfig.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpBindingConfig.java
@@ -225,10 +225,28 @@ private List<HttpRequestType> createRequestTypes(
                 List<HttpRequestType.Response> responses = new LinkedList<>();
                 if (request.responses != null)
                 {
-                    for (HttpResponseConfig config : request.responses)
+                    for (HttpResponseConfig response0 : request.responses)
                     {
-                        HttpRequestType.Response response = new HttpRequestType.Response(config.status, config.contentType,
-                            createValidator.apply(config.content, this.resolveId));
+                        Map<String8FW, Validator> responseHeaderValidators = new HashMap<>();
+                        if (response0.headers != null)
+                        {
+                            for (HttpParamConfig header : response0.headers)
+                            {
+                                String8FW name = new String8FW(header.name);
+                                Validator validator = createValidator.apply(header.validator, this.resolveId);
+                                if (validator != null)
+                                {
+                                    responseHeaderValidators.put(name, validator);
+                                }
+                            }
+                        }
+                        Validator contentValidator = null;
+                        if (response0.content != null)
+                        {
+                            contentValidator = createValidator.apply(response0.content, this.resolveId);
+                        }
+                        HttpRequestType.Response response = new HttpRequestType.Response(response0.status, response0.contentType,
+                            responseHeaderValidators, contentValidator);
                         responses.add(response);
                     }
                 }
@@ -272,11 +290,11 @@ public HttpRequestType resolveRequestType(
         return result;
     }
 
-    public Validator resolveResponseValidator(
+    public HttpRequestType.Response resolveResponse(
         HttpRequestType requestType,
         HttpBeginExFW beginEx)
     {
-        Validator result = null;
+        HttpRequestType.Response result = null;
         if (requestType != null && requestType.responses != null)
         {
             String status = resolveHeaderValue(beginEx, HEADER_STATUS);
@@ -286,7 +304,7 @@ public Validator resolveResponseValidator(
                 if (matchResponseStatus(response, status) &&
                     matchResponseContentType(response, contentType))
                 {
-                    result = response.content;
+                    result = response;
                 }
             }
         }
diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestType.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRequestType.java
@@ -79,12 +79,18 @@ public static final class Response
     {
         public final List<String> status;
         public final List<String> contentType;
+        public final Map<String8FW, Validator> headers;
         public final Validator content;
 
-        public Response(List<String> status, List<String> contentType, Validator content)
+        public Response(
+            List<String> status,
+            List<String> contentType,
+            Map<String8FW, Validator> headers,
+            Validator content)
         {
             this.status = status;
             this.contentType = contentType;
+            this.headers = headers;
             this.content = content;
         }
     }
diff --git a/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpClientFactory.java b/runtime/binding-http/src/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpClientFactory.java
@@ -2896,7 +2896,7 @@ private void onDecodeHttp11Headers(
                 pool.onUpgradedOrClosed(this);
             }
 
-            exchange.resolveResponseValidator(beginEx);
+            exchange.resolveResponse(beginEx);
         }
 
         private void onDecodeHttp11HeadersOnly(
@@ -2918,9 +2918,9 @@ private int onDecodeHttp11Body(
         {
             int result;
             boolean valid = true;
-            if (exchange.responseValidator != null)
+            if (exchange.response != null && exchange.response.content != null)
             {
-                valid = exchange.responseValidator.read(buffer, offset, limit - offset);
+                valid = exchange.response.content.read(buffer, offset, limit - offset);
             }
             if (valid)
             {
@@ -3354,9 +3354,9 @@ private int onDecodeHttp2Data(
                         else
                         {
                             boolean valid = true;
-                            if (exchange.responseValidator != null)
+                            if (exchange.response != null && exchange.response.content != null)
                             {
-                                valid = exchange.responseValidator.read(payload, 0, payloadLength);
+                                valid = exchange.response.content.read(payload, 0, payloadLength);
                             }
                             if (valid)
                             {
@@ -3467,7 +3467,7 @@ else if (headersDecoder.httpError())
                         .headers(hs -> headers.forEach((n, v) -> hs.item(h -> h.name(n).value(v))))
                         .build();
 
-                exchange.resolveResponseValidator(beginEx);
+                exchange.resolveResponse(beginEx);
                 exchange.doResponseBegin(traceId, authorization, beginEx);
 
                 if (endResponse)
@@ -4497,7 +4497,7 @@ private final class HttpExchange
 
         private final HttpBindingConfig binding;
         private HttpRequestType requestType;
-        private Validator responseValidator;
+        private HttpRequestType.Response response;
 
         private HttpExchange(
             HttpClient client,
@@ -5049,10 +5049,10 @@ private void cleanup(
             doResponseAbort(traceId, authorization, EMPTY_OCTETS);
         }
 
-        public void resolveResponseValidator(
+        public void resolveResponse(
             HttpBeginExFW beginEx)
         {
-            this.responseValidator = binding.resolveResponseValidator(requestType, beginEx);
+            this.response = binding.resolveResponse(requestType, beginEx);
         }
     }
 
diff --git a/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json b/specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json
@@ -366,9 +366,20 @@
                                                         "$ref": "#/$defs/validator/type"
                                                     }
                                                 },
-                                                "required":
+                                                "anyOf":
                                                 [
-                                                    "content"
+                                                    {
+                                                        "required":
+                                                        [
+                                                            "content"
+                                                        ]
+                                                    },
+                                                    {
+                                                        "required":
+                                                        [
+                                                            "headers"
+                                                        ]
+                                                    }
                                                 ],
                                                 "additionalProperties": false
                                             }

Original file line number	Diff line number	Diff line change
`@@ -225,10 +225,28 @@ private List<HttpRequestType> createRequestTypes(`
`225`	`225`	`List<HttpRequestType.Response> responses = new LinkedList<>();`
`226`	`226`	`if (request.responses != null)`
`227`	`227`	`{`
`228`		`- for (HttpResponseConfig config : request.responses)`
	`228`	`+ for (HttpResponseConfig response0 : request.responses)`
`229`	`229`	`{`
`230`		`- HttpRequestType.Response response = new HttpRequestType.Response(config.status, config.contentType,`
`231`		`- createValidator.apply(config.content, this.resolveId));`
	`230`	`+ Map<String8FW, Validator> responseHeaderValidators = new HashMap<>();`
	`231`	`+ if (response0.headers != null)`
	`232`	`+ {`
	`233`	`+ for (HttpParamConfig header : response0.headers)`
	`234`	`+ {`
	`235`	`+ String8FW name = new String8FW(header.name);`
	`236`	`+ Validator validator = createValidator.apply(header.validator, this.resolveId);`
	`237`	`+ if (validator != null)`
	`238`	`+ {`
	`239`	`+ responseHeaderValidators.put(name, validator);`
	`240`	`+ }`
	`241`	`+ }`
	`242`	`+ }`
	`243`	`+ Validator contentValidator = null;`
	`244`	`+ if (response0.content != null)`
	`245`	`+ {`
	`246`	`+ contentValidator = createValidator.apply(response0.content, this.resolveId);`
	`247`	`+ }`
	`248`	`+ HttpRequestType.Response response = new HttpRequestType.Response(response0.status, response0.contentType,`
	`249`	`+ responseHeaderValidators, contentValidator);`
`232`	`250`	`responses.add(response);`
`233`	`251`	`}`
`234`	`252`	`}`
`@@ -272,11 +290,11 @@ public HttpRequestType resolveRequestType(`
`272`	`290`	`return result;`
`273`	`291`	`}`
`274`	`292`
`275`		`- public Validator resolveResponseValidator(`
	`293`	`+ public HttpRequestType.Response resolveResponse(`
`276`	`294`	`HttpRequestType requestType,`
`277`	`295`	`HttpBeginExFW beginEx)`
`278`	`296`	`{`
`279`		`- Validator result = null;`
	`297`	`+ HttpRequestType.Response result = null;`
`280`	`298`	`if (requestType != null && requestType.responses != null)`
`281`	`299`	`{`
`282`	`300`	`String status = resolveHeaderValue(beginEx, HEADER_STATUS);`
`@@ -286,7 +304,7 @@ public Validator resolveResponseValidator(`
`286`	`304`	`if (matchResponseStatus(response, status) &&`
`287`	`305`	`matchResponseContentType(response, contentType))`
`288`	`306`	`{`
`289`		`- result = response.content;`
	`307`	`+ result = response;`
`290`	`308`	`}`
`291`	`309`	`}`
`292`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,18 @@ public static final class Response`
`79`	`79`	`{`
`80`	`80`	`public final List<String> status;`
`81`	`81`	`public final List<String> contentType;`
	`82`	`+ public final Map<String8FW, Validator> headers;`
`82`	`83`	`public final Validator content;`
`83`	`84`
`84`		`- public Response(List<String> status, List<String> contentType, Validator content)`
	`85`	`+ public Response(`
	`86`	`+ List<String> status,`
	`87`	`+ List<String> contentType,`
	`88`	`+ Map<String8FW, Validator> headers,`
	`89`	`+ Validator content)`
`85`	`90`	`{`
`86`	`91`	`this.status = status;`
`87`	`92`	`this.contentType = contentType;`
	`93`	`+ this.headers = headers;`
`88`	`94`	`this.content = content;`
`89`	`95`	`}`
`90`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2896,7 +2896,7 @@ private void onDecodeHttp11Headers(`
`2896`	`2896`	`pool.onUpgradedOrClosed(this);`
`2897`	`2897`	`}`
`2898`	`2898`
`2899`		`- exchange.resolveResponseValidator(beginEx);`
	`2899`	`+ exchange.resolveResponse(beginEx);`
`2900`	`2900`	`}`
`2901`	`2901`
`2902`	`2902`	`private void onDecodeHttp11HeadersOnly(`
`@@ -2918,9 +2918,9 @@ private int onDecodeHttp11Body(`
`2918`	`2918`	`{`
`2919`	`2919`	`int result;`
`2920`	`2920`	`boolean valid = true;`
`2921`		`- if (exchange.responseValidator != null)`
	`2921`	`+ if (exchange.response != null && exchange.response.content != null)`
`2922`	`2922`	`{`
`2923`		`- valid = exchange.responseValidator.read(buffer, offset, limit - offset);`
	`2923`	`+ valid = exchange.response.content.read(buffer, offset, limit - offset);`
`2924`	`2924`	`}`
`2925`	`2925`	`if (valid)`
`2926`	`2926`	`{`
`@@ -3354,9 +3354,9 @@ private int onDecodeHttp2Data(`
`3354`	`3354`	`else`
`3355`	`3355`	`{`
`3356`	`3356`	`boolean valid = true;`
`3357`		`- if (exchange.responseValidator != null)`
	`3357`	`+ if (exchange.response != null && exchange.response.content != null)`
`3358`	`3358`	`{`
`3359`		`- valid = exchange.responseValidator.read(payload, 0, payloadLength);`
	`3359`	`+ valid = exchange.response.content.read(payload, 0, payloadLength);`
`3360`	`3360`	`}`
`3361`	`3361`	`if (valid)`
`3362`	`3362`	`{`
`@@ -3467,7 +3467,7 @@ else if (headersDecoder.httpError())`
`3467`	`3467`	`.headers(hs -> headers.forEach((n, v) -> hs.item(h -> h.name(n).value(v))))`
`3468`	`3468`	`.build();`
`3469`	`3469`
`3470`		`- exchange.resolveResponseValidator(beginEx);`
	`3470`	`+ exchange.resolveResponse(beginEx);`
`3471`	`3471`	`exchange.doResponseBegin(traceId, authorization, beginEx);`
`3472`	`3472`
`3473`	`3473`	`if (endResponse)`
`@@ -4497,7 +4497,7 @@ private final class HttpExchange`
`4497`	`4497`
`4498`	`4498`	`private final HttpBindingConfig binding;`
`4499`	`4499`	`private HttpRequestType requestType;`
`4500`		`- private Validator responseValidator;`
	`4500`	`+ private HttpRequestType.Response response;`
`4501`	`4501`
`4502`	`4502`	`private HttpExchange(`
`4503`	`4503`	`HttpClient client,`
`@@ -5049,10 +5049,10 @@ private void cleanup(`
`5049`	`5049`	`doResponseAbort(traceId, authorization, EMPTY_OCTETS);`
`5050`	`5050`	`}`
`5051`	`5051`
`5052`		`- public void resolveResponseValidator(`
	`5052`	`+ public void resolveResponse(`
`5053`	`5053`	`HttpBeginExFW beginEx)`
`5054`	`5054`	`{`
`5055`		`- this.responseValidator = binding.resolveResponseValidator(requestType, beginEx);`
	`5055`	`+ this.response = binding.resolveResponse(requestType, beginEx);`
`5056`	`5056`	`}`
`5057`	`5057`	`}`
`5058`	`5058`