aljaz/certspotter
1
1
Fork 0
mirror of https://github.com/SSLMate/certspotter.git synced 2026-01-31 17:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

loglist/mozilla: handle static-ct-api logs

Browse Source
This commit is contained in:
Andrew Ayer
2025-07-04 12:37:51 -04:00
parent 43d6c4de2e
commit ed8cec77ab
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
loglist/mozilla/ctlogs.go
View File

@@ -24,6 +24,7 @@ import (
type CTLogInfo struct {
Name string
State string // Admissible or Retired
Protocol string // RFC6962 or Tiled
Timestamp time.Time
OperatorIndex int
Key []byte
@@ -116,7 +117,7 @@ func readLogEntry(firstLine string, s *bufio.Scanner) (CTLogInfo, error) {
var log CTLogInfo
// Example first line:
// {"Name", CTLogState::Admissible,
// {"Name", CTLogState::Admissible, CTLogFormat::RFC6962,
firstLine = strings.TrimSpace(firstLine)
if !strings.HasPrefix(firstLine, "{") {
return log, errors.New("invalid log entry start")
@@ -125,22 +126,18 @@ func readLogEntry(firstLine string, s *bufio.Scanner) (CTLogInfo, error) {
firstLine = strings.TrimSuffix(firstLine, ",")
parts := splitCSV(firstLine)
var statePart string
switch len(parts) {
case 2:
log.Name = trimQuotes(parts[0])
statePart = parts[1]
case 1:
log.Name = trimQuotes(parts[0])
for len(parts) < 3 {
if !s.Scan() {
return log, io.ErrUnexpectedEOF
}
statePart = strings.TrimSpace(s.Text())
default:
return log, errors.New("invalid log entry header")
next := strings.TrimSpace(strings.TrimSuffix(s.Text(), ","))
parts = append(parts, splitCSV(next)...)
}
statePart = strings.TrimSuffix(strings.TrimSpace(statePart), ",")
log.State = strings.TrimPrefix(statePart, "CTLogState::")
log.Name = trimQuotes(parts[0])
log.State = strings.TrimPrefix(strings.TrimSpace(parts[1]), "CTLogState::")
log.Protocol = strings.TrimPrefix(strings.TrimSpace(parts[2]), "CTLogFormat::")
// Next line: timestamp
if !s.Scan() {

3
loglist/mozilla/ctlogs_test.go
View File

@@ -73,6 +73,9 @@ func TestParseFromURL(t *testing.T) {
if l.State != "Admissible" && l.State != "Retired" {
t.Errorf("unexpected state %q", l.State)
}
if l.Protocol != "RFC6962" && l.Protocol != "Tiled" {
t.Errorf("unexpected protocol %q", l.Protocol)
}
hash := sha256.Sum256(l.Key)
if base64.StdEncoding.EncodeToString(hash[:]) == targetHash {
foundHash = true

6
loglist/mozilla/example_test.go
View File

@@ -44,12 +44,12 @@ func ExampleParse() {
tw.Flush()
tw = tabwriter.NewWriter(os.Stdout, 0, 8, 1, ' ', 0)
fmt.Fprintln(tw, "LogID\tState\tTimestamp\tOperator\tName")
fmt.Fprintln(tw, "LogID\tProtocol\tState\tTimestamp\tOperator\tName")
for _, l := range logs {
hash := sha256.Sum256(l.Key)
fmt.Fprintf(tw, "%s\t%s\t%s\t%d\t%s\n",
fmt.Fprintf(tw, "%s\t%s\t%s\t%s\t%d\t%s\n",
base64.StdEncoding.EncodeToString(hash[:]),
l.State, l.Timestamp.UTC().Format(time.RFC3339), l.OperatorIndex, l.Name)
l.Protocol, l.State, l.Timestamp.UTC().Format(time.RFC3339), l.OperatorIndex, l.Name)
}
tw.Flush()
}