Merge branch 'master' into multiple-underlay-addresses

Author: janos

Dockerfile.dev

@@ -18,13 +18,19 @@ FROM debian:12.12-slim
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates; \
+    ca-certificates \
+    iputils-ping \
+    netcat-openbsd \
+    telnet \
+    curl \
+    wget \
+    jq \
+    net-tools; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*; \
     groupadd -r bee --gid 999; \
     useradd -r -g bee --uid 999 --no-log-init -m bee;
 
-# make sure mounted volumes have correct permissions
 RUN mkdir -p /home/bee/.bee && chown 999:999 /home/bee/.bee
 
 COPY --from=build /src/dist/bee /usr/local/bin/bee

openapi/Swarm.yaml

@@ -565,12 +565,6 @@ paths:
       tags:
         - Tag
       description: Tags can be thought of as upload sessions which can be tracked using the tags endpoint. It will keep track of the chunks that are uploaded as part of the tag and will push them out to the network once a done split is called on the Tag. This happens internally if you use the `Swarm-Deferred-Upload` header.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "SwarmCommon.yaml#/components/schemas/NewTagRequest"
       responses:
         "201":
           description: New Tag Info

openapi/SwarmCommon.yaml

@@ -295,12 +295,6 @@ components:
     MultiAddress:
       type: string
 
-    NewTagRequest:
-      type: object
-      properties:
-        address:
-          $ref: "#/components/schemas/SwarmAddress"
-
     NewTagResponse:
       type: object
       properties:

pkg/node/chain.go

@@ -372,8 +372,8 @@ func (m noOpChainBackend) SuggestGasTipCap(context.Context) (*big.Int, error) {
 	panic("chain no op: SuggestGasTipCap")
 }
 
-func (m noOpChainBackend) EstimateGas(context.Context, ethereum.CallMsg) (uint64, error) {
-	panic("chain no op: EstimateGas")
+func (m noOpChainBackend) EstimateGasAtBlock(context.Context, ethereum.CallMsg, *big.Int) (uint64, error) {
+	panic("chain no op: EstimateGasAtBlock")
 }
 
 func (m noOpChainBackend) SendTransaction(context.Context, *types.Transaction) error {

pkg/node/export_test.go

@@ -0,0 +1,7 @@
+// Copyright 2025 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package node
+
+var ValidatePublicAddress = validatePublicAddress

pkg/node/node.go

@@ -20,6 +20,7 @@ import (
 	"net/http"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -222,6 +223,10 @@ func NewBee(
 		return nil, fmt.Errorf("tracer: %w", err)
 	}
 
+	if err := validatePublicAddress(o.NATAddr); err != nil {
+		return nil, fmt.Errorf("invalid NAT address %s: %w", o.NATAddr, err)
+	}
+
 	ctx, ctxCancel := context.WithCancel(ctx)
 	defer func() {
 		// if there's been an error on this function
@@ -1463,3 +1468,38 @@ func isChainEnabled(o *Options, swapEndpoint string, logger log.Logger) bool {
 	logger.Info("starting with an enabled chain backend")
 	return true // all other modes operate require chain enabled
 }
+
+func validatePublicAddress(addr string) error {
+	if addr == "" {
+		return nil
+	}
+
+	host, port, err := net.SplitHostPort(addr)
+	if err != nil {
+		return fmt.Errorf("%w", err)
+	}
+	if host == "" {
+		return errors.New("host is empty")
+	}
+	if port == "" {
+		return errors.New("port is empty")
+	}
+	if _, err := strconv.ParseUint(port, 10, 16); err != nil {
+		return fmt.Errorf("port is not a valid number: %w", err)
+	}
+	if host == "localhost" {
+		return errors.New("localhost is not a valid address")
+	}
+	ip := net.ParseIP(host)
+	if ip == nil {
+		return errors.New("not a valid IP address")
+	}
+	if ip.IsLoopback() {
+		return errors.New("loopback address is not a valid address")
+	}
+	if ip.IsPrivate() {
+		return errors.New("private address is not a valid address")
+	}
+
+	return nil
+}

pkg/node/node_test.go

@@ -0,0 +1,99 @@
+// Copyright 2025 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package node_test
+
+import (
+	"testing"
+
+	"github.com/ethersphere/bee/v2/pkg/node"
+)
+
+func TestValidatePublicAddress(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name   string
+		addr   string
+		expErr bool
+	}{
+		{
+			name:   "empty host",
+			addr:   ":1635",
+			expErr: true,
+		},
+		{
+			name:   "localhost",
+			addr:   "localhost:1635",
+			expErr: true,
+		},
+		{
+			name:   "loopback",
+			addr:   "127.0.0.1:1635",
+			expErr: true,
+		},
+		{
+			name:   "loopback ipv6",
+			addr:   "[::1]:1635",
+			expErr: true,
+		},
+		{
+			name:   "missing port",
+			addr:   "1.2.3.4",
+			expErr: true,
+		},
+		{
+			name:   "empty port",
+			addr:   "1.2.3.4:",
+			expErr: true,
+		},
+		{
+			name:   "invalid port number",
+			addr:   "1.2.3.4:abc",
+			expErr: true,
+		},
+		{
+			name:   "valid",
+			addr:   "1.2.3.4:1635",
+			expErr: false,
+		},
+		{
+			name:   "valid ipv6",
+			addr:   "[2001:db8::1]:1635",
+			expErr: false,
+		},
+		{
+			name:   "empty",
+			addr:   "",
+			expErr: false,
+		},
+		{
+			name:   "invalid IP",
+			addr:   "not-an-ip:8080",
+			expErr: true,
+		},
+		{
+			name:   "private IP",
+			addr:   "192.168.1.1:8080",
+			expErr: true,
+		},
+		{
+			name:   "hostname",
+			addr:   "example.com:8080",
+			expErr: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := node.ValidatePublicAddress(tc.addr)
+			if tc.expErr && err == nil {
+				t.Fatal("expected error, but got none")
+			}
+			if !tc.expErr && err != nil {
+				t.Fatalf("expected no error, but got: %v", err)
+			}
+		})
+	}
+}

pkg/transaction/backend/backend.go

@@ -20,7 +20,7 @@ type Geth interface {
 	CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error)
 	ChainID(ctx context.Context) (*big.Int, error)
 	Close()
-	EstimateGas(ctx context.Context, msg ethereum.CallMsg) (uint64, error)
+	EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (uint64, error)
 	FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error)
 	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
 	NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error)

pkg/transaction/backendmock/backend.go

@@ -20,7 +20,7 @@ type backendMock struct {
 	sendTransaction    func(ctx context.Context, tx *types.Transaction) error
 	suggestedFeeAndTip func(ctx context.Context, gasPrice *big.Int, boostPercent int) (*big.Int, *big.Int, error)
 	suggestGasTipCap   func(ctx context.Context) (*big.Int, error)
-	estimateGas        func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error)
+	estimateGasAtBlock func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error)
 	transactionReceipt func(ctx context.Context, txHash common.Hash) (*types.Receipt, error)
 	pendingNonceAt     func(ctx context.Context, account common.Address) (uint64, error)
 	transactionByHash  func(ctx context.Context, hash common.Hash) (tx *types.Transaction, isPending bool, err error)
@@ -51,9 +51,9 @@ func (m *backendMock) SuggestedFeeAndTip(ctx context.Context, gasPrice *big.Int,
 	return nil, nil, errors.New("not implemented")
 }
 
-func (m *backendMock) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
-	if m.estimateGas != nil {
-		return m.estimateGas(ctx, call)
+func (m *backendMock) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (uint64, error) {
+	if m.estimateGasAtBlock != nil {
+		return m.estimateGasAtBlock(ctx, msg, blockNumber)
 	}
 	return 0, errors.New("not implemented")
 }
@@ -171,9 +171,9 @@ func WithSuggestGasTipCapFunc(f func(ctx context.Context) (*big.Int, error)) Opt
 	})
 }
 
-func WithEstimateGasFunc(f func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error)) Option {
+func WithEstimateGasAtBlockFunc(f func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error)) Option {
 	return optionFunc(func(s *backendMock) {
-		s.estimateGas = f
+		s.estimateGasAtBlock = f
 	})
 }
 

pkg/transaction/backendsimulation/backend.go

@@ -95,7 +95,7 @@ func (m *simulatedBackend) SuggestedFeeAndTip(ctx context.Context, gasPrice *big
 	return nil, nil, errors.New("not implemented")
 }
 
-func (m *simulatedBackend) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
+func (m *simulatedBackend) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (uint64, error) {
 	return 0, errors.New("not implemented")
 }