certificate-transparency/ctool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up stderr logging

Browse Source
This commit is contained in:
Pim van Pelt
2026-04-05 22:54:29 +02:00
parent 76e3ce28e1
commit 8efc43b0e4
2 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/ctfetch/main.go
View File

@@ -102,37 +102,18 @@ func runLeafIndex(logURL, indexStr string, opts utils.Options) {
tile.L = -1
partialPath := sunlight.TilePath(tile)
fullTile := tile
fullTile.W = sunlight.TileWidth
fullPath := sunlight.TilePath(fullTile)
positionInTile := leafIndex % sunlight.TileWidth
fmt.Fprintf(os.Stderr, "Leaf Index: %d\n", leafIndex)
fmt.Fprintf(os.Stderr, "Position in tile: %d\n", positionInTile)
fmt.Fprintf(os.Stderr, "Partial tile path: %s\n", partialPath)
fmt.Fprintf(os.Stderr, "Full tile path: %s\n", fullPath)
partialURL := logURL + "/" + partialPath
fmt.Fprintf(os.Stderr, "Trying: %s\n", partialURL)
tileData, err := utils.FetchTile(partialURL)
tileData, err := utils.FetchTile(logURL + "/" + partialPath)
if err != nil {
fullURL := logURL + "/" + fullPath
fmt.Fprintf(os.Stderr, "Partial tile failed, trying: %s\n", fullURL)
tileData, err = utils.FetchURL(fullURL)
if err != nil {
fatal("failed to fetch tile: %v", err)
}
fmt.Fprintf(os.Stderr, "Successfully fetched full tile\n")
} else {
fmt.Fprintf(os.Stderr, "Successfully fetched partial tile\n")
fatal("failed to fetch tile: %v", err)
}
tileData, err = utils.Decompress(tileData)
if err != nil {
fatal("failed to decompress tile: %v", err)
}
fmt.Fprintf(os.Stderr, "Tile size: %d bytes\n\n", len(tileData))
entry, err := utils.DumpEntryAtPosition(tileData, int(positionInTile), leafIndex, opts)
if err != nil {
@@ -156,12 +137,10 @@ func runTileDump(arg, monitoringURL string, opts utils.Options) {
fatal("+issuer requires a log root URL; none could be derived from %q and --monitoring-url is not set", arg)
}
}
fmt.Fprintf(os.Stderr, "Fetching: %s\n", arg)
tileData, err = utils.FetchTile(arg)
if err != nil {
fatal("failed to fetch tile: %v", err)
}
fmt.Fprintf(os.Stderr, "Fetched %d bytes\n", len(tileData))
} else {
// File input.
if opts.ShowIssuer {
@@ -175,14 +154,12 @@ func runTileDump(arg, monitoringURL string, opts utils.Options) {
if err != nil {
fatal("failed to read file: %v", err)
}
fmt.Fprintf(os.Stderr, "Read %d bytes from %s\n", len(tileData), arg)
}
tileData, err = utils.Decompress(tileData)
if err != nil {
fatal("failed to decompress tile: %v", err)
}
fmt.Fprintf(os.Stderr, "Tile size: %d bytes\n\n", len(tileData))
result, err := utils.DumpAllEntries(tileData, opts)
if err != nil {