Skip to content

Commit

Permalink
pr(parser) use consistent caps and label unsafe
Browse files Browse the repository at this point in the history
Use SNI (rather than sni) throughout, and prefix which version is unsafe
rather than which version is safe.
  • Loading branch information
Travis Raines committed Oct 28, 2020
1 parent 7b303d3 commit 4bd17e9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions internal/ingress/controller/parser/kongstate/route.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,17 +290,17 @@ func (r *Route) overrideByKongIngress(log logrus.FieldLogger, kongIngress *confi
r.PathHandling = kong.String(*ir.PathHandling)
}
if len(ir.SNIs) != 0 {
var snis []*string
for _, sni := range ir.SNIs {
sanitizedSNI := strings.TrimSpace(*sni)
if validSNIs.MatchString(sanitizedSNI) {
snis = append(snis, kong.String(sanitizedSNI))
var SNIs []*string
for _, unsanitizedSNI := range ir.SNIs {
SNI := strings.TrimSpace(*unsanitizedSNI)
if validSNIs.MatchString(SNI) {
SNIs = append(SNIs, kong.String(SNI))
} else {
// SNI is not a valid hostname
log.WithField("kongroute", ir.Name).Errorf("invalid SNI: %v", sni)
log.WithField("kongroute", ir.Name).Errorf("invalid SNI: %v", unsanitizedSNI)
return
}
}
r.SNIs = snis
r.SNIs = SNIs
}
}

0 comments on commit 4bd17e9

Please sign in to comment.