a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* helper functions return 'error', not 'int'

This commit is contained in:
Simon Zolin 2019-02-27 18:46:04 +03:00
parent 99c8cd06c9
commit 24edf7eeb6
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
control.go
View File

@ -1114,8 +1114,7 @@ func handleTLSConfigure(w http.ResponseWriter, r *http.Request) {
} }
} }
// Return 0 on success func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string) error {
func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string) int {
log.Tracef("got certificate: %s", certChain) log.Tracef("got certificate: %s", certChain)
// now do a more extended validation // now do a more extended validation
@ -1142,14 +1141,14 @@ func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string)
parsed, err := x509.ParseCertificate(cert.Bytes) parsed, err := x509.ParseCertificate(cert.Bytes)
if err != nil { if err != nil {
data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err) data.WarningValidation = fmt.Sprintf("Failed to parse certificate: %s", err)
return 1 return errors.New("")
} }
parsedCerts = append(parsedCerts, parsed) parsedCerts = append(parsedCerts, parsed)
} }
if len(parsedCerts) == 0 { if len(parsedCerts) == 0 {
data.WarningValidation = fmt.Sprintf("You have specified an empty certificate") data.WarningValidation = fmt.Sprintf("You have specified an empty certificate")
return 1 return errors.New("")
} }
data.ValidCert = true data.ValidCert = true
@ -1192,11 +1191,10 @@ func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string)
data.DNSNames = mainCert.DNSNames data.DNSNames = mainCert.DNSNames
} }
return 0 return nil
} }
// Return 0 on success func validatePkey(data *tlsConfigStatus, pkey string) error {
func validatePkey(data *tlsConfigStatus, pkey string) int {
// now do a more extended validation // now do a more extended validation
var key *pem.Block // PEM-encoded certificates var key *pem.Block // PEM-encoded certificates
var skippedBytes []string // skipped bytes var skippedBytes []string // skipped bytes
@ -1219,19 +1217,19 @@ func validatePkey(data *tlsConfigStatus, pkey string) int {
if key == nil { if key == nil {
data.WarningValidation = "No valid keys were found" data.WarningValidation = "No valid keys were found"
return 1 return errors.New("")
} }
// parse the decoded key // parse the decoded key
_, keytype, err := parsePrivateKey(key.Bytes) _, keytype, err := parsePrivateKey(key.Bytes)
if err != nil { if err != nil {
data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err) data.WarningValidation = fmt.Sprintf("Failed to parse private key: %s", err)
return 1 return errors.New("")
} }
data.ValidKey = true data.ValidKey = true
data.KeyType = keytype data.KeyType = keytype
return 0 return nil
} }
/* Process certificate data and its private key. /* Process certificate data and its private key.
@ -1244,14 +1242,14 @@ func validateCertificates(certChain, pkey, serverName string) tlsConfigStatus {
// check only public certificate separately from the key // check only public certificate separately from the key
if certChain != "" { if certChain != "" {
if verifyCertChain(&data, certChain, serverName) != 0 { if verifyCertChain(&data, certChain, serverName) != nil {
return data return data
} }
} }
// validate private key (right now the only validation possible is just parsing it) // validate private key (right now the only validation possible is just parsing it)
if pkey != "" { if pkey != "" {
if validatePkey(&data, pkey) != 0 { if validatePkey(&data, pkey) != nil {
return data return data
} }
} }