feat: remove certLink for tiled logs and add field to source object

This is a way to differentiate between the two log types.

Author: d-Rickyy-b

internal/certificatetransparency/ct-parser.go

@@ -23,9 +23,12 @@ import (
 )
 
 // parseData converts a *ct.RawLogEntry struct into a certstream.Data struct by copying some values and calculating others.
-func parseData(entry *ct.RawLogEntry, operatorName, logName, ctURL string) (models.Data, error) {
-	certLink := fmt.Sprintf("%s/ct/v1/get-entries?start=%d&end=%d", ctURL, entry.Index, entry.Index)
-	// TODO implement tiled cert link
+func parseData(entry *ct.RawLogEntry, operatorName, logName, ctURL, logType string) (models.Data, error) {
+	var certLink string
+	// There is no direct link for tiled ct logs
+	if logType == models.SourceIsRFC6962 {
+		certLink = fmt.Sprintf("%s/ct/v1/get-entries?start=%d&end=%d", ctURL, entry.Index, entry.Index)
+	}
 
 	// Create main data structure
 	data := models.Data{
@@ -38,6 +41,7 @@ func parseData(entry *ct.RawLogEntry, operatorName, logName, ctURL string) (mode
 			Timestamp:     float64(entry.Leaf.TimestampedEntry.Timestamp) / 1_000,
 			Operator:      operatorName,
 			NormalizedURL: normalizeCtlogURL(ctURL),
+			Type:          logType,
 		},
 		UpdateType: "X509LogEntry",
 	}
@@ -414,12 +418,12 @@ func keyUsageToString(k x509.KeyUsage) string {
 }
 
 // ParseCertstreamEntry creates an Entry from a ct.RawLogEntry.
-func ParseCertstreamEntry(rawEntry *ct.RawLogEntry, operatorName, logname, ctURL string) (models.Entry, error) {
+func ParseCertstreamEntry(rawEntry *ct.RawLogEntry, operatorName, logname, ctURL, logType string) (models.Entry, error) {
 	if rawEntry == nil {
 		return models.Entry{}, errors.New("certstream entry is nil")
 	}
 
-	data, err := parseData(rawEntry, operatorName, logname, ctURL)
+	data, err := parseData(rawEntry, operatorName, logname, ctURL, logType)
 	if err != nil {
 		return models.Entry{}, err
 	}

internal/certificatetransparency/ct-watcher.go

@@ -562,7 +562,12 @@ func (w *worker) processTile(ctx context.Context, hc *http.Client, tileIndex uin
 
 // foundCertCallback is the callback that handles cases where new regular certs are found.
 func (w *worker) foundCertCallback(rawEntry *ct.RawLogEntry) {
-	entry, parseErr := ParseCertstreamEntry(rawEntry, w.operatorName, w.name, w.ctURL)
+	logType := models.SourceIsRFC6962
+	if w.isTiled {
+		logType = models.SourceIsTiled
+	}
+
+	entry, parseErr := ParseCertstreamEntry(rawEntry, w.operatorName, w.name, w.ctURL, logType)
 	if parseErr != nil {
 		log.Println("Error parsing certstream entry: ", parseErr)
 		return
@@ -576,7 +581,12 @@ func (w *worker) foundCertCallback(rawEntry *ct.RawLogEntry) {
 
 // foundPrecertCallback is the callback that handles cases where new precerts are found.
 func (w *worker) foundPrecertCallback(rawEntry *ct.RawLogEntry) {
-	entry, parseErr := ParseCertstreamEntry(rawEntry, w.operatorName, w.name, w.ctURL)
+	logType := models.SourceIsRFC6962
+	if w.isTiled {
+		logType = models.SourceIsTiled
+	}
+
+	entry, parseErr := ParseCertstreamEntry(rawEntry, w.operatorName, w.name, w.ctURL, logType)
 	if parseErr != nil {
 		log.Println("Error parsing certstream entry: ", parseErr)
 		return

internal/models/certstream.go

@@ -96,12 +96,18 @@ type Data struct {
 	UpdateType string     `json:"update_type"`
 }
 
+const (
+	SourceIsTiled   = "tiled"
+	SourceIsRFC6962 = "rfc6962"
+)
+
 type Source struct {
 	Name          string  `json:"name"`
 	URL           string  `json:"url"`
 	Timestamp     float64 `json:"timestamp"`
 	Operator      string  `json:"-"`
 	NormalizedURL string  `json:"-"`
+	Type          string  `json:"type"`
 }
 
 type LeafCert struct {