78afe7e389
* Drop v1beta1 from ingress nginx Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix intorstr logic in controller Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * fixing admission Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * more intorstr fixing * correct template rendering Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix e2e tests for v1 api Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix gofmt errors * This is finally working...almost there... Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Re-add removed validation of AdmissionReview
99 lines
2.6 KiB
Go
99 lines
2.6 KiB
Go
/*
|
|
Copyright 2018 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package modsecurity
|
|
|
|
import (
|
|
networking "k8s.io/api/networking/v1"
|
|
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
|
|
"k8s.io/ingress-nginx/internal/ingress/resolver"
|
|
)
|
|
|
|
// Config contains ModSecurity Configuration items
|
|
type Config struct {
|
|
Enable bool `json:"enable-modsecurity"`
|
|
EnableSet bool `json:"enable-modsecurity-set"`
|
|
OWASPRules bool `json:"enable-owasp-core-rules"`
|
|
TransactionID string `json:"modsecurity-transaction-id"`
|
|
Snippet string `json:"modsecurity-snippet"`
|
|
}
|
|
|
|
// Equal tests for equality between two Config types
|
|
func (modsec1 *Config) Equal(modsec2 *Config) bool {
|
|
if modsec1 == modsec2 {
|
|
return true
|
|
}
|
|
if modsec1 == nil || modsec2 == nil {
|
|
return false
|
|
}
|
|
if modsec1.Enable != modsec2.Enable {
|
|
return false
|
|
}
|
|
if modsec1.EnableSet != modsec2.EnableSet {
|
|
return false
|
|
}
|
|
if modsec1.OWASPRules != modsec2.OWASPRules {
|
|
return false
|
|
}
|
|
if modsec1.TransactionID != modsec2.TransactionID {
|
|
return false
|
|
}
|
|
if modsec1.Snippet != modsec2.Snippet {
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// NewParser creates a new ModSecurity annotation parser
|
|
func NewParser(resolver resolver.Resolver) parser.IngressAnnotation {
|
|
return modSecurity{resolver}
|
|
}
|
|
|
|
type modSecurity struct {
|
|
r resolver.Resolver
|
|
}
|
|
|
|
// Parse parses the annotations contained in the ingress
|
|
// rule used to enable ModSecurity in a particular location
|
|
func (a modSecurity) Parse(ing *networking.Ingress) (interface{}, error) {
|
|
var err error
|
|
config := &Config{}
|
|
|
|
config.EnableSet = true
|
|
config.Enable, err = parser.GetBoolAnnotation("enable-modsecurity", ing)
|
|
if err != nil {
|
|
config.Enable = false
|
|
config.EnableSet = false
|
|
}
|
|
|
|
config.OWASPRules, err = parser.GetBoolAnnotation("enable-owasp-core-rules", ing)
|
|
if err != nil {
|
|
config.OWASPRules = false
|
|
}
|
|
|
|
config.TransactionID, err = parser.GetStringAnnotation("modsecurity-transaction-id", ing)
|
|
if err != nil {
|
|
config.TransactionID = ""
|
|
}
|
|
|
|
config.Snippet, err = parser.GetStringAnnotation("modsecurity-snippet", ing)
|
|
if err != nil {
|
|
config.Snippet = ""
|
|
}
|
|
|
|
return config, nil
|
|
}
|