Skip to content

Commit

Permalink
Merge pull request #53 from emersion/lax-parse-ssl-tlv
Browse files Browse the repository at this point in the history
Don't make SSL_CN mandatory
  • Loading branch information
pires authored Nov 9, 2020
2 parents 84376ea + cd4b0ca commit 9d53ed5
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions tlvparse/ssl.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ func SSL(t proxyproto.TLV) (PP2SSL, error) {
return PP2SSL{}, err
}
versionFound := !ssl.ClientSSL()
var cnFound bool
for _, tlv := range ssl.TLV {
switch tlv.Type {
case proxyproto.PP2_SUBTYPE_SSL_VERSION:
Expand All @@ -139,10 +138,9 @@ func SSL(t proxyproto.TLV) (PP2SSL, error) {
if len(tlv.Value) == 0 || !utf8.Valid(tlv.Value) {
return PP2SSL{}, proxyproto.ErrMalformedTLV
}
cnFound = true
}
}
if !(versionFound && cnFound) {
if !versionFound {
return PP2SSL{}, proxyproto.ErrMalformedTLV
}
return ssl, nil
Expand Down

0 comments on commit 9d53ed5

Please sign in to comment.