BUG/MINOR: add missing rst-ttl option to relevant keywords

haproxytech · Sep 23, 2024 · 4949065 · 4949065
1 parent 718fbc5
commit 4949065
Show file tree

Hide file tree

Showing 23 changed files with 135 additions and 11 deletions.
diff --git a/configuration/http_request_rule.go b/configuration/http_request_rule.go
@@ -667,6 +667,7 @@ func ParseHTTPRequestRule(f types.Action) (rule *models.HTTPRequestRule, err err
 		}
 	case *actions.SilentDrop:
 		rule = &models.HTTPRequestRule{
+			RstTTL:   v.RstTTL,
 			Type:     "silent-drop",
 			Cond:     v.Cond,
 			CondTest: v.CondTest,
@@ -1138,6 +1139,7 @@ func SerializeHTTPRequestRule(f models.HTTPRequestRule) (rule types.Action, err
 		}
 	case "silent-drop":
 		rule = &actions.SilentDrop{
+			RstTTL:   f.RstTTL,
 			Cond:     f.Cond,
 			CondTest: f.CondTest,
 		}

diff --git a/configuration/http_response_rule.go b/configuration/http_response_rule.go
@@ -508,6 +508,7 @@ func ParseHTTPResponseRule(f types.Action) *models.HTTPResponseRule { //nolint:m
 		}
 	case *actions.SilentDrop:
 		return &models.HTTPResponseRule{
+			RstTTL:   v.RstTTL,
 			Type:     "silent-drop",
 			Cond:     v.Cond,
 			CondTest: v.CondTest,
@@ -817,6 +818,7 @@ func SerializeHTTPResponseRule(f models.HTTPResponseRule) (rule types.Action, er
 		}
 	case "silent-drop":
 		rule = &actions.SilentDrop{
+			RstTTL:   f.RstTTL,
 			Cond:     f.Cond,
 			CondTest: f.CondTest,
 		}

diff --git a/configuration/tcp_request_rule.go b/configuration/tcp_request_rule.go
@@ -315,6 +315,7 @@ func ParseTCPRequestRule(f types.TCPType) (rule *models.TCPRequestRule, err erro
 			rule.CondTest = a.CondTest
 		case *actions.SilentDrop:
 			rule.Action = models.TCPRequestRuleActionSilentDashDrop
+			rule.RstTTL = a.RstTTL
 			rule.Cond = a.Cond
 			rule.CondTest = a.CondTest
 		case *actions.Lua:
@@ -494,6 +495,7 @@ func ParseTCPRequestRule(f types.TCPType) (rule *models.TCPRequestRule, err erro
 			rule.CondTest = a.CondTest
 		case *actions.SilentDrop:
 			rule.Action = models.TCPRequestRuleActionSilentDashDrop
+			rule.RstTTL = a.RstTTL
 			rule.Cond = a.Cond
 			rule.CondTest = a.CondTest
 		case *actions.SendSpoeGroup:
@@ -677,6 +679,7 @@ func ParseTCPRequestRule(f types.TCPType) (rule *models.TCPRequestRule, err erro
 			rule.CondTest = a.CondTest
 		case *actions.SilentDrop:
 			rule.Action = models.TCPRequestRuleActionSilentDashDrop
+			rule.RstTTL = a.RstTTL
 			rule.Cond = a.Cond
 			rule.CondTest = a.CondTest
 		default:
@@ -836,6 +839,7 @@ func SerializeTCPRequestRule(f models.TCPRequestRule) (rule types.TCPType, err e
 		case models.TCPRequestRuleActionSilentDashDrop:
 			return &tcp_types.Connection{
 				Action: &actions.SilentDrop{
+					RstTTL:   f.RstTTL,
 					Cond:     f.Cond,
 					CondTest: f.CondTest,
 				},
@@ -1130,6 +1134,7 @@ func SerializeTCPRequestRule(f models.TCPRequestRule) (rule types.TCPType, err e
 		case models.TCPRequestRuleActionSilentDashDrop:
 			return &tcp_types.Content{
 				Action: &actions.SilentDrop{
+					RstTTL:   f.RstTTL,
 					Cond:     f.Cond,
 					CondTest: f.CondTest,
 				},
@@ -1427,6 +1432,7 @@ func SerializeTCPRequestRule(f models.TCPRequestRule) (rule types.TCPType, err e
 		case models.TCPRequestRuleActionSilentDashDrop:
 			return &tcp_types.Session{
 				Action: &actions.SilentDrop{
+					RstTTL:   f.RstTTL,
 					Cond:     f.Cond,
 					CondTest: f.CondTest,
 				},

diff --git a/configuration/tcp_response_rule.go b/configuration/tcp_response_rule.go
@@ -372,6 +372,7 @@ func ParseTCPResponseRule(t types.TCPType) (*models.TCPResponseRule, error) {
 			return &models.TCPResponseRule{
 				Type:     models.TCPResponseRuleTypeContent,
 				Action:   models.TCPResponseRuleActionSilentDashDrop,
+				RstTTL:   a.RstTTL,
 				Cond:     a.Cond,
 				CondTest: a.CondTest,
 			}, nil
@@ -570,6 +571,7 @@ func SerializeTCPResponseRule(t models.TCPResponseRule) (types.TCPType, error) {
 		case models.TCPResponseRuleActionSilentDashDrop:
 			return &tcp_types.Content{
 				Action: &actions.SilentDrop{
+					RstTTL:   t.RstTTL,
 					Cond:     t.Cond,
 					CondTest: t.CondTest,
 				},

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.6.0
-	github.com/haproxytech/config-parser/v5 v5.1.5
+	github.com/haproxytech/config-parser/v5 v5.1.6-0.20240923121611-21c538dab47a
 	github.com/json-iterator/go v1.1.12
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/mitchellh/mapstructure v1.5.0

diff --git a/go.sum b/go.sum
@@ -32,8 +32,8 @@ github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU
 github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/haproxytech/config-parser/v5 v5.1.5 h1:wZZ7z62Q5xbRQCoyEejli3unj0/Eo+ixJrwe9ZBdzvI=
-github.com/haproxytech/config-parser/v5 v5.1.5/go.mod h1:16+1AbS+AvMZkDScIhergz2dqecQuEmjwV4Xt5ncS9s=
+github.com/haproxytech/config-parser/v5 v5.1.6-0.20240923121611-21c538dab47a h1:zrHz2vatWGa6lHVSt+daH8erytvuKhre2EFpXXopJa0=
+github.com/haproxytech/config-parser/v5 v5.1.6-0.20240923121611-21c538dab47a/go.mod h1:16+1AbS+AvMZkDScIhergz2dqecQuEmjwV4Xt5ncS9s=
 github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
 github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=

diff --git a/models/http_request_rule.go b/models/http_request_rule.go
diff --git a/models/http_request_rule_compare.go b/models/http_request_rule_compare.go
diff --git a/models/http_request_rule_compare_test.go b/models/http_request_rule_compare_test.go
diff --git a/models/http_response_rule.go b/models/http_response_rule.go
diff --git a/models/http_response_rule_compare.go b/models/http_response_rule_compare.go
diff --git a/models/http_response_rule_compare_test.go b/models/http_response_rule_compare_test.go
diff --git a/models/tcp_request_rule.go b/models/tcp_request_rule.go
diff --git a/models/tcp_request_rule_compare.go b/models/tcp_request_rule_compare.go
diff --git a/models/tcp_request_rule_compare_test.go b/models/tcp_request_rule_compare_test.go
diff --git a/models/tcp_response_rule.go b/models/tcp_response_rule.go
diff --git a/models/tcp_response_rule_compare.go b/models/tcp_response_rule_compare.go
diff --git a/models/tcp_response_rule_compare_test.go b/models/tcp_response_rule_compare_test.go