TrueCloudLab/certificates
17
0
Fork 2
Code Issues 1 Pull requests 1 Releases Activity Actions

Merge branch 'master' into ssh-cert-templates

Browse source
This commit is contained in:
Mariano Cano 2020-08-24 15:08:28 -07:00
commit c94a1c51be
20 changed files with 531 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/api.go
View file

@ -394,7 +394,8 @@ func logOtt(w http.ResponseWriter, token string) {
}
}
func logCertificate(w http.ResponseWriter, cert *x509.Certificate) {
// LogCertificate add certificate fields to the log message.
func LogCertificate(w http.ResponseWriter, cert *x509.Certificate) {
if rl, ok := w.(logging.ResponseLogger); ok {
m := map[string]interface{}{
"serial": cert.SerialNumber,
@ -412,7 +413,11 @@ func logCertificate(w http.ResponseWriter, cert *x509.Certificate) {
if err != nil || len(rest) > 0 {
break
}
m["provisioner"] = fmt.Sprintf("%s (%s)", val.Name, val.CredentialID)
if len(val.CredentialID) > 0 {
m["provisioner"] = fmt.Sprintf("%s (%s)", val.Name, val.CredentialID)
} else {
m["provisioner"] = fmt.Sprintf("%s", val.Name)
}
break
}
}