Merge branch 'main' into update-deps

Author: gammazero

.github/workflows/docker.yml

@@ -28,13 +28,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -58,12 +51,10 @@ jobs:
           push: true
           file: ./Dockerfile
           tags: "${{ steps.tags.outputs.value }}"
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-from: |
+            type=gha
+            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache
+          cache-to: |
+            type=gha,mode=max
+            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
 
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      - name: Move cache to limit growth
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

CHANGELOG.md

@@ -28,6 +28,18 @@ The following emojis are used to highlight certain changes:
 
 ### Security
 
+## [v0.10.0]
+
+### Added
+
+- Automatic generation of peer IDs for HTTP block providers when not explicitly configured ([#117](https://github.com/ipfs/someguy/pull/117))
+  - When `SOMEGUY_HTTP_BLOCK_PROVIDER_ENDPOINTS` are configured but no `SOMEGUY_HTTP_BLOCK_PROVIDER_PEERIDS` are configured, synthetic PeerIDs will now be autogenerated. These are deterministic placeholders derived from endpoint URLs, used only for routing system compatibility with HTTP-based trustless gateways - no libp2p cryptographic operations are performed with these IDs
+
+### Changed
+
+- Modernized Docker build configuration ([#118](https://github.com/ipfs/someguy/pull/118))
+- Updated to Go 1.24/1.25 ([#115](https://github.com/ipfs/someguy/pull/115), [#118](https://github.com/ipfs/someguy/pull/118))
+
 ## [v0.9.1]
 
 ### Added

Dockerfile

@@ -1,5 +1,6 @@
+# syntax=docker/dockerfile:1
 # Builder
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.23-bookworm AS builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.25-bookworm AS builder
 
 LABEL org.opencontainers.image.source=https://github.com/ipfs/someguy
 LABEL org.opencontainers.image.documentation=https://github.com/ipfs/someguy#docker
@@ -8,17 +9,20 @@ LABEL org.opencontainers.image.licenses=MIT+APACHE_2.0
 
 ARG TARGETPLATFORM TARGETOS TARGETARCH
 
-ENV GOPATH      /go
-ENV SRC_PATH    $GOPATH/src/github.com/ipfs/someguy
-ENV GO111MODULE on
-ENV GOPROXY     https://proxy.golang.org
+ENV GOPATH=/go
+ENV SRC_PATH=$GOPATH/src/github.com/ipfs/someguy
+ENV GO111MODULE=on
+ENV GOPROXY=https://proxy.golang.org
 
-COPY go.* $SRC_PATH/
+COPY go.mod go.sum $SRC_PATH/
 WORKDIR $SRC_PATH
-RUN go mod download
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
 
 COPY . $SRC_PATH
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o $GOPATH/bin/someguy
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o $GOPATH/bin/someguy
 
 # Runner
 FROM debian:bookworm-slim
@@ -27,9 +31,9 @@ RUN apt-get update && \
   apt-get install --no-install-recommends -y tini ca-certificates curl && \
   rm -rf /var/lib/apt/lists/*
 
-ENV GOPATH      /go
-ENV SRC_PATH    $GOPATH/src/github.com/ipfs/someguy
-ENV DATA_PATH   /data/someguy
+ENV GOPATH=/go
+ENV SRC_PATH=$GOPATH/src/github.com/ipfs/someguy
+ENV DATA_PATH=/data/someguy
 
 COPY --from=builder $GOPATH/bin/someguy /usr/local/bin/someguy
 

docs/environment-variables.md

@@ -91,7 +91,9 @@ Default: none
 
 ### `SOMEGUY_HTTP_BLOCK_PROVIDER_PEERIDS`
 
-Comma-separated list of [multibase-encoded peerIDs](https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#string-representation) to use in synthetic provider records returned for HTTP providers in `SOMEGUY_HTTP_BLOCK_PROVIDER_ENDPOINTS`.
+Comma-separated list of [multibase-encoded peerIDs](https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#string-representation) to use in synthetic provider records returned for HTTP providers in `SOMEGUY_HTTP_BLOCK_PROVIDER_ENDPOINTS`. The order of PeerIDs must match the order of endpoints.
+
+If no peerIDs are passed but provider endpoints are configured, synthetic PeerIDs will be automatically generated. These are deterministic identifiers derived from SHA256 hashes of the endpoint URLs, used solely for routing system compatibility. Since these providers use HTTP trustless gateway protocol rather than libp2p, the PeerIDs are purely synthetic and never participate in any cryptographic operations or peer authentication.
 
 Default: none
 

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"crypto/sha256"
 	"errors"
 	"fmt"
 	"log"
@@ -12,6 +13,7 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/multiformats/go-multibase"
+	"github.com/multiformats/go-multihash"
 	"github.com/urfave/cli/v2"
 )
 
@@ -175,6 +177,27 @@ func main() {
 					printIfListConfigured("SOMEGUY_PROVIDER_ENDPOINTS = ", cfg.contentEndpoints)
 					printIfListConfigured("SOMEGUY_PEER_ENDPOINTS = ", cfg.peerEndpoints)
 					printIfListConfigured("SOMEGUY_IPNS_ENDPOINTS = ", cfg.ipnsEndpoints)
+
+					if len(cfg.blockProviderEndpoints) > 0 && len(cfg.blockProviderPeerIDs) == 0 {
+						fmt.Printf("SOMEGUY_HTTP_BLOCK_PROVIDER_ENDPOINTS is set but SOMEGUY_HTTP_BLOCK_PROVIDER_PEERIDS were not. PeerIDs will be autogenerated.\n")
+						// Generate synthetic PeerIDs for HTTP block providers. These are deterministic
+						// identifiers based on endpoint URLs, used solely for routing system compatibility.
+						// Since HTTP providers use trustless gateway protocol, these PeerIDs are never
+						// used for cryptographic operations or libp2p authentication.
+						for i := 0; i < len(cfg.blockProviderEndpoints); i++ {
+							digest := sha256.Sum256([]byte(cfg.blockProviderEndpoints[i]))
+							mh, err := multihash.Encode((digest[:]), multihash.SHA2_256)
+							if err != nil {
+								return err
+							}
+							p, err := peer.IDFromBytes(mh)
+							if err != nil {
+								return err
+							}
+							cfg.blockProviderPeerIDs = append(cfg.blockProviderPeerIDs, p.String())
+						}
+					}
+
 					printIfListConfigured("SOMEGUY_HTTP_BLOCK_PROVIDER_ENDPOINTS = ", cfg.blockProviderEndpoints)
 					printIfListConfigured("SOMEGUY_HTTP_BLOCK_PROVIDER_PEERIDS = ", cfg.blockProviderPeerIDs)
 

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "v0.9.1"
+  "version": "v0.10.0"
 }