Tandem
/
certspotter
mirror of https://github.com/SSLMate/certspotter.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some TODOs that I'v decided not to do

This commit is contained in:
Andrew Ayer 2023-02-03 14:29:24 -05:00
parent 209cdb181b
commit 5e7fa8c079
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor/discoveredcert.go
View File

@ -100,14 +100,14 @@ func (cert *discoveredCert) Environ() []string {
env := []string{ env := []string{
"EVENT=discovered_cert", "EVENT=discovered_cert",
"SUMMARY=certificate discovered for " + cert.WatchItem.String(), "SUMMARY=certificate discovered for " + cert.WatchItem.String(),
"CERT_PARSEABLE=yes", // backwards compat; not documented (TODO-3: consider removing) "CERT_PARSEABLE=yes", // backwards compat with pre-0.15.0; not documented
"LOG_URI=" + cert.LogEntry.Log.URL, "LOG_URI=" + cert.LogEntry.Log.URL,
"ENTRY_INDEX=" + fmt.Sprint(cert.LogEntry.Index), "ENTRY_INDEX=" + fmt.Sprint(cert.LogEntry.Index),
"WATCH_ITEM=" + cert.WatchItem.String(), "WATCH_ITEM=" + cert.WatchItem.String(),
"CERT_SHA256=" + hex.EncodeToString(cert.LeafSHA256[:]), "CERT_SHA256=" + hex.EncodeToString(cert.LeafSHA256[:]),
"FINGERPRINT=" + hex.EncodeToString(cert.LeafSHA256[:]), // backwards compat; not documented (TODO-3: consider removing) "FINGERPRINT=" + hex.EncodeToString(cert.LeafSHA256[:]), // backwards compat with pre-0.15.0; not documented
"PUBKEY_SHA256=" + hex.EncodeToString(pubkeySha256[:]), "PUBKEY_SHA256=" + hex.EncodeToString(pubkeySha256[:]),
"PUBKEY_HASH=" + hex.EncodeToString(pubkeySha256[:]), // backwards compat; not documented (TODO-3: consider removing) "PUBKEY_HASH=" + hex.EncodeToString(pubkeySha256[:]), // backwards compat with pre-0.15.0; not documented
"CERT_FILENAME=" + cert.CertPath, "CERT_FILENAME=" + cert.CertPath,
"JSON_FILENAME=" + cert.JSONPath, "JSON_FILENAME=" + cert.JSONPath,
"TEXT_FILENAME=" + cert.TextPath, "TEXT_FILENAME=" + cert.TextPath,
@ -136,7 +136,6 @@ func (cert *discoveredCert) Environ() []string {
env = append(env, "ISSUER_PARSE_ERROR="+cert.Info.IssuerParseError.Error()) env = append(env, "ISSUER_PARSE_ERROR="+cert.Info.IssuerParseError.Error())
} }
// TODO-3: consider removing $SERIAL due to misuse potential, or renaming to $SERIAL_NUMBER
if cert.Info.SerialNumberParseError == nil { if cert.Info.SerialNumberParseError == nil {
env = append(env, "SERIAL="+fmt.Sprintf("%x", cert.Info.SerialNumber)) env = append(env, "SERIAL="+fmt.Sprintf("%x", cert.Info.SerialNumber))
} else { } else {
@ -174,7 +173,7 @@ func (cert *discoveredCert) Text() string {
writeField("Not Before", fmt.Sprintf("[unable to parse: %s]", cert.Info.ValidityParseError)) writeField("Not Before", fmt.Sprintf("[unable to parse: %s]", cert.Info.ValidityParseError))
writeField("Not After", fmt.Sprintf("[unable to parse: %s]", cert.Info.ValidityParseError)) writeField("Not After", fmt.Sprintf("[unable to parse: %s]", cert.Info.ValidityParseError))
} }
writeField("Log Entry", fmt.Sprintf("%d @ %s", cert.LogEntry.Index, cert.LogEntry.Log.URL)) // TODO-3: include entry type here? writeField("Log Entry", fmt.Sprintf("%d @ %s", cert.LogEntry.Index, cert.LogEntry.Log.URL))
writeField("crt.sh", "https://crt.sh/?sha256="+hex.EncodeToString(cert.LeafSHA256[:])) writeField("crt.sh", "https://crt.sh/?sha256="+hex.EncodeToString(cert.LeafSHA256[:]))
if cert.CertPath != "" { if cert.CertPath != "" {
writeField("Filename", cert.CertPath) writeField("Filename", cert.CertPath)

2
monitor/malformed.go
View File

@ -27,7 +27,7 @@ func (malformed *malformedLogEntry) Environ() []string {
"ENTRY_INDEX=" + fmt.Sprint(malformed.Entry.Index), "ENTRY_INDEX=" + fmt.Sprint(malformed.Entry.Index),
"LEAF_HASH=" + malformed.Entry.LeafHash.Base64String(), "LEAF_HASH=" + malformed.Entry.LeafHash.Base64String(),
"PARSE_ERROR=" + malformed.Error, "PARSE_ERROR=" + malformed.Error,
"CERT_PARSEABLE=no", // backwards compat; not documented (TODO-3: consider removing) "CERT_PARSEABLE=no", // backwards compat with pre-0.15.0; not documented
} }
} }