MINOR: httpchk: add support for host param

haproxytech · Dec 23, 2024 · cd0563e · cd0563e
1 parent 4c78f49
commit cd0563e
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 6 deletions.
diff --git a/config-parser/parsers/option-httpchk.go b/config-parser/parsers/option-httpchk.go
@@ -59,13 +59,16 @@ func (s *OptionHttpchk) Parse(line string, parts []string, comment string) (stri
 				Version: parts[4],
 				Comment: comment,
 			}
-		default: // > 5
+		case 6:
 			s.data = &types.OptionHttpchk{
 				Method:  parts[2],
 				URI:     parts[3],
-				Version: strings.Join(parts[4:], " "),
+				Version: parts[4],
+				Host:    parts[5],
 				Comment: comment,
 			}
+		default: // > 6
+			return "", &errors.ParseError{Parser: "option httpchk", Line: line}
 		}
 		return "", nil
 	}
@@ -90,6 +93,10 @@ func (s *OptionHttpchk) Result() ([]common.ReturnResultLine, error) {
 		sb.WriteString(" ")
 		sb.WriteString(s.data.Version)
 	}
+	if s.data.Host != "" {
+		sb.WriteString(" ")
+		sb.WriteString(s.data.Host)
+	}
 	return []common.ReturnResultLine{
 		{
 			Data:    sb.String(),

diff --git a/config-parser/tests/integration/backend_data_test.go b/config-parser/tests/integration/backend_data_test.go
diff --git a/config-parser/tests/integration/backend_test.go b/config-parser/tests/integration/backend_test.go
diff --git a/config-parser/tests/integration/defaults_data_test.go b/config-parser/tests/integration/defaults_data_test.go
diff --git a/config-parser/tests/integration/defaults_test.go b/config-parser/tests/integration/defaults_test.go
diff --git a/config-parser/tests/option-httpchk_generated_test.go b/config-parser/tests/option-httpchk_generated_test.go
diff --git a/config-parser/types/types.go b/config-parser/types/types.go
@@ -782,11 +782,13 @@ type OptionForwardFor struct {
 //test:ok:option httpchk <uri>
 //test:ok:option httpchk <method> <uri>
 //test:ok:option httpchk <method> <uri> <version>
+//test:ok:option httpchk <method> <uri> <version> <host>
 type OptionHttpchk struct {
 	NoOption bool
 	Method   string
 	URI      string
 	Version  string
+	Host     string
 	Comment  string
 }
 

diff --git a/configuration/configuration.go b/configuration/configuration.go
@@ -761,6 +761,7 @@ func (s *SectionParser) getHttpchkData() (bool, interface{}) {
 				Method:  d.Method,
 				URI:     d.URI,
 				Version: d.Version,
+				Host:    d.Host,
 			})
 			return true, "httpchk"
 		}
@@ -2093,6 +2094,7 @@ func (s *SectionObject) getHTTPChkData() (common.ParserData, error) {
 		Method:   params.Method,
 		Version:  params.Version,
 		URI:      params.URI,
+		Host:     params.Host,
 	}, nil
 }
 

diff --git a/models/httpchk_params.go b/models/httpchk_params.go
diff --git a/models/httpchk_params_compare.go b/models/httpchk_params_compare.go
diff --git a/models/httpchk_params_compare_test.go b/models/httpchk_params_compare_test.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -9963,6 +9963,8 @@ definitions:
     title: Default Server
   httpchk_params:
     properties:
+      host:
+        type: string
       method:
         enum:
           - HEAD

diff --git a/specification/models/configuration/misc.yaml b/specification/models/configuration/misc.yaml
@@ -139,6 +139,8 @@ httpchk_params:
       pattern: '^[^ ]*$'
     version:
       type: string
+    host:
+      type: string
 redispatch:
   type: object
   required:

diff --git a/test/configuration_test.go b/test/configuration_test.go
@@ -717,7 +717,7 @@ backend test
   log-tag bla
   option http-keep-alive
   option forwardfor header X-Forwarded-For
-  option httpchk HEAD /
+  option httpchk HEAD / HTTP/1.1 www
   option tcpka
   option srvtcpka
   option checkcache

diff --git a/test/expected/structured.json b/test/expected/structured.json
@@ -552,7 +552,9 @@
             "http_send_name_header": "X-My-Awesome-Header",
             "httpchk_params": {
                 "method": "HEAD",
-                "uri": "/"
+                "uri": "/",
+                "version": "HTTP/1.1",
+                "host": "www"
             },
             "id": 456,
             "ignore_persist_list": [