Release 2024.8.0

.github/workflows/semgrep.yml

@@ -1,25 +0,0 @@
-
-on:
-  pull_request: {}
-  workflow_dispatch: {}
-  push: 
-    branches:
-      - main
-      - master
-  schedule:
-    - cron: '0 0 * * *'
-name: Semgrep config
-jobs:
-  semgrep:
-    name: semgrep/ci
-    runs-on: ubuntu-20.04
-    env:
-      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
-      SEMGREP_URL: https://cloudflare.semgrep.dev
-      SEMGREP_APP_URL: https://cloudflare.semgrep.dev
-      SEMGREP_VERSION_CHECK_URL: https://cloudflare.semgrep.dev/api/check-version
-    container:
-      image: returntocorp/semgrep
-    steps:
-      - uses: actions/checkout@v3
-      - run: semgrep ci

.teamcity/package-windows.sh

@@ -3,17 +3,14 @@ echo $VERSION
 
 export TARGET_OS=windows
 # This controls the directory the built artifacts go into
-export BUILT_ARTIFACT_DIR=built_artifacts/
-export FINAL_ARTIFACT_DIR=artifacts/
-mkdir -p $BUILT_ARTIFACT_DIR
-mkdir -p $FINAL_ARTIFACT_DIR
+export ARTIFACT_DIR=built_artifacts/
+mkdir -p $ARTIFACT_DIR
 windowsArchs=("amd64" "386")
 for arch in ${windowsArchs[@]}; do
     export TARGET_ARCH=$arch
     # Copy exe into final directory
-    cp $BUILT_ARTIFACT_DIR/cloudflared-windows-$arch.exe ./cloudflared.exe
+    cp $ARTIFACT_DIR/cloudflared-windows-$arch.exe ./cloudflared.exe
     make cloudflared-msi
     # Copy msi into final directory
-    mv cloudflared-$VERSION-$arch.msi $FINAL_ARTIFACT_DIR/cloudflared-windows-$arch.msi
-    cp $BUILT_ARTIFACT_DIR/cloudflared-windows-$arch.exe $FINAL_ARTIFACT_DIR/cloudflared-windows-$arch.exe 
+    mv cloudflared-$VERSION-$arch.msi $ARTIFACT_DIR/cloudflared-windows-$arch.msi
 done

CHANGES.md

@@ -1,7 +1,3 @@
-## 2024.10.0
-### Bug Fixes
-- We fixed a bug related to `--grace-period`. Tunnels that use QUIC as transport weren't abiding by this waiting period before forcefully closing the connections to the edge. From now on, both QUIC and HTTP2 tunnels will wait for either the grace period to end (defaults to 30 seconds) or until the last in-flight request is handled. Users that wish to maintain the previous behavior should set `--grace-period` to 0 if `--protocol` is set to `quic`. This will force `cloudflared` to shutdown as soon as either SIGTERM or SIGINT is received.
-
 ## 2024.2.1
 ### Notices
 - Starting from this version, tunnel diagnostics will be enabled by default. This will allow the engineering team to remotely get diagnostics from cloudflared during debug activities. Users still have the capability to opt-out of this feature by defining `--management-diagnostics=false` (or env `TUNNEL_MANAGEMENT_DIAGNOSTICS`).

Makefile

@@ -218,10 +218,6 @@ cloudflared-pkg: cloudflared cloudflared.1
 cloudflared-msi:
 	wixl --define Version=$(VERSION) --define Path=$(EXECUTABLE_PATH) --output cloudflared-$(VERSION)-$(TARGET_ARCH).msi cloudflared.wxs
 
-.PHONY: github-release-dryrun
-github-release-dryrun:
-	python3 github_release.py --path $(PWD)/built_artifacts --release-version $(VERSION) --dry-run
-
 .PHONY: github-release
 github-release:
 	python3 github_release.py --path $(PWD)/built_artifacts --release-version $(VERSION)

RELEASE_NOTES

@@ -1,33 +1,5 @@
-2024.10.0
-- 2024-10-01 TUN-8646: Add datagram v3 support feature flag
-- 2024-09-30 TUN-8621: Fix cloudflared version in change notes to account for release date
-- 2024-09-19 Adding semgrep yaml file
-- 2024-09-12 TUN-8632: Delay checking auto-update by the provided frequency
-- 2024-09-11 TUN-8630: Check checksum of downloaded binary to compare to current for auto-updating
-- 2024-09-09 TUN-8629: Cloudflared update on Windows requires running it twice to update
-- 2024-09-06 PPIP-2310: Update quick tunnel disclaimer
-- 2024-08-30 TUN-8621: Prevent QUIC connection from closing before grace period after unregistering
-- 2024-08-09 TUN-8592: Use metadata from the edge to determine if request body is empty for QUIC transport
-- 2024-06-26 TUN-8484: Print response when QuickTunnel can't be unmarshalled
-
-2024.9.1
-- 2024-09-10 Revert Release 2024.9.0
-
-2024.9.0
-- 2024-09-10 TUN-8621: Fix cloudflared version in change notes.
-- 2024-09-06 PPIP-2310: Update quick tunnel disclaimer
-- 2024-08-30 TUN-8621: Prevent QUIC connection from closing before grace period after unregistering
-- 2024-08-09 TUN-8592: Use metadata from the edge to determine if request body is empty for QUIC transport
-- 2024-06-26 TUN-8484: Print response when QuickTunnel can't be unmarshalled
-
-2024.8.3
-- 2024-08-15 TUN-8591 login command without extra text
-- 2024-03-25 remove code that will not be executed
-- 2024-03-25 remove code that will not be executed
-
-2024.8.2
-- 2024-08-05 TUN-8583: change final directory of artifacts
-- 2024-08-05 TUN-8585: Avoid creating GH client when dry-run is true
+2024.8.0
+- 2024-08-01 TUN-8546: remove call to non existant make target
 
 2024.7.3
 - 2024-07-31 TUN-8546: Fix final artifacts paths

build-packages-fips.sh

@@ -3,7 +3,7 @@ VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
 echo $VERSION
 
 # This controls the directory the built artifacts go into
-export ARTIFACT_DIR=artifacts/
+export ARTIFACT_DIR=built_artifacts/
 mkdir -p $ARTIFACT_DIR
 
 arch=("amd64")
@@ -23,4 +23,4 @@ make cloudflared-rpm
 mv cloudflared-fips-$RPMVERSION-1.$RPMARCH.rpm $ARTIFACT_DIR/cloudflared-fips-linux-$RPMARCH.rpm
 
 # finally move the linux binary as well.
-mv ./cloudflared $ARTIFACT_DIR/cloudflared-fips-linux-$arch
+mv ./cloudflared $ARTIFACT_DIR/cloudflared-fips-linux-$arch

build-packages.sh

@@ -7,7 +7,7 @@ export GOEXPERIMENT=noboringcrypto
 export CGO_ENABLED=0
 
 # This controls the directory the built artifacts go into
-export ARTIFACT_DIR=artifacts/
+export ARTIFACT_DIR=built_artifacts/
 mkdir -p $ARTIFACT_DIR
 
 linuxArchs=("386" "amd64" "arm" "armhf" "arm64")

cfsetup.yaml

@@ -195,23 +195,9 @@ buster: &buster
       - component-tests/requirements.txt
     pre-cache: *component_test_pre_cache
     post-cache: *component_test_post_cache
-  github-release-dryrun:
-    build_dir: *build_dir
-    builddeps:
-      - *pinned_go
-      - build-essential
-      - python3-dev
-      - libffi-dev
-      - python3-setuptools
-      - python3-pip
-    pre-cache:
-      - pip3 install pynacl==1.4.0
-      - pip3 install pygithub==1.55
-    post-cache:
-      - make github-release-dryrun
   github-release:
     build_dir: *build_dir
-    builddeps:
+    builddeps: 
       - *pinned_go
       - build-essential
       - python3-dev

cmd/cloudflared/access/cmd.go

@@ -26,7 +26,6 @@ import (
 )
 
 const (
-	appURLFlag         = "app"
 	loginQuietFlag     = "quiet"
 	sshHostnameFlag    = "hostname"
 	sshDestinationFlag = "destination"
@@ -84,10 +83,9 @@ func Commands() []*cli.Command {
 			applications from the command line.`,
 			Subcommands: []*cli.Command{
 				{
-					Name:      "login",
-					Action:    cliutil.Action(login),
-					Usage:     "login <url of access application>",
-					ArgsUsage: "url of Access application",
+					Name:   "login",
+					Action: cliutil.Action(login),
+					Usage:  "login <url of access application>",
 					Description: `The login subcommand initiates an authentication flow with your identity provider.
 					The subcommand will launch a browser. For headless systems, a url is provided.
 					Once authenticated with your identity provider, the login command will generate a JSON Web Token (JWT)
@@ -99,13 +97,6 @@ func Commands() []*cli.Command {
 							Aliases: []string{"q"},
 							Usage:   "do not print the jwt to the command line",
 						},
-						&cli.BoolFlag{
-							Name:  "no-verbose",
-							Usage: "print only the jwt to stdout",
-						},
-						&cli.StringFlag{
-							Name: appURLFlag,
-						},
 					},
 				},
 				{
@@ -120,12 +111,12 @@ func Commands() []*cli.Command {
 				{
 					Name:        "token",
 					Action:      cliutil.Action(generateToken),
-					Usage:       "token <url of access application>",
+					Usage:       "token -app=<url of access application>",
 					ArgsUsage:   "url of Access application",
 					Description: `The token subcommand produces a JWT which can be used to authenticate requests.`,
 					Flags: []cli.Flag{
 						&cli.StringFlag{
-							Name: appURLFlag,
+							Name: "app",
 						},
 					},
 				},
@@ -241,8 +232,9 @@ func login(c *cli.Context) error {
 
 	log := logger.CreateLoggerFromContext(c, logger.EnableTerminalLog)
 
-	appURL, err := getAppURLFromArgs(c)
-	if err != nil {
+	args := c.Args()
+	appURL, err := parseURL(args.First())
+	if args.Len() < 1 || err != nil {
 		log.Error().Msg("Please provide the url of the Access application")
 		return err
 	}
@@ -269,14 +261,7 @@ func login(c *cli.Context) error {
 	if c.Bool(loginQuietFlag) {
 		return nil
 	}
-
-	// Chatty by default for backward compat. The new --app flag
-	// is an implicit opt-out of the backwards-compatible chatty output.
-	if c.Bool("no-verbose") || c.IsSet(appURLFlag) {
-		fmt.Fprint(os.Stdout, cfdToken)
-	} else {
-		fmt.Fprintf(os.Stdout, "Successfully fetched your token:\n\n%s\n\n", cfdToken)
-	}
+	fmt.Fprintf(os.Stdout, "Successfully fetched your token:\n\n%s\n\n", cfdToken)
 
 	return nil
 }
@@ -355,17 +340,6 @@ func run(cmd string, args ...string) error {
 	return c.Run()
 }
 
-func getAppURLFromArgs(c *cli.Context) (*url.URL, error) {
-	var appURLStr string
-	args := c.Args()
-	if args.Len() < 1 {
-		appURLStr = c.String(appURLFlag)
-	} else {
-		appURLStr = args.First()
-	}
-	return parseURL(appURLStr)
-}
-
 // token dumps provided token to stdout
 func generateToken(c *cli.Context) error {
 	err := sentry.Init(sentry.ClientOptions{
@@ -375,8 +349,8 @@ func generateToken(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	appURL, err := getAppURLFromArgs(c)
-	if err != nil {
+	appURL, err := parseURL(c.String("app"))
+	if err != nil || c.NumFlags() < 1 {
 		fmt.Fprintln(os.Stderr, "Please provide a url.")
 		return err
 	}

cmd/cloudflared/cliutil/build_info.go

@@ -1,10 +1,7 @@
 package cliutil
 
 import (
-	"crypto/sha256"
 	"fmt"
-	"io"
-	"os"
 	"runtime"
 
 	"github.com/rs/zerolog"
@@ -16,7 +13,6 @@ type BuildInfo struct {
 	GoArch             string `json:"go_arch"`
 	BuildType          string `json:"build_type"`
 	CloudflaredVersion string `json:"cloudflared_version"`
-	Checksum           string `json:"checksum"`
 }
 
 func GetBuildInfo(buildType, version string) *BuildInfo {
@@ -26,12 +22,11 @@ func GetBuildInfo(buildType, version string) *BuildInfo {
 		GoArch:             runtime.GOARCH,
 		BuildType:          buildType,
 		CloudflaredVersion: version,
-		Checksum:           currentBinaryChecksum(),
 	}
 }
 
 func (bi *BuildInfo) Log(log *zerolog.Logger) {
-	log.Info().Msgf("Version %s (Checksum %s)", bi.CloudflaredVersion, bi.Checksum)
+	log.Info().Msgf("Version %s", bi.CloudflaredVersion)
 	if bi.BuildType != "" {
 		log.Info().Msgf("Built%s", bi.GetBuildTypeMsg())
 	}
@@ -56,28 +51,3 @@ func (bi *BuildInfo) GetBuildTypeMsg() string {
 func (bi *BuildInfo) UserAgent() string {
 	return fmt.Sprintf("cloudflared/%s", bi.CloudflaredVersion)
 }
-
-// FileChecksum opens a file and returns the SHA256 checksum.
-func FileChecksum(filePath string) (string, error) {
-	f, err := os.Open(filePath)
-	if err != nil {
-		return "", err
-	}
-	defer f.Close()
-
-	h := sha256.New()
-	if _, err := io.Copy(h, f); err != nil {
-		return "", err
-	}
-
-	return fmt.Sprintf("%x", h.Sum(nil)), nil
-}
-
-func currentBinaryChecksum() string {
-	currentPath, err := os.Executable()
-	if err != nil {
-		return ""
-	}
-	sum, _ := FileChecksum(currentPath)
-	return sum
-}

cmd/cloudflared/main.go

@@ -91,7 +91,7 @@ func main() {
 
 	tunnel.Init(bInfo, graceShutdownC) // we need this to support the tunnel sub command...
 	access.Init(graceShutdownC, Version)
-	updater.Init(bInfo)
+	updater.Init(Version)
 	tracing.Init(Version)
 	token.Init(Version)
 	tail.Init(bInfo)

cmd/cloudflared/tunnel/quick_tunnel.go

@@ -3,7 +3,6 @@ package tunnel
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -16,7 +15,10 @@ import (
 
 const httpTimeout = 15 * time.Second
 
-const disclaimer = "Thank you for trying Cloudflare Tunnel. Doing so, without a Cloudflare account, is a quick way to experiment and try it out. However, be aware that these account-less Tunnels have no uptime guarantee, are subject to the Cloudflare Online Services Terms of Use (https://www.cloudflare.com/website-terms/), and Cloudflare reserves the right to investigate your use of Tunnels for violations of such terms. If you intend to use Tunnels in production you should use a pre-created named tunnel by following: https://developers.cloudflare.com/cloudflare-one/connections/connect-apps"
+const disclaimer = "Thank you for trying Cloudflare Tunnel. Doing so, without a Cloudflare account, is a quick way to" +
+	" experiment and try it out. However, be aware that these account-less Tunnels have no uptime guarantee. If you " +
+	"intend to use Tunnels in production you should use a pre-created named tunnel by following: " +
+	"https://developers.cloudflare.com/cloudflare-one/connections/connect-apps"
 
 // RunQuickTunnel requests a tunnel from the specified service.
 // We use this to power quick tunnels on trycloudflare.com, but the
@@ -45,17 +47,8 @@ func RunQuickTunnel(sc *subcommandContext) error {
 	}
 	defer resp.Body.Close()
 
-	// This will read the entire response into memory so we can print it in case of error
-	rsp_body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return errors.Wrap(err, "failed to read quick-tunnel response")
-	}
-
 	var data QuickTunnelResponse
-	if err := json.Unmarshal(rsp_body, &data); err != nil {
-		rsp_string := string(rsp_body)
-		fields := map[string]interface{}{"status_code": resp.Status}
-		sc.log.Err(err).Fields(fields).Msgf("Error unmarshaling QuickTunnel response: %s", rsp_string)
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
 		return errors.Wrap(err, "failed to unmarshal quick Tunnel")
 	}
 

cmd/cloudflared/updater/update.go

@@ -14,7 +14,6 @@ import (
 	"github.com/urfave/cli/v2"
 	"golang.org/x/term"
 
-	"github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
 	"github.com/cloudflare/cloudflared/config"
 	"github.com/cloudflare/cloudflared/logger"
 )
@@ -32,7 +31,7 @@ const (
 )
 
 var (
-	buildInfo              *cliutil.BuildInfo
+	version                string
 	BuiltForPackageManager = ""
 )
 
@@ -82,8 +81,8 @@ func (uo *UpdateOutcome) noUpdate() bool {
 	return uo.Error == nil && uo.Updated == false
 }
 
-func Init(info *cliutil.BuildInfo) {
-	buildInfo = info
+func Init(v string) {
+	version = v
 }
 
 func CheckForUpdate(options updateOptions) (CheckResult, error) {
@@ -101,12 +100,11 @@ func CheckForUpdate(options updateOptions) (CheckResult, error) {
 		cfdPath = encodeWindowsPath(cfdPath)
 	}
 
-	s := NewWorkersService(buildInfo.CloudflaredVersion, url, cfdPath, Options{IsBeta: options.isBeta,
+	s := NewWorkersService(version, url, cfdPath, Options{IsBeta: options.isBeta,
 		IsForced: options.isForced, RequestedVersion: options.intendedVersion})
 
 	return s.Check()
 }
-
 func encodeWindowsPath(path string) string {
 	// We do this because Windows allows spaces in directories such as
 	// Program Files but does not allow these directories to be spaced in batch files.
@@ -198,9 +196,10 @@ func loggedUpdate(log *zerolog.Logger, options updateOptions) UpdateOutcome {
 
 // AutoUpdater periodically checks for new version of cloudflared.
 type AutoUpdater struct {
-	configurable *configurable
-	listeners    *gracenet.Net
-	log          *zerolog.Logger
+	configurable     *configurable
+	listeners        *gracenet.Net
+	updateConfigChan chan *configurable
+	log              *zerolog.Logger
 }
 
 // AutoUpdaterConfigurable is the attributes of AutoUpdater that can be reconfigured during runtime
@@ -211,9 +210,10 @@ type configurable struct {
 
 func NewAutoUpdater(updateDisabled bool, freq time.Duration, listeners *gracenet.Net, log *zerolog.Logger) *AutoUpdater {
 	return &AutoUpdater{
-		configurable: createUpdateConfig(updateDisabled, freq, log),
-		listeners:    listeners,
-		log:          log,
+		configurable:     createUpdateConfig(updateDisabled, freq, log),
+		listeners:        listeners,
+		updateConfigChan: make(chan *configurable),
+		log:              log,
 	}
 }
 
@@ -232,20 +232,12 @@ func createUpdateConfig(updateDisabled bool, freq time.Duration, log *zerolog.Lo
 	}
 }
 
-// Run will perodically check for cloudflared updates, download them, and then restart the current cloudflared process
-// to use the new version. It delays the first update check by the configured frequency as to not attempt a
-// download immediately and restart after starting (in the case that there is an upgrade available).
 func (a *AutoUpdater) Run(ctx context.Context) error {
 	ticker := time.NewTicker(a.configurable.freq)
 	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-ticker.C:
-		}
 		updateOutcome := loggedUpdate(a.log, updateOptions{updateDisabled: !a.configurable.enabled})
 		if updateOutcome.Updated {
-			buildInfo.CloudflaredVersion = updateOutcome.Version
+			Init(updateOutcome.Version)
 			if IsSysV() {
 				// SysV doesn't have a mechanism to keep service alive, we have to restart the process
 				a.log.Info().Msg("Restarting service managed by SysV...")
@@ -262,9 +254,25 @@ func (a *AutoUpdater) Run(ctx context.Context) error {
 		} else if updateOutcome.UserMessage != "" {
 			a.log.Warn().Msg(updateOutcome.UserMessage)
 		}
+
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case newConfigurable := <-a.updateConfigChan:
+			ticker.Stop()
+			a.configurable = newConfigurable
+			ticker = time.NewTicker(a.configurable.freq)
+			// Check if there is new version of cloudflared after receiving new AutoUpdaterConfigurable
+		case <-ticker.C:
+		}
 	}
 }
 
+// Update is the method to pass new AutoUpdaterConfigurable to a running AutoUpdater. It is safe to be called concurrently
+func (a *AutoUpdater) Update(updateDisabled bool, newFreq time.Duration) {
+	a.updateConfigChan <- createUpdateConfig(updateDisabled, newFreq, a.log)
+}
+
 func isAutoupdateEnabled(log *zerolog.Logger, updateDisabled bool, updateFreq time.Duration) bool {
 	if !supportAutoUpdate(log) {
 		return false

cmd/cloudflared/updater/update_test.go

@@ -9,14 +9,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli/v2"
-
-	"github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
 )
 
-func init() {
-	Init(cliutil.GetBuildInfo("TEST", "TEST"))
-}
-
 func TestDisabledAutoUpdater(t *testing.T) {
 	listeners := &gracenet.Net{}
 	log := zerolog.Nop()

cmd/cloudflared/updater/workers_service.go

@@ -3,7 +3,6 @@ package updater
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"net/http"
 	"runtime"
 )
@@ -80,10 +79,6 @@ func (s *WorkersService) Check() (CheckResult, error) {
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("unable to check for update: %d", resp.StatusCode)
-	}
-
 	var v VersionResponse
 	if err := json.NewDecoder(resp.Body).Decode(&v); err != nil {
 		return nil, err

cmd/cloudflared/updater/workers_update.go

@@ -3,6 +3,7 @@ package updater
 import (
 	"archive/tar"
 	"compress/gzip"
+	"crypto/sha256"
 	"errors"
 	"fmt"
 	"io"
@@ -15,10 +16,6 @@ import (
 	"strings"
 	"text/template"
 	"time"
-
-	"github.com/getsentry/sentry-go"
-
-	"github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
 )
 
 const (
@@ -30,9 +27,9 @@ const (
 	// start the service
 	// exit with code 0 if we've reached this point indicating success.
 	windowsUpdateCommandTemplate = `sc stop cloudflared >nul 2>&1
-del "{{.OldPath}}"
 rename "{{.TargetPath}}" {{.OldName}}
 rename "{{.NewPath}}" {{.BinaryName}}
+del "{{.OldPath}}"
 sc start cloudflared >nul 2>&1
 exit /b 0`
 	batchFileName = "cfd_update.bat"
@@ -89,25 +86,8 @@ func (v *WorkersVersion) Apply() error {
 		return err
 	}
 
-	downloadSum, err := cliutil.FileChecksum(newFilePath)
-	if err != nil {
-		return err
-	}
-
-	// Check that the file downloaded matches what is expected.
-	if v.checksum != downloadSum {
-		return errors.New("checksum validation failed")
-	}
-
-	// Check if the currently running version has the same checksum
-	if downloadSum == buildInfo.Checksum {
-		// Currently running binary matches the downloaded binary so we have no reason to update. This is
-		// typically unexpected, as such we emit a sentry event.
-		localHub := sentry.CurrentHub().Clone()
-		err := errors.New("checksum validation matches currently running process")
-		localHub.CaptureException(err)
-		// Make sure to cleanup the new downloaded file since we aren't upgrading versions.
-		os.Remove(newFilePath)
+	// check that the file is what is expected
+	if err := isValidChecksum(v.checksum, newFilePath); err != nil {
 		return err
 	}
 
@@ -209,6 +189,27 @@ func isCompressedFile(urlstring string) bool {
 	return strings.HasSuffix(u.Path, ".tgz")
 }
 
+// checks if the checksum in the json response matches the checksum of the file download
+func isValidChecksum(checksum, filePath string) error {
+	f, err := os.Open(filePath)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	h := sha256.New()
+	if _, err := io.Copy(h, f); err != nil {
+		return err
+	}
+
+	hash := fmt.Sprintf("%x", h.Sum(nil))
+
+	if checksum != hash {
+		return errors.New("checksum validation failed")
+	}
+	return nil
+}
+
 // writeBatchFile writes a batch file out to disk
 // see the dicussion on why it has to be done this way
 func writeBatchFile(targetPath string, newPath string, oldPath string) error {

component-tests/test_termination.py

@@ -45,10 +45,9 @@ class TestTermination:
             with connected:
                 connected.wait(self.timeout)
             # Send signal after the SSE connection is established
-            with self.within_grace_period():
-                self.terminate_by_signal(cloudflared, signal)
-                self.wait_eyeball_thread(
-                    in_flight_req, self.grace_period + self.timeout)
+            self.terminate_by_signal(cloudflared, signal)
+            self.wait_eyeball_thread(
+                in_flight_req, self.grace_period + self.timeout)
 
     # test cloudflared terminates before grace period expires when all eyeball
     # connections are drained
@@ -67,7 +66,7 @@ class TestTermination:
 
             with connected:
                 connected.wait(self.timeout)
-            with self.within_grace_period(has_connection=False):
+            with self.within_grace_period():
                 # Send signal after the SSE connection is established
                 self.terminate_by_signal(cloudflared, signal)
                 self.wait_eyeball_thread(in_flight_req, self.grace_period)
@@ -79,7 +78,7 @@ class TestTermination:
         with start_cloudflared(
                 tmp_path, config, cfd_pre_args=["tunnel", "--ha-connections", "1"], new_process=True, capture_output=False) as cloudflared:
             wait_tunnel_ready(tunnel_url=config.get_url())
-            with self.within_grace_period(has_connection=False):
+            with self.within_grace_period():
                 self.terminate_by_signal(cloudflared, signal)
 
     def terminate_by_signal(self, cloudflared, sig):
@@ -93,21 +92,13 @@ class TestTermination:
 
     # Using this context asserts logic within the context is executed within grace period
     @contextmanager
-    def within_grace_period(self, has_connection=True):
+    def within_grace_period(self):
         try:
             start = time.time()
             yield
         finally:
-
-            # If the request takes longer than the grace period then we need to wait at most the grace period.
-            # If the request fell within the grace period cloudflared can close earlier, but to ensure that it doesn't
-            # close immediately we add a minimum boundary. If cloudflared shutdown in less than 1s it's likely that
-            # it shutdown as soon as it received SIGINT. The only way cloudflared can close immediately is if it has no
-            # in-flight requests
-            minimum = 1 if has_connection else 0
             duration = time.time() - start
-            # Here we truncate to ensure that we don't fail on minute differences like 10.1 instead of 10
-            assert minimum <= int(duration) <= self.grace_period
+            assert duration < self.grace_period
 
     def stream_request(self, config, connected, early_terminate):
         expected_terminate_message = "502 Bad Gateway"

connection/control.go

@@ -6,8 +6,6 @@ import (
 	"net"
 	"time"
 
-	"github.com/pkg/errors"
-
 	"github.com/cloudflare/cloudflared/management"
 	"github.com/cloudflare/cloudflared/tunnelrpc"
 	tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
@@ -118,32 +116,27 @@ func (c *controlStream) ServeControlStream(
 		}
 	}
 
-	return c.waitForUnregister(ctx, registrationClient)
+	c.waitForUnregister(ctx, registrationClient)
+	return nil
 }
 
-func (c *controlStream) waitForUnregister(ctx context.Context, registrationClient tunnelrpc.RegistrationClient) error {
+func (c *controlStream) waitForUnregister(ctx context.Context, registrationClient tunnelrpc.RegistrationClient) {
 	// wait for connection termination or start of graceful shutdown
 	defer registrationClient.Close()
-	var shutdownError error
 	select {
 	case <-ctx.Done():
-		shutdownError = ctx.Err()
 		break
 	case <-c.gracefulShutdownC:
 		c.stoppedGracefully = true
 	}
 
 	c.observer.sendUnregisteringEvent(c.connIndex)
-	err := registrationClient.GracefulShutdown(ctx, c.gracePeriod)
-	if err != nil {
-		return errors.Wrap(err, "Error shutting down control stream")
-	}
+	registrationClient.GracefulShutdown(ctx, c.gracePeriod)
 	c.observer.log.Info().
 		Int(management.EventTypeKey, int(management.Cloudflared)).
 		Uint8(LogFieldConnIndex, c.connIndex).
 		IPAddr(LogFieldIPAddress, c.edgeAddress).
 		Msg("Unregistered tunnel connection")
-	return shutdownError
 }
 
 func (c *controlStream) IsStopped() bool {

connection/http2_test.go

@@ -192,9 +192,8 @@ func (mc mockNamedTunnelRPCClient) RegisterConnection(
 	}, nil
 }
 
-func (mc mockNamedTunnelRPCClient) GracefulShutdown(ctx context.Context, gracePeriod time.Duration) error {
+func (mc mockNamedTunnelRPCClient) GracefulShutdown(ctx context.Context, gracePeriod time.Duration) {
 	close(mc.unregistered)
-	return nil
 }
 
 func (mockNamedTunnelRPCClient) Close() {}

connection/quic.go

@@ -42,26 +42,12 @@ const (
 	HTTPMethodKey = "HttpMethod"
 	// HTTPHostKey is used to get or set http Method in QUIC ALPN if the underlying proxy connection type is HTTP.
 	HTTPHostKey = "HttpHost"
-	// HTTPRequestBodyHintKey is used in ConnectRequest metadata to indicate if the request has body
-	HTTPRequestBodyHintKey = "HttpReqBodyHint"
 
 	QUICMetadataFlowID = "FlowID"
 	// emperically this capacity has been working well
 	demuxChanCapacity = 16
 )
 
-type RequestBodyHint uint64
-
-const (
-	RequestBodyHintMissing RequestBodyHint = iota
-	RequestBodyHintEmpty
-	RequestBodyHintHasData
-)
-
-func (rbh RequestBodyHint) String() string {
-	return [...]string{"missing", "empty", "data"}[rbh]
-}
-
 var (
 	portForConnIndex = make(map[uint8]int, 0)
 	portMapMutex     sync.Mutex
@@ -83,7 +69,6 @@ type QUICConnection struct {
 
 	rpcTimeout         time.Duration
 	streamWriteTimeout time.Duration
-	gracePeriod        time.Duration
 }
 
 // NewQUICConnection returns a new instance of QUICConnection.
@@ -101,7 +86,6 @@ func NewQUICConnection(
 	packetRouterConfig *ingress.GlobalRouterConfig,
 	rpcTimeout time.Duration,
 	streamWriteTimeout time.Duration,
-	gracePeriod time.Duration,
 ) (*QUICConnection, error) {
 	udpConn, err := createUDPConnForConnIndex(connIndex, localAddr, logger)
 	if err != nil {
@@ -138,7 +122,6 @@ func NewQUICConnection(
 		connIndex:            connIndex,
 		rpcTimeout:           rpcTimeout,
 		streamWriteTimeout:   streamWriteTimeout,
-		gracePeriod:          gracePeriod,
 	}, nil
 }
 
@@ -161,17 +144,8 @@ func (q *QUICConnection) Serve(ctx context.Context) error {
 	// In the future, if cloudflared can autonomously push traffic to the edge, we have to make sure the control
 	// stream is already fully registered before the other goroutines can proceed.
 	errGroup.Go(func() error {
-		// err is equal to nil if we exit due to unregistration. If that happens we want to wait the full
-		// amount of the grace period, allowing requests to finish before we cancel the context, which will
-		// make cloudflared exit.
-		if err := q.serveControlStream(ctx, controlStream); err == nil {
-			select {
-			case <-ctx.Done():
-			case <-time.Tick(q.gracePeriod):
-			}
-		}
-		cancel()
-		return err
+		defer cancel()
+		return q.serveControlStream(ctx, controlStream)
 	})
 	errGroup.Go(func() error {
 		defer cancel()
@@ -500,6 +474,7 @@ func buildHTTPRequest(
 	dest := connectRequest.Dest
 	method := metadata[HTTPMethodKey]
 	host := metadata[HTTPHostKey]
+	isWebsocket := connectRequest.Type == pogs.ConnectionTypeWebsocket
 
 	req, err := http.NewRequestWithContext(ctx, method, dest, body)
 	if err != nil {
@@ -524,8 +499,13 @@ func buildHTTPRequest(
 		return nil, fmt.Errorf("Error setting content-length: %w", err)
 	}
 
-	if shouldSetRequestBodyToEmpty(connectRequest, metadata, req) {
-		log.Debug().Str("host", req.Host).Str("method", req.Method).Msg("Set request to have no body")
+	// Go's client defaults to chunked encoding after a 200ms delay if the following cases are true:
+	//   * the request body blocks
+	//   * the content length is not set (or set to -1)
+	//   * the method doesn't usually have a body (GET, HEAD, DELETE, ...)
+	//   * there is no transfer-encoding=chunked already set.
+	// So, if transfer cannot be chunked and content length is 0, we dont set a request body.
+	if !isWebsocket && !isTransferEncodingChunked(req) && req.ContentLength == 0 {
 		req.Body = http.NoBody
 	}
 	stripWebsocketUpgradeHeader(req)
@@ -550,35 +530,6 @@ func isTransferEncodingChunked(req *http.Request) bool {
 	return strings.Contains(strings.ToLower(transferEncodingVal), "chunked")
 }
 
-// Borrowed from https://github.com/golang/go/blob/go1.22.6/src/net/http/request.go#L1541
-func requestMethodUsuallyLacksBody(req *http.Request) bool {
-	switch strings.ToUpper(req.Method) {
-	case "GET", "HEAD", "DELETE", "OPTIONS", "PROPFIND", "SEARCH":
-		return true
-	}
-	return false
-}
-
-func shouldSetRequestBodyToEmpty(connectRequest *pogs.ConnectRequest, metadata map[string]string, req *http.Request) bool {
-	switch metadata[HTTPRequestBodyHintKey] {
-	case RequestBodyHintEmpty.String():
-		return true
-	case RequestBodyHintHasData.String():
-		return false
-	default:
-	}
-
-	isWebsocket := connectRequest.Type == pogs.ConnectionTypeWebsocket
-	// Go's client defaults to chunked encoding after a 200ms delay if the following cases are true:
-	//   * the request body blocks
-	//   * the content length is not set (or set to -1)
-	//   * the method doesn't usually have a body (GET, HEAD, DELETE, ...)
-	//   * there is no transfer-encoding=chunked already set.
-	// So, if transfer cannot be chunked and content length is 0, we dont set a request body.
-	// Reference: https://github.com/golang/go/blob/go1.22.2/src/net/http/transfer.go#L192-L206
-	return !isWebsocket && requestMethodUsuallyLacksBody(req) && !isTransferEncodingChunked(req) && req.ContentLength == 0
-}
-
 // A helper struct that guarantees a call to close only affects read side, but not write side.
 type nopCloserReadWriter struct {
 	io.ReadWriteCloser

connection/quic_test.go

@@ -484,125 +484,6 @@ func TestBuildHTTPRequest(t *testing.T) {
 			},
 			body: io.NopCloser(&bytes.Buffer{}),
 		},
-		{
-			name: "if edge sends the body is empty hint, set body to empty",
-			connectRequest: &pogs.ConnectRequest{
-				Dest: "http://test.com",
-				Metadata: []pogs.Metadata{
-					{
-						Key: "HttpHeader:Another-Header",
-						Val: "Misc",
-					},
-					{
-						Key: "HttpHost",
-						Val: "cf.host",
-					},
-					{
-						Key: "HttpMethod",
-						Val: "put",
-					},
-					{
-						Key: HTTPRequestBodyHintKey,
-						Val: RequestBodyHintEmpty.String(),
-					},
-				},
-			},
-			req: &http.Request{
-				Method: "put",
-				URL: &url.URL{
-					Scheme: "http",
-					Host:   "test.com",
-				},
-				Proto:      "HTTP/1.1",
-				ProtoMajor: 1,
-				ProtoMinor: 1,
-				Header: http.Header{
-					"Another-Header": []string{"Misc"},
-				},
-				ContentLength: 0,
-				Host:          "cf.host",
-				Body:          http.NoBody,
-			},
-			body: io.NopCloser(&bytes.Buffer{}),
-		},
-		{
-			name: "if edge sends the body has data hint, don't set body to empty",
-			connectRequest: &pogs.ConnectRequest{
-				Dest: "http://test.com",
-				Metadata: []pogs.Metadata{
-					{
-						Key: "HttpHeader:Another-Header",
-						Val: "Misc",
-					},
-					{
-						Key: "HttpHost",
-						Val: "cf.host",
-					},
-					{
-						Key: "HttpMethod",
-						Val: "put",
-					},
-					{
-						Key: HTTPRequestBodyHintKey,
-						Val: RequestBodyHintHasData.String(),
-					},
-				},
-			},
-			req: &http.Request{
-				Method: "put",
-				URL: &url.URL{
-					Scheme: "http",
-					Host:   "test.com",
-				},
-				Proto:      "HTTP/1.1",
-				ProtoMajor: 1,
-				ProtoMinor: 1,
-				Header: http.Header{
-					"Another-Header": []string{"Misc"},
-				},
-				ContentLength: 0,
-				Host:          "cf.host",
-				Body:          io.NopCloser(&bytes.Buffer{}),
-			},
-			body: io.NopCloser(&bytes.Buffer{}),
-		},
-		{
-			name: "if the http method usually has body, don't set body to empty",
-			connectRequest: &pogs.ConnectRequest{
-				Dest: "http://test.com",
-				Metadata: []pogs.Metadata{
-					{
-						Key: "HttpHeader:Another-Header",
-						Val: "Misc",
-					},
-					{
-						Key: "HttpHost",
-						Val: "cf.host",
-					},
-					{
-						Key: "HttpMethod",
-						Val: "post",
-					},
-				},
-			},
-			req: &http.Request{
-				Method: "post",
-				URL: &url.URL{
-					Scheme: "http",
-					Host:   "test.com",
-				},
-				Proto:      "HTTP/1.1",
-				ProtoMajor: 1,
-				ProtoMinor: 1,
-				Header: http.Header{
-					"Another-Header": []string{"Misc"},
-				},
-				ContentLength: 0,
-				Host:          "cf.host",
-				Body:          io.NopCloser(&bytes.Buffer{}),
-			},
-			body: io.NopCloser(&bytes.Buffer{}),
-		},
 	}
 
 	log := zerolog.Nop()
@@ -855,7 +736,6 @@ func testQUICConnection(udpListenerAddr net.Addr, t *testing.T, index uint8) *QU
 		nil,
 		15*time.Second,
 		0*time.Second,
-		0*time.Second,
 	)
 	require.NoError(t, err)
 	return qc

features/features.go

@@ -8,7 +8,6 @@ const (
 	FeaturePostQuantum       = "postquantum"
 	FeatureQUICSupportEOF    = "support_quic_eof"
 	FeatureManagementLogs    = "management_logs"
-	FeatureDatagramV3        = "support_datagram_v3"
 )
 
 var (

github_release.py

@@ -17,7 +17,7 @@ import re
 from github import Github, GithubException, UnknownObjectException
 
 FORMAT = "%(levelname)s - %(asctime)s: %(message)s"
-logging.basicConfig(format=FORMAT, level=logging.INFO)
+logging.basicConfig(format=FORMAT)
 
 CLOUDFLARED_REPO = os.environ.get("GITHUB_REPO", "cloudflare/cloudflared")
 GITHUB_CONFLICT_CODE = "already_exists"
@@ -214,33 +214,24 @@ def main():
     """ Attempts to upload Asset to Github Release. Creates Release if it doesn't exist """
     try:
         args = parse_args()
+        client = Github(args.api_key)
+        repo = client.get_repo(CLOUDFLARED_REPO)
+        release = get_or_create_release(repo, args.release_version, args.dry_run)
 
         if args.dry_run:
-            if os.path.isdir(args.path):
-                onlyfiles = [f for f in listdir(args.path) if isfile(join(args.path, f))]
-                for filename in onlyfiles:
-                    binary_path = os.path.join(args.path, filename)
-                    logging.info("binary: " + binary_path)
-            elif os.path.isfile(args.path):
-                logging.info("binary: " + binary_path)
-            else:
-                logging.error("dryrun failed")
+            logging.info("Skipping asset upload because of dry-run")
             return
-        else:
-            client = Github(args.api_key)
-            repo = client.get_repo(CLOUDFLARED_REPO)
-            release = get_or_create_release(repo, args.release_version, args.dry_run)
 
-            if os.path.isdir(args.path):
-                onlyfiles = [f for f in listdir(args.path) if isfile(join(args.path, f))]
-                for filename in onlyfiles:
-                    binary_path = os.path.join(args.path, filename)
-                    upload_asset(release, binary_path, filename, args.release_version, args.kv_account_id, args.namespace_id,
-                    args.kv_api_token)
-                    move_asset(binary_path, filename)
-            else:
-                upload_asset(release, args.path, args.name, args.release_version, args.kv_account_id, args.namespace_id,
-                    args.kv_api_token)
+        if os.path.isdir(args.path):
+            onlyfiles = [f for f in listdir(args.path) if isfile(join(args.path, f))]
+            for filename in onlyfiles:
+                binary_path = os.path.join(args.path, filename)
+                upload_asset(release, binary_path, filename, args.release_version, args.kv_account_id, args.namespace_id,
+                args.kv_api_token)
+                move_asset(binary_path, filename)
+        else:
+            upload_asset(release, args.path, args.name, args.release_version, args.kv_account_id, args.namespace_id,
+                args.kv_api_token)
 
     except Exception as e:
         logging.exception(e)

management/middleware_test.go

@@ -52,11 +52,13 @@ func testRequest(t *testing.T, ts *httptest.Server, method, path string, body io
 	req, err := http.NewRequest(method, ts.URL+path, body)
 	if err != nil {
 		t.Fatal(err)
+		return nil, nil
 	}
 
 	resp, err := ts.Client().Do(req)
 	if err != nil {
 		t.Fatal(err)
+		return nil, nil
 	}
 	var claims managementErrorResponse
 	err = json.NewDecoder(resp.Body).Decode(&claims)

supervisor/tunnel.go

@@ -604,7 +604,6 @@ func (e *EdgeTunnelServer) serveQUIC(
 		e.config.PacketConfig,
 		e.config.RPCTimeout,
 		e.config.WriteStreamTimeout,
-		e.config.GracePeriod,
 	)
 	if err != nil {
 		connLogger.ConnAwareLogger().Err(err).Msgf("Failed to create new quic connection")

tunnelrpc/registration_client.go

@@ -23,7 +23,7 @@ type RegistrationClient interface {
 		edgeAddress net.IP,
 	) (*pogs.ConnectionDetails, error)
 	SendLocalConfiguration(ctx context.Context, config []byte) error
-	GracefulShutdown(ctx context.Context, gracePeriod time.Duration) error
+	GracefulShutdown(ctx context.Context, gracePeriod time.Duration)
 	Close()
 }
 
@@ -79,7 +79,7 @@ func (r *registrationClient) SendLocalConfiguration(ctx context.Context, config
 	return err
 }
 
-func (r *registrationClient) GracefulShutdown(ctx context.Context, gracePeriod time.Duration) error {
+func (r *registrationClient) GracefulShutdown(ctx context.Context, gracePeriod time.Duration) {
 	ctx, cancel := context.WithTimeout(ctx, gracePeriod)
 	defer cancel()
 	defer metrics.CapnpMetrics.ClientOperations.WithLabelValues(metrics.Registration, metrics.OperationUnregisterConnection).Inc()
@@ -88,9 +88,7 @@ func (r *registrationClient) GracefulShutdown(ctx context.Context, gracePeriod t
 	err := r.client.UnregisterConnection(ctx)
 	if err != nil {
 		metrics.CapnpMetrics.ClientFailures.WithLabelValues(metrics.Registration, metrics.OperationUnregisterConnection).Inc()
-		return err
 	}
-	return nil
 }
 
 func (r *registrationClient) Close() {