Release 2024.11.0

## Summary
The initial purpose of this PR was to bump the base image from buster to bookworm however these tests are no longer exercised hence the removal

Closes VULN-66059

.github/workflows/semgrep.yml

@@ -0,0 +1,25 @@
+
+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

.gitignore

@@ -17,3 +17,4 @@ cscope.*
 ssh_server_tests/.env
 /.cover
 built_artifacts/
+component-tests/.venv

.teamcity/install-cloudflare-go.sh

@@ -3,6 +3,6 @@
 cd /tmp
 git clone -q https://github.com/cloudflare/go
 cd go/src
-# https://github.com/cloudflare/go/tree/ec0a014545f180b0c74dfd687698657a9e86e310 is version go1.22.2-devel-cf
-git checkout -q ec0a014545f180b0c74dfd687698657a9e86e310
-./make.bash
+# https://github.com/cloudflare/go/tree/f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38 is version go1.22.5-devel-cf
+git checkout -q f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38
+./make.bash

.teamcity/mac/build.sh

@@ -7,13 +7,17 @@ if [[ "$(uname)" != "Darwin" ]] ; then
     exit 1
 fi
 
+if [[ "amd64" != "${TARGET_ARCH}" && "arm64" != "${TARGET_ARCH}" ]]
+then
+  echo "TARGET_ARCH must be amd64 or arm64"
+  exit 1
+fi
+
 go version
 export GO111MODULE=on
 
 # build 'cloudflared-darwin-amd64.tgz'
 mkdir -p artifacts
-FILENAME="$(pwd)/artifacts/cloudflared-darwin-amd64.tgz"
-PKGNAME="$(pwd)/artifacts/cloudflared-amd64.pkg"
 TARGET_DIRECTORY=".build"
 BINARY_NAME="cloudflared"
 VERSION=$(git describe --tags --always --dirty="-dev")
@@ -25,10 +29,11 @@ INSTALLER_CERT="installer.cer"
 BUNDLE_ID="com.cloudflare.cloudflared"
 SEC_DUP_MSG="security: SecKeychainItemImport: The specified item already exists in the keychain."
 export PATH="$PATH:/usr/local/bin"
+FILENAME="$(pwd)/artifacts/cloudflared-darwin-$TARGET_ARCH.tgz"
+PKGNAME="$(pwd)/artifacts/cloudflared-$TARGET_ARCH.pkg"
 mkdir -p ../src/github.com/cloudflare/    
 cp -r . ../src/github.com/cloudflare/cloudflared
 cd ../src/github.com/cloudflare/cloudflared 
-GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
 
 # Add code signing private key to the key chain
 if [[ ! -z "$CFD_CODE_SIGN_KEY" ]]; then
@@ -138,22 +143,28 @@ else
   fi
 fi
 
+# cleanup the build directory because the previous execution might have failed without cleaning up.
+rm -rf "${TARGET_DIRECTORY}"
+export TARGET_OS="darwin"
+GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
+
 # sign the cloudflared binary
 if [[ ! -z "$CODE_SIGN_NAME" ]]; then
   codesign -s "${CODE_SIGN_NAME}" -f -v --timestamp --options runtime ${BINARY_NAME}
-  
+
  # notarize the binary
  # TODO: TUN-5789
 fi
 
+ARCH_TARGET_DIRECTORY="${TARGET_DIRECTORY}/${TARGET_ARCH}-build"
 # creating build directory
-rm -rf $TARGET_DIRECTORY
-mkdir "${TARGET_DIRECTORY}"
-mkdir "${TARGET_DIRECTORY}/contents"
-cp -r ".mac_resources/scripts" "${TARGET_DIRECTORY}/scripts"
+rm -rf $ARCH_TARGET_DIRECTORY
+mkdir -p "${ARCH_TARGET_DIRECTORY}"
+mkdir -p "${ARCH_TARGET_DIRECTORY}/contents"
+cp -r ".mac_resources/scripts" "${ARCH_TARGET_DIRECTORY}/scripts"
 
 # copy cloudflared into the build directory
-cp ${BINARY_NAME} "${TARGET_DIRECTORY}/contents/${PRODUCT}"
+cp ${BINARY_NAME} "${ARCH_TARGET_DIRECTORY}/contents/${PRODUCT}"
 
 # compress cloudflared into a tar and gzipped file
 tar czf "$FILENAME" "${BINARY_NAME}"
@@ -162,8 +173,8 @@ tar czf "$FILENAME" "${BINARY_NAME}"
 if [[ ! -z "$PKG_SIGN_NAME" ]]; then
   pkgbuild --identifier com.cloudflare.${PRODUCT} \
       --version ${VERSION} \
-      --scripts ${TARGET_DIRECTORY}/scripts \
-      --root ${TARGET_DIRECTORY}/contents \
+      --scripts ${ARCH_TARGET_DIRECTORY}/scripts \
+      --root ${ARCH_TARGET_DIRECTORY}/contents \
       --install-location /usr/local/bin \
       --sign "${PKG_SIGN_NAME}" \
       ${PKGNAME}
@@ -173,12 +184,12 @@ if [[ ! -z "$PKG_SIGN_NAME" ]]; then
 else
     pkgbuild --identifier com.cloudflare.${PRODUCT} \
       --version ${VERSION} \
-      --scripts ${TARGET_DIRECTORY}/scripts \
-      --root ${TARGET_DIRECTORY}/contents \
+      --scripts ${ARCH_TARGET_DIRECTORY}/scripts \
+      --root ${ARCH_TARGET_DIRECTORY}/contents \
       --install-location /usr/local/bin \
       ${PKGNAME}
 fi
 
-
-# cleaning up the build directory
-rm -rf $TARGET_DIRECTORY
+# cleanup build directory because this script is not ran within containers,
+# which might lead to future issues in subsequent runs.
+rm -rf "${TARGET_DIRECTORY}"

.teamcity/package-windows.sh

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

.teamcity/windows/component-test.ps1

@@ -5,41 +5,6 @@ $ProgressPreference = "SilentlyContinue"
 $WorkingDirectory = Get-Location
 $CloudflaredDirectory = "$WorkingDirectory\go\src\github.com\cloudflare\cloudflared"
 
-Write-Output "Installing python..."
-
-$PythonVersion = "3.10.11"
-$PythonZipFile = "$env:Temp\python-$PythonVersion-embed-amd64.zip"
-$PipInstallFile = "$env:Temp\get-pip.py"
-$PythonZipUrl = "https://www.python.org/ftp/python/$PythonVersion/python-$PythonVersion-embed-amd64.zip"
-$PythonPath = "$WorkingDirectory\Python"
-$PythonBinPath = "$PythonPath\python.exe"
-
-# Download Python zip file
-Invoke-WebRequest -Uri $PythonZipUrl -OutFile $PythonZipFile
-
-# Download Python pip file
-Invoke-WebRequest -Uri "https://bootstrap.pypa.io/get-pip.py" -OutFile $PipInstallFile
-
-# Extract Python files
-Expand-Archive $PythonZipFile -DestinationPath $PythonPath -Force
-
-# Add Python to PATH
-$env:Path = "$PythonPath\Scripts;$PythonPath;$($env:Path)"
-
-Write-Output "Installed to $PythonPath"
-
-# Install pip
-& $PythonBinPath $PipInstallFile
-
-# Add package paths in pythonXX._pth to unblock python -m pip
-$PythonImportPathFile = "$PythonPath\python310._pth"
-$ComponentTestsDir = "$CloudflaredDirectory\component-tests\"
-@($ComponentTestsDir, "Lib\site-packages", $(Get-Content $PythonImportPathFile)) | Set-Content $PythonImportPathFile
-
-# Test Python installation
-& $PythonBinPath --version
-& $PythonBinPath -m pip --version
-
 go env
 go version
 
@@ -48,8 +13,8 @@ $env:CGO_ENABLED = 1
 $env:TARGET_ARCH = "amd64"
 $env:Path = "$Env:Temp\go\bin;$($env:Path)"
 
-& $PythonBinPath --version
-& $PythonBinPath -m pip --version
+python --version
+python -m pip --version
 
 cd $CloudflaredDirectory
 
@@ -72,11 +37,11 @@ if ($LASTEXITCODE -ne 0) { throw "Failed unit tests" }
 
 Write-Output "Running component tests"
 
-& $PythonBinPath -m pip install --upgrade -r component-tests/requirements.txt
-& $PythonBinPath component-tests/setup.py --type create
-& $PythonBinPath -m pytest component-tests -o log_cli=true --log-cli-level=INFO
+python -m pip --disable-pip-version-check install --upgrade -r component-tests/requirements.txt --use-pep517
+python component-tests/setup.py --type create
+python -m pytest component-tests -o log_cli=true --log-cli-level=INFO
 if ($LASTEXITCODE -ne 0) {
-    & $PythonBinPath component-tests/setup.py --type cleanup
+    python component-tests/setup.py --type cleanup
     throw "Failed component tests"
 }
-& $PythonBinPath component-tests/setup.py --type cleanup
+python component-tests/setup.py --type cleanup

.teamcity/windows/install-cloudflare-go.ps1

@@ -9,8 +9,8 @@ Set-Location "$Env:Temp"
 git clone -q https://github.com/cloudflare/go
 Write-Output "Building go..."
 cd go/src
-# https://github.com/cloudflare/go/tree/ec0a014545f180b0c74dfd687698657a9e86e310 is version go1.22.2-devel-cf
-git checkout -q ec0a014545f180b0c74dfd687698657a9e86e310
+# https://github.com/cloudflare/go/tree/f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38 is version go1.22.5-devel-cf
+git checkout -q f4334cdc0c3f22a3bfdd7e66f387e3ffc65a5c38
 & ./make.bat
 
-Write-Output "Installed"
+Write-Output "Installed"

.teamcity/windows/install-go-msi.ps1

@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Stop"
 $ProgressPreference = "SilentlyContinue"
-$GoMsiVersion = "go1.22.2.windows-amd64.msi"
+$GoMsiVersion = "go1.22.5.windows-amd64.msi"
 
 Write-Output "Downloading go installer..."
 
@@ -17,4 +17,4 @@ Install-Package "$Env:Temp\$GoMsiVersion" -Force
 # Go installer updates global $PATH
 go env
 
-Write-Output "Installed"
+Write-Output "Installed"

CHANGES.md

@@ -1,3 +1,7 @@
+## 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`).

Dockerfile

@@ -1,7 +1,7 @@
 # use a builder image for building cloudflare
 ARG TARGET_GOOS
 ARG TARGET_GOARCH
-FROM golang:1.22.2 as builder
+FROM golang:1.22.5 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0 \
     TARGET_GOOS=${TARGET_GOOS} \

Dockerfile.amd64

@@ -1,5 +1,5 @@
 # use a builder image for building cloudflare
-FROM golang:1.22.2 as builder
+FROM golang:1.22.5 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0
 

Dockerfile.arm64

@@ -1,5 +1,5 @@
 # use a builder image for building cloudflare
-FROM golang:1.22.2 as builder
+FROM golang:1.22.5 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0
 

Makefile

@@ -165,10 +165,6 @@ cover:
 	# Generate the HTML report that can be viewed from the browser in CI.
 	$Q go tool cover -html ".cover/c.out" -o .cover/all.html
 
-.PHONY: test-ssh-server
-test-ssh-server:
-	docker-compose -f ssh_server_tests/docker-compose.yml up
-
 .PHONY: install-go
 install-go:
 	rm -rf ${CF_GO_PATH}
@@ -218,38 +214,18 @@ cloudflared-pkg: cloudflared cloudflared.1
 cloudflared-msi:
 	wixl --define Version=$(VERSION) --define Path=$(EXECUTABLE_PATH) --output cloudflared-$(VERSION)-$(TARGET_ARCH).msi cloudflared.wxs
 
-.PHONY: cloudflared-darwin-amd64.tgz
-cloudflared-darwin-amd64.tgz: cloudflared
-	tar czf cloudflared-darwin-amd64.tgz cloudflared
-	rm cloudflared
+.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: cloudflared
-	python3 github_release.py --path $(EXECUTABLE_PATH) --release-version $(VERSION)
-
-.PHONY: github-release-built-pkgs
-github-release-built-pkgs:
+github-release:
 	python3 github_release.py --path $(PWD)/built_artifacts --release-version $(VERSION)
-
-.PHONY: release-pkgs-linux
-release-pkgs-linux:
-	python3 ./release_pkgs.py
-
-.PHONY: github-message
-github-message:
 	python3 github_message.py --release-version $(VERSION)
 
-.PHONY: github-mac-upload
-github-mac-upload:
-	python3 github_release.py --path artifacts/cloudflared-darwin-amd64.tgz --release-version $(VERSION) --name cloudflared-darwin-amd64.tgz
-	python3 github_release.py --path artifacts/cloudflared-amd64.pkg --release-version $(VERSION) --name cloudflared-amd64.pkg
-
-.PHONY: github-windows-upload
-github-windows-upload:
-	python3 github_release.py --path built_artifacts/cloudflared-windows-amd64.exe --release-version $(VERSION) --name cloudflared-windows-amd64.exe
-	python3 github_release.py --path built_artifacts/cloudflared-windows-amd64.msi --release-version $(VERSION) --name cloudflared-windows-amd64.msi
-	python3 github_release.py --path built_artifacts/cloudflared-windows-386.exe --release-version $(VERSION) --name cloudflared-windows-386.exe
-	python3 github_release.py --path built_artifacts/cloudflared-windows-386.msi --release-version $(VERSION) --name cloudflared-windows-386.msi
+.PHONY: r2-linux-release
+r2-linux-release:
+	python3 ./release_pkgs.py
 
 .PHONY: capnp
 capnp:

RELEASE_NOTES

@@ -1,3 +1,79 @@
+2024.11.0
+- 2024-11-05 VULN-66059: remove ssh server tests
+- 2024-11-04 TUN-8700: Add datagram v3 muxer
+- 2024-11-04 TUN-8646: Allow experimental feature support for datagram v3
+- 2024-11-04 TUN-8641: Expose methods to simplify V3 Datagram parsing on the edge
+- 2024-10-31 TUN-8708: Bump python min version to 3.10
+- 2024-10-31 TUN-8667: Add datagram v3 session manager
+- 2024-10-25 TUN-8692: remove dashes from session id
+- 2024-10-24 TUN-8694: Rework release script
+- 2024-10-24 TUN-8661: Refactor connection methods to support future different datagram muxing methods
+- 2024-07-22 TUN-8553: Bump go to 1.22.5 and go-boring 1.22.5-1
+
+2024.10.1
+- 2024-10-23 TUN-8694: Fix github release script
+- 2024-10-21 Revert "TUN-8592: Use metadata from the edge to determine if request body is empty for QUIC transport"
+- 2024-10-18 TUN-8688: Correct UDP bind for IPv6 edge connectivity on macOS
+- 2024-10-17 TUN-8685: Bump coredns dependency
+- 2024-10-16 TUN-8638: Add datagram v3 serializers and deserializers
+- 2024-10-15 chore: Remove h2mux code
+- 2024-10-11 TUN-8631: Abort release on version mismatch
+
+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.7.3
+- 2024-07-31 TUN-8546: Fix final artifacts paths
+
+2024.7.2
+- 2024-07-17 TUN-8546: rework MacOS build script
+
+2024.7.1
+- 2024-07-16 TUN-8543: use -p flag to create intermediate directories
+
+2024.7.0
+- 2024-07-05 TUN-8520: add macos arm64 build
+- 2024-07-05 TUN-8523: refactor makefile and cfsetup
+- 2024-07-02 TUN-8504: Use pre-installed python version instead of downloading it on Windows builds
+- 2024-06-26 TUN-8489: Add default noop logger for capnprpc
+- 2024-06-25 TUN-8487: Add user-agent for quick-tunnel requests
+- 2023-12-12 TUN-8057: cloudflared uses new PQ curve ID
+
+2024.6.1
+- 2024-06-12 TUN-8461: Don't log Failed to send session payload if the error is EOF
+- 2024-06-07 TUN-8456: Update quic-go to 0.45 and collect mtu and congestion control metrics
+- 2024-06-06 TUN-8452: Add flag to control QUIC stream-level flow control limit
+- 2024-06-06 TUN-8451: Log QUIC flow control frames and transport parameters received
+- 2024-06-05 TUN-8449: Add flag to control QUIC connection-level flow control limit and increase default to 30MB
+
 2024.6.0
 - 2024-05-30 TUN-8441: Correct UDP total sessions metric to a counter and add new ICMP metrics
 - 2024-05-28 TUN-8422: Add metrics for capnp method calls

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=built_artifacts/
+export ARTIFACT_DIR=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=built_artifacts/
+export ARTIFACT_DIR=artifacts/
 mkdir -p $ARTIFACT_DIR
 
 linuxArchs=("386" "amd64" "arm" "armhf" "arm64")

cfsetup.yaml

@@ -1,36 +1,29 @@
-pinned_go: &pinned_go go-boring=1.22.2-1
+pinned_go: &pinned_go go-boring=1.22.5-1
 
 build_dir: &build_dir /cfsetup_build
 default-flavor: bullseye
 buster: &buster
-  build:
+  build-linux:
     build_dir: *build_dir
     builddeps: &build_deps
       - *pinned_go
       - build-essential
-      - gotest-to-teamcity
       - fakeroot
       - rubygem-fpm
       - rpm
       - libffi-dev
-      - reprepro
-      - createrepo
     pre-cache: &build_pre_cache
       - export GOCACHE=/cfsetup_build/.cache/go-build
       - go install golang.org/x/tools/cmd/goimports@latest
     post-cache:
-      # TODO: TUN-8126 this is temporary to make sure packages can be built before release
-      - ./build-packages.sh
       # Build binary for component test
       - GOOS=linux GOARCH=amd64 make cloudflared
-  build-fips:
+  build-linux-fips:
     build_dir: *build_dir
     builddeps: *build_deps
     pre-cache: *build_pre_cache
     post-cache:
       - export FIPS=true
-      # TODO: TUN-8126 this is temporary to make sure packages can be built before release
-      - ./build-packages-fips.sh
       # Build binary for component test
       - GOOS=linux GOARCH=amd64 make cloudflared
   cover:
@@ -39,28 +32,21 @@ buster: &buster
     pre-cache: *build_pre_cache
     post-cache:
      - make cover
-  # except FIPS (handled in github-fips-release-pkgs) and macos (handled in github-release-macos-amd64)
-  github-release-pkgs:
+  # except FIPS and macos 
+  build-linux-release:
     build_dir: *build_dir
-    builddeps:
+    builddeps: &build_deps_release
       - *pinned_go
       - build-essential
       - fakeroot
       - rubygem-fpm
       - rpm
-      - wget
-      # libmsi and libgcab are libraries the wixl binary depends on.
-      - libmsi-dev
-      - libgcab-dev
-      - python3-dev
       - libffi-dev
-      - python3-setuptools
+      - python3-dev
       - python3-pip
-      - reprepro
-      - createrepo
-    pre-cache: &github_release_pkgs_pre_cache
-      - wget https://github.com/sudarshan-reddy/msitools/releases/download/v0.101b/wixl -P /usr/local/bin
-      - chmod a+x /usr/local/bin/wixl
+      - python3-setuptools
+      - wget
+    pre-cache: &build_release_pre_cache
       - pip3 install pynacl==1.4.0
       - pip3 install pygithub==1.55
       - pip3 install boto3==1.22.9
@@ -68,32 +54,14 @@ buster: &buster
     post-cache:
       # build all packages (except macos and FIPS) and move them to /cfsetup/built_artifacts
       - ./build-packages.sh
-      # release the packages built and moved to /cfsetup/built_artifacts
-      - make github-release-built-pkgs
-      # publish packages to linux repos
-      - make release-pkgs-linux
   # handle FIPS separately so that we built with gofips compiler
-  github-fips-release-pkgs:
+  build-linux-fips-release:
     build_dir: *build_dir
-    builddeps:
-      - *pinned_go
-      - build-essential
-      - fakeroot
-      - rubygem-fpm
-      - rpm
-      - wget
-      # libmsi and libgcab are libraries the wixl binary depends on.
-      - libmsi-dev
-      - libgcab-dev
-      - python3-dev
-      - libffi-dev
-      - python3-setuptools
-      - python3-pip
-    pre-cache: *github_release_pkgs_pre_cache
+    builddeps: *build_deps_release
+    pre-cache: *build_release_pre_cache
     post-cache:
       # same logic as above, but for FIPS packages only
       - ./build-packages-fips.sh
-      - make github-release-built-pkgs
   generate-versions-file:
     build_dir: *build_dir
     builddeps:
@@ -152,21 +120,7 @@ buster: &buster
       - export GOOS=linux
       - export GOARCH=arm64
       - make cloudflared-deb
-  github-release-macos-amd64:
-    build_dir: *build_dir
-    builddeps: &build_pygithub
-      - *pinned_go
-      - build-essential
-      - python3-dev
-      - libffi-dev
-      - python3-setuptools
-      - python3-pip
-    pre-cache: &install_pygithub
-      - pip3 install pynacl==1.4.0
-      - pip3 install pygithub==1.55
-    post-cache:
-      - make github-mac-upload
-  github-release-windows:
+  package-windows:
     build_dir: *build_dir
     builddeps:
       - *pinned_go
@@ -186,10 +140,16 @@ buster: &buster
       - pip3 install pygithub==1.55
     post-cache:
       - .teamcity/package-windows.sh
-      - make github-windows-upload
   test:
     build_dir: *build_dir
-    builddeps: *build_deps
+    builddeps: &build_deps_tests
+      - *pinned_go
+      - build-essential
+      - fakeroot
+      - rubygem-fpm
+      - rpm
+      - libffi-dev
+      - gotest-to-teamcity
     pre-cache: *build_pre_cache
     post-cache:
       - export GOOS=linux
@@ -199,7 +159,7 @@ buster: &buster
       - make test | gotest-to-teamcity
   test-fips:
     build_dir: *build_dir
-    builddeps: *build_deps
+    builddeps: *build_deps_tests
     pre-cache: *build_pre_cache
     post-cache:
       - export GOOS=linux
@@ -210,7 +170,7 @@ buster: &buster
       - make test | gotest-to-teamcity
   component-test:
     build_dir: *build_dir
-    builddeps:
+    builddeps: &build_deps_component_test
       - *pinned_go
       - python3.7
       - python3-pip
@@ -230,24 +190,61 @@ buster: &buster
       - python3 component-tests/setup.py --type cleanup
   component-test-fips:
     build_dir: *build_dir
-    builddeps:
-      - *pinned_go
-      - python3.7
-      - python3-pip
-      - python3-setuptools
-      # procps installs the ps command which is needed in test_sysv_service because the init script
-      # uses ps pid to determine if the agent is running
-      - procps
+    builddeps: *build_deps_component_test
     pre-cache-copy-paths:
       - component-tests/requirements.txt
     pre-cache: *component_test_pre_cache
     post-cache: *component_test_post_cache
-  github-message-release:
+  github-release-dryrun:
     build_dir: *build_dir
-    builddeps: *build_pygithub
-    pre-cache: *install_pygithub
+    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-message
+      - make github-release-dryrun
+  github-release:
+    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
+  r2-linux-release:
+    build_dir: *build_dir
+    builddeps:
+      - *pinned_go
+      - build-essential
+      - fakeroot
+      - rubygem-fpm
+      - rpm
+      - wget
+      - python3-dev
+      - libffi-dev
+      - python3-setuptools
+      - python3-pip
+      - reprepro
+      - createrepo
+    pre-cache:
+      - pip3 install pynacl==1.4.0
+      - pip3 install pygithub==1.55
+      - pip3 install boto3==1.22.9
+      - pip3 install python-gnupg==0.4.9
+    post-cache:
+      - make r2-linux-release
 
 bullseye: *buster
 bookworm: *buster

cmd/cloudflared/access/cmd.go

@@ -26,6 +26,7 @@ import (
 )
 
 const (
+	appURLFlag         = "app"
 	loginQuietFlag     = "quiet"
 	sshHostnameFlag    = "hostname"
 	sshDestinationFlag = "destination"
@@ -83,9 +84,10 @@ func Commands() []*cli.Command {
 			applications from the command line.`,
 			Subcommands: []*cli.Command{
 				{
-					Name:   "login",
-					Action: cliutil.Action(login),
-					Usage:  "login <url of access application>",
+					Name:      "login",
+					Action:    cliutil.Action(login),
+					Usage:     "login <url of access application>",
+					ArgsUsage: "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)
@@ -97,6 +99,13 @@ 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,
+						},
 					},
 				},
 				{
@@ -111,12 +120,12 @@ func Commands() []*cli.Command {
 				{
 					Name:        "token",
 					Action:      cliutil.Action(generateToken),
-					Usage:       "token -app=<url of access application>",
+					Usage:       "token <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: "app",
+							Name: appURLFlag,
 						},
 					},
 				},
@@ -232,9 +241,8 @@ func login(c *cli.Context) error {
 
 	log := logger.CreateLoggerFromContext(c, logger.EnableTerminalLog)
 
-	args := c.Args()
-	appURL, err := parseURL(args.First())
-	if args.Len() < 1 || err != nil {
+	appURL, err := getAppURLFromArgs(c)
+	if err != nil {
 		log.Error().Msg("Please provide the url of the Access application")
 		return err
 	}
@@ -261,7 +269,14 @@ func login(c *cli.Context) error {
 	if c.Bool(loginQuietFlag) {
 		return nil
 	}
-	fmt.Fprintf(os.Stdout, "Successfully fetched your token:\n\n%s\n\n", cfdToken)
+
+	// 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)
+	}
 
 	return nil
 }
@@ -340,6 +355,17 @@ 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{
@@ -349,8 +375,8 @@ func generateToken(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	appURL, err := parseURL(c.String("app"))
-	if err != nil || c.NumFlags() < 1 {
+	appURL, err := getAppURLFromArgs(c)
+	if err != nil {
 		fmt.Fprintln(os.Stderr, "Please provide a url.")
 		return err
 	}

cmd/cloudflared/cliutil/build_info.go

@@ -1,7 +1,10 @@
 package cliutil
 
 import (
+	"crypto/sha256"
 	"fmt"
+	"io"
+	"os"
 	"runtime"
 
 	"github.com/rs/zerolog"
@@ -13,6 +16,7 @@ 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 {
@@ -22,11 +26,12 @@ 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", bi.CloudflaredVersion)
+	log.Info().Msgf("Version %s (Checksum %s)", bi.CloudflaredVersion, bi.Checksum)
 	if bi.BuildType != "" {
 		log.Info().Msgf("Built%s", bi.GetBuildTypeMsg())
 	}
@@ -51,3 +56,28 @@ 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(Version)
+	updater.Init(bInfo)
 	tracing.Init(Version)
 	token.Init(Version)
 	tail.Init(bInfo)

cmd/cloudflared/tunnel/cmd.go

@@ -89,6 +89,14 @@ const (
 	// Note that this may result in packet drops for UDP proxying, since we expect being able to send at least 1280 bytes of inner packets.
 	quicDisablePathMTUDiscovery = "quic-disable-pmtu-discovery"
 
+	// quicConnLevelFlowControlLimit controls the max flow control limit allocated for a QUIC connection. This controls how much data is the
+	// receiver willing to buffer. Once the limit is reached, the sender will send a DATA_BLOCKED frame to indicate it has more data to write,
+	// but it's blocked by flow control
+	quicConnLevelFlowControlLimit = "quic-connection-level-flow-control-limit"
+	// quicStreamLevelFlowControlLimit is similar to quicConnLevelFlowControlLimit but for each QUIC stream. When the sender is blocked,
+	// it will send a STREAM_DATA_BLOCKED frame
+	quicStreamLevelFlowControlLimit = "quic-stream-level-flow-control-limit"
+
 	// uiFlag is to enable launching cloudflared in interactive UI mode
 	uiFlag = "ui"
 
@@ -718,6 +726,20 @@ func tunnelFlags(shouldHide bool) []cli.Flag {
 			Value:   false,
 			Hidden:  true,
 		}),
+		altsrc.NewIntFlag(&cli.IntFlag{
+			Name:    quicConnLevelFlowControlLimit,
+			EnvVars: []string{"TUNNEL_QUIC_CONN_LEVEL_FLOW_CONTROL_LIMIT"},
+			Usage:   "Use this option to change the connection-level flow control limit for QUIC transport.",
+			Value:   30 * (1 << 20), // 30 MB
+			Hidden:  true,
+		}),
+		altsrc.NewIntFlag(&cli.IntFlag{
+			Name:    quicStreamLevelFlowControlLimit,
+			EnvVars: []string{"TUNNEL_QUIC_STREAM_LEVEL_FLOW_CONTROL_LIMIT"},
+			Usage:   "Use this option to change the connection-level flow control limit for QUIC transport.",
+			Value:   6 * (1 << 20), // 6 MB
+			Hidden:  true,
+		}),
 		altsrc.NewStringFlag(&cli.StringFlag{
 			Name:  connectorLabelFlag,
 			Usage: "Use this option to give a meaningful label to a specific connector. When a tunnel starts up, a connector id unique to the tunnel is generated. This is a uuid. To make it easier to identify a connector, we will use the hostname of the machine the tunnel is running on along with the connector ID. This option exists if one wants to have more control over what their individual connectors are called.",

cmd/cloudflared/tunnel/configuration.go

@@ -239,16 +239,18 @@ func prepareTunnelConfig(
 		Observer:        observer,
 		ReportedVersion: info.Version(),
 		// Note TUN-3758 , we use Int because UInt is not supported with altsrc
-		Retries:                     uint(c.Int("retries")),
-		RunFromTerminal:             isRunningFromTerminal(),
-		NamedTunnel:                 namedTunnel,
-		ProtocolSelector:            protocolSelector,
-		EdgeTLSConfigs:              edgeTLSConfigs,
-		FeatureSelector:             featureSelector,
-		MaxEdgeAddrRetries:          uint8(c.Int("max-edge-addr-retries")),
-		RPCTimeout:                  c.Duration(rpcTimeout),
-		WriteStreamTimeout:          c.Duration(writeStreamTimeout),
-		DisableQUICPathMTUDiscovery: c.Bool(quicDisablePathMTUDiscovery),
+		Retries:                             uint(c.Int("retries")),
+		RunFromTerminal:                     isRunningFromTerminal(),
+		NamedTunnel:                         namedTunnel,
+		ProtocolSelector:                    protocolSelector,
+		EdgeTLSConfigs:                      edgeTLSConfigs,
+		FeatureSelector:                     featureSelector,
+		MaxEdgeAddrRetries:                  uint8(c.Int("max-edge-addr-retries")),
+		RPCTimeout:                          c.Duration(rpcTimeout),
+		WriteStreamTimeout:                  c.Duration(writeStreamTimeout),
+		DisableQUICPathMTUDiscovery:         c.Bool(quicDisablePathMTUDiscovery),
+		QUICConnectionLevelFlowControlLimit: c.Uint64(quicConnLevelFlowControlLimit),
+		QUICStreamLevelFlowControlLimit:     c.Uint64(quicStreamLevelFlowControlLimit),
 	}
 	packetConfig, err := newPacketConfig(c, log)
 	if err != nil {

cmd/cloudflared/tunnel/quick_tunnel.go

@@ -3,6 +3,7 @@ package tunnel
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -15,10 +16,7 @@ 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. 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, 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"
 
 // RunQuickTunnel requests a tunnel from the specified service.
 // We use this to power quick tunnels on trycloudflare.com, but the
@@ -35,14 +33,29 @@ func RunQuickTunnel(sc *subcommandContext) error {
 		Timeout: httpTimeout,
 	}
 
-	resp, err := client.Post(fmt.Sprintf("%s/tunnel", sc.c.String("quick-service")), "application/json", nil)
+	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/tunnel", sc.c.String("quick-service")), nil)
+	if err != nil {
+		return errors.Wrap(err, "failed to build quick tunnel request")
+	}
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("User-Agent", buildInfo.UserAgent())
+	resp, err := client.Do(req)
 	if err != nil {
 		return errors.Wrap(err, "failed to request quick Tunnel")
 	}
 	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.NewDecoder(resp.Body).Decode(&data); err != nil {
+	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)
 		return errors.Wrap(err, "failed to unmarshal quick Tunnel")
 	}
 

cmd/cloudflared/updater/update.go

@@ -14,6 +14,7 @@ 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"
 )
@@ -31,7 +32,7 @@ const (
 )
 
 var (
-	version                string
+	buildInfo              *cliutil.BuildInfo
 	BuiltForPackageManager = ""
 )
 
@@ -81,8 +82,8 @@ func (uo *UpdateOutcome) noUpdate() bool {
 	return uo.Error == nil && uo.Updated == false
 }
 
-func Init(v string) {
-	version = v
+func Init(info *cliutil.BuildInfo) {
+	buildInfo = info
 }
 
 func CheckForUpdate(options updateOptions) (CheckResult, error) {
@@ -100,11 +101,12 @@ func CheckForUpdate(options updateOptions) (CheckResult, error) {
 		cfdPath = encodeWindowsPath(cfdPath)
 	}
 
-	s := NewWorkersService(version, url, cfdPath, Options{IsBeta: options.isBeta,
+	s := NewWorkersService(buildInfo.CloudflaredVersion, 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.
@@ -196,10 +198,9 @@ func loggedUpdate(log *zerolog.Logger, options updateOptions) UpdateOutcome {
 
 // AutoUpdater periodically checks for new version of cloudflared.
 type AutoUpdater struct {
-	configurable     *configurable
-	listeners        *gracenet.Net
-	updateConfigChan chan *configurable
-	log              *zerolog.Logger
+	configurable *configurable
+	listeners    *gracenet.Net
+	log          *zerolog.Logger
 }
 
 // AutoUpdaterConfigurable is the attributes of AutoUpdater that can be reconfigured during runtime
@@ -210,10 +211,9 @@ 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,
-		updateConfigChan: make(chan *configurable),
-		log:              log,
+		configurable: createUpdateConfig(updateDisabled, freq, log),
+		listeners:    listeners,
+		log:          log,
 	}
 }
 
@@ -232,12 +232,20 @@ 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 {
-			Init(updateOutcome.Version)
+			buildInfo.CloudflaredVersion = 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...")
@@ -254,25 +262,9 @@ 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,8 +9,14 @@ 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,6 +3,7 @@ package updater
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
 	"runtime"
 )
@@ -79,6 +80,10 @@ 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,7 +3,6 @@ package updater
 import (
 	"archive/tar"
 	"compress/gzip"
-	"crypto/sha256"
 	"errors"
 	"fmt"
 	"io"
@@ -16,6 +15,10 @@ import (
 	"strings"
 	"text/template"
 	"time"
+
+	"github.com/getsentry/sentry-go"
+
+	"github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
 )
 
 const (
@@ -27,9 +30,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"
@@ -86,8 +89,25 @@ func (v *WorkersVersion) Apply() error {
 		return err
 	}
 
-	// check that the file is what is expected
-	if err := isValidChecksum(v.checksum, newFilePath); err != nil {
+	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)
 		return err
 	}
 
@@ -189,27 +209,6 @@ 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/README.md

@@ -1,9 +1,9 @@
 # Requirements
-1. Python 3.7 or later with packages in the given `requirements.txt`
-   - E.g. with conda:
-   - `conda create -n component-tests python=3.7`  
-   - `conda activate component-tests`
-   - `pip3 install -r requirements.txt`
+1. Python 3.10 or later with packages in the given `requirements.txt`
+   - E.g. with venv:
+   - `python3 -m venv ./.venv`  
+   - `source ./.venv/bin/activate`
+   - `python3 -m pip install -r requirements.txt`
 
 2. Create a config yaml file, for example:
 ```

component-tests/test_tail.py

@@ -47,7 +47,12 @@ class TestTail:
             url = cfd_cli.get_management_wsurl("logs", config, config_path)
             async with connect(url, open_timeout=5, close_timeout=5) as websocket:
                 # send start_streaming
-                await websocket.send('{"type": "start_streaming"}')
+                await websocket.send(json.dumps({
+                    "type": "start_streaming",
+                    "filters": {
+                        "events": ["http"]
+                    }
+                }))
                 # send some http requests to the tunnel to trigger some logs
                 await generate_and_validate_http_events(websocket, config.get_url(), 10)
                 # send stop_streaming
@@ -99,7 +104,8 @@ class TestTail:
                 await websocket.send(json.dumps({
                     "type": "start_streaming",
                     "filters": {
-                        "sampling": 0.5
+                        "sampling": 0.5,
+                        "events": ["http"]
                     }
                 }))
                 # don't expect any http logs

component-tests/test_termination.py

@@ -45,9 +45,10 @@ class TestTermination:
             with connected:
                 connected.wait(self.timeout)
             # Send signal after the SSE connection is established
-            self.terminate_by_signal(cloudflared, signal)
-            self.wait_eyeball_thread(
-                in_flight_req, self.grace_period + self.timeout)
+            with self.within_grace_period():
+                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
@@ -66,7 +67,7 @@ class TestTermination:
 
             with connected:
                 connected.wait(self.timeout)
-            with self.within_grace_period():
+            with self.within_grace_period(has_connection=False):
                 # Send signal after the SSE connection is established
                 self.terminate_by_signal(cloudflared, signal)
                 self.wait_eyeball_thread(in_flight_req, self.grace_period)
@@ -78,7 +79,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():
+            with self.within_grace_period(has_connection=False):
                 self.terminate_by_signal(cloudflared, signal)
 
     def terminate_by_signal(self, cloudflared, sig):
@@ -92,13 +93,21 @@ class TestTermination:
 
     # Using this context asserts logic within the context is executed within grace period
     @contextmanager
-    def within_grace_period(self):
+    def within_grace_period(self, has_connection=True):
         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
-            assert duration < self.grace_period
+            # 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
 
     def stream_request(self, config, connected, early_terminate):
         expected_terminate_message = "502 Bad Gateway"

connection/connection.go

@@ -36,6 +36,13 @@ var (
 	flushableContentTypes = []string{sseContentType, grpcContentType}
 )
 
+// TunnelConnection represents the connection to the edge.
+// The Serve method is provided to allow clients to handle any errors from the connection encountered during
+// processing of the connection. Cancelling of the context provided to Serve will close the connection.
+type TunnelConnection interface {
+	Serve(ctx context.Context) error
+}
+
 type Orchestrator interface {
 	UpdateConfig(version int32, config []byte) *pogs.UpdateConfigurationResponse
 	GetConfigJSON() ([]byte, error)

connection/control.go

@@ -6,6 +6,8 @@ import (
 	"net"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/cloudflare/cloudflared/management"
 	"github.com/cloudflare/cloudflared/tunnelrpc"
 	tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
@@ -116,27 +118,32 @@ func (c *controlStream) ServeControlStream(
 		}
 	}
 
-	c.waitForUnregister(ctx, registrationClient)
-	return nil
+	return c.waitForUnregister(ctx, registrationClient)
 }
 
-func (c *controlStream) waitForUnregister(ctx context.Context, registrationClient tunnelrpc.RegistrationClient) {
+func (c *controlStream) waitForUnregister(ctx context.Context, registrationClient tunnelrpc.RegistrationClient) error {
 	// 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)
-	registrationClient.GracefulShutdown(ctx, c.gracePeriod)
+	err := registrationClient.GracefulShutdown(ctx, c.gracePeriod)
+	if err != nil {
+		return errors.Wrap(err, "Error shutting down control stream")
+	}
 	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/errors.go

@@ -2,7 +2,6 @@ package connection
 
 import (
 	"github.com/cloudflare/cloudflared/edgediscovery"
-	"github.com/cloudflare/cloudflared/h2mux"
 	tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
 )
 
@@ -71,8 +70,6 @@ func isHandshakeErrRecoverable(err error, connIndex uint8, observer *Observer) b
 	switch err.(type) {
 	case edgediscovery.DialError:
 		log.Error().Msg("Connection unable to dial edge")
-	case h2mux.MuxerHandshakeError:
-		log.Error().Msg("Connection handshake with edge server failed")
 	default:
 		log.Error().Msg("Connection failed")
 		return false

connection/h2mux.go

@@ -1,32 +0,0 @@
-package connection
-
-import (
-	"time"
-
-	"github.com/rs/zerolog"
-
-	"github.com/cloudflare/cloudflared/h2mux"
-)
-
-const (
-	muxerTimeout = 5 * time.Second
-)
-
-type MuxerConfig struct {
-	HeartbeatInterval  time.Duration
-	MaxHeartbeats      uint64
-	CompressionSetting h2mux.CompressionSetting
-	MetricsUpdateFreq  time.Duration
-}
-
-func (mc *MuxerConfig) H2MuxerConfig(h h2mux.MuxedStreamHandler, log *zerolog.Logger) *h2mux.MuxerConfig {
-	return &h2mux.MuxerConfig{
-		Timeout:            muxerTimeout,
-		Handler:            h,
-		IsClient:           true,
-		HeartbeatInterval:  mc.HeartbeatInterval,
-		MaxHeartbeats:      mc.MaxHeartbeats,
-		Log:                log,
-		CompressionQuality: mc.CompressionSetting,
-	}
-}

connection/h2mux_header.go

@@ -1,128 +0,0 @@
-package connection
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/pkg/errors"
-
-	"github.com/cloudflare/cloudflared/h2mux"
-)
-
-// H2RequestHeadersToH1Request converts the HTTP/2 headers coming from origintunneld
-// to an HTTP/1 Request object destined for the local origin web service.
-// This operation includes conversion of the pseudo-headers into their closest
-// HTTP/1 equivalents. See https://tools.ietf.org/html/rfc7540#section-8.1.2.3
-func H2RequestHeadersToH1Request(h2 []h2mux.Header, h1 *http.Request) error {
-	for _, header := range h2 {
-		name := strings.ToLower(header.Name)
-		if !IsH2muxControlRequestHeader(name) {
-			continue
-		}
-
-		switch name {
-		case ":method":
-			h1.Method = header.Value
-		case ":scheme":
-			// noop - use the preexisting scheme from h1.URL
-		case ":authority":
-			// Otherwise the host header will be based on the origin URL
-			h1.Host = header.Value
-		case ":path":
-			// We don't want to be an "opinionated" proxy, so ideally we would use :path as-is.
-			// However, this HTTP/1 Request object belongs to the Go standard library,
-			// whose URL package makes some opinionated decisions about the encoding of
-			// URL characters: see the docs of https://godoc.org/net/url#URL,
-			// in particular the EscapedPath method https://godoc.org/net/url#URL.EscapedPath,
-			// which is always used when computing url.URL.String(), whether we'd like it or not.
-			//
-			// Well, not *always*. We could circumvent this by using url.URL.Opaque. But
-			// that would present unusual difficulties when using an HTTP proxy: url.URL.Opaque
-			// is treated differently when HTTP_PROXY is set!
-			// See https://github.com/golang/go/issues/5684#issuecomment-66080888
-			//
-			// This means we are subject to the behavior of net/url's function `shouldEscape`
-			// (as invoked with mode=encodePath): https://github.com/golang/go/blob/go1.12.7/src/net/url/url.go#L101
-
-			if header.Value == "*" {
-				h1.URL.Path = "*"
-				continue
-			}
-			// Due to the behavior of validation.ValidateUrl, h1.URL may
-			// already have a partial value, with or without a trailing slash.
-			base := h1.URL.String()
-			base = strings.TrimRight(base, "/")
-			// But we know :path begins with '/', because we handled '*' above - see RFC7540
-			requestURL, err := url.Parse(base + header.Value)
-			if err != nil {
-				return errors.Wrap(err, fmt.Sprintf("invalid path '%v'", header.Value))
-			}
-			h1.URL = requestURL
-		case "content-length":
-			contentLength, err := strconv.ParseInt(header.Value, 10, 64)
-			if err != nil {
-				return fmt.Errorf("unparseable content length")
-			}
-			h1.ContentLength = contentLength
-		case RequestUserHeaders:
-			// Do not forward the serialized headers to the origin -- deserialize them, and ditch the serialized version
-			// Find and parse user headers serialized into a single one
-			userHeaders, err := DeserializeHeaders(header.Value)
-			if err != nil {
-				return errors.Wrap(err, "Unable to parse user headers")
-			}
-			for _, userHeader := range userHeaders {
-				h1.Header.Add(userHeader.Name, userHeader.Value)
-			}
-		default:
-			// All other control headers shall just be proxied transparently
-			h1.Header.Add(header.Name, header.Value)
-		}
-	}
-
-	return nil
-}
-
-func H1ResponseToH2ResponseHeaders(status int, h1 http.Header) (h2 []h2mux.Header) {
-	h2 = []h2mux.Header{
-		{Name: ":status", Value: strconv.Itoa(status)},
-	}
-	userHeaders := make(http.Header, len(h1))
-	for header, values := range h1 {
-		h2name := strings.ToLower(header)
-		if h2name == "content-length" {
-			// This header has meaning in HTTP/2 and will be used by the edge,
-			// so it should be sent as an HTTP/2 response header.
-
-			// Since these are http2 headers, they're required to be lowercase
-			h2 = append(h2, h2mux.Header{Name: "content-length", Value: values[0]})
-		} else if !IsH2muxControlResponseHeader(h2name) || IsWebsocketClientHeader(h2name) {
-			// User headers, on the other hand, must all be serialized so that
-			// HTTP/2 header validation won't be applied to HTTP/1 header values
-			userHeaders[header] = values
-		}
-	}
-
-	// Perform user header serialization and set them in the single header
-	h2 = append(h2, h2mux.Header{Name: ResponseUserHeaders, Value: SerializeHeaders(userHeaders)})
-	return h2
-}
-
-// IsH2muxControlRequestHeader is called in the direction of eyeball -> origin.
-func IsH2muxControlRequestHeader(headerName string) bool {
-	return headerName == "content-length" ||
-		headerName == "connection" || headerName == "upgrade" || // Websocket request headers
-		strings.HasPrefix(headerName, ":") ||
-		strings.HasPrefix(headerName, "cf-")
-}
-
-// IsH2muxControlResponseHeader is called in the direction of eyeball <- origin.
-func IsH2muxControlResponseHeader(headerName string) bool {
-	return headerName == "content-length" ||
-		strings.HasPrefix(headerName, ":") ||
-		strings.HasPrefix(headerName, "cf-int-") ||
-		strings.HasPrefix(headerName, "cf-cloudflared-")
-}

connection/h2mux_header_test.go

@@ -1,642 +0,0 @@
-package connection
-
-import (
-	"fmt"
-	"math/rand"
-	"net/http"
-	"net/url"
-	"reflect"
-	"regexp"
-	"strings"
-	"testing"
-	"testing/quick"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/cloudflare/cloudflared/h2mux"
-)
-
-type ByName []h2mux.Header
-
-func (a ByName) Len() int      { return len(a) }
-func (a ByName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ByName) Less(i, j int) bool {
-	if a[i].Name == a[j].Name {
-		return a[i].Value < a[j].Value
-	}
-
-	return a[i].Name < a[j].Name
-}
-
-func TestH2RequestHeadersToH1Request_RegularHeaders(t *testing.T) {
-	request, err := http.NewRequest(http.MethodGet, "http://example.com", nil)
-	assert.NoError(t, err)
-
-	mockHeaders := http.Header{
-		"Mock header 1": {"Mock value 1"},
-		"Mock header 2": {"Mock value 2"},
-	}
-
-	headersConversionErr := H2RequestHeadersToH1Request(createSerializedHeaders(RequestUserHeaders, mockHeaders), request)
-
-	assert.True(t, reflect.DeepEqual(mockHeaders, request.Header))
-	assert.NoError(t, headersConversionErr)
-}
-
-func createSerializedHeaders(headersField string, headers http.Header) []h2mux.Header {
-	return []h2mux.Header{{
-		Name:  headersField,
-		Value: SerializeHeaders(headers),
-	}}
-}
-
-func TestH2RequestHeadersToH1Request_NoHeaders(t *testing.T) {
-	request, err := http.NewRequest(http.MethodGet, "http://example.com", nil)
-	assert.NoError(t, err)
-
-	emptyHeaders := make(http.Header)
-	headersConversionErr := H2RequestHeadersToH1Request(
-		[]h2mux.Header{{
-			Name:  RequestUserHeaders,
-			Value: SerializeHeaders(emptyHeaders),
-		}},
-		request,
-	)
-
-	assert.True(t, reflect.DeepEqual(emptyHeaders, request.Header))
-	assert.NoError(t, headersConversionErr)
-}
-
-func TestH2RequestHeadersToH1Request_InvalidHostPath(t *testing.T) {
-	request, err := http.NewRequest(http.MethodGet, "http://example.com", nil)
-	assert.NoError(t, err)
-
-	mockRequestHeaders := []h2mux.Header{
-		{Name: ":path", Value: "//bad_path/"},
-		{Name: RequestUserHeaders, Value: SerializeHeaders(http.Header{"Mock header": {"Mock value"}})},
-	}
-
-	headersConversionErr := H2RequestHeadersToH1Request(mockRequestHeaders, request)
-
-	assert.Equal(t, http.Header{
-		"Mock header": []string{"Mock value"},
-	}, request.Header)
-
-	assert.Equal(t, "http://example.com//bad_path/", request.URL.String())
-
-	assert.NoError(t, headersConversionErr)
-}
-
-func TestH2RequestHeadersToH1Request_HostPathWithQuery(t *testing.T) {
-	request, err := http.NewRequest(http.MethodGet, "http://example.com/", nil)
-	assert.NoError(t, err)
-
-	mockRequestHeaders := []h2mux.Header{
-		{Name: ":path", Value: "/?query=mock%20value"},
-		{Name: RequestUserHeaders, Value: SerializeHeaders(http.Header{"Mock header": {"Mock value"}})},
-	}
-
-	headersConversionErr := H2RequestHeadersToH1Request(mockRequestHeaders, request)
-
-	assert.Equal(t, http.Header{
-		"Mock header": []string{"Mock value"},
-	}, request.Header)
-
-	assert.Equal(t, "http://example.com/?query=mock%20value", request.URL.String())
-
-	assert.NoError(t, headersConversionErr)
-}
-
-func TestH2RequestHeadersToH1Request_HostPathWithURLEncoding(t *testing.T) {
-	request, err := http.NewRequest(http.MethodGet, "http://example.com/", nil)
-	assert.NoError(t, err)
-
-	mockRequestHeaders := []h2mux.Header{
-		{Name: ":path", Value: "/mock%20path"},
-		{Name: RequestUserHeaders, Value: SerializeHeaders(http.Header{"Mock header": {"Mock value"}})},
-	}
-
-	headersConversionErr := H2RequestHeadersToH1Request(mockRequestHeaders, request)
-
-	assert.Equal(t, http.Header{
-		"Mock header": []string{"Mock value"},
-	}, request.Header)
-
-	assert.Equal(t, "http://example.com/mock%20path", request.URL.String())
-
-	assert.NoError(t, headersConversionErr)
-}
-
-func TestH2RequestHeadersToH1Request_WeirdURLs(t *testing.T) {
-	type testCase struct {
-		path string
-		want string
-	}
-	testCases := []testCase{
-		{
-			path: "",
-			want: "",
-		},
-		{
-			path: "/",
-			want: "/",
-		},
-		{
-			path: "//",
-			want: "//",
-		},
-		{
-			path: "/test",
-			want: "/test",
-		},
-		{
-			path: "//test",
-			want: "//test",
-		},
-		{
-			// https://github.com/cloudflare/cloudflared/issues/81
-			path: "//test/",
-			want: "//test/",
-		},
-		{
-			path: "/%2Ftest",
-			want: "/%2Ftest",
-		},
-		{
-			path: "//%20test",
-			want: "//%20test",
-		},
-		{
-			// https://github.com/cloudflare/cloudflared/issues/124
-			path: "/test?get=somthing%20a",
-			want: "/test?get=somthing%20a",
-		},
-		{
-			path: "/%20",
-			want: "/%20",
-		},
-		{
-			// stdlib's EscapedPath() will always percent-encode ' '
-			path: "/ ",
-			want: "/%20",
-		},
-		{
-			path: "/ a ",
-			want: "/%20a%20",
-		},
-		{
-			path: "/a%20b",
-			want: "/a%20b",
-		},
-		{
-			path: "/foo/bar;param?query#frag",
-			want: "/foo/bar;param?query#frag",
-		},
-		{
-			// stdlib's EscapedPath() will always percent-encode non-ASCII chars
-			path: "/a␠b",
-			want: "/a%E2%90%A0b",
-		},
-		{
-			path: "/a-umlaut-ä",
-			want: "/a-umlaut-%C3%A4",
-		},
-		{
-			path: "/a-umlaut-%C3%A4",
-			want: "/a-umlaut-%C3%A4",
-		},
-		{
-			path: "/a-umlaut-%c3%a4",
-			want: "/a-umlaut-%c3%a4",
-		},
-		{
-			// here the second '#' is treated as part of the fragment
-			path: "/a#b#c",
-			want: "/a#b%23c",
-		},
-		{
-			path: "/a#b␠c",
-			want: "/a#b%E2%90%A0c",
-		},
-		{
-			path: "/a#b%20c",
-			want: "/a#b%20c",
-		},
-		{
-			path: "/a#b c",
-			want: "/a#b%20c",
-		},
-		{
-			// stdlib's EscapedPath() will always percent-encode '\'
-			path: "/\\",
-			want: "/%5C",
-		},
-		{
-			path: "/a\\",
-			want: "/a%5C",
-		},
-		{
-			path: "/a,b.c.",
-			want: "/a,b.c.",
-		},
-		{
-			path: "/.",
-			want: "/.",
-		},
-		{
-			// stdlib's EscapedPath() will always percent-encode '`'
-			path: "/a`",
-			want: "/a%60",
-		},
-		{
-			path: "/a[0]",
-			want: "/a[0]",
-		},
-		{
-			path: "/?a[0]=5 &b[]=",
-			want: "/?a[0]=5 &b[]=",
-		},
-		{
-			path: "/?a=%22b%20%22",
-			want: "/?a=%22b%20%22",
-		},
-	}
-
-	for index, testCase := range testCases {
-		requestURL := "https://example.com"
-
-		request, err := http.NewRequest(http.MethodGet, requestURL, nil)
-		assert.NoError(t, err)
-
-		mockRequestHeaders := []h2mux.Header{
-			{Name: ":path", Value: testCase.path},
-			{Name: RequestUserHeaders, Value: SerializeHeaders(http.Header{"Mock header": {"Mock value"}})},
-		}
-
-		headersConversionErr := H2RequestHeadersToH1Request(mockRequestHeaders, request)
-		assert.NoError(t, headersConversionErr)
-
-		assert.Equal(t,
-			http.Header{
-				"Mock header": []string{"Mock value"},
-			},
-			request.Header)
-
-		assert.Equal(t,
-			"https://example.com"+testCase.want,
-			request.URL.String(),
-			"Failed URL index: %v %#v", index, testCase)
-	}
-}
-
-func TestH2RequestHeadersToH1Request_QuickCheck(t *testing.T) {
-	config := &quick.Config{
-		Values: func(args []reflect.Value, rand *rand.Rand) {
-			args[0] = reflect.ValueOf(randomHTTP2Path(t, rand))
-		},
-	}
-
-	type testOrigin struct {
-		url string
-
-		expectedScheme   string
-		expectedBasePath string
-	}
-	testOrigins := []testOrigin{
-		{
-			url:              "http://origin.hostname.example.com:8080",
-			expectedScheme:   "http",
-			expectedBasePath: "http://origin.hostname.example.com:8080",
-		},
-		{
-			url:              "http://origin.hostname.example.com:8080/",
-			expectedScheme:   "http",
-			expectedBasePath: "http://origin.hostname.example.com:8080",
-		},
-		{
-			url:              "http://origin.hostname.example.com:8080/api",
-			expectedScheme:   "http",
-			expectedBasePath: "http://origin.hostname.example.com:8080/api",
-		},
-		{
-			url:              "http://origin.hostname.example.com:8080/api/",
-			expectedScheme:   "http",
-			expectedBasePath: "http://origin.hostname.example.com:8080/api",
-		},
-		{
-			url:              "https://origin.hostname.example.com:8080/api",
-			expectedScheme:   "https",
-			expectedBasePath: "https://origin.hostname.example.com:8080/api",
-		},
-	}
-
-	// use multiple schemes to demonstrate that the URL is based on the
-	// origin's scheme, not the :scheme header
-	for _, testScheme := range []string{"http", "https"} {
-		for _, testOrigin := range testOrigins {
-			assertion := func(testPath string) bool {
-				const expectedMethod = "POST"
-				const expectedHostname = "request.hostname.example.com"
-
-				h2 := []h2mux.Header{
-					{Name: ":method", Value: expectedMethod},
-					{Name: ":scheme", Value: testScheme},
-					{Name: ":authority", Value: expectedHostname},
-					{Name: ":path", Value: testPath},
-					{Name: RequestUserHeaders, Value: ""},
-				}
-				h1, err := http.NewRequest("GET", testOrigin.url, nil)
-				require.NoError(t, err)
-
-				err = H2RequestHeadersToH1Request(h2, h1)
-				return assert.NoError(t, err) &&
-					assert.Equal(t, expectedMethod, h1.Method) &&
-					assert.Equal(t, expectedHostname, h1.Host) &&
-					assert.Equal(t, testOrigin.expectedScheme, h1.URL.Scheme) &&
-					assert.Equal(t, testOrigin.expectedBasePath+testPath, h1.URL.String())
-			}
-			err := quick.Check(assertion, config)
-			assert.NoError(t, err)
-		}
-	}
-}
-
-func randomASCIIPrintableChar(rand *rand.Rand) int {
-	// smallest printable ASCII char is 32, largest is 126
-	const startPrintable = 32
-	const endPrintable = 127
-	return startPrintable + rand.Intn(endPrintable-startPrintable)
-}
-
-// randomASCIIText generates an ASCII string, some of whose characters may be
-// percent-encoded. Its "logical length" (ignoring percent-encoding) is
-// between 1 and `maxLength`.
-func randomASCIIText(rand *rand.Rand, minLength int, maxLength int) string {
-	length := minLength + rand.Intn(maxLength)
-	var result strings.Builder
-	for i := 0; i < length; i++ {
-		c := randomASCIIPrintableChar(rand)
-
-		// 1/4 chance of using percent encoding when not necessary
-		if c == '%' || rand.Intn(4) == 0 {
-			result.WriteString(fmt.Sprintf("%%%02X", c))
-		} else {
-			result.WriteByte(byte(c))
-		}
-	}
-	return result.String()
-}
-
-// Calls `randomASCIIText` and ensures the result is a valid URL path,
-// i.e. one that can pass unchanged through url.URL.String()
-func randomHTTP1Path(t *testing.T, rand *rand.Rand, minLength int, maxLength int) string {
-	text := randomASCIIText(rand, minLength, maxLength)
-	re, err := regexp.Compile("[^/;,]*")
-	require.NoError(t, err)
-	return "/" + re.ReplaceAllStringFunc(text, url.PathEscape)
-}
-
-// Calls `randomASCIIText` and ensures the result is a valid URL query,
-// i.e. one that can pass unchanged through url.URL.String()
-func randomHTTP1Query(rand *rand.Rand, minLength int, maxLength int) string {
-	text := randomASCIIText(rand, minLength, maxLength)
-	return "?" + strings.ReplaceAll(text, "#", "%23")
-}
-
-// Calls `randomASCIIText` and ensures the result is a valid URL fragment,
-// i.e. one that can pass unchanged through url.URL.String()
-func randomHTTP1Fragment(t *testing.T, rand *rand.Rand, minLength int, maxLength int) string {
-	text := randomASCIIText(rand, minLength, maxLength)
-	u, err := url.Parse("#" + text)
-	require.NoError(t, err)
-	return u.String()
-}
-
-// Assemble a random :path pseudoheader that is legal by Go stdlib standards
-// (i.e. all characters will satisfy "net/url".shouldEscape for their respective locations)
-func randomHTTP2Path(t *testing.T, rand *rand.Rand) string {
-	result := randomHTTP1Path(t, rand, 1, 64)
-	if rand.Intn(2) == 1 {
-		result += randomHTTP1Query(rand, 1, 32)
-	}
-	if rand.Intn(2) == 1 {
-		result += randomHTTP1Fragment(t, rand, 1, 16)
-	}
-	return result
-}
-
-func stdlibHeaderToH2muxHeader(headers http.Header) (h2muxHeaders []h2mux.Header) {
-	for name, values := range headers {
-		for _, value := range values {
-			h2muxHeaders = append(h2muxHeaders, h2mux.Header{Name: name, Value: value})
-		}
-	}
-
-	return h2muxHeaders
-}
-
-func TestParseRequestHeaders(t *testing.T) {
-	mockUserHeadersToSerialize := http.Header{
-		"Mock-Header-One":   {"1", "1.5"},
-		"Mock-Header-Two":   {"2"},
-		"Mock-Header-Three": {"3"},
-	}
-
-	mockHeaders := []h2mux.Header{
-		{Name: "One", Value: "1"}, // will be dropped
-		{Name: "Cf-Two", Value: "cf-value-1"},
-		{Name: "Cf-Two", Value: "cf-value-2"},
-		{Name: RequestUserHeaders, Value: SerializeHeaders(mockUserHeadersToSerialize)},
-	}
-
-	expectedHeaders := []h2mux.Header{
-		{Name: "Cf-Two", Value: "cf-value-1"},
-		{Name: "Cf-Two", Value: "cf-value-2"},
-		{Name: "Mock-Header-One", Value: "1"},
-		{Name: "Mock-Header-One", Value: "1.5"},
-		{Name: "Mock-Header-Two", Value: "2"},
-		{Name: "Mock-Header-Three", Value: "3"},
-	}
-	h1 := &http.Request{
-		Header: make(http.Header),
-	}
-	err := H2RequestHeadersToH1Request(mockHeaders, h1)
-	assert.NoError(t, err)
-	assert.ElementsMatch(t, expectedHeaders, stdlibHeaderToH2muxHeader(h1.Header))
-}
-
-func TestIsH2muxControlRequestHeader(t *testing.T) {
-	controlRequestHeaders := []string{
-		// Anything that begins with cf-
-		"cf-sample-header",
-
-		// Any http2 pseudoheader
-		":sample-pseudo-header",
-
-		// content-length is a special case, it has to be there
-		// for some requests to work (per the HTTP2 spec)
-		"content-length",
-
-		// Websocket request headers
-		"connection",
-		"upgrade",
-	}
-
-	for _, header := range controlRequestHeaders {
-		assert.True(t, IsH2muxControlRequestHeader(header))
-	}
-}
-
-func TestIsH2muxControlResponseHeader(t *testing.T) {
-	controlResponseHeaders := []string{
-		// Anything that begins with cf-int- or cf-cloudflared-
-		"cf-int-sample-header",
-		"cf-cloudflared-sample-header",
-
-		// Any http2 pseudoheader
-		":sample-pseudo-header",
-
-		// content-length is a special case, it has to be there
-		// for some requests to work (per the HTTP2 spec)
-		"content-length",
-	}
-
-	for _, header := range controlResponseHeaders {
-		assert.True(t, IsH2muxControlResponseHeader(header))
-	}
-}
-
-func TestIsNotH2muxControlRequestHeader(t *testing.T) {
-	notControlRequestHeaders := []string{
-		"mock-header",
-		"another-sample-header",
-	}
-
-	for _, header := range notControlRequestHeaders {
-		assert.False(t, IsH2muxControlRequestHeader(header))
-	}
-}
-
-func TestIsNotH2muxControlResponseHeader(t *testing.T) {
-	notControlResponseHeaders := []string{
-		"mock-header",
-		"another-sample-header",
-		"upgrade",
-		"connection",
-		"cf-whatever", // On the response path, we only want to filter cf-int- and cf-cloudflared-
-	}
-
-	for _, header := range notControlResponseHeaders {
-		assert.False(t, IsH2muxControlResponseHeader(header))
-	}
-}
-
-func TestH1ResponseToH2ResponseHeaders(t *testing.T) {
-	mockHeaders := http.Header{
-		"User-header-one":       {""},
-		"User-header-two":       {"1", "2"},
-		"cf-header":             {"cf-value"},
-		"cf-int-header":         {"cf-int-value"},
-		"cf-cloudflared-header": {"cf-cloudflared-value"},
-		"Content-Length":        {"123"},
-	}
-	mockResponse := http.Response{
-		StatusCode: 200,
-		Header:     mockHeaders,
-	}
-
-	headers := H1ResponseToH2ResponseHeaders(mockResponse.StatusCode, mockResponse.Header)
-
-	serializedHeadersIndex := -1
-	for i, header := range headers {
-		if header.Name == ResponseUserHeaders {
-			serializedHeadersIndex = i
-			break
-		}
-	}
-	assert.NotEqual(t, -1, serializedHeadersIndex)
-	actualControlHeaders := append(
-		headers[:serializedHeadersIndex],
-		headers[serializedHeadersIndex+1:]...,
-	)
-	expectedControlHeaders := []h2mux.Header{
-		{Name: ":status", Value: "200"},
-		{Name: "content-length", Value: "123"},
-	}
-
-	assert.ElementsMatch(t, expectedControlHeaders, actualControlHeaders)
-
-	actualUserHeaders, err := DeserializeHeaders(headers[serializedHeadersIndex].Value)
-	expectedUserHeaders := []h2mux.Header{
-		{Name: "User-header-one", Value: ""},
-		{Name: "User-header-two", Value: "1"},
-		{Name: "User-header-two", Value: "2"},
-		{Name: "cf-header", Value: "cf-value"},
-	}
-	assert.NoError(t, err)
-	assert.ElementsMatch(t, expectedUserHeaders, actualUserHeaders)
-}
-
-// The purpose of this test is to check that our code and the http.Header
-// implementation don't throw validation errors about header size
-func TestHeaderSize(t *testing.T) {
-	largeValue := randSeq(5 * 1024 * 1024) // 5Mb
-	largeHeaders := http.Header{
-		"User-header": {largeValue},
-	}
-	mockResponse := http.Response{
-		StatusCode: 200,
-		Header:     largeHeaders,
-	}
-
-	serializedHeaders := H1ResponseToH2ResponseHeaders(mockResponse.StatusCode, mockResponse.Header)
-	request, err := http.NewRequest(http.MethodGet, "https://example.com/", nil)
-	assert.NoError(t, err)
-	for _, header := range serializedHeaders {
-		request.Header.Set(header.Name, header.Value)
-	}
-
-	for _, header := range serializedHeaders {
-		if header.Name != ResponseUserHeaders {
-			continue
-		}
-
-		deserializedHeaders, err := DeserializeHeaders(header.Value)
-		assert.NoError(t, err)
-		assert.Equal(t, largeValue, deserializedHeaders[0].Value)
-	}
-}
-
-func randSeq(n int) string {
-	randomizer := rand.New(rand.NewSource(17))
-	var letters = []rune(":;,+/=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = letters[randomizer.Intn(len(letters))]
-	}
-	return string(b)
-}
-
-func BenchmarkH1ResponseToH2ResponseHeaders(b *testing.B) {
-	ser := "eC1mb3J3YXJkZWQtcHJvdG8:aHR0cHM;dXBncmFkZS1pbnNlY3VyZS1yZXF1ZXN0cw:MQ;YWNjZXB0LWxhbmd1YWdl:ZW4tVVMsZW47cT0wLjkscnU7cT0wLjg;YWNjZXB0LWVuY29kaW5n:Z3ppcA;eC1mb3J3YXJkZWQtZm9y:MTczLjI0NS42MC42;dXNlci1hZ2VudA:TW96aWxsYS81LjAgKE1hY2ludG9zaDsgSW50ZWwgTWFjIE9TIFggMTBfMTRfNikgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzg0LjAuNDE0Ny44OSBTYWZhcmkvNTM3LjM2;c2VjLWZldGNoLW1vZGU:bmF2aWdhdGU;Y2RuLWxvb3A:Y2xvdWRmbGFyZQ;c2VjLWZldGNoLWRlc3Q:ZG9jdW1lbnQ;c2VjLWZldGNoLXVzZXI:PzE;c2VjLWZldGNoLXNpdGU:bm9uZQ;Y29va2ll:X19jZmR1aWQ9ZGNkOWZjOGNjNWMxMzE0NTMyYTFkMjhlZDEyOWRhOTYwMTU2OTk1MTYzNDsgX19jZl9ibT1mYzY2MzMzYzAzZmM0MWFiZTZmOWEyYzI2ZDUwOTA0YzIxYzZhMTQ2LTE1OTU2MjIzNDEtMTgwMC1BZTVzS2pIU2NiWGVFM05mMUhrTlNQMG1tMHBLc2pQWkloVnM1Z2g1SkNHQkFhS1UxVDB2b003alBGN3FjMHVSR2NjZGcrWHdhL1EzbTJhQzdDVU4xZ2M9;YWNjZXB0:dGV4dC9odG1sLGFwcGxpY2F0aW9uL3hodG1sK3htbCxhcHBsaWNhdGlvbi94bWw7cT0wLjksaW1hZ2Uvd2VicCxpbWFnZS9hcG5nLCovKjtxPTAuOCxhcHBsaWNhdGlvbi9zaWduZWQtZXhjaGFuZ2U7dj1iMztxPTAuOQ"
-	h2, _ := DeserializeHeaders(ser)
-	h1 := make(http.Header)
-	for _, header := range h2 {
-		h1.Add(header.Name, header.Value)
-	}
-	h1.Add("Content-Length", "200")
-	h1.Add("Cf-Something", "Else")
-	h1.Add("Upgrade", "websocket")
-
-	h1resp := &http.Response{
-		StatusCode: 200,
-		Header:     h1,
-	}
-
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_ = H1ResponseToH2ResponseHeaders(h1resp.StatusCode, h1resp.Header)
-	}
-}

connection/header.go

@@ -7,17 +7,15 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-
-	"github.com/cloudflare/cloudflared/h2mux"
 )
 
 var (
-	// h2mux-style special headers
+	// internal special headers
 	RequestUserHeaders  = "cf-cloudflared-request-headers"
 	ResponseUserHeaders = "cf-cloudflared-response-headers"
 	ResponseMetaHeader  = "cf-cloudflared-response-meta"
 
-	// h2mux-style special headers
+	// internal special headers
 	CanonicalResponseUserHeaders = http.CanonicalHeaderKey(ResponseUserHeaders)
 	CanonicalResponseMetaHeader  = http.CanonicalHeaderKey(ResponseMetaHeader)
 )
@@ -28,6 +26,13 @@ var (
 	responseMetaHeaderOrigin = mustInitRespMetaHeader("origin")
 )
 
+// HTTPHeader is a custom header struct that expects only ever one value for the header.
+// This structure is used to serialize the headers and attach them to the HTTP2 request when proxying.
+type HTTPHeader struct {
+	Name  string
+	Value string
+}
+
 type responseMetaHeader struct {
 	Source string `json:"src"`
 }
@@ -104,10 +109,10 @@ func SerializeHeaders(h1Headers http.Header) string {
 }
 
 // Deserialize headers serialized by `SerializeHeader`
-func DeserializeHeaders(serializedHeaders string) ([]h2mux.Header, error) {
+func DeserializeHeaders(serializedHeaders string) ([]HTTPHeader, error) {
 	const unableToDeserializeErr = "Unable to deserialize headers"
 
-	var deserialized []h2mux.Header
+	var deserialized []HTTPHeader
 	for _, serializedPair := range strings.Split(serializedHeaders, ";") {
 		if len(serializedPair) == 0 {
 			continue
@@ -130,7 +135,7 @@ func DeserializeHeaders(serializedHeaders string) ([]h2mux.Header, error) {
 			return nil, errors.Wrap(err, unableToDeserializeErr)
 		}
 
-		deserialized = append(deserialized, h2mux.Header{
+		deserialized = append(deserialized, HTTPHeader{
 			Name:  string(deserializedName),
 			Value: string(deserializedValue),
 		})

connection/header_test.go

@@ -46,18 +46,40 @@ func TestSerializeHeaders(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.Equal(t, 13, len(deserializedHeaders))
-	h2muxExpectedHeaders := stdlibHeaderToH2muxHeader(mockHeaders)
+	expectedHeaders := headerToReqHeader(mockHeaders)
 
 	sort.Sort(ByName(deserializedHeaders))
-	sort.Sort(ByName(h2muxExpectedHeaders))
+	sort.Sort(ByName(expectedHeaders))
 
 	assert.True(
 		t,
-		reflect.DeepEqual(h2muxExpectedHeaders, deserializedHeaders),
-		fmt.Sprintf("got = %#v, want = %#v\n", deserializedHeaders, h2muxExpectedHeaders),
+		reflect.DeepEqual(expectedHeaders, deserializedHeaders),
+		fmt.Sprintf("got = %#v, want = %#v\n", deserializedHeaders, expectedHeaders),
 	)
 }
 
+type ByName []HTTPHeader
+
+func (a ByName) Len() int      { return len(a) }
+func (a ByName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ByName) Less(i, j int) bool {
+	if a[i].Name == a[j].Name {
+		return a[i].Value < a[j].Value
+	}
+
+	return a[i].Name < a[j].Name
+}
+
+func headerToReqHeader(headers http.Header) (reqHeaders []HTTPHeader) {
+	for name, values := range headers {
+		for _, value := range values {
+			reqHeaders = append(reqHeaders, HTTPHeader{Name: name, Value: value})
+		}
+	}
+
+	return reqHeaders
+}
+
 func TestSerializeNoHeaders(t *testing.T) {
 	request, err := http.NewRequest(http.MethodGet, "http://example.com", nil)
 	assert.NoError(t, err)

connection/http2.go

@@ -385,8 +385,7 @@ func determineHTTP2Type(r *http.Request) Type {
 func handleMissingRequestParts(connType Type, r *http.Request) {
 	if connType == TypeHTTP {
 		// http library has no guarantees that we receive a filled URL. If not, then we fill it, as we reuse the request
-		// for proxying. We use the same values as we used to in h2mux. For proxying they should not matter since we
-		// control the dialer on every egress proxied.
+		// for proxying. For proxying they should not matter since we control the dialer on every egress proxied.
 		if len(r.URL.Scheme) == 0 {
 			r.URL.Scheme = "http"
 		}

connection/http2_test.go

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

connection/metrics.go

@@ -2,11 +2,8 @@ package connection
 
 import (
 	"sync"
-	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-
-	"github.com/cloudflare/cloudflared/h2mux"
 )
 
 const (
@@ -16,27 +13,6 @@ const (
 	configSubsystem  = "config"
 )
 
-type muxerMetrics struct {
-	rtt              *prometheus.GaugeVec
-	rttMin           *prometheus.GaugeVec
-	rttMax           *prometheus.GaugeVec
-	receiveWindowAve *prometheus.GaugeVec
-	sendWindowAve    *prometheus.GaugeVec
-	receiveWindowMin *prometheus.GaugeVec
-	receiveWindowMax *prometheus.GaugeVec
-	sendWindowMin    *prometheus.GaugeVec
-	sendWindowMax    *prometheus.GaugeVec
-	inBoundRateCurr  *prometheus.GaugeVec
-	inBoundRateMin   *prometheus.GaugeVec
-	inBoundRateMax   *prometheus.GaugeVec
-	outBoundRateCurr *prometheus.GaugeVec
-	outBoundRateMin  *prometheus.GaugeVec
-	outBoundRateMax  *prometheus.GaugeVec
-	compBytesBefore  *prometheus.GaugeVec
-	compBytesAfter   *prometheus.GaugeVec
-	compRateAve      *prometheus.GaugeVec
-}
-
 type localConfigMetrics struct {
 	pushes       prometheus.Counter
 	pushesErrors prometheus.Counter
@@ -53,7 +29,6 @@ type tunnelMetrics struct {
 	regFail    *prometheus.CounterVec
 	rpcFail    *prometheus.CounterVec
 
-	muxerMetrics        *muxerMetrics
 	tunnelsHA           tunnelsForHA
 	userHostnamesCounts *prometheus.CounterVec
 
@@ -91,252 +66,6 @@ func newLocalConfigMetrics() *localConfigMetrics {
 	}
 }
 
-func newMuxerMetrics() *muxerMetrics {
-	rtt := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "rtt",
-			Help:      "Round-trip time in millisecond",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(rtt)
-
-	rttMin := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "rtt_min",
-			Help:      "Shortest round-trip time in millisecond",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(rttMin)
-
-	rttMax := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "rtt_max",
-			Help:      "Longest round-trip time in millisecond",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(rttMax)
-
-	receiveWindowAve := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "receive_window_ave",
-			Help:      "Average receive window size in bytes",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(receiveWindowAve)
-
-	sendWindowAve := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "send_window_ave",
-			Help:      "Average send window size in bytes",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(sendWindowAve)
-
-	receiveWindowMin := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "receive_window_min",
-			Help:      "Smallest receive window size in bytes",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(receiveWindowMin)
-
-	receiveWindowMax := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "receive_window_max",
-			Help:      "Largest receive window size in bytes",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(receiveWindowMax)
-
-	sendWindowMin := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "send_window_min",
-			Help:      "Smallest send window size in bytes",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(sendWindowMin)
-
-	sendWindowMax := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "send_window_max",
-			Help:      "Largest send window size in bytes",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(sendWindowMax)
-
-	inBoundRateCurr := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "inbound_bytes_per_sec_curr",
-			Help:      "Current inbounding bytes per second, 0 if there is no incoming connection",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(inBoundRateCurr)
-
-	inBoundRateMin := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "inbound_bytes_per_sec_min",
-			Help:      "Minimum non-zero inbounding bytes per second",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(inBoundRateMin)
-
-	inBoundRateMax := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "inbound_bytes_per_sec_max",
-			Help:      "Maximum inbounding bytes per second",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(inBoundRateMax)
-
-	outBoundRateCurr := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "outbound_bytes_per_sec_curr",
-			Help:      "Current outbounding bytes per second, 0 if there is no outgoing traffic",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(outBoundRateCurr)
-
-	outBoundRateMin := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "outbound_bytes_per_sec_min",
-			Help:      "Minimum non-zero outbounding bytes per second",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(outBoundRateMin)
-
-	outBoundRateMax := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "outbound_bytes_per_sec_max",
-			Help:      "Maximum outbounding bytes per second",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(outBoundRateMax)
-
-	compBytesBefore := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "comp_bytes_before",
-			Help:      "Bytes sent via cross-stream compression, pre compression",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(compBytesBefore)
-
-	compBytesAfter := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "comp_bytes_after",
-			Help:      "Bytes sent via cross-stream compression, post compression",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(compBytesAfter)
-
-	compRateAve := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: MetricsNamespace,
-			Subsystem: muxerSubsystem,
-			Name:      "comp_rate_ave",
-			Help:      "Average outbound cross-stream compression ratio",
-		},
-		[]string{"connection_id"},
-	)
-	prometheus.MustRegister(compRateAve)
-
-	return &muxerMetrics{
-		rtt:              rtt,
-		rttMin:           rttMin,
-		rttMax:           rttMax,
-		receiveWindowAve: receiveWindowAve,
-		sendWindowAve:    sendWindowAve,
-		receiveWindowMin: receiveWindowMin,
-		receiveWindowMax: receiveWindowMax,
-		sendWindowMin:    sendWindowMin,
-		sendWindowMax:    sendWindowMax,
-		inBoundRateCurr:  inBoundRateCurr,
-		inBoundRateMin:   inBoundRateMin,
-		inBoundRateMax:   inBoundRateMax,
-		outBoundRateCurr: outBoundRateCurr,
-		outBoundRateMin:  outBoundRateMin,
-		outBoundRateMax:  outBoundRateMax,
-		compBytesBefore:  compBytesBefore,
-		compBytesAfter:   compBytesAfter,
-		compRateAve:      compRateAve,
-	}
-}
-
-func (m *muxerMetrics) update(connectionID string, metrics *h2mux.MuxerMetrics) {
-	m.rtt.WithLabelValues(connectionID).Set(convertRTTMilliSec(metrics.RTT))
-	m.rttMin.WithLabelValues(connectionID).Set(convertRTTMilliSec(metrics.RTTMin))
-	m.rttMax.WithLabelValues(connectionID).Set(convertRTTMilliSec(metrics.RTTMax))
-	m.receiveWindowAve.WithLabelValues(connectionID).Set(metrics.ReceiveWindowAve)
-	m.sendWindowAve.WithLabelValues(connectionID).Set(metrics.SendWindowAve)
-	m.receiveWindowMin.WithLabelValues(connectionID).Set(float64(metrics.ReceiveWindowMin))
-	m.receiveWindowMax.WithLabelValues(connectionID).Set(float64(metrics.ReceiveWindowMax))
-	m.sendWindowMin.WithLabelValues(connectionID).Set(float64(metrics.SendWindowMin))
-	m.sendWindowMax.WithLabelValues(connectionID).Set(float64(metrics.SendWindowMax))
-	m.inBoundRateCurr.WithLabelValues(connectionID).Set(float64(metrics.InBoundRateCurr))
-	m.inBoundRateMin.WithLabelValues(connectionID).Set(float64(metrics.InBoundRateMin))
-	m.inBoundRateMax.WithLabelValues(connectionID).Set(float64(metrics.InBoundRateMax))
-	m.outBoundRateCurr.WithLabelValues(connectionID).Set(float64(metrics.OutBoundRateCurr))
-	m.outBoundRateMin.WithLabelValues(connectionID).Set(float64(metrics.OutBoundRateMin))
-	m.outBoundRateMax.WithLabelValues(connectionID).Set(float64(metrics.OutBoundRateMax))
-	m.compBytesBefore.WithLabelValues(connectionID).Set(float64(metrics.CompBytesBefore.Value()))
-	m.compBytesAfter.WithLabelValues(connectionID).Set(float64(metrics.CompBytesAfter.Value()))
-	m.compRateAve.WithLabelValues(connectionID).Set(float64(metrics.CompRateAve()))
-}
-
-func convertRTTMilliSec(t time.Duration) float64 {
-	return float64(t / time.Millisecond)
-}
-
 // Metrics that can be collected without asking the edge
 func initTunnelMetrics() *tunnelMetrics {
 	maxConcurrentRequestsPerTunnel := prometheus.NewGaugeVec(
@@ -408,7 +137,6 @@ func initTunnelMetrics() *tunnelMetrics {
 	return &tunnelMetrics{
 		serverLocations:     serverLocations,
 		oldServerLocations:  make(map[string]string),
-		muxerMetrics:        newMuxerMetrics(),
 		tunnelsHA:           newTunnelsForHA(),
 		regSuccess:          registerSuccess,
 		regFail:             registerFail,
@@ -418,10 +146,6 @@ func initTunnelMetrics() *tunnelMetrics {
 	}
 }
 
-func (t *tunnelMetrics) updateMuxerMetrics(connectionID string, metrics *h2mux.MuxerMetrics) {
-	t.muxerMetrics.update(connectionID, metrics)
-}
-
 func (t *tunnelMetrics) registerServerLocation(connectionID, loc string) {
 	t.locationLock.Lock()
 	defer t.locationLock.Unlock()

connection/protocol.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	AvailableProtocolFlagMessage = "Available protocols: 'auto' - automatically chooses the best protocol over time (the default; and also the recommended one); 'quic' - based on QUIC, relying on UDP egress to Cloudflare edge; 'http2' - using Go's HTTP2 library, relying on TCP egress to Cloudflare edge"
-	// edgeH2muxTLSServerName is the server name to establish h2mux connection with edge
+	// edgeH2muxTLSServerName is the server name to establish h2mux connection with edge (unused, but kept for legacy reference).
 	edgeH2muxTLSServerName = "cftunnel.com"
 	// edgeH2TLSServerName is the server name to establish http2 connection with edge
 	edgeH2TLSServerName = "h2.cftunnel.com"

connection/quic.go

@@ -1,51 +1,16 @@
 package connection
 
 import (
-	"bufio"
 	"context"
 	"crypto/tls"
 	"fmt"
-	"io"
 	"net"
-	"net/http"
 	"net/netip"
 	"runtime"
-	"strconv"
-	"strings"
 	"sync"
-	"sync/atomic"
-	"time"
 
-	"github.com/google/uuid"
-	"github.com/pkg/errors"
 	"github.com/quic-go/quic-go"
 	"github.com/rs/zerolog"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
-	"golang.org/x/sync/errgroup"
-
-	"github.com/cloudflare/cloudflared/datagramsession"
-	"github.com/cloudflare/cloudflared/ingress"
-	"github.com/cloudflare/cloudflared/management"
-	"github.com/cloudflare/cloudflared/packet"
-	cfdquic "github.com/cloudflare/cloudflared/quic"
-	"github.com/cloudflare/cloudflared/tracing"
-	"github.com/cloudflare/cloudflared/tunnelrpc/pogs"
-	tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
-	rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic"
-)
-
-const (
-	// HTTPHeaderKey is used to get or set http headers in QUIC ALPN if the underlying proxy connection type is HTTP.
-	HTTPHeaderKey = "HttpHeader"
-	// HTTPMethodKey is used to get or set http method in QUIC ALPN if the underlying proxy connection type is HTTP.
-	HTTPMethodKey = "HttpMethod"
-	// HTTPHostKey is used to get or set http Method in QUIC ALPN if the underlying proxy connection type is HTTP.
-	HTTPHostKey = "HttpHost"
-
-	QUICMetadataFlowID = "FlowID"
-	// emperically this capacity has been working well
-	demuxChanCapacity = 16
 )
 
 var (
@@ -53,46 +18,21 @@ var (
 	portMapMutex     sync.Mutex
 )
 
-// QUICConnection represents the type that facilitates Proxying via QUIC streams.
-type QUICConnection struct {
-	session      quic.Connection
-	logger       *zerolog.Logger
-	orchestrator Orchestrator
-	// sessionManager tracks active sessions. It receives datagrams from quic connection via datagramMuxer
-	sessionManager datagramsession.Manager
-	// datagramMuxer mux/demux datagrams from quic connection
-	datagramMuxer        *cfdquic.DatagramMuxerV2
-	packetRouter         *ingress.PacketRouter
-	controlStreamHandler ControlStreamHandler
-	connOptions          *tunnelpogs.ConnectionOptions
-	connIndex            uint8
-
-	rpcTimeout         time.Duration
-	streamWriteTimeout time.Duration
-}
-
-// NewQUICConnection returns a new instance of QUICConnection.
-func NewQUICConnection(
+func DialQuic(
 	ctx context.Context,
 	quicConfig *quic.Config,
-	edgeAddr net.Addr,
+	tlsConfig *tls.Config,
+	edgeAddr netip.AddrPort,
 	localAddr net.IP,
 	connIndex uint8,
-	tlsConfig *tls.Config,
-	orchestrator Orchestrator,
-	connOptions *tunnelpogs.ConnectionOptions,
-	controlStreamHandler ControlStreamHandler,
 	logger *zerolog.Logger,
-	packetRouterConfig *ingress.GlobalRouterConfig,
-	rpcTimeout time.Duration,
-	streamWriteTimeout time.Duration,
-) (*QUICConnection, error) {
-	udpConn, err := createUDPConnForConnIndex(connIndex, localAddr, logger)
+) (quic.Connection, error) {
+	udpConn, err := createUDPConnForConnIndex(connIndex, localAddr, edgeAddr, logger)
 	if err != nil {
 		return nil, err
 	}
 
-	session, err := quic.Dial(ctx, udpConn, edgeAddr, tlsConfig, quicConfig)
+	conn, err := quic.Dial(ctx, udpConn, net.UDPAddrFromAddrPort(edgeAddr), tlsConfig, quicConfig)
 	if err != nil {
 		// close the udp server socket in case of error connecting to the edge
 		udpConn.Close()
@@ -100,510 +40,22 @@ func NewQUICConnection(
 	}
 
 	// wrap the session, so that the UDPConn is closed after session is closed.
-	session = &wrapCloseableConnQuicConnection{
-		session,
+	conn = &wrapCloseableConnQuicConnection{
+		conn,
 		udpConn,
 	}
-
-	sessionDemuxChan := make(chan *packet.Session, demuxChanCapacity)
-	datagramMuxer := cfdquic.NewDatagramMuxerV2(session, logger, sessionDemuxChan)
-	sessionManager := datagramsession.NewManager(logger, datagramMuxer.SendToSession, sessionDemuxChan)
-	packetRouter := ingress.NewPacketRouter(packetRouterConfig, datagramMuxer, logger)
-
-	return &QUICConnection{
-		session:              session,
-		orchestrator:         orchestrator,
-		logger:               logger,
-		sessionManager:       sessionManager,
-		datagramMuxer:        datagramMuxer,
-		packetRouter:         packetRouter,
-		controlStreamHandler: controlStreamHandler,
-		connOptions:          connOptions,
-		connIndex:            connIndex,
-		rpcTimeout:           rpcTimeout,
-		streamWriteTimeout:   streamWriteTimeout,
-	}, nil
+	return conn, nil
 }
 
-// Serve starts a QUIC session that begins accepting streams.
-func (q *QUICConnection) Serve(ctx context.Context) error {
-	// origintunneld assumes the first stream is used for the control plane
-	controlStream, err := q.session.OpenStream()
-	if err != nil {
-		return fmt.Errorf("failed to open a registration control stream: %w", err)
-	}
-
-	// If either goroutine returns nil error, we rely on this cancellation to make sure the other goroutine exits
-	// as fast as possible as well. Nil error means we want to exit for good (caller code won't retry serving this
-	// connection).
-	// If either goroutine returns a non nil error, then the error group cancels the context, thus also canceling the
-	// other goroutine as fast as possible.
-	ctx, cancel := context.WithCancel(ctx)
-	errGroup, ctx := errgroup.WithContext(ctx)
-
-	// 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 {
-		defer cancel()
-		return q.serveControlStream(ctx, controlStream)
-	})
-	errGroup.Go(func() error {
-		defer cancel()
-		return q.acceptStream(ctx)
-	})
-	errGroup.Go(func() error {
-		defer cancel()
-		return q.sessionManager.Serve(ctx)
-	})
-	errGroup.Go(func() error {
-		defer cancel()
-		return q.datagramMuxer.ServeReceive(ctx)
-	})
-	errGroup.Go(func() error {
-		defer cancel()
-		return q.packetRouter.Serve(ctx)
-	})
-
-	return errGroup.Wait()
-}
-
-func (q *QUICConnection) serveControlStream(ctx context.Context, controlStream quic.Stream) error {
-	// This blocks until the control plane is done.
-	err := q.controlStreamHandler.ServeControlStream(ctx, controlStream, q.connOptions, q.orchestrator)
-	if err != nil {
-		// Not wrapping error here to be consistent with the http2 message.
-		return err
-	}
-
-	return nil
-}
-
-// Close closes the session with no errors specified.
-func (q *QUICConnection) Close() {
-	q.session.CloseWithError(0, "")
-}
-
-func (q *QUICConnection) acceptStream(ctx context.Context) error {
-	defer q.Close()
-	for {
-		quicStream, err := q.session.AcceptStream(ctx)
-		if err != nil {
-			// context.Canceled is usually a user ctrl+c. We don't want to log an error here as it's intentional.
-			if errors.Is(err, context.Canceled) || q.controlStreamHandler.IsStopped() {
-				return nil
-			}
-			return fmt.Errorf("failed to accept QUIC stream: %w", err)
-		}
-		go q.runStream(quicStream)
-	}
-}
-
-func (q *QUICConnection) runStream(quicStream quic.Stream) {
-	ctx := quicStream.Context()
-	stream := cfdquic.NewSafeStreamCloser(quicStream, q.streamWriteTimeout, q.logger)
-	defer stream.Close()
-
-	// we are going to fuse readers/writers from stream <- cloudflared -> origin, and we want to guarantee that
-	// code executed in the code path of handleStream don't trigger an earlier close to the downstream write stream.
-	// So, we wrap the stream with a no-op write closer and only this method can actually close write side of the stream.
-	// A call to close will simulate a close to the read-side, which will fail subsequent reads.
-	noCloseStream := &nopCloserReadWriter{ReadWriteCloser: stream}
-	ss := rpcquic.NewCloudflaredServer(q.handleDataStream, q, q, q.rpcTimeout)
-	if err := ss.Serve(ctx, noCloseStream); err != nil {
-		q.logger.Debug().Err(err).Msg("Failed to handle QUIC stream")
-
-		// if we received an error at this level, then close write side of stream with an error, which will result in
-		// RST_STREAM frame.
-		quicStream.CancelWrite(0)
-	}
-}
-
-func (q *QUICConnection) handleDataStream(ctx context.Context, stream *rpcquic.RequestServerStream) error {
-	request, err := stream.ReadConnectRequestData()
-	if err != nil {
-		return err
-	}
-
-	if err, connectResponseSent := q.dispatchRequest(ctx, stream, err, request); err != nil {
-		q.logger.Err(err).Str("type", request.Type.String()).Str("dest", request.Dest).Msg("Request failed")
-
-		// if the connectResponse was already sent and we had an error, we need to propagate it up, so that the stream is
-		// closed with an RST_STREAM frame
-		if connectResponseSent {
-			return err
-		}
-
-		if writeRespErr := stream.WriteConnectResponseData(err); writeRespErr != nil {
-			return writeRespErr
-		}
-	}
-
-	return nil
-}
-
-// dispatchRequest will dispatch the request depending on the type and returns an error if it occurs.
-// More importantly, it also tells if the during processing of the request the ConnectResponse metadata was sent downstream.
-// This is important since it informs
-func (q *QUICConnection) dispatchRequest(ctx context.Context, stream *rpcquic.RequestServerStream, err error, request *pogs.ConnectRequest) (error, bool) {
-	originProxy, err := q.orchestrator.GetOriginProxy()
-	if err != nil {
-		return err, false
-	}
-
-	switch request.Type {
-	case pogs.ConnectionTypeHTTP, pogs.ConnectionTypeWebsocket:
-		tracedReq, err := buildHTTPRequest(ctx, request, stream, q.connIndex, q.logger)
-		if err != nil {
-			return err, false
-		}
-		w := newHTTPResponseAdapter(stream)
-		return originProxy.ProxyHTTP(&w, tracedReq, request.Type == pogs.ConnectionTypeWebsocket), w.connectResponseSent
-
-	case pogs.ConnectionTypeTCP:
-		rwa := &streamReadWriteAcker{RequestServerStream: stream}
-		metadata := request.MetadataMap()
-		return originProxy.ProxyTCP(ctx, rwa, &TCPRequest{
-			Dest:      request.Dest,
-			FlowID:    metadata[QUICMetadataFlowID],
-			CfTraceID: metadata[tracing.TracerContextName],
-			ConnIndex: q.connIndex,
-		}), rwa.connectResponseSent
-	default:
-		return errors.Errorf("unsupported error type: %s", request.Type), false
-	}
-}
-
-// RegisterUdpSession is the RPC method invoked by edge to register and run a session
-func (q *QUICConnection) RegisterUdpSession(ctx context.Context, sessionID uuid.UUID, dstIP net.IP, dstPort uint16, closeAfterIdleHint time.Duration, traceContext string) (*tunnelpogs.RegisterUdpSessionResponse, error) {
-	traceCtx := tracing.NewTracedContext(ctx, traceContext, q.logger)
-	ctx, registerSpan := traceCtx.Tracer().Start(traceCtx, "register-session", trace.WithAttributes(
-		attribute.String("session-id", sessionID.String()),
-		attribute.String("dst", fmt.Sprintf("%s:%d", dstIP, dstPort)),
-	))
-	log := q.logger.With().Int(management.EventTypeKey, int(management.UDP)).Logger()
-	// Each session is a series of datagram from an eyeball to a dstIP:dstPort.
-	// (src port, dst IP, dst port) uniquely identifies a session, so it needs a dedicated connected socket.
-	originProxy, err := ingress.DialUDP(dstIP, dstPort)
-	if err != nil {
-		log.Err(err).Msgf("Failed to create udp proxy to %s:%d", dstIP, dstPort)
-		tracing.EndWithErrorStatus(registerSpan, err)
-		return nil, err
-	}
-	registerSpan.SetAttributes(
-		attribute.Bool("socket-bind-success", true),
-		attribute.String("src", originProxy.LocalAddr().String()),
-	)
-
-	session, err := q.sessionManager.RegisterSession(ctx, sessionID, originProxy)
-	if err != nil {
-		originProxy.Close()
-		log.Err(err).Str("sessionID", sessionID.String()).Msgf("Failed to register udp session")
-		tracing.EndWithErrorStatus(registerSpan, err)
-		return nil, err
-	}
-
-	go q.serveUDPSession(session, closeAfterIdleHint)
-
-	log.Debug().
-		Str("sessionID", sessionID.String()).
-		Str("src", originProxy.LocalAddr().String()).
-		Str("dst", fmt.Sprintf("%s:%d", dstIP, dstPort)).
-		Msgf("Registered session")
-	tracing.End(registerSpan)
-
-	resp := tunnelpogs.RegisterUdpSessionResponse{
-		Spans: traceCtx.GetProtoSpans(),
-	}
-
-	return &resp, nil
-}
-
-func (q *QUICConnection) serveUDPSession(session *datagramsession.Session, closeAfterIdleHint time.Duration) {
-	ctx := q.session.Context()
-	closedByRemote, err := session.Serve(ctx, closeAfterIdleHint)
-	// If session is terminated by remote, then we know it has been unregistered from session manager and edge
-	if !closedByRemote {
-		if err != nil {
-			q.closeUDPSession(ctx, session.ID, err.Error())
-		} else {
-			q.closeUDPSession(ctx, session.ID, "terminated without error")
-		}
-	}
-	q.logger.Debug().Err(err).
-		Int(management.EventTypeKey, int(management.UDP)).
-		Str("sessionID", session.ID.String()).
-		Msg("Session terminated")
-}
-
-// closeUDPSession first unregisters the session from session manager, then it tries to unregister from edge
-func (q *QUICConnection) closeUDPSession(ctx context.Context, sessionID uuid.UUID, message string) {
-	q.sessionManager.UnregisterSession(ctx, sessionID, message, false)
-	quicStream, err := q.session.OpenStream()
-	if err != nil {
-		// Log this at debug because this is not an error if session was closed due to lost connection
-		// with edge
-		q.logger.Debug().Err(err).
-			Int(management.EventTypeKey, int(management.UDP)).
-			Str("sessionID", sessionID.String()).
-			Msgf("Failed to open quic stream to unregister udp session with edge")
-		return
-	}
-
-	stream := cfdquic.NewSafeStreamCloser(quicStream, q.streamWriteTimeout, q.logger)
-	defer stream.Close()
-	rpcClientStream, err := rpcquic.NewSessionClient(ctx, stream, q.rpcTimeout)
-	if err != nil {
-		// Log this at debug because this is not an error if session was closed due to lost connection
-		// with edge
-		q.logger.Err(err).Str("sessionID", sessionID.String()).
-			Msgf("Failed to open rpc stream to unregister udp session with edge")
-		return
-	}
-	defer rpcClientStream.Close()
-
-	if err := rpcClientStream.UnregisterUdpSession(ctx, sessionID, message); err != nil {
-		q.logger.Err(err).Str("sessionID", sessionID.String()).
-			Msgf("Failed to unregister udp session with edge")
-	}
-}
-
-// UnregisterUdpSession is the RPC method invoked by edge to unregister and terminate a sesssion
-func (q *QUICConnection) UnregisterUdpSession(ctx context.Context, sessionID uuid.UUID, message string) error {
-	return q.sessionManager.UnregisterSession(ctx, sessionID, message, true)
-}
-
-// UpdateConfiguration is the RPC method invoked by edge when there is a new configuration
-func (q *QUICConnection) UpdateConfiguration(ctx context.Context, version int32, config []byte) *tunnelpogs.UpdateConfigurationResponse {
-	return q.orchestrator.UpdateConfig(version, config)
-}
-
-// streamReadWriteAcker is a light wrapper over QUIC streams with a callback to send response back to
-// the client.
-type streamReadWriteAcker struct {
-	*rpcquic.RequestServerStream
-	connectResponseSent bool
-}
-
-// AckConnection acks response back to the proxy.
-func (s *streamReadWriteAcker) AckConnection(tracePropagation string) error {
-	metadata := []pogs.Metadata{}
-	// Only add tracing if provided by origintunneld
-	if tracePropagation != "" {
-		metadata = append(metadata, pogs.Metadata{
-			Key: tracing.CanonicalCloudflaredTracingHeader,
-			Val: tracePropagation,
-		})
-	}
-	s.connectResponseSent = true
-	return s.WriteConnectResponseData(nil, metadata...)
-}
-
-// httpResponseAdapter translates responses written by the HTTP Proxy into ones that can be used in QUIC.
-type httpResponseAdapter struct {
-	*rpcquic.RequestServerStream
-	headers             http.Header
-	connectResponseSent bool
-}
-
-func newHTTPResponseAdapter(s *rpcquic.RequestServerStream) httpResponseAdapter {
-	return httpResponseAdapter{RequestServerStream: s, headers: make(http.Header)}
-}
-
-func (hrw *httpResponseAdapter) AddTrailer(trailerName, trailerValue string) {
-	// we do not support trailers over QUIC
-}
-
-func (hrw *httpResponseAdapter) WriteRespHeaders(status int, header http.Header) error {
-	metadata := make([]pogs.Metadata, 0)
-	metadata = append(metadata, pogs.Metadata{Key: "HttpStatus", Val: strconv.Itoa(status)})
-	for k, vv := range header {
-		for _, v := range vv {
-			httpHeaderKey := fmt.Sprintf("%s:%s", HTTPHeaderKey, k)
-			metadata = append(metadata, pogs.Metadata{Key: httpHeaderKey, Val: v})
-		}
-	}
-
-	return hrw.WriteConnectResponseData(nil, metadata...)
-}
-
-func (hrw *httpResponseAdapter) Write(p []byte) (int, error) {
-	// Make sure to send WriteHeader response if not called yet
-	if !hrw.connectResponseSent {
-		hrw.WriteRespHeaders(http.StatusOK, hrw.headers)
-	}
-	return hrw.RequestServerStream.Write(p)
-}
-
-func (hrw *httpResponseAdapter) Header() http.Header {
-	return hrw.headers
-}
-
-// This is a no-op Flush because this adapter is over a quic.Stream and we don't need Flush here.
-func (hrw *httpResponseAdapter) Flush() {}
-
-func (hrw *httpResponseAdapter) WriteHeader(status int) {
-	hrw.WriteRespHeaders(status, hrw.headers)
-}
-
-func (hrw *httpResponseAdapter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	conn := &localProxyConnection{hrw.ReadWriteCloser}
-	readWriter := bufio.NewReadWriter(
-		bufio.NewReader(hrw.ReadWriteCloser),
-		bufio.NewWriter(hrw.ReadWriteCloser),
-	)
-	return conn, readWriter, nil
-}
-
-func (hrw *httpResponseAdapter) WriteErrorResponse(err error) {
-	hrw.WriteConnectResponseData(err, pogs.Metadata{Key: "HttpStatus", Val: strconv.Itoa(http.StatusBadGateway)})
-}
-
-func (hrw *httpResponseAdapter) WriteConnectResponseData(respErr error, metadata ...pogs.Metadata) error {
-	hrw.connectResponseSent = true
-	return hrw.RequestServerStream.WriteConnectResponseData(respErr, metadata...)
-}
-
-func buildHTTPRequest(
-	ctx context.Context,
-	connectRequest *pogs.ConnectRequest,
-	body io.ReadCloser,
-	connIndex uint8,
-	log *zerolog.Logger,
-) (*tracing.TracedHTTPRequest, error) {
-	metadata := connectRequest.MetadataMap()
-	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 {
-		return nil, err
-	}
-
-	req.Host = host
-	for _, metadata := range connectRequest.Metadata {
-		if strings.Contains(metadata.Key, HTTPHeaderKey) {
-			// metadata.Key is off the format httpHeaderKey:<HTTPHeader>
-			httpHeaderKey := strings.Split(metadata.Key, ":")
-			if len(httpHeaderKey) != 2 {
-				return nil, fmt.Errorf("header Key: %s malformed", metadata.Key)
-			}
-			req.Header.Add(httpHeaderKey[1], metadata.Val)
-		}
-	}
-	// Go's http.Client automatically sends chunked request body if this value is not set on the
-	// *http.Request struct regardless of header:
-	// https://go.googlesource.com/go/+/go1.8rc2/src/net/http/transfer.go#154.
-	if err := setContentLength(req); err != nil {
-		return nil, fmt.Errorf("Error setting content-length: %w", err)
-	}
-
-	// 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)
-
-	// Check for tracing on request
-	tracedReq := tracing.NewTracedHTTPRequest(req, connIndex, log)
-	return tracedReq, err
-}
-
-func setContentLength(req *http.Request) error {
-	var err error
-	if contentLengthStr := req.Header.Get("Content-Length"); contentLengthStr != "" {
-		req.ContentLength, err = strconv.ParseInt(contentLengthStr, 10, 64)
-	}
-	return err
-}
-
-func isTransferEncodingChunked(req *http.Request) bool {
-	transferEncodingVal := req.Header.Get("Transfer-Encoding")
-	// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Transfer-Encoding suggests that this can be a comma
-	// separated value as well.
-	return strings.Contains(strings.ToLower(transferEncodingVal), "chunked")
-}
-
-// A helper struct that guarantees a call to close only affects read side, but not write side.
-type nopCloserReadWriter struct {
-	io.ReadWriteCloser
-
-	// for use by Read only
-	// we don't need a memory barrier here because there is an implicit assumption that
-	// Read calls can't happen concurrently by different go-routines.
-	sawEOF bool
-	// should be updated and read using atomic primitives.
-	// value is read in Read method and written in Close method, which could be done by different
-	// go-routines.
-	closed uint32
-}
-
-func (np *nopCloserReadWriter) Read(p []byte) (n int, err error) {
-	if np.sawEOF {
-		return 0, io.EOF
-	}
-
-	if atomic.LoadUint32(&np.closed) > 0 {
-		return 0, fmt.Errorf("closed by handler")
-	}
-
-	n, err = np.ReadWriteCloser.Read(p)
-	if err == io.EOF {
-		np.sawEOF = true
-	}
-
-	return
-}
-
-func (np *nopCloserReadWriter) Close() error {
-	atomic.StoreUint32(&np.closed, 1)
-
-	return nil
-}
-
-// muxerWrapper wraps DatagramMuxerV2 to satisfy the packet.FunnelUniPipe interface
-type muxerWrapper struct {
-	muxer *cfdquic.DatagramMuxerV2
-}
-
-func (rp *muxerWrapper) SendPacket(dst netip.Addr, pk packet.RawPacket) error {
-	return rp.muxer.SendPacket(cfdquic.RawPacket(pk))
-}
-
-func (rp *muxerWrapper) ReceivePacket(ctx context.Context) (packet.RawPacket, error) {
-	pk, err := rp.muxer.ReceivePacket(ctx)
-	if err != nil {
-		return packet.RawPacket{}, err
-	}
-	rawPacket, ok := pk.(cfdquic.RawPacket)
-	if ok {
-		return packet.RawPacket(rawPacket), nil
-	}
-	return packet.RawPacket{}, fmt.Errorf("unexpected packet type %+v", pk)
-}
-
-func (rp *muxerWrapper) Close() error {
-	return nil
-}
-
-func createUDPConnForConnIndex(connIndex uint8, localIP net.IP, logger *zerolog.Logger) (*net.UDPConn, error) {
+func createUDPConnForConnIndex(connIndex uint8, localIP net.IP, edgeIP netip.AddrPort, logger *zerolog.Logger) (*net.UDPConn, error) {
 	portMapMutex.Lock()
 	defer portMapMutex.Unlock()
 
-	if localIP == nil {
-		localIP = net.IPv4zero
-	}
-
 	listenNetwork := "udp"
-	// https://github.com/quic-go/quic-go/issues/3793 DF bit cannot be set for dual stack listener on OSX
+	// https://github.com/quic-go/quic-go/issues/3793 DF bit cannot be set for dual stack listener ("udp") on macOS,
+	// to set the DF bit properly, the network string needs to be specific to the IP family.
 	if runtime.GOOS == "darwin" {
-		if localIP.To4() != nil {
+		if edgeIP.Addr().Is4() {
 			listenNetwork = "udp4"
 		} else {
 			listenNetwork = "udp6"

connection/quic_connection.go

@@ -0,0 +1,444 @@
+package connection
+
+import (
+	"bufio"
+	"context"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/netip"
+	"strconv"
+	"strings"
+	"sync/atomic"
+	"time"
+
+	"github.com/pkg/errors"
+	"github.com/quic-go/quic-go"
+	"github.com/rs/zerolog"
+	"golang.org/x/sync/errgroup"
+
+	"github.com/cloudflare/cloudflared/packet"
+	cfdquic "github.com/cloudflare/cloudflared/quic"
+	"github.com/cloudflare/cloudflared/tracing"
+	"github.com/cloudflare/cloudflared/tunnelrpc/pogs"
+	tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
+	rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic"
+)
+
+const (
+	// HTTPHeaderKey is used to get or set http headers in QUIC ALPN if the underlying proxy connection type is HTTP.
+	HTTPHeaderKey = "HttpHeader"
+	// HTTPMethodKey is used to get or set http method in QUIC ALPN if the underlying proxy connection type is HTTP.
+	HTTPMethodKey = "HttpMethod"
+	// HTTPHostKey is used to get or set http host in QUIC ALPN if the underlying proxy connection type is HTTP.
+	HTTPHostKey = "HttpHost"
+
+	QUICMetadataFlowID = "FlowID"
+)
+
+// quicConnection represents the type that facilitates Proxying via QUIC streams.
+type quicConnection struct {
+	conn                 quic.Connection
+	logger               *zerolog.Logger
+	orchestrator         Orchestrator
+	datagramHandler      DatagramSessionHandler
+	controlStreamHandler ControlStreamHandler
+	connOptions          *tunnelpogs.ConnectionOptions
+	connIndex            uint8
+
+	rpcTimeout         time.Duration
+	streamWriteTimeout time.Duration
+	gracePeriod        time.Duration
+}
+
+// NewTunnelConnection takes a [quic.Connection] to wrap it for use with cloudflared application logic.
+func NewTunnelConnection(
+	ctx context.Context,
+	conn quic.Connection,
+	connIndex uint8,
+	orchestrator Orchestrator,
+	datagramSessionHandler DatagramSessionHandler,
+	controlStreamHandler ControlStreamHandler,
+	connOptions *pogs.ConnectionOptions,
+	rpcTimeout time.Duration,
+	streamWriteTimeout time.Duration,
+	gracePeriod time.Duration,
+	logger *zerolog.Logger,
+) (TunnelConnection, error) {
+	return &quicConnection{
+		conn:                 conn,
+		logger:               logger,
+		orchestrator:         orchestrator,
+		datagramHandler:      datagramSessionHandler,
+		controlStreamHandler: controlStreamHandler,
+		connOptions:          connOptions,
+		connIndex:            connIndex,
+		rpcTimeout:           rpcTimeout,
+		streamWriteTimeout:   streamWriteTimeout,
+		gracePeriod:          gracePeriod,
+	}, nil
+}
+
+// Serve starts a QUIC connection that begins accepting streams.
+func (q *quicConnection) Serve(ctx context.Context) error {
+	// The edge assumes the first stream is used for the control plane
+	controlStream, err := q.conn.OpenStream()
+	if err != nil {
+		return fmt.Errorf("failed to open a registration control stream: %w", err)
+	}
+
+	// If either goroutine returns nil error, we rely on this cancellation to make sure the other goroutine exits
+	// as fast as possible as well. Nil error means we want to exit for good (caller code won't retry serving this
+	// connection).
+	// If either goroutine returns a non nil error, then the error group cancels the context, thus also canceling the
+	// other goroutine as fast as possible.
+	ctx, cancel := context.WithCancel(ctx)
+	errGroup, ctx := errgroup.WithContext(ctx)
+
+	// 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
+
+	})
+	errGroup.Go(func() error {
+		defer cancel()
+		return q.acceptStream(ctx)
+	})
+	errGroup.Go(func() error {
+		defer cancel()
+		return q.datagramHandler.Serve(ctx)
+	})
+
+	return errGroup.Wait()
+}
+
+// serveControlStream will serve the RPC; blocking until the control plane is done.
+func (q *quicConnection) serveControlStream(ctx context.Context, controlStream quic.Stream) error {
+	return q.controlStreamHandler.ServeControlStream(ctx, controlStream, q.connOptions, q.orchestrator)
+}
+
+// Close the connection with no errors specified.
+func (q *quicConnection) Close() {
+	q.conn.CloseWithError(0, "")
+}
+
+func (q *quicConnection) acceptStream(ctx context.Context) error {
+	defer q.Close()
+	for {
+		quicStream, err := q.conn.AcceptStream(ctx)
+		if err != nil {
+			// context.Canceled is usually a user ctrl+c. We don't want to log an error here as it's intentional.
+			if errors.Is(err, context.Canceled) || q.controlStreamHandler.IsStopped() {
+				return nil
+			}
+			return fmt.Errorf("failed to accept QUIC stream: %w", err)
+		}
+		go q.runStream(quicStream)
+	}
+}
+
+func (q *quicConnection) runStream(quicStream quic.Stream) {
+	ctx := quicStream.Context()
+	stream := cfdquic.NewSafeStreamCloser(quicStream, q.streamWriteTimeout, q.logger)
+	defer stream.Close()
+
+	// we are going to fuse readers/writers from stream <- cloudflared -> origin, and we want to guarantee that
+	// code executed in the code path of handleStream don't trigger an earlier close to the downstream write stream.
+	// So, we wrap the stream with a no-op write closer and only this method can actually close write side of the stream.
+	// A call to close will simulate a close to the read-side, which will fail subsequent reads.
+	noCloseStream := &nopCloserReadWriter{ReadWriteCloser: stream}
+	ss := rpcquic.NewCloudflaredServer(q.handleDataStream, q.datagramHandler, q, q.rpcTimeout)
+	if err := ss.Serve(ctx, noCloseStream); err != nil {
+		q.logger.Debug().Err(err).Msg("Failed to handle QUIC stream")
+
+		// if we received an error at this level, then close write side of stream with an error, which will result in
+		// RST_STREAM frame.
+		quicStream.CancelWrite(0)
+	}
+}
+
+func (q *quicConnection) handleDataStream(ctx context.Context, stream *rpcquic.RequestServerStream) error {
+	request, err := stream.ReadConnectRequestData()
+	if err != nil {
+		return err
+	}
+
+	if err, connectResponseSent := q.dispatchRequest(ctx, stream, request); err != nil {
+		q.logger.Err(err).Str("type", request.Type.String()).Str("dest", request.Dest).Msg("Request failed")
+
+		// if the connectResponse was already sent and we had an error, we need to propagate it up, so that the stream is
+		// closed with an RST_STREAM frame
+		if connectResponseSent {
+			return err
+		}
+
+		if writeRespErr := stream.WriteConnectResponseData(err); writeRespErr != nil {
+			return writeRespErr
+		}
+	}
+
+	return nil
+}
+
+// dispatchRequest will dispatch the request to the origin depending on the type and returns an error if it occurs.
+// Also returns if the connect response was sent to the downstream during processing of the origin request.
+func (q *quicConnection) dispatchRequest(ctx context.Context, stream *rpcquic.RequestServerStream, request *pogs.ConnectRequest) (err error, connectResponseSent bool) {
+	originProxy, err := q.orchestrator.GetOriginProxy()
+	if err != nil {
+		return err, false
+	}
+
+	switch request.Type {
+	case pogs.ConnectionTypeHTTP, pogs.ConnectionTypeWebsocket:
+		tracedReq, err := buildHTTPRequest(ctx, request, stream, q.connIndex, q.logger)
+		if err != nil {
+			return err, false
+		}
+		w := newHTTPResponseAdapter(stream)
+		return originProxy.ProxyHTTP(&w, tracedReq, request.Type == pogs.ConnectionTypeWebsocket), w.connectResponseSent
+
+	case pogs.ConnectionTypeTCP:
+		rwa := &streamReadWriteAcker{RequestServerStream: stream}
+		metadata := request.MetadataMap()
+		return originProxy.ProxyTCP(ctx, rwa, &TCPRequest{
+			Dest:      request.Dest,
+			FlowID:    metadata[QUICMetadataFlowID],
+			CfTraceID: metadata[tracing.TracerContextName],
+			ConnIndex: q.connIndex,
+		}), rwa.connectResponseSent
+	default:
+		return errors.Errorf("unsupported error type: %s", request.Type), false
+	}
+}
+
+// UpdateConfiguration is the RPC method invoked by edge when there is a new configuration
+func (q *quicConnection) UpdateConfiguration(ctx context.Context, version int32, config []byte) *tunnelpogs.UpdateConfigurationResponse {
+	return q.orchestrator.UpdateConfig(version, config)
+}
+
+// streamReadWriteAcker is a light wrapper over QUIC streams with a callback to send response back to
+// the client.
+type streamReadWriteAcker struct {
+	*rpcquic.RequestServerStream
+	connectResponseSent bool
+}
+
+// AckConnection acks response back to the proxy.
+func (s *streamReadWriteAcker) AckConnection(tracePropagation string) error {
+	metadata := []pogs.Metadata{}
+	// Only add tracing if provided by the edge request
+	if tracePropagation != "" {
+		metadata = append(metadata, pogs.Metadata{
+			Key: tracing.CanonicalCloudflaredTracingHeader,
+			Val: tracePropagation,
+		})
+	}
+	s.connectResponseSent = true
+	return s.WriteConnectResponseData(nil, metadata...)
+}
+
+// httpResponseAdapter translates responses written by the HTTP Proxy into ones that can be used in QUIC.
+type httpResponseAdapter struct {
+	*rpcquic.RequestServerStream
+	headers             http.Header
+	connectResponseSent bool
+}
+
+func newHTTPResponseAdapter(s *rpcquic.RequestServerStream) httpResponseAdapter {
+	return httpResponseAdapter{RequestServerStream: s, headers: make(http.Header)}
+}
+
+func (hrw *httpResponseAdapter) AddTrailer(trailerName, trailerValue string) {
+	// we do not support trailers over QUIC
+}
+
+func (hrw *httpResponseAdapter) WriteRespHeaders(status int, header http.Header) error {
+	metadata := make([]pogs.Metadata, 0)
+	metadata = append(metadata, pogs.Metadata{Key: "HttpStatus", Val: strconv.Itoa(status)})
+	for k, vv := range header {
+		for _, v := range vv {
+			httpHeaderKey := fmt.Sprintf("%s:%s", HTTPHeaderKey, k)
+			metadata = append(metadata, pogs.Metadata{Key: httpHeaderKey, Val: v})
+		}
+	}
+
+	return hrw.WriteConnectResponseData(nil, metadata...)
+}
+
+func (hrw *httpResponseAdapter) Write(p []byte) (int, error) {
+	// Make sure to send WriteHeader response if not called yet
+	if !hrw.connectResponseSent {
+		hrw.WriteRespHeaders(http.StatusOK, hrw.headers)
+	}
+	return hrw.RequestServerStream.Write(p)
+}
+
+func (hrw *httpResponseAdapter) Header() http.Header {
+	return hrw.headers
+}
+
+// This is a no-op Flush because this adapter is over a quic.Stream and we don't need Flush here.
+func (hrw *httpResponseAdapter) Flush() {}
+
+func (hrw *httpResponseAdapter) WriteHeader(status int) {
+	hrw.WriteRespHeaders(status, hrw.headers)
+}
+
+func (hrw *httpResponseAdapter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+	conn := &localProxyConnection{hrw.ReadWriteCloser}
+	readWriter := bufio.NewReadWriter(
+		bufio.NewReader(hrw.ReadWriteCloser),
+		bufio.NewWriter(hrw.ReadWriteCloser),
+	)
+	return conn, readWriter, nil
+}
+
+func (hrw *httpResponseAdapter) WriteErrorResponse(err error) {
+	hrw.WriteConnectResponseData(err, pogs.Metadata{Key: "HttpStatus", Val: strconv.Itoa(http.StatusBadGateway)})
+}
+
+func (hrw *httpResponseAdapter) WriteConnectResponseData(respErr error, metadata ...pogs.Metadata) error {
+	hrw.connectResponseSent = true
+	return hrw.RequestServerStream.WriteConnectResponseData(respErr, metadata...)
+}
+
+func buildHTTPRequest(
+	ctx context.Context,
+	connectRequest *pogs.ConnectRequest,
+	body io.ReadCloser,
+	connIndex uint8,
+	log *zerolog.Logger,
+) (*tracing.TracedHTTPRequest, error) {
+	metadata := connectRequest.MetadataMap()
+	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 {
+		return nil, err
+	}
+
+	req.Host = host
+	for _, metadata := range connectRequest.Metadata {
+		if strings.Contains(metadata.Key, HTTPHeaderKey) {
+			// metadata.Key is off the format httpHeaderKey:<HTTPHeader>
+			httpHeaderKey := strings.Split(metadata.Key, ":")
+			if len(httpHeaderKey) != 2 {
+				return nil, fmt.Errorf("header Key: %s malformed", metadata.Key)
+			}
+			req.Header.Add(httpHeaderKey[1], metadata.Val)
+		}
+	}
+	// Go's http.Client automatically sends chunked request body if this value is not set on the
+	// *http.Request struct regardless of header:
+	// https://go.googlesource.com/go/+/go1.8rc2/src/net/http/transfer.go#154.
+	if err := setContentLength(req); err != nil {
+		return nil, fmt.Errorf("Error setting content-length: %w", err)
+	}
+
+	// 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)
+
+	// Check for tracing on request
+	tracedReq := tracing.NewTracedHTTPRequest(req, connIndex, log)
+	return tracedReq, err
+}
+
+func setContentLength(req *http.Request) error {
+	var err error
+	if contentLengthStr := req.Header.Get("Content-Length"); contentLengthStr != "" {
+		req.ContentLength, err = strconv.ParseInt(contentLengthStr, 10, 64)
+	}
+	return err
+}
+
+func isTransferEncodingChunked(req *http.Request) bool {
+	transferEncodingVal := req.Header.Get("Transfer-Encoding")
+	// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Transfer-Encoding suggests that this can be a comma
+	// separated value as well.
+	return strings.Contains(strings.ToLower(transferEncodingVal), "chunked")
+}
+
+// A helper struct that guarantees a call to close only affects read side, but not write side.
+type nopCloserReadWriter struct {
+	io.ReadWriteCloser
+
+	// for use by Read only
+	// we don't need a memory barrier here because there is an implicit assumption that
+	// Read calls can't happen concurrently by different go-routines.
+	sawEOF bool
+	// should be updated and read using atomic primitives.
+	// value is read in Read method and written in Close method, which could be done by different
+	// go-routines.
+	closed uint32
+}
+
+func (np *nopCloserReadWriter) Read(p []byte) (n int, err error) {
+	if np.sawEOF {
+		return 0, io.EOF
+	}
+
+	if atomic.LoadUint32(&np.closed) > 0 {
+		return 0, fmt.Errorf("closed by handler")
+	}
+
+	n, err = np.ReadWriteCloser.Read(p)
+	if err == io.EOF {
+		np.sawEOF = true
+	}
+
+	return
+}
+
+func (np *nopCloserReadWriter) Close() error {
+	atomic.StoreUint32(&np.closed, 1)
+
+	return nil
+}
+
+// muxerWrapper wraps DatagramMuxerV2 to satisfy the packet.FunnelUniPipe interface
+type muxerWrapper struct {
+	muxer *cfdquic.DatagramMuxerV2
+}
+
+func (rp *muxerWrapper) SendPacket(dst netip.Addr, pk packet.RawPacket) error {
+	return rp.muxer.SendPacket(cfdquic.RawPacket(pk))
+}
+
+func (rp *muxerWrapper) ReceivePacket(ctx context.Context) (packet.RawPacket, error) {
+	pk, err := rp.muxer.ReceivePacket(ctx)
+	if err != nil {
+		return packet.RawPacket{}, err
+	}
+	rawPacket, ok := pk.(cfdquic.RawPacket)
+	if ok {
+		return packet.RawPacket(rawPacket), nil
+	}
+	return packet.RawPacket{}, fmt.Errorf("unexpected packet type %+v", pk)
+}
+
+func (rp *muxerWrapper) Close() error {
+	return nil
+}

connection/quic_connection_test.go

@@ -13,8 +13,8 @@ import (
 	"math/big"
 	"net"
 	"net/http"
+	"net/netip"
 	"net/url"
-	"os"
 	"strings"
 	"testing"
 	"time"
@@ -26,12 +26,14 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/net/nettest"
 
 	"github.com/cloudflare/cloudflared/datagramsession"
+	"github.com/cloudflare/cloudflared/ingress"
+	"github.com/cloudflare/cloudflared/packet"
 	cfdquic "github.com/cloudflare/cloudflared/quic"
 	"github.com/cloudflare/cloudflared/tracing"
 	"github.com/cloudflare/cloudflared/tunnelrpc/pogs"
-	tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
 	rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic"
 )
 
@@ -162,11 +164,11 @@ func TestQUICServer(t *testing.T) {
 				close(serverDone)
 			}()
 
-			qc := testQUICConnection(udpListener.LocalAddr(), t, uint8(i))
+			tunnelConn, _ := testTunnelConnection(t, netip.MustParseAddrPort(udpListener.LocalAddr().String()), uint8(i))
 
 			connDone := make(chan struct{})
 			go func() {
-				qc.Serve(ctx)
+				tunnelConn.Serve(ctx)
 				close(connDone)
 			}()
 
@@ -513,7 +515,6 @@ func TestServeUDPSession(t *testing.T) {
 	defer udpListener.Close()
 
 	ctx, cancel := context.WithCancel(context.Background())
-	val := udpListener.LocalAddr()
 
 	// Establish QUIC connection with edge
 	edgeQUICSessionChan := make(chan quic.Connection)
@@ -527,13 +528,14 @@ func TestServeUDPSession(t *testing.T) {
 	}()
 
 	// Random index to avoid reusing port
-	qc := testQUICConnection(val, t, 28)
-	go qc.Serve(ctx)
+	tunnelConn, datagramConn := testTunnelConnection(t, netip.MustParseAddrPort(udpListener.LocalAddr().String()), 28)
+	go tunnelConn.Serve(ctx)
 
 	edgeQUICSession := <-edgeQUICSessionChan
-	serveSession(ctx, qc, edgeQUICSession, closedByOrigin, io.EOF.Error(), t)
-	serveSession(ctx, qc, edgeQUICSession, closedByTimeout, datagramsession.SessionIdleErr(time.Millisecond*50).Error(), t)
-	serveSession(ctx, qc, edgeQUICSession, closedByRemote, "eyeball closed connection", t)
+
+	serveSession(ctx, datagramConn, edgeQUICSession, closedByOrigin, io.EOF.Error(), t)
+	serveSession(ctx, datagramConn, edgeQUICSession, closedByTimeout, datagramsession.SessionIdleErr(time.Millisecond*50).Error(), t)
+	serveSession(ctx, datagramConn, edgeQUICSession, closedByRemote, "eyeball closed connection", t)
 	cancel()
 }
 
@@ -576,8 +578,20 @@ func TestNopCloserReadWriterCloseAfterEOF(t *testing.T) {
 }
 
 func TestCreateUDPConnReuseSourcePort(t *testing.T) {
+	edgeIPv4 := netip.MustParseAddrPort("0.0.0.0:0")
+	edgeIPv6 := netip.MustParseAddrPort("[::]:0")
+
+	// We assume the test environment has access to an IPv4 interface
+	testCreateUDPConnReuseSourcePortForEdgeIP(t, edgeIPv4)
+
+	if nettest.SupportsIPv6() {
+		testCreateUDPConnReuseSourcePortForEdgeIP(t, edgeIPv6)
+	}
+}
+
+func testCreateUDPConnReuseSourcePortForEdgeIP(t *testing.T, edgeIP netip.AddrPort) {
 	logger := zerolog.Nop()
-	conn, err := createUDPConnForConnIndex(0, nil, &logger)
+	conn, err := createUDPConnForConnIndex(0, nil, edgeIP, &logger)
 	require.NoError(t, err)
 
 	getPortFunc := func(conn *net.UDPConn) int {
@@ -591,34 +605,34 @@ func TestCreateUDPConnReuseSourcePort(t *testing.T) {
 	conn.Close()
 
 	// should get the same port as before.
-	conn, err = createUDPConnForConnIndex(0, nil, &logger)
+	conn, err = createUDPConnForConnIndex(0, nil, edgeIP, &logger)
 	require.NoError(t, err)
 	require.Equal(t, initialPort, getPortFunc(conn))
 
 	// new index, should get a different port
-	conn1, err := createUDPConnForConnIndex(1, nil, &logger)
+	conn1, err := createUDPConnForConnIndex(1, nil, edgeIP, &logger)
 	require.NoError(t, err)
 	require.NotEqual(t, initialPort, getPortFunc(conn1))
 
 	// not closing the conn and trying to obtain a new conn for same index should give a different random port
-	conn, err = createUDPConnForConnIndex(0, nil, &logger)
+	conn, err = createUDPConnForConnIndex(0, nil, edgeIP, &logger)
 	require.NoError(t, err)
 	require.NotEqual(t, initialPort, getPortFunc(conn))
 }
 
-func serveSession(ctx context.Context, qc *QUICConnection, edgeQUICSession quic.Connection, closeType closeReason, expectedReason string, t *testing.T) {
+func serveSession(ctx context.Context, datagramConn *datagramV2Connection, edgeQUICSession quic.Connection, closeType closeReason, expectedReason string, t *testing.T) {
 	var (
 		payload = []byte(t.Name())
 	)
 	sessionID := uuid.New()
 	cfdConn, originConn := net.Pipe()
 	// Registers and run a new session
-	session, err := qc.sessionManager.RegisterSession(ctx, sessionID, cfdConn)
+	session, err := datagramConn.sessionManager.RegisterSession(ctx, sessionID, cfdConn)
 	require.NoError(t, err)
 
 	sessionDone := make(chan struct{})
 	go func() {
-		qc.serveUDPSession(session, time.Millisecond*50)
+		datagramConn.serveUDPSession(session, time.Millisecond*50)
 		close(sessionDone)
 	}()
 
@@ -642,7 +656,7 @@ func serveSession(ctx context.Context, qc *QUICConnection, edgeQUICSession quic.
 	case closedByOrigin:
 		originConn.Close()
 	case closedByRemote:
-		err = qc.UnregisterUdpSession(ctx, sessionID, expectedReason)
+		err = datagramConn.UnregisterUdpSession(ctx, sessionID, expectedReason)
 		require.NoError(t, err)
 	case closedByTimeout:
 	}
@@ -713,32 +727,58 @@ func (s mockSessionRPCServer) UnregisterUdpSession(ctx context.Context, sessionI
 	return nil
 }
 
-func testQUICConnection(udpListenerAddr net.Addr, t *testing.T, index uint8) *QUICConnection {
+func testTunnelConnection(t *testing.T, serverAddr netip.AddrPort, index uint8) (TunnelConnection, *datagramV2Connection) {
 	tlsClientConfig := &tls.Config{
 		InsecureSkipVerify: true,
 		NextProtos:         []string{"argotunnel"},
 	}
 	// Start a mock httpProxy
-	log := zerolog.New(os.Stdout)
+	log := zerolog.New(io.Discard)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	qc, err := NewQUICConnection(
+
+	// Dial the QUIC connection to the edge
+	conn, err := DialQuic(
 		ctx,
 		testQUICConfig,
-		udpListenerAddr,
-		nil,
-		index,
 		tlsClientConfig,
-		&mockOrchestrator{originProxy: &mockOriginProxyWithRequest{}},
-		&tunnelpogs.ConnectionOptions{},
-		fakeControlStream{},
+		serverAddr,
+		nil, // connect on a random port
+		index,
 		&log,
-		nil,
+	)
+
+	// Start a session manager for the connection
+	sessionDemuxChan := make(chan *packet.Session, 4)
+	datagramMuxer := cfdquic.NewDatagramMuxerV2(conn, &log, sessionDemuxChan)
+	sessionManager := datagramsession.NewManager(&log, datagramMuxer.SendToSession, sessionDemuxChan)
+	packetRouter := ingress.NewPacketRouter(nil, datagramMuxer, &log)
+
+	datagramConn := &datagramV2Connection{
+		conn,
+		sessionManager,
+		datagramMuxer,
+		packetRouter,
+		15 * time.Second,
+		0 * time.Second,
+		&log,
+	}
+
+	tunnelConn, err := NewTunnelConnection(
+		ctx,
+		conn,
+		index,
+		&mockOrchestrator{originProxy: &mockOriginProxyWithRequest{}},
+		datagramConn,
+		fakeControlStream{},
+		&pogs.ConnectionOptions{},
 		15*time.Second,
 		0*time.Second,
+		0*time.Second,
+		&log,
 	)
 	require.NoError(t, err)
-	return qc
+	return tunnelConn, datagramConn
 }
 
 type mockReaderNoopWriter struct {

connection/quic_datagram_v2.go

@@ -0,0 +1,200 @@
+package connection
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/quic-go/quic-go"
+	"github.com/rs/zerolog"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+	"golang.org/x/sync/errgroup"
+
+	"github.com/cloudflare/cloudflared/datagramsession"
+	"github.com/cloudflare/cloudflared/ingress"
+	"github.com/cloudflare/cloudflared/management"
+	"github.com/cloudflare/cloudflared/packet"
+	cfdquic "github.com/cloudflare/cloudflared/quic"
+	"github.com/cloudflare/cloudflared/tracing"
+	"github.com/cloudflare/cloudflared/tunnelrpc/pogs"
+	tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
+	rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic"
+)
+
+const (
+	// emperically this capacity has been working well
+	demuxChanCapacity = 16
+)
+
+// DatagramSessionHandler is a service that can serve datagrams for a connection and handle sessions from incoming
+// connection streams.
+type DatagramSessionHandler interface {
+	Serve(context.Context) error
+
+	pogs.SessionManager
+}
+
+type datagramV2Connection struct {
+	conn quic.Connection
+
+	// sessionManager tracks active sessions. It receives datagrams from quic connection via datagramMuxer
+	sessionManager datagramsession.Manager
+	// datagramMuxer mux/demux datagrams from quic connection
+	datagramMuxer *cfdquic.DatagramMuxerV2
+	packetRouter  *ingress.PacketRouter
+
+	rpcTimeout         time.Duration
+	streamWriteTimeout time.Duration
+
+	logger *zerolog.Logger
+}
+
+func NewDatagramV2Connection(ctx context.Context,
+	conn quic.Connection,
+	packetConfig *ingress.GlobalRouterConfig,
+	rpcTimeout time.Duration,
+	streamWriteTimeout time.Duration,
+	logger *zerolog.Logger,
+) DatagramSessionHandler {
+	sessionDemuxChan := make(chan *packet.Session, demuxChanCapacity)
+	datagramMuxer := cfdquic.NewDatagramMuxerV2(conn, logger, sessionDemuxChan)
+	sessionManager := datagramsession.NewManager(logger, datagramMuxer.SendToSession, sessionDemuxChan)
+	packetRouter := ingress.NewPacketRouter(packetConfig, datagramMuxer, logger)
+
+	return &datagramV2Connection{
+		conn,
+		sessionManager,
+		datagramMuxer,
+		packetRouter,
+		rpcTimeout,
+		streamWriteTimeout,
+		logger,
+	}
+}
+
+func (d *datagramV2Connection) Serve(ctx context.Context) error {
+	// If either goroutine returns nil error, we rely on this cancellation to make sure the other goroutine exits
+	// as fast as possible as well. Nil error means we want to exit for good (caller code won't retry serving this
+	// connection).
+	// If either goroutine returns a non nil error, then the error group cancels the context, thus also canceling the
+	// other goroutine as fast as possible.
+	ctx, cancel := context.WithCancel(ctx)
+	errGroup, ctx := errgroup.WithContext(ctx)
+
+	errGroup.Go(func() error {
+		defer cancel()
+		return d.sessionManager.Serve(ctx)
+	})
+	errGroup.Go(func() error {
+		defer cancel()
+		return d.datagramMuxer.ServeReceive(ctx)
+	})
+	errGroup.Go(func() error {
+		defer cancel()
+		return d.packetRouter.Serve(ctx)
+	})
+
+	return errGroup.Wait()
+}
+
+// RegisterUdpSession is the RPC method invoked by edge to register and run a session
+func (q *datagramV2Connection) RegisterUdpSession(ctx context.Context, sessionID uuid.UUID, dstIP net.IP, dstPort uint16, closeAfterIdleHint time.Duration, traceContext string) (*tunnelpogs.RegisterUdpSessionResponse, error) {
+	traceCtx := tracing.NewTracedContext(ctx, traceContext, q.logger)
+	ctx, registerSpan := traceCtx.Tracer().Start(traceCtx, "register-session", trace.WithAttributes(
+		attribute.String("session-id", sessionID.String()),
+		attribute.String("dst", fmt.Sprintf("%s:%d", dstIP, dstPort)),
+	))
+	log := q.logger.With().Int(management.EventTypeKey, int(management.UDP)).Logger()
+	// Each session is a series of datagram from an eyeball to a dstIP:dstPort.
+	// (src port, dst IP, dst port) uniquely identifies a session, so it needs a dedicated connected socket.
+	originProxy, err := ingress.DialUDP(dstIP, dstPort)
+	if err != nil {
+		log.Err(err).Msgf("Failed to create udp proxy to %s:%d", dstIP, dstPort)
+		tracing.EndWithErrorStatus(registerSpan, err)
+		return nil, err
+	}
+	registerSpan.SetAttributes(
+		attribute.Bool("socket-bind-success", true),
+		attribute.String("src", originProxy.LocalAddr().String()),
+	)
+
+	session, err := q.sessionManager.RegisterSession(ctx, sessionID, originProxy)
+	if err != nil {
+		originProxy.Close()
+		log.Err(err).Str(datagramsession.LogFieldSessionID, datagramsession.FormatSessionID(sessionID)).Msgf("Failed to register udp session")
+		tracing.EndWithErrorStatus(registerSpan, err)
+		return nil, err
+	}
+
+	go q.serveUDPSession(session, closeAfterIdleHint)
+
+	log.Debug().
+		Str(datagramsession.LogFieldSessionID, datagramsession.FormatSessionID(sessionID)).
+		Str("src", originProxy.LocalAddr().String()).
+		Str("dst", fmt.Sprintf("%s:%d", dstIP, dstPort)).
+		Msgf("Registered session")
+	tracing.End(registerSpan)
+
+	resp := tunnelpogs.RegisterUdpSessionResponse{
+		Spans: traceCtx.GetProtoSpans(),
+	}
+
+	return &resp, nil
+}
+
+// UnregisterUdpSession is the RPC method invoked by edge to unregister and terminate a sesssion
+func (q *datagramV2Connection) UnregisterUdpSession(ctx context.Context, sessionID uuid.UUID, message string) error {
+	return q.sessionManager.UnregisterSession(ctx, sessionID, message, true)
+}
+
+func (q *datagramV2Connection) serveUDPSession(session *datagramsession.Session, closeAfterIdleHint time.Duration) {
+	ctx := q.conn.Context()
+	closedByRemote, err := session.Serve(ctx, closeAfterIdleHint)
+	// If session is terminated by remote, then we know it has been unregistered from session manager and edge
+	if !closedByRemote {
+		if err != nil {
+			q.closeUDPSession(ctx, session.ID, err.Error())
+		} else {
+			q.closeUDPSession(ctx, session.ID, "terminated without error")
+		}
+	}
+	q.logger.Debug().Err(err).
+		Int(management.EventTypeKey, int(management.UDP)).
+		Str(datagramsession.LogFieldSessionID, datagramsession.FormatSessionID(session.ID)).
+		Msg("Session terminated")
+}
+
+// closeUDPSession first unregisters the session from session manager, then it tries to unregister from edge
+func (q *datagramV2Connection) closeUDPSession(ctx context.Context, sessionID uuid.UUID, message string) {
+	q.sessionManager.UnregisterSession(ctx, sessionID, message, false)
+	quicStream, err := q.conn.OpenStream()
+	if err != nil {
+		// Log this at debug because this is not an error if session was closed due to lost connection
+		// with edge
+		q.logger.Debug().Err(err).
+			Int(management.EventTypeKey, int(management.UDP)).
+			Str(datagramsession.LogFieldSessionID, datagramsession.FormatSessionID(sessionID)).
+			Msgf("Failed to open quic stream to unregister udp session with edge")
+		return
+	}
+
+	stream := cfdquic.NewSafeStreamCloser(quicStream, q.streamWriteTimeout, q.logger)
+	defer stream.Close()
+	rpcClientStream, err := rpcquic.NewSessionClient(ctx, stream, q.rpcTimeout)
+	if err != nil {
+		// Log this at debug because this is not an error if session was closed due to lost connection
+		// with edge
+		q.logger.Err(err).Str(datagramsession.LogFieldSessionID, datagramsession.FormatSessionID(sessionID)).
+			Msgf("Failed to open rpc stream to unregister udp session with edge")
+		return
+	}
+	defer rpcClientStream.Close()
+
+	if err := rpcClientStream.UnregisterUdpSession(ctx, sessionID, message); err != nil {
+		q.logger.Err(err).Str(datagramsession.LogFieldSessionID, datagramsession.FormatSessionID(sessionID)).
+			Msgf("Failed to unregister udp session with edge")
+	}
+}

connection/quic_datagram_v3.go

@@ -0,0 +1,48 @@
+package connection
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/quic-go/quic-go"
+	"github.com/rs/zerolog"
+
+	cfdquic "github.com/cloudflare/cloudflared/quic/v3"
+	"github.com/cloudflare/cloudflared/tunnelrpc/pogs"
+)
+
+type datagramV3Connection struct {
+	conn quic.Connection
+	// datagramMuxer mux/demux datagrams from quic connection
+	datagramMuxer cfdquic.DatagramConn
+	logger        *zerolog.Logger
+}
+
+func NewDatagramV3Connection(ctx context.Context,
+	conn quic.Connection,
+	sessionManager cfdquic.SessionManager,
+	logger *zerolog.Logger,
+) DatagramSessionHandler {
+	datagramMuxer := cfdquic.NewDatagramConn(conn, sessionManager, logger)
+
+	return &datagramV3Connection{
+		conn,
+		datagramMuxer,
+		logger,
+	}
+}
+
+func (d *datagramV3Connection) Serve(ctx context.Context) error {
+	return d.datagramMuxer.Serve(ctx)
+}
+
+func (d *datagramV3Connection) RegisterUdpSession(ctx context.Context, sessionID uuid.UUID, dstIP net.IP, dstPort uint16, closeAfterIdleHint time.Duration, traceContext string) (*pogs.RegisterUdpSessionResponse, error) {
+	return nil, fmt.Errorf("datagram v3 does not support RegisterUdpSession RPC")
+}
+
+func (d *datagramV3Connection) UnregisterUdpSession(ctx context.Context, sessionID uuid.UUID, message string) error {
+	return fmt.Errorf("datagram v3 does not support UnregisterUdpSession RPC")
+}

datagramsession/manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -20,8 +21,15 @@ const (
 
 var (
 	errSessionManagerClosed = fmt.Errorf("session manager closed")
+	LogFieldSessionID       = "sessionID"
 )
 
+func FormatSessionID(sessionID uuid.UUID) string {
+	sessionIDStr := sessionID.String()
+	sessionIDStr = strings.ReplaceAll(sessionIDStr, "-", "")
+	return sessionIDStr
+}
+
 // Manager defines the APIs to manage sessions from the same transport.
 type Manager interface {
 	// Serve starts the event loop
@@ -127,7 +135,7 @@ func (m *manager) registerSession(ctx context.Context, registration *registerSes
 func (m *manager) newSession(id uuid.UUID, dstConn io.ReadWriteCloser) *Session {
 	logger := m.log.With().
 		Int(management.EventTypeKey, int(management.UDP)).
-		Str("sessionID", id.String()).Logger()
+		Str(LogFieldSessionID, FormatSessionID(id)).Logger()
 	return &Session{
 		ID:       id,
 		sendFunc: m.sendFunc,
@@ -174,7 +182,7 @@ func (m *manager) unregisterSession(unregistration *unregisterSessionEvent) {
 func (m *manager) sendToSession(datagram *packet.Session) {
 	session, ok := m.sessions[datagram.ID]
 	if !ok {
-		m.log.Error().Str("sessionID", datagram.ID.String()).Msg("session not found")
+		m.log.Error().Str(LogFieldSessionID, FormatSessionID(datagram.ID)).Msg("session not found")
 		return
 	}
 	// session writes to destination over a connected UDP socket, which should not be blocking, so this call doesn't

datagramsession/session.go

@@ -57,7 +57,7 @@ func (s *Session) Serve(ctx context.Context, closeAfterIdle time.Duration) (clos
 		readBuffer := make([]byte, maxPacketSize)
 		for {
 			if closeSession, err := s.dstToTransport(readBuffer); err != nil {
-				if errors.Is(err, net.ErrClosed) {
+				if errors.Is(err, net.ErrClosed) || errors.Is(err, io.EOF) {
 					s.log.Debug().Msg("Destination connection closed")
 				} else {
 					level := zerolog.ErrorLevel

dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.2 as builder
+FROM golang:1.22.5 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0
 WORKDIR /go/src/github.com/cloudflare/cloudflared/

edgediscovery/dial.go

@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-// DialEdgeWithH2Mux makes a TLS connection to a Cloudflare edge node
+// DialEdge makes a TLS connection to a Cloudflare edge node
 func DialEdge(
 	ctx context.Context,
 	timeout time.Duration,
@@ -36,7 +36,7 @@ func DialEdge(
 	if err = tlsEdgeConn.Handshake(); err != nil {
 		return nil, newDialError(err, "TLS handshake with edge error")
 	}
-	// clear the deadline on the conn; h2mux has its own timeouts
+	// clear the deadline on the conn; http2 has its own timeouts
 	tlsEdgeConn.SetDeadline(time.Time{})
 	return tlsEdgeConn, nil
 }

features/features.go

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

github_release.py

@@ -11,13 +11,14 @@ import hashlib
 import requests
 import tarfile
 from os import listdir
-from os.path import isfile, join
+from os.path import isfile, join, splitext
 import re
+import subprocess
 
 from github import Github, GithubException, UnknownObjectException
 
 FORMAT = "%(levelname)s - %(asctime)s: %(message)s"
-logging.basicConfig(format=FORMAT)
+logging.basicConfig(format=FORMAT, level=logging.INFO)
 
 CLOUDFLARED_REPO = os.environ.get("GITHUB_REPO", "cloudflare/cloudflared")
 GITHUB_CONFLICT_CODE = "already_exists"
@@ -210,28 +211,95 @@ def move_asset(filepath, filename):
     except shutil.SameFileError:
         pass # the macOS release copy fails with being the same file (already in the artifacts directory)
 
+def get_binary_version(binary_path):
+    """
+    Sample output from go version -m <binary>:
+    ...
+    build	-compiler=gc
+	build	-ldflags="-X \"main.Version=2024.8.3-6-gec072691\" -X \"main.BuildTime=2024-09-10-1027 UTC\" "
+	build	CGO_ENABLED=1
+    ...
+
+    This function parses the above output to retrieve the following substring 2024.8.3-6-gec072691.
+    To do this a start and end indexes are computed and the a slice is extracted from the output using them.
+    """
+    needle = "main.Version="
+    cmd = ['go','version', '-m', binary_path]
+    process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    output, _ = process.communicate()
+    version_info = output.decode()
+
+    # Find start of needle
+    needle_index = version_info.find(needle)
+    # Find backward slash relative to the beggining of the needle
+    relative_end_index = version_info[needle_index:].find("\\")
+    # Calculate needle position plus needle length to find version beggining
+    start_index = needle_index + len(needle)
+    # Calculate needle position plus relative position of the backward slash
+    end_index = needle_index + relative_end_index
+    return version_info[start_index:end_index]
+
+def assert_asset_version(binary_path, release_version):
+    """
+    Asserts that the artifacts have the correct release_version.
+    The artifacts that are checked must not have an extension expecting .exe and .tgz.
+    In the occurrence of any other extension the function exits early.
+    """
+    try:
+        shutil.rmtree('tmp')
+    except OSError:
+        pass
+    _, ext = os.path.splitext(binary_path)
+    if ext == '.exe' or ext == '':
+        binary_version = get_binary_version(binary_path)
+    elif ext == '.tgz':
+        tar = tarfile.open(binary_path, "r:gz")
+        tar.extractall("tmp")
+        tar.close()
+        binary_path = os.path.join(os.getcwd(), 'tmp', 'cloudflared')
+        binary_version = get_binary_version(binary_path)
+    else:
+        return
+
+    if binary_version != release_version:
+        logging.error(f"Version mismatch {binary_path}, binary_version {binary_version} release_version {release_version}")
+        exit(1)
+
+
 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:
-            logging.info("Skipping asset upload because of 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)
+                    assert_asset_version(binary_path, args.release_version)
+            elif os.path.isfile(args.path):
+                logging.info("binary: " + binary_path)
+            else:
+                logging.error("dryrun failed")
             return
-
-        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)
+            client = Github(args.api_key)
+            repo = client.get_repo(CLOUDFLARED_REPO)
+
+            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)
+                    assert_asset_version(binary_path, args.release_version)
+                release = get_or_create_release(repo, args.release_version, args.dry_run)
+                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:
+                raise Exception("the argument path must be a directory")
 
     except Exception as e:
         logging.exception(e)

go.mod

@@ -3,7 +3,7 @@ module github.com/cloudflare/cloudflared
 go 1.22
 
 require (
-	github.com/coredns/coredns v1.10.0
+	github.com/coredns/coredns v1.11.3
 	github.com/coreos/go-oidc/v3 v3.10.0
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434
@@ -13,19 +13,18 @@ require (
 	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-chi/cors v1.2.1
 	github.com/go-jose/go-jose/v4 v4.0.1
-	github.com/gobwas/ws v1.0.4
-	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
+	github.com/gobwas/ws v1.2.1
 	github.com/google/gopacket v1.1.19
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/json-iterator/go v1.1.12
 	github.com/mattn/go-colorable v0.1.13
-	github.com/miekg/dns v1.1.50
+	github.com/miekg/dns v1.1.58
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.13.0
-	github.com/prometheus/client_model v0.2.0
-	github.com/quic-go/quic-go v0.42.0
+	github.com/prometheus/client_golang v1.19.1
+	github.com/prometheus/client_model v0.6.0
+	github.com/quic-go/quic-go v0.45.0
 	github.com/rs/zerolog v1.20.0
 	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v2 v2.3.0
@@ -38,7 +37,7 @@ require (
 	go.uber.org/automaxprocs v1.4.0
 	golang.org/x/crypto v0.23.0
 	golang.org/x/net v0.25.0
-	golang.org/x/sync v0.6.0
+	golang.org/x/sync v0.7.0
 	golang.org/x/sys v0.20.0
 	golang.org/x/term v0.20.0
 	google.golang.org/protobuf v1.34.1
@@ -55,7 +54,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coredns/caddy v1.1.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
 	github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 // indirect
 	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
@@ -64,36 +63,36 @@ require (
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 // indirect
+	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
+	github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
 	github.com/klauspost/compress v1.15.11 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
+	github.com/onsi/ginkgo/v2 v2.13.0 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/common v0.53.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	go.opentelemetry.io/otel/metric v1.26.0 // indirect
 	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
-	golang.org/x/mod v0.11.0 // indirect
-	golang.org/x/oauth2 v0.17.0 // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.9.1 // indirect
+	golang.org/x/tools v0.21.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/grpc v1.63.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
+	google.golang.org/grpc v1.63.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 

go.sum

@@ -1,65 +1,16 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU=
 github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
 github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
-github.com/coredns/coredns v1.10.0 h1:jCfuWsBjTs0dapkkhISfPCzn5LqvSRtrFtaf/Tjj4DI=
-github.com/coredns/coredns v1.10.0/go.mod h1:CIfRU5TgpuoIiJBJ4XrofQzfFQpPFh32ERpUevrSlaw=
+github.com/coredns/coredns v1.11.3 h1:8RjnpZc42db5th84/QJKH2i137ecJdzZK1HJwhetSPk=
+github.com/coredns/coredns v1.11.3/go.mod h1:lqFkDsHjEUdY7LJ75Nib3lwqJGip6ewWOqNIf8OavIQ=
 github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU=
 github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -70,12 +21,9 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
 github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 h1:wWke/RUCl7VRjQhwPlR/v0glZXNYzBHdNUzf/Am2Nmg=
@@ -105,19 +53,8 @@ github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U=
 github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -133,63 +70,28 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ=
 github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 h1:YyrUZvJaU8Q0QsoVo+xLFBgWDTam29PKea6GYmwvSiQ=
-github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs=
-github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
+github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
 github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
 github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
-github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -197,23 +99,11 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b h1:h9U78+dx9a4BKdQkBBos92HalKpaGKHrp+3Uo6yTodo=
+github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -221,30 +111,14 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0Q
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ipostelnik/cli/v2 v2.3.1-0.20210324024421-b6ea8234fe3d h1:PRDnysJ9dF1vUMmEzBu6aHQeUluSQy4eWH3RsSSy/vI=
 github.com/ipostelnik/cli/v2 v2.3.1-0.20210324024421-b6ea8234fe3d/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -262,67 +136,45 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
-github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
+github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
-github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
-github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
-github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
+github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
+github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
-github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=
-github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
+github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
+github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU=
-github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
-github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
-github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
+github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
+github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
+github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
+github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE=
+github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/quic-go/quic-go v0.45.0 h1:OHmkQGM37luZITyTSu6ff03HP/2IrwDX1ZFiNEhSFUE=
+github.com/quic-go/quic-go v0.45.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -332,35 +184,21 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ=
-github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
+github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
+github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opentelemetry.io/contrib/propagators v0.22.0 h1:KGdv58M2//veiYLIhb31mofaI2LgkIPXXAZVeYVyfd8=
 go.opentelemetry.io/contrib/propagators v0.22.0/go.mod h1:xGOuXr6lLIF9BXipA4pm6UuOSI0M98U6tsI3khbOiwU=
 go.opentelemetry.io/otel v1.0.0-RC2/go.mod h1:w1thVQ7qbAy8MHb0IFj8a5Q2QU0l2ksf8u/CN8m3NOM=
@@ -381,344 +219,93 @@ go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0=
 go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=
-golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
-golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
-golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
+golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
-golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
+golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
-google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
-google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0=
-google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8=
-google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 zombiezen.com/go/capnproto2 v2.18.0+incompatible h1:mwfXZniffG5mXokQGHUJWGnqIBggoPfT/CEwon9Yess=
 zombiezen.com/go/capnproto2 v2.18.0+incompatible/go.mod h1:XO5Pr2SbXgqZwn0m0Ru54QBqpOf4K5AYBO+8LAOBQEQ=

h2mux/activestreammap.go

@@ -1,195 +0,0 @@
-package h2mux
-
-import (
-	"sync"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/net/http2"
-)
-
-var (
-	ActiveStreams = prometheus.NewGauge(prometheus.GaugeOpts{
-		Namespace: "cloudflared",
-		Subsystem: "tunnel",
-		Name:      "active_streams",
-		Help:      "Number of active streams created by all muxers.",
-	})
-)
-
-func init() {
-	prometheus.MustRegister(ActiveStreams)
-}
-
-// activeStreamMap is used to moderate access to active streams between the read and write
-// threads, and deny access to new peer streams while shutting down.
-type activeStreamMap struct {
-	sync.RWMutex
-	// streams tracks open streams.
-	streams map[uint32]*MuxedStream
-	// nextStreamID is the next ID to use on our side of the connection.
-	// This is odd for clients, even for servers.
-	nextStreamID uint32
-	// maxPeerStreamID is the ID of the most recent stream opened by the peer.
-	maxPeerStreamID uint32
-	// activeStreams is a gauge shared by all muxers of this process to expose the total number of active streams
-	activeStreams prometheus.Gauge
-
-	// ignoreNewStreams is true when the connection is being shut down. New streams
-	// cannot be registered.
-	ignoreNewStreams bool
-	// streamsEmpty is a chan that will be closed when no more streams are open.
-	streamsEmptyChan chan struct{}
-	closeOnce        sync.Once
-}
-
-func newActiveStreamMap(useClientStreamNumbers bool, activeStreams prometheus.Gauge) *activeStreamMap {
-	m := &activeStreamMap{
-		streams:          make(map[uint32]*MuxedStream),
-		streamsEmptyChan: make(chan struct{}),
-		nextStreamID:     1,
-		activeStreams:    activeStreams,
-	}
-	// Client initiated stream uses odd stream ID, server initiated stream uses even stream ID
-	if !useClientStreamNumbers {
-		m.nextStreamID = 2
-	}
-	return m
-}
-
-// This function should be called while `m` is locked.
-func (m *activeStreamMap) notifyStreamsEmpty() {
-	m.closeOnce.Do(func() {
-		close(m.streamsEmptyChan)
-	})
-}
-
-// Len returns the number of active streams.
-func (m *activeStreamMap) Len() int {
-	m.RLock()
-	defer m.RUnlock()
-	return len(m.streams)
-}
-
-func (m *activeStreamMap) Get(streamID uint32) (*MuxedStream, bool) {
-	m.RLock()
-	defer m.RUnlock()
-	stream, ok := m.streams[streamID]
-	return stream, ok
-}
-
-// Set returns true if the stream was assigned successfully. If a stream
-// already existed with that ID or we are shutting down, return false.
-func (m *activeStreamMap) Set(newStream *MuxedStream) bool {
-	m.Lock()
-	defer m.Unlock()
-	if _, ok := m.streams[newStream.streamID]; ok {
-		return false
-	}
-	if m.ignoreNewStreams {
-		return false
-	}
-	m.streams[newStream.streamID] = newStream
-	m.activeStreams.Inc()
-	return true
-}
-
-// Delete stops tracking the stream. It should be called only after it is closed and reset.
-func (m *activeStreamMap) Delete(streamID uint32) {
-	m.Lock()
-	defer m.Unlock()
-	if _, ok := m.streams[streamID]; ok {
-		delete(m.streams, streamID)
-		m.activeStreams.Dec()
-	}
-
-	// shutting down, and now the map is empty
-	if m.ignoreNewStreams && len(m.streams) == 0 {
-		m.notifyStreamsEmpty()
-	}
-}
-
-// Shutdown blocks new streams from being created.
-// It returns `done`, a channel that is closed once the last stream has closed
-// and `progress`, whether a shutdown was already in progress
-func (m *activeStreamMap) Shutdown() (done <-chan struct{}, alreadyInProgress bool) {
-	m.Lock()
-	defer m.Unlock()
-	if m.ignoreNewStreams {
-		// already shutting down
-		return m.streamsEmptyChan, true
-	}
-	m.ignoreNewStreams = true
-	if len(m.streams) == 0 {
-		// there are no streams to wait for
-		m.notifyStreamsEmpty()
-	}
-	return m.streamsEmptyChan, false
-}
-
-// AcquireLocalID acquires a new stream ID for a stream you're opening.
-func (m *activeStreamMap) AcquireLocalID() uint32 {
-	m.Lock()
-	defer m.Unlock()
-	x := m.nextStreamID
-	m.nextStreamID += 2
-	return x
-}
-
-// ObservePeerID observes the ID of a stream opened by the peer. It returns true if we should accept
-// the new stream, or false to reject it. The ErrCode gives the reason why.
-func (m *activeStreamMap) AcquirePeerID(streamID uint32) (bool, http2.ErrCode) {
-	m.Lock()
-	defer m.Unlock()
-	switch {
-	case m.ignoreNewStreams:
-		return false, http2.ErrCodeStreamClosed
-	case streamID > m.maxPeerStreamID:
-		m.maxPeerStreamID = streamID
-		return true, http2.ErrCodeNo
-	default:
-		return false, http2.ErrCodeStreamClosed
-	}
-}
-
-// IsPeerStreamID is true if the stream ID belongs to the peer.
-func (m *activeStreamMap) IsPeerStreamID(streamID uint32) bool {
-	m.RLock()
-	defer m.RUnlock()
-	return (streamID % 2) != (m.nextStreamID % 2)
-}
-
-// IsLocalStreamID is true if it is a stream we have opened, even if it is now closed.
-func (m *activeStreamMap) IsLocalStreamID(streamID uint32) bool {
-	m.RLock()
-	defer m.RUnlock()
-	return (streamID%2) == (m.nextStreamID%2) && streamID < m.nextStreamID
-}
-
-// LastPeerStreamID returns the most recently opened peer stream ID.
-func (m *activeStreamMap) LastPeerStreamID() uint32 {
-	m.RLock()
-	defer m.RUnlock()
-	return m.maxPeerStreamID
-}
-
-// LastLocalStreamID returns the most recently opened local stream ID.
-func (m *activeStreamMap) LastLocalStreamID() uint32 {
-	m.RLock()
-	defer m.RUnlock()
-	if m.nextStreamID > 1 {
-		return m.nextStreamID - 2
-	}
-	return 0
-}
-
-// Abort closes every active stream and prevents new ones being created. This should be used to
-// return errors in pending read/writes when the underlying connection goes away.
-func (m *activeStreamMap) Abort() {
-	m.Lock()
-	defer m.Unlock()
-	for _, stream := range m.streams {
-		stream.Close()
-	}
-	m.ignoreNewStreams = true
-	m.notifyStreamsEmpty()
-}

h2mux/activestreammap_test.go

@@ -1,195 +0,0 @@
-package h2mux
-
-import (
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestShutdown(t *testing.T) {
-	const numStreams = 1000
-	m := newActiveStreamMap(true, ActiveStreams)
-
-	// Add all the streams
-	{
-		var wg sync.WaitGroup
-		wg.Add(numStreams)
-		for i := 0; i < numStreams; i++ {
-			go func(streamID int) {
-				defer wg.Done()
-				stream := &MuxedStream{streamID: uint32(streamID)}
-				ok := m.Set(stream)
-				assert.True(t, ok)
-			}(i)
-		}
-		wg.Wait()
-	}
-	assert.Equal(t, numStreams, m.Len(), "All the streams should have been added")
-
-	shutdownChan, alreadyInProgress := m.Shutdown()
-	select {
-	case <-shutdownChan:
-		assert.Fail(t, "before Shutdown(), shutdownChan shouldn't be closed")
-	default:
-	}
-	assert.False(t, alreadyInProgress)
-
-	shutdownChan2, alreadyInProgress2 := m.Shutdown()
-	assert.Equal(t, shutdownChan, shutdownChan2, "repeated calls to Shutdown() should return the same channel")
-	assert.True(t, alreadyInProgress2, "repeated calls to Shutdown() should return true for 'in progress'")
-
-	// Delete all the streams
-	{
-		var wg sync.WaitGroup
-		wg.Add(numStreams)
-		for i := 0; i < numStreams; i++ {
-			go func(streamID int) {
-				defer wg.Done()
-				m.Delete(uint32(streamID))
-			}(i)
-		}
-		wg.Wait()
-	}
-	assert.Equal(t, 0, m.Len(), "All the streams should have been deleted")
-
-	select {
-	case <-shutdownChan:
-	default:
-		assert.Fail(t, "After all the streams are deleted, shutdownChan should have been closed")
-	}
-}
-
-func TestEmptyBeforeShutdown(t *testing.T) {
-	const numStreams = 1000
-	m := newActiveStreamMap(true, ActiveStreams)
-
-	// Add all the streams
-	{
-		var wg sync.WaitGroup
-		wg.Add(numStreams)
-		for i := 0; i < numStreams; i++ {
-			go func(streamID int) {
-				defer wg.Done()
-				stream := &MuxedStream{streamID: uint32(streamID)}
-				ok := m.Set(stream)
-				assert.True(t, ok)
-			}(i)
-		}
-		wg.Wait()
-	}
-	assert.Equal(t, numStreams, m.Len(), "All the streams should have been added")
-
-	// Delete all the streams, bringing m to size 0
-	{
-		var wg sync.WaitGroup
-		wg.Add(numStreams)
-		for i := 0; i < numStreams; i++ {
-			go func(streamID int) {
-				defer wg.Done()
-				m.Delete(uint32(streamID))
-			}(i)
-		}
-		wg.Wait()
-	}
-	assert.Equal(t, 0, m.Len(), "All the streams should have been deleted")
-
-	// Add one stream back
-	const soloStreamID = uint32(0)
-	ok := m.Set(&MuxedStream{streamID: soloStreamID})
-	assert.True(t, ok)
-
-	shutdownChan, alreadyInProgress := m.Shutdown()
-	select {
-	case <-shutdownChan:
-		assert.Fail(t, "before Shutdown(), shutdownChan shouldn't be closed")
-	default:
-	}
-	assert.False(t, alreadyInProgress)
-
-	shutdownChan2, alreadyInProgress2 := m.Shutdown()
-	assert.Equal(t, shutdownChan, shutdownChan2, "repeated calls to Shutdown() should return the same channel")
-	assert.True(t, alreadyInProgress2, "repeated calls to Shutdown() should return true for 'in progress'")
-
-	// Remove the remaining stream
-	m.Delete(soloStreamID)
-
-	select {
-	case <-shutdownChan:
-	default:
-		assert.Fail(t, "After all the streams are deleted, shutdownChan should have been closed")
-	}
-}
-
-type noopBuffer struct {
-	isClosed bool
-}
-
-func (t *noopBuffer) Read(p []byte) (n int, err error)  { return len(p), nil }
-func (t *noopBuffer) Write(p []byte) (n int, err error) { return len(p), nil }
-func (t *noopBuffer) Reset()                            {}
-func (t *noopBuffer) Len() int                          { return 0 }
-func (t *noopBuffer) Close() error                      { t.isClosed = true; return nil }
-func (t *noopBuffer) Closed() bool                      { return t.isClosed }
-
-type noopReadyList struct{}
-
-func (_ *noopReadyList) Signal(streamID uint32) {}
-
-func TestAbort(t *testing.T) {
-	const numStreams = 1000
-	m := newActiveStreamMap(true, ActiveStreams)
-
-	var openedStreams sync.Map
-
-	// Add all the streams
-	{
-		var wg sync.WaitGroup
-		wg.Add(numStreams)
-		for i := 0; i < numStreams; i++ {
-			go func(streamID int) {
-				defer wg.Done()
-				stream := &MuxedStream{
-					streamID:    uint32(streamID),
-					readBuffer:  &noopBuffer{},
-					writeBuffer: &noopBuffer{},
-					readyList:   &noopReadyList{},
-				}
-				ok := m.Set(stream)
-				assert.True(t, ok)
-
-				openedStreams.Store(stream.streamID, stream)
-			}(i)
-		}
-		wg.Wait()
-	}
-	assert.Equal(t, numStreams, m.Len(), "All the streams should have been added")
-
-	shutdownChan, alreadyInProgress := m.Shutdown()
-	select {
-	case <-shutdownChan:
-		assert.Fail(t, "before Abort(), shutdownChan shouldn't be closed")
-	default:
-	}
-	assert.False(t, alreadyInProgress)
-
-	m.Abort()
-	assert.Equal(t, numStreams, m.Len(), "Abort() shouldn't delete any streams")
-	openedStreams.Range(func(key interface{}, value interface{}) bool {
-		stream := value.(*MuxedStream)
-		readBuffer := stream.readBuffer.(*noopBuffer)
-		writeBuffer := stream.writeBuffer.(*noopBuffer)
-		return assert.True(t, readBuffer.isClosed && writeBuffer.isClosed, "Abort() should have closed all the streams")
-	})
-
-	select {
-	case <-shutdownChan:
-	default:
-		assert.Fail(t, "after Abort(), shutdownChan should have been closed")
-	}
-
-	// multiple aborts shouldn't cause any issues
-	m.Abort()
-	m.Abort()
-	m.Abort()
-}

h2mux/bytes_counter.go

@@ -1,27 +0,0 @@
-package h2mux
-
-import (
-	"sync/atomic"
-)
-
-type AtomicCounter struct {
-	count uint64
-}
-
-func NewAtomicCounter(initCount uint64) *AtomicCounter {
-	return &AtomicCounter{count: initCount}
-}
-
-func (c *AtomicCounter) IncrementBy(number uint64) {
-	atomic.AddUint64(&c.count, number)
-}
-
-// Count returns the current value of counter and reset it to 0
-func (c *AtomicCounter) Count() uint64 {
-	return atomic.SwapUint64(&c.count, 0)
-}
-
-// Value returns the current value of counter
-func (c *AtomicCounter) Value() uint64 {
-	return atomic.LoadUint64(&c.count)
-}

h2mux/bytes_counter_test.go

@@ -1,23 +0,0 @@
-package h2mux
-
-import (
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCounter(t *testing.T) {
-	var wg sync.WaitGroup
-	wg.Add(dataPoints)
-	c := AtomicCounter{}
-	for i := 0; i < dataPoints; i++ {
-		go func() {
-			defer wg.Done()
-			c.IncrementBy(uint64(1))
-		}()
-	}
-	wg.Wait()
-	assert.Equal(t, uint64(dataPoints), c.Count())
-	assert.Equal(t, uint64(0), c.Count())
-}

h2mux/error.go

@@ -1,66 +0,0 @@
-package h2mux
-
-import (
-	"fmt"
-
-	"golang.org/x/net/http2"
-)
-
-var (
-	// HTTP2 error codes: https://http2.github.io/http2-spec/#ErrorCodes
-	ErrHandshakeTimeout               = MuxerHandshakeError{"1000 handshake timeout"}
-	ErrBadHandshakeNotSettings        = MuxerHandshakeError{"1001 unexpected response"}
-	ErrBadHandshakeUnexpectedAck      = MuxerHandshakeError{"1002 unexpected response"}
-	ErrBadHandshakeNoMagic            = MuxerHandshakeError{"1003 unexpected response"}
-	ErrBadHandshakeWrongMagic         = MuxerHandshakeError{"1004 connected to endpoint of wrong type"}
-	ErrBadHandshakeNotSettingsAck     = MuxerHandshakeError{"1005 unexpected response"}
-	ErrBadHandshakeUnexpectedSettings = MuxerHandshakeError{"1006 unexpected response"}
-
-	ErrUnexpectedFrameType = MuxerProtocolError{"2001 unexpected frame type", http2.ErrCodeProtocol}
-	ErrUnknownStream       = MuxerProtocolError{"2002 unknown stream", http2.ErrCodeProtocol}
-	ErrInvalidStream       = MuxerProtocolError{"2003 invalid stream", http2.ErrCodeProtocol}
-	ErrNotRPCStream        = MuxerProtocolError{"2004 not RPC stream", http2.ErrCodeProtocol}
-
-	ErrStreamHeadersSent               = MuxerApplicationError{"3000 headers already sent"}
-	ErrStreamRequestConnectionClosed   = MuxerApplicationError{"3001 connection closed while opening stream"}
-	ErrConnectionDropped               = MuxerApplicationError{"3002 connection dropped"}
-	ErrStreamRequestTimeout            = MuxerApplicationError{"3003 open stream timeout"}
-	ErrResponseHeadersTimeout          = MuxerApplicationError{"3004 timeout waiting for initial response headers"}
-	ErrResponseHeadersConnectionClosed = MuxerApplicationError{"3005 connection closed while waiting for initial response headers"}
-
-	ErrClosedStream = MuxerStreamError{"4000 stream closed", http2.ErrCodeStreamClosed}
-)
-
-type MuxerHandshakeError struct {
-	cause string
-}
-
-func (e MuxerHandshakeError) Error() string {
-	return fmt.Sprintf("Handshake error: %s", e.cause)
-}
-
-type MuxerProtocolError struct {
-	cause  string
-	h2code http2.ErrCode
-}
-
-func (e MuxerProtocolError) Error() string {
-	return fmt.Sprintf("Protocol error: %s", e.cause)
-}
-
-type MuxerApplicationError struct {
-	cause string
-}
-
-func (e MuxerApplicationError) Error() string {
-	return fmt.Sprintf("Application error: %s", e.cause)
-}
-
-type MuxerStreamError struct {
-	cause  string
-	h2code http2.ErrCode
-}
-
-func (e MuxerStreamError) Error() string {
-	return fmt.Sprintf("Stream error: %s", e.cause)
-}

h2mux/h2_compressor.go

@@ -1,17 +0,0 @@
-package h2mux
-
-import (
-	"io"
-)
-
-func CompressionIsSupported() bool {
-	return false
-}
-
-func newDecompressor(src io.Reader) decompressor {
-	return nil
-}
-
-func newCompressor(dst io.Writer, quality, lgwin int) compressor {
-	return nil
-}

h2mux/h2_dictionaries.go

@@ -1,596 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"io"
-	"strings"
-	"sync"
-
-	"golang.org/x/net/http2"
-)
-
-/* This is an implementation of https://github.com/vkrasnov/h2-compression-dictionaries
-but modified for tunnels in a few key ways:
-Since tunnels is a server-to-server service, some aspects of the spec would cause
-unnecessary head-of-line blocking on the CPU and on the network, hence this implementation
-allows for parallel compression on the "client", and buffering on the "server" to solve
-this problem. */
-
-// Assign temporary values
-const SettingCompression http2.SettingID = 0xff20
-
-const (
-	FrameSetCompressionContext http2.FrameType = 0xf0
-	FrameUseDictionary         http2.FrameType = 0xf1
-	FrameSetDictionary         http2.FrameType = 0xf2
-)
-
-const (
-	FlagSetDictionaryAppend http2.Flags = 0x1
-	FlagSetDictionaryOffset http2.Flags = 0x2
-)
-
-const compressionVersion = uint8(1)
-const compressionFormat = uint8(2)
-
-type CompressionSetting uint
-
-const (
-	CompressionNone CompressionSetting = iota
-	CompressionLow
-	CompressionMedium
-	CompressionMax
-)
-
-type CompressionPreset struct {
-	nDicts, dictSize, quality uint8
-}
-
-type compressor interface {
-	Write([]byte) (int, error)
-	Flush() error
-	SetDictionary([]byte)
-	Close() error
-}
-
-type decompressor interface {
-	Read([]byte) (int, error)
-	SetDictionary([]byte)
-	Close() error
-}
-
-var compressionPresets = map[CompressionSetting]CompressionPreset{
-	CompressionNone:   {0, 0, 0},
-	CompressionLow:    {32, 17, 5},
-	CompressionMedium: {64, 18, 6},
-	CompressionMax:    {255, 19, 9},
-}
-
-func compressionSettingVal(version, fmt, sz, nd uint8) uint32 {
-	// Currently the compression settings are include:
-	// * version: only 1 is supported
-	// * fmt: only 2 for brotli is supported
-	// * sz: log2 of the maximal allowed dictionary size
-	// * nd: max allowed number of dictionaries
-	return uint32(version)<<24 + uint32(fmt)<<16 + uint32(sz)<<8 + uint32(nd)
-}
-
-func parseCompressionSettingVal(setting uint32) (version, fmt, sz, nd uint8) {
-	version = uint8(setting >> 24)
-	fmt = uint8(setting >> 16)
-	sz = uint8(setting >> 8)
-	nd = uint8(setting)
-	return
-}
-
-func (c CompressionSetting) toH2Setting() uint32 {
-	p, ok := compressionPresets[c]
-	if !ok {
-		return 0
-	}
-	return compressionSettingVal(compressionVersion, compressionFormat, p.dictSize, p.nDicts)
-}
-
-func (c CompressionSetting) getPreset() CompressionPreset {
-	return compressionPresets[c]
-}
-
-type dictUpdate struct {
-	reader     *h2DictionaryReader
-	dictionary *h2ReadDictionary
-	buff       []byte
-	isReady    bool
-	isUse      bool
-	s          setDictRequest
-}
-
-type h2ReadDictionary struct {
-	dictionary []byte
-	queue      []*dictUpdate
-	maxSize    int
-}
-
-type h2ReadDictionaries struct {
-	d       []h2ReadDictionary
-	maxSize int
-}
-
-type h2DictionaryReader struct {
-	*SharedBuffer                // Propagate the decompressed output into the original buffer
-	decompBuffer   *bytes.Buffer // Intermediate buffer for the brotli compressor
-	dictionary     []byte        // The content of the dictionary being used by this reader
-	internalBuffer []byte
-	s, e           int           // Start and end of the buffer
-	decomp         decompressor  // The brotli compressor
-	isClosed       bool          // Indicates that Close was called for this reader
-	queue          []*dictUpdate // List of dictionaries to update, when the data is available
-}
-
-type h2WriteDictionary []byte
-
-type setDictRequest struct {
-	streamID         uint32
-	dictID           uint8
-	dictSZ           uint64
-	truncate, offset uint64
-	P, E, D          bool
-}
-
-type useDictRequest struct {
-	dictID   uint8
-	streamID uint32
-	setDict  []setDictRequest
-}
-
-type h2WriteDictionaries struct {
-	dictLock        sync.Mutex
-	dictChan        chan useDictRequest
-	dictionaries    []h2WriteDictionary
-	nextAvail       int              // next unused dictionary slot
-	maxAvail        int              // max ID, defined by SETTINGS
-	maxSize         int              // max size, defined by SETTINGS
-	typeToDict      map[string]uint8 // map from content type to dictionary that encodes it
-	pathToDict      map[string]uint8 // map from path to dictionary that encodes it
-	quality         int
-	window          int
-	compIn, compOut *AtomicCounter
-}
-
-type h2DictWriter struct {
-	*bytes.Buffer
-	comp       compressor
-	dicts      *h2WriteDictionaries
-	writerLock sync.Mutex
-
-	streamID    uint32
-	path        string
-	contentType string
-}
-
-type h2Dictionaries struct {
-	write *h2WriteDictionaries
-	read  *h2ReadDictionaries
-}
-
-func (o *dictUpdate) update(buff []byte) {
-	o.buff = make([]byte, len(buff))
-	copy(o.buff, buff)
-	o.isReady = true
-}
-
-func (d *h2ReadDictionary) update() {
-	for len(d.queue) > 0 {
-		o := d.queue[0]
-		if !o.isReady {
-			break
-		}
-		if o.isUse {
-			reader := o.reader
-			reader.dictionary = make([]byte, len(d.dictionary))
-			copy(reader.dictionary, d.dictionary)
-			reader.decomp = newDecompressor(reader.decompBuffer)
-			if len(reader.dictionary) > 0 {
-				reader.decomp.SetDictionary(reader.dictionary)
-			}
-			reader.Write([]byte{})
-		} else {
-			d.dictionary = adjustDictionary(d.dictionary, o.buff, o.s, d.maxSize)
-		}
-		d.queue = d.queue[1:]
-	}
-}
-
-func newH2ReadDictionaries(nd, sz uint8) h2ReadDictionaries {
-	d := make([]h2ReadDictionary, int(nd))
-	for i := range d {
-		d[i].maxSize = 1 << uint(sz)
-	}
-	return h2ReadDictionaries{d: d, maxSize: 1 << uint(sz)}
-}
-
-func (dicts *h2ReadDictionaries) getDictByID(dictID uint8) (*h2ReadDictionary, error) {
-	if int(dictID) > len(dicts.d) {
-		return nil, MuxerStreamError{"dictID too big", http2.ErrCodeProtocol}
-	}
-
-	return &dicts.d[dictID], nil
-}
-
-func (dicts *h2ReadDictionaries) newReader(b *SharedBuffer, dictID uint8) *h2DictionaryReader {
-	if int(dictID) > len(dicts.d) {
-		return nil
-	}
-
-	dictionary := &dicts.d[dictID]
-	reader := &h2DictionaryReader{SharedBuffer: b, decompBuffer: &bytes.Buffer{}, internalBuffer: make([]byte, dicts.maxSize)}
-
-	if len(dictionary.queue) == 0 {
-		reader.dictionary = make([]byte, len(dictionary.dictionary))
-		copy(reader.dictionary, dictionary.dictionary)
-		reader.decomp = newDecompressor(reader.decompBuffer)
-		if len(reader.dictionary) > 0 {
-			reader.decomp.SetDictionary(reader.dictionary)
-		}
-	} else {
-		dictionary.queue = append(dictionary.queue, &dictUpdate{isUse: true, isReady: true, reader: reader})
-	}
-	return reader
-}
-
-func (r *h2DictionaryReader) updateWaitingDictionaries() {
-	// Update all the waiting dictionaries
-	for _, o := range r.queue {
-		if o.isReady {
-			continue
-		}
-		if r.isClosed || uint64(r.e) >= o.s.dictSZ {
-			o.update(r.internalBuffer[:r.e])
-			if o == o.dictionary.queue[0] {
-				defer o.dictionary.update()
-			}
-		}
-	}
-}
-
-// Write actually happens when reading from network, this is therefore the stage where we decompress the buffer
-func (r *h2DictionaryReader) Write(p []byte) (n int, err error) {
-	// Every write goes into brotli buffer first
-	n, err = r.decompBuffer.Write(p)
-	if err != nil {
-		return
-	}
-
-	if r.decomp == nil {
-		return
-	}
-
-	for {
-		m, err := r.decomp.Read(r.internalBuffer[r.e:])
-		if err != nil && err != io.EOF {
-			r.SharedBuffer.Close()
-			r.decomp.Close()
-			return n, err
-		}
-
-		r.SharedBuffer.Write(r.internalBuffer[r.e : r.e+m])
-		r.e += m
-
-		if m == 0 {
-			break
-		}
-
-		if r.e == len(r.internalBuffer) {
-			r.updateWaitingDictionaries()
-			r.e = 0
-		}
-	}
-
-	r.updateWaitingDictionaries()
-
-	if r.isClosed {
-		r.SharedBuffer.Close()
-		r.decomp.Close()
-	}
-
-	return
-}
-
-func (r *h2DictionaryReader) Close() error {
-	if r.isClosed {
-		return nil
-	}
-	r.isClosed = true
-	r.Write([]byte{})
-	return nil
-}
-
-var compressibleTypes = map[string]bool{
-	"application/atom+xml":                true,
-	"application/javascript":              true,
-	"application/json":                    true,
-	"application/ld+json":                 true,
-	"application/manifest+json":           true,
-	"application/rss+xml":                 true,
-	"application/vnd.geo+json":            true,
-	"application/vnd.ms-fontobject":       true,
-	"application/x-font-ttf":              true,
-	"application/x-yaml":                  true,
-	"application/x-web-app-manifest+json": true,
-	"application/xhtml+xml":               true,
-	"application/xml":                     true,
-	"font/opentype":                       true,
-	"image/bmp":                           true,
-	"image/svg+xml":                       true,
-	"image/x-icon":                        true,
-	"text/cache-manifest":                 true,
-	"text/css":                            true,
-	"text/html":                           true,
-	"text/plain":                          true,
-	"text/vcard":                          true,
-	"text/vnd.rim.location.xloc":          true,
-	"text/vtt":                            true,
-	"text/x-component":                    true,
-	"text/x-cross-domain-policy":          true,
-	"text/x-yaml":                         true,
-}
-
-func getContentType(headers []Header) string {
-	for _, h := range headers {
-		if strings.ToLower(h.Name) == "content-type" {
-			val := strings.ToLower(h.Value)
-			sep := strings.IndexRune(val, ';')
-			if sep != -1 {
-				return val[:sep]
-			}
-			return val
-		}
-	}
-
-	return ""
-}
-
-func newH2WriteDictionaries(nd, sz, quality uint8, compIn, compOut *AtomicCounter) (*h2WriteDictionaries, chan useDictRequest) {
-	useDictChan := make(chan useDictRequest)
-	return &h2WriteDictionaries{
-		dictionaries: make([]h2WriteDictionary, nd),
-		nextAvail:    0,
-		maxAvail:     int(nd),
-		maxSize:      1 << uint(sz),
-		dictChan:     useDictChan,
-		typeToDict:   make(map[string]uint8),
-		pathToDict:   make(map[string]uint8),
-		quality:      int(quality),
-		window:       1 << uint(sz+1),
-		compIn:       compIn,
-		compOut:      compOut,
-	}, useDictChan
-}
-
-func adjustDictionary(currentDictionary, newData []byte, set setDictRequest, maxSize int) []byte {
-	currentDictionary = append(currentDictionary, newData[:set.dictSZ]...)
-
-	if len(currentDictionary) > maxSize {
-		currentDictionary = currentDictionary[len(currentDictionary)-maxSize:]
-	}
-
-	return currentDictionary
-}
-
-func (h2d *h2WriteDictionaries) getNextDictID() (dictID uint8, ok bool) {
-	if h2d.nextAvail < h2d.maxAvail {
-		dictID, ok = uint8(h2d.nextAvail), true
-		h2d.nextAvail++
-		return
-	}
-
-	return 0, false
-}
-
-func (h2d *h2WriteDictionaries) getGenericDictID() (dictID uint8, ok bool) {
-	if h2d.maxAvail == 0 {
-		return 0, false
-	}
-	return uint8(h2d.maxAvail - 1), true
-}
-
-func (h2d *h2WriteDictionaries) getDictWriter(s *MuxedStream, headers []Header) *h2DictWriter {
-	w := s.writeBuffer
-
-	if w == nil {
-		return nil
-	}
-
-	if s.method != "GET" && s.method != "POST" {
-		return nil
-	}
-
-	s.contentType = getContentType(headers)
-	if _, ok := compressibleTypes[s.contentType]; !ok && !strings.HasPrefix(s.contentType, "text") {
-		return nil
-	}
-
-	return &h2DictWriter{
-		Buffer:      w.(*bytes.Buffer),
-		path:        s.path,
-		contentType: s.contentType,
-		streamID:    s.streamID,
-		dicts:       h2d,
-	}
-}
-
-func assignDictToStream(s *MuxedStream, p []byte) bool {
-
-	// On first write to stream:
-	// * assign the right dictionary
-	// * update relevant dictionaries
-	// * send the required USE_DICT and SET_DICT frames
-
-	h2d := s.dictionaries.write
-	if h2d == nil {
-		return false
-	}
-
-	w, ok := s.writeBuffer.(*h2DictWriter)
-	if !ok || w.comp != nil {
-		return false
-	}
-
-	h2d.dictLock.Lock()
-
-	if w.comp != nil {
-		// Check again with lock, in therory the interface allows for unordered writes
-		h2d.dictLock.Unlock()
-		return false
-	}
-
-	// The logic of dictionary generation is below
-
-	// Is there a dictionary for the exact path or content-type?
-	var useID uint8
-	pathID, pathFound := h2d.pathToDict[w.path]
-	typeID, typeFound := h2d.typeToDict[w.contentType]
-
-	if pathFound {
-		// Use dictionary for path as top priority
-		useID = pathID
-		if !typeFound { // Shouldn't really happen, unless type changes between requests
-			typeID, typeFound = h2d.getNextDictID()
-			if typeFound {
-				h2d.typeToDict[w.contentType] = typeID
-			}
-		}
-	} else if typeFound {
-		// Use dictionary for same content type as second priority
-		useID = typeID
-		pathID, pathFound = h2d.getNextDictID()
-		if pathFound { // If a slot is available, generate new dictionary for path
-			h2d.pathToDict[w.path] = pathID
-		}
-	} else {
-		// Use the overflow dictionary as last resort
-		// If slots are available generate new dictionaries for path and content-type
-		useID, _ = h2d.getGenericDictID()
-		pathID, pathFound = h2d.getNextDictID()
-		if pathFound {
-			h2d.pathToDict[w.path] = pathID
-		}
-		typeID, typeFound = h2d.getNextDictID()
-		if typeFound {
-			h2d.typeToDict[w.contentType] = typeID
-		}
-	}
-
-	useLen := h2d.maxSize
-	if len(p) < useLen {
-		useLen = len(p)
-	}
-
-	// Update all the dictionaries using the new data
-	setDicts := make([]setDictRequest, 0, 3)
-	setDict := setDictRequest{
-		streamID: w.streamID,
-		dictID:   useID,
-		dictSZ:   uint64(useLen),
-	}
-	setDicts = append(setDicts, setDict)
-	if pathID != useID {
-		setDict.dictID = pathID
-		setDicts = append(setDicts, setDict)
-	}
-	if typeID != useID {
-		setDict.dictID = typeID
-		setDicts = append(setDicts, setDict)
-	}
-
-	h2d.dictChan <- useDictRequest{streamID: w.streamID, dictID: uint8(useID), setDict: setDicts}
-
-	dict := h2d.dictionaries[useID]
-
-	// Brolti requires the dictionary to be immutable
-	copyDict := make([]byte, len(dict))
-	copy(copyDict, dict)
-
-	for _, set := range setDicts {
-		h2d.dictionaries[set.dictID] = adjustDictionary(h2d.dictionaries[set.dictID], p, set, h2d.maxSize)
-	}
-
-	w.comp = newCompressor(w.Buffer, h2d.quality, h2d.window)
-
-	s.writeLock.Lock()
-	h2d.dictLock.Unlock()
-
-	if len(copyDict) > 0 {
-		w.comp.SetDictionary(copyDict)
-	}
-
-	return true
-}
-
-func (w *h2DictWriter) Write(p []byte) (n int, err error) {
-	bufLen := w.Buffer.Len()
-	if w.comp != nil {
-		n, err = w.comp.Write(p)
-		if err != nil {
-			return
-		}
-		err = w.comp.Flush()
-		w.dicts.compIn.IncrementBy(uint64(n))
-		w.dicts.compOut.IncrementBy(uint64(w.Buffer.Len() - bufLen))
-		return
-	}
-	return w.Buffer.Write(p)
-}
-
-func (w *h2DictWriter) Close() error {
-	if w.comp != nil {
-		return w.comp.Close()
-	}
-	return nil
-}
-
-// From http2/hpack
-func http2ReadVarInt(n byte, p []byte) (remain []byte, v uint64, err error) {
-	if n < 1 || n > 8 {
-		panic("bad n")
-	}
-	if len(p) == 0 {
-		return nil, 0, MuxerStreamError{"unexpected EOF", http2.ErrCodeProtocol}
-	}
-	v = uint64(p[0])
-	if n < 8 {
-		v &= (1 << uint64(n)) - 1
-	}
-	if v < (1<<uint64(n))-1 {
-		return p[1:], v, nil
-	}
-
-	origP := p
-	p = p[1:]
-	var m uint64
-	for len(p) > 0 {
-		b := p[0]
-		p = p[1:]
-		v += uint64(b&127) << m
-		if b&128 == 0 {
-			return p, v, nil
-		}
-		m += 7
-		if m >= 63 {
-			return origP, 0, MuxerStreamError{"invalid integer", http2.ErrCodeProtocol}
-		}
-	}
-	return nil, 0, MuxerStreamError{"unexpected EOF", http2.ErrCodeProtocol}
-}
-
-func appendVarInt(dst []byte, n byte, i uint64) []byte {
-	k := uint64((1 << n) - 1)
-	if i < k {
-		return append(dst, byte(i))
-	}
-	dst = append(dst, byte(k))
-	i -= k
-	for ; i >= 128; i >>= 7 {
-		dst = append(dst, byte(0x80|(i&0x7f)))
-	}
-	return append(dst, byte(i))
-}

h2mux/h2mux.go

@@ -1,506 +0,0 @@
-package h2mux
-
-import (
-	"context"
-	"io"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/rs/zerolog"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/sync/errgroup"
-)
-
-const (
-	defaultFrameSize         uint32        = 1 << 14       // Minimum frame size in http2 spec
-	defaultWindowSize        uint32        = (1 << 16) - 1 // Minimum window size in http2 spec
-	maxWindowSize            uint32        = (1 << 31) - 1 // 2^31-1 = 2147483647, max window size in http2 spec
-	defaultTimeout           time.Duration = 5 * time.Second
-	defaultRetries           uint64        = 5
-	defaultWriteBufferMaxLen int           = 1024 * 1024 // 1mb
-	writeBufferInitialSize   int           = 16 * 1024   // 16KB
-
-	SettingMuxerMagic http2.SettingID = 0x42db
-	MuxerMagicOrigin  uint32          = 0xa2e43c8b
-	MuxerMagicEdge    uint32          = 0x1088ebf9
-)
-
-type MuxedStreamHandler interface {
-	ServeStream(*MuxedStream) error
-}
-
-type MuxedStreamFunc func(stream *MuxedStream) error
-
-func (f MuxedStreamFunc) ServeStream(stream *MuxedStream) error {
-	return f(stream)
-}
-
-type MuxerConfig struct {
-	Timeout  time.Duration
-	Handler  MuxedStreamHandler
-	IsClient bool
-	// Name is used to identify this muxer instance when logging.
-	Name string
-	// The minimum time this connection can be idle before sending a heartbeat.
-	HeartbeatInterval time.Duration
-	// The minimum number of heartbeats to send before terminating the connection.
-	MaxHeartbeats uint64
-	// Logger to use
-	Log                *zerolog.Logger
-	CompressionQuality CompressionSetting
-	// Initial size for HTTP2 flow control windows
-	DefaultWindowSize uint32
-	// Largest allowable size for HTTP2 flow control windows
-	MaxWindowSize uint32
-	// Largest allowable capacity for the buffer of data to be sent
-	StreamWriteBufferMaxLen int
-}
-
-type Muxer struct {
-	// f is used to read and write HTTP2 frames on the wire.
-	f *http2.Framer
-	// config is the MuxerConfig given in Handshake.
-	config MuxerConfig
-	// w, r are references to the underlying connection used.
-	w io.WriteCloser
-	r io.ReadCloser
-	// muxReader is the read process.
-	muxReader *MuxReader
-	// muxWriter is the write process.
-	muxWriter *MuxWriter
-	// muxMetricsUpdater is the process to update metrics
-	muxMetricsUpdater muxMetricsUpdater
-	// newStreamChan is used to create new streams on the writer thread.
-	// The writer will assign the next available stream ID.
-	newStreamChan chan MuxedStreamRequest
-	// abortChan is used to abort the writer event loop.
-	abortChan chan struct{}
-	// abortOnce is used to ensure abortChan is closed once only.
-	abortOnce sync.Once
-	// readyList is used to signal writable streams.
-	readyList *ReadyList
-	// streams tracks currently-open streams.
-	streams *activeStreamMap
-	// explicitShutdown records whether the Muxer is closing because Shutdown was called, or due to another
-	// error.
-	explicitShutdown *BooleanFuse
-
-	compressionQuality CompressionPreset
-}
-
-func RPCHeaders() []Header {
-	return []Header{
-		{Name: ":method", Value: "RPC"},
-		{Name: ":scheme", Value: "capnp"},
-		{Name: ":path", Value: "*"},
-	}
-}
-
-// Handshake establishes a muxed connection with the peer.
-// After the handshake completes, it is possible to open and accept streams.
-func Handshake(
-	w io.WriteCloser,
-	r io.ReadCloser,
-	config MuxerConfig,
-	activeStreamsMetrics prometheus.Gauge,
-) (*Muxer, error) {
-	// Set default config values
-	if config.Timeout == 0 {
-		config.Timeout = defaultTimeout
-	}
-	if config.DefaultWindowSize == 0 {
-		config.DefaultWindowSize = defaultWindowSize
-	}
-	if config.MaxWindowSize == 0 {
-		config.MaxWindowSize = maxWindowSize
-	}
-	if config.StreamWriteBufferMaxLen == 0 {
-		config.StreamWriteBufferMaxLen = defaultWriteBufferMaxLen
-	}
-	// Initialise connection state fields
-	m := &Muxer{
-		f:             http2.NewFramer(w, r), // A framer that writes to w and reads from r
-		config:        config,
-		w:             w,
-		r:             r,
-		newStreamChan: make(chan MuxedStreamRequest),
-		abortChan:     make(chan struct{}),
-		readyList:     NewReadyList(),
-		streams:       newActiveStreamMap(config.IsClient, activeStreamsMetrics),
-	}
-
-	m.f.ReadMetaHeaders = hpack.NewDecoder(4096, func(hpack.HeaderField) {})
-	// Initialise the settings to identify this connection and confirm the other end is sane.
-	handshakeSetting := http2.Setting{ID: SettingMuxerMagic, Val: MuxerMagicEdge}
-	compressionSetting := http2.Setting{ID: SettingCompression, Val: 0}
-
-	expectedMagic := MuxerMagicOrigin
-	if config.IsClient {
-		handshakeSetting.Val = MuxerMagicOrigin
-		expectedMagic = MuxerMagicEdge
-	}
-	errChan := make(chan error, 2)
-	// Simultaneously send our settings and verify the peer's settings.
-	go func() { errChan <- m.f.WriteSettings(handshakeSetting, compressionSetting) }()
-	go func() { errChan <- m.readPeerSettings(expectedMagic) }()
-	err := joinErrorsWithTimeout(errChan, 2, config.Timeout, ErrHandshakeTimeout)
-	if err != nil {
-		return nil, err
-	}
-	// Confirm sanity by ACKing the frame and expecting an ACK for our frame.
-	// Not strictly necessary, but let's pretend to be H2-like.
-	go func() { errChan <- m.f.WriteSettingsAck() }()
-	go func() { errChan <- m.readPeerSettingsAck() }()
-	err = joinErrorsWithTimeout(errChan, 2, config.Timeout, ErrHandshakeTimeout)
-	if err != nil {
-		return nil, err
-	}
-
-	// set up reader/writer pair ready for serve
-	streamErrors := NewStreamErrorMap()
-	goAwayChan := make(chan http2.ErrCode, 1)
-	inBoundCounter := NewAtomicCounter(0)
-	outBoundCounter := NewAtomicCounter(0)
-	pingTimestamp := NewPingTimestamp()
-	connActive := NewSignal()
-	idleDuration := config.HeartbeatInterval
-	// Sanity check to ensure idelDuration is sane
-	if idleDuration == 0 || idleDuration < defaultTimeout {
-		idleDuration = defaultTimeout
-		config.Log.Info().Msgf("muxer: Minimum idle time has been adjusted to %d", defaultTimeout)
-	}
-	maxRetries := config.MaxHeartbeats
-	if maxRetries == 0 {
-		maxRetries = defaultRetries
-		config.Log.Info().Msgf("muxer: Minimum number of unacked heartbeats to send before closing the connection has been adjusted to %d", maxRetries)
-	}
-
-	compBytesBefore, compBytesAfter := NewAtomicCounter(0), NewAtomicCounter(0)
-
-	m.muxMetricsUpdater = newMuxMetricsUpdater(
-		m.abortChan,
-		compBytesBefore,
-		compBytesAfter,
-	)
-
-	m.explicitShutdown = NewBooleanFuse()
-	m.muxReader = &MuxReader{
-		f:                       m.f,
-		handler:                 m.config.Handler,
-		streams:                 m.streams,
-		readyList:               m.readyList,
-		streamErrors:            streamErrors,
-		goAwayChan:              goAwayChan,
-		abortChan:               m.abortChan,
-		pingTimestamp:           pingTimestamp,
-		connActive:              connActive,
-		initialStreamWindow:     m.config.DefaultWindowSize,
-		streamWindowMax:         m.config.MaxWindowSize,
-		streamWriteBufferMaxLen: m.config.StreamWriteBufferMaxLen,
-		r:                       m.r,
-		metricsUpdater:          m.muxMetricsUpdater,
-		bytesRead:               inBoundCounter,
-	}
-	m.muxWriter = &MuxWriter{
-		f:               m.f,
-		streams:         m.streams,
-		streamErrors:    streamErrors,
-		readyStreamChan: m.readyList.ReadyChannel(),
-		newStreamChan:   m.newStreamChan,
-		goAwayChan:      goAwayChan,
-		abortChan:       m.abortChan,
-		pingTimestamp:   pingTimestamp,
-		idleTimer:       NewIdleTimer(idleDuration, maxRetries),
-		connActiveChan:  connActive.WaitChannel(),
-		maxFrameSize:    defaultFrameSize,
-		metricsUpdater:  m.muxMetricsUpdater,
-		bytesWrote:      outBoundCounter,
-	}
-	m.muxWriter.headerEncoder = hpack.NewEncoder(&m.muxWriter.headerBuffer)
-
-	if m.compressionQuality.dictSize > 0 && m.compressionQuality.nDicts > 0 {
-		nd, sz := m.compressionQuality.nDicts, m.compressionQuality.dictSize
-		writeDicts, dictChan := newH2WriteDictionaries(
-			nd,
-			sz,
-			m.compressionQuality.quality,
-			compBytesBefore,
-			compBytesAfter,
-		)
-		readDicts := newH2ReadDictionaries(nd, sz)
-		m.muxReader.dictionaries = h2Dictionaries{read: &readDicts, write: writeDicts}
-		m.muxWriter.useDictChan = dictChan
-	}
-
-	return m, nil
-}
-
-func (m *Muxer) readPeerSettings(magic uint32) error {
-	frame, err := m.f.ReadFrame()
-	if err != nil {
-		return err
-	}
-	settingsFrame, ok := frame.(*http2.SettingsFrame)
-	if !ok {
-		return ErrBadHandshakeNotSettings
-	}
-	if settingsFrame.Header().Flags != 0 {
-		return ErrBadHandshakeUnexpectedAck
-	}
-	peerMagic, ok := settingsFrame.Value(SettingMuxerMagic)
-	if !ok {
-		return ErrBadHandshakeNoMagic
-	}
-	if magic != peerMagic {
-		return ErrBadHandshakeWrongMagic
-	}
-	peerCompression, ok := settingsFrame.Value(SettingCompression)
-	if !ok {
-		m.compressionQuality = compressionPresets[CompressionNone]
-		return nil
-	}
-	ver, fmt, sz, nd := parseCompressionSettingVal(peerCompression)
-	if ver != compressionVersion || fmt != compressionFormat || sz == 0 || nd == 0 {
-		m.compressionQuality = compressionPresets[CompressionNone]
-		return nil
-	}
-	// Values used for compression are the minimum between the two peers
-	if sz < m.compressionQuality.dictSize {
-		m.compressionQuality.dictSize = sz
-	}
-	if nd < m.compressionQuality.nDicts {
-		m.compressionQuality.nDicts = nd
-	}
-	return nil
-}
-
-func (m *Muxer) readPeerSettingsAck() error {
-	frame, err := m.f.ReadFrame()
-	if err != nil {
-		return err
-	}
-	settingsFrame, ok := frame.(*http2.SettingsFrame)
-	if !ok {
-		return ErrBadHandshakeNotSettingsAck
-	}
-	if settingsFrame.Header().Flags != http2.FlagSettingsAck {
-		return ErrBadHandshakeUnexpectedSettings
-	}
-	return nil
-}
-
-func joinErrorsWithTimeout(errChan <-chan error, receiveCount int, timeout time.Duration, timeoutError error) error {
-	for i := 0; i < receiveCount; i++ {
-		select {
-		case err := <-errChan:
-			if err != nil {
-				return err
-			}
-		case <-time.After(timeout):
-			return timeoutError
-		}
-	}
-	return nil
-}
-
-// Serve runs the event loops that comprise h2mux:
-// - MuxReader.run()
-// - MuxWriter.run()
-// - muxMetricsUpdater.run()
-// In the normal case, Shutdown() is called concurrently with Serve() to stop
-// these loops.
-func (m *Muxer) Serve(ctx context.Context) error {
-	errGroup, _ := errgroup.WithContext(ctx)
-	errGroup.Go(func() error {
-		ch := make(chan error)
-		go func() {
-			err := m.muxReader.run(m.config.Log)
-			m.explicitShutdown.Fuse(false)
-			m.r.Close()
-			m.abort()
-			// don't block if parent goroutine quit early
-			select {
-			case ch <- err:
-			default:
-			}
-		}()
-		select {
-		case err := <-ch:
-			return err
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	})
-
-	errGroup.Go(func() error {
-		ch := make(chan error)
-		go func() {
-			err := m.muxWriter.run(m.config.Log)
-			m.explicitShutdown.Fuse(false)
-			m.w.Close()
-			m.abort()
-			// don't block if parent goroutine quit early
-			select {
-			case ch <- err:
-			default:
-			}
-		}()
-		select {
-		case err := <-ch:
-			return err
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	})
-
-	errGroup.Go(func() error {
-		ch := make(chan error)
-		go func() {
-			err := m.muxMetricsUpdater.run(m.config.Log)
-			// don't block if parent goroutine quit early
-			select {
-			case ch <- err:
-			default:
-			}
-		}()
-		select {
-		case err := <-ch:
-			return err
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	})
-
-	err := errGroup.Wait()
-	if isUnexpectedTunnelError(err, m.explicitShutdown.Value()) {
-		return err
-	}
-	return nil
-}
-
-// Shutdown is called to initiate the "happy path" of muxer termination.
-// It blocks new streams from being created.
-// It returns a channel that is closed when the last stream has been closed.
-func (m *Muxer) Shutdown() <-chan struct{} {
-	m.explicitShutdown.Fuse(true)
-	return m.muxReader.Shutdown()
-}
-
-// IsUnexpectedTunnelError identifies errors that are expected when shutting down the h2mux tunnel.
-// The set of expected errors change depending on whether we initiated shutdown or not.
-func isUnexpectedTunnelError(err error, expectedShutdown bool) bool {
-	if err == nil {
-		return false
-	}
-	if !expectedShutdown {
-		return true
-	}
-	return !isConnectionClosedError(err)
-}
-
-func isConnectionClosedError(err error) bool {
-	if err == io.EOF {
-		return true
-	}
-	if err == io.ErrClosedPipe {
-		return true
-	}
-	if err.Error() == "tls: use of closed connection" {
-		return true
-	}
-	if strings.HasSuffix(err.Error(), "use of closed network connection") {
-		return true
-	}
-	return false
-}
-
-// OpenStream opens a new data stream with the given headers.
-// Called by proxy server and tunnel
-func (m *Muxer) OpenStream(ctx context.Context, headers []Header, body io.Reader) (*MuxedStream, error) {
-	stream := m.NewStream(headers)
-	if err := m.MakeMuxedStreamRequest(ctx, NewMuxedStreamRequest(stream, body)); err != nil {
-		return nil, err
-	}
-	if err := m.AwaitResponseHeaders(ctx, stream); err != nil {
-		return nil, err
-	}
-	return stream, nil
-}
-
-func (m *Muxer) OpenRPCStream(ctx context.Context) (*MuxedStream, error) {
-	stream := m.NewStream(RPCHeaders())
-	if err := m.MakeMuxedStreamRequest(ctx, NewMuxedStreamRequest(stream, nil)); err != nil {
-		stream.Close()
-		return nil, err
-	}
-	if err := m.AwaitResponseHeaders(ctx, stream); err != nil {
-		stream.Close()
-		return nil, err
-	}
-	if !IsRPCStreamResponse(stream) {
-		stream.Close()
-		return nil, ErrNotRPCStream
-	}
-	return stream, nil
-}
-
-func (m *Muxer) NewStream(headers []Header) *MuxedStream {
-	return NewStream(m.config, headers, m.readyList, m.muxReader.dictionaries)
-}
-
-func (m *Muxer) MakeMuxedStreamRequest(ctx context.Context, request MuxedStreamRequest) error {
-	select {
-	case <-ctx.Done():
-		return ErrStreamRequestTimeout
-	case <-m.abortChan:
-		return ErrStreamRequestConnectionClosed
-	// Will be received by mux writer
-	case m.newStreamChan <- request:
-		return nil
-	}
-}
-
-func (m *Muxer) CloseStreamRead(stream *MuxedStream) {
-	stream.CloseRead()
-	if stream.WriteClosed() {
-		m.streams.Delete(stream.streamID)
-	}
-}
-
-func (m *Muxer) AwaitResponseHeaders(ctx context.Context, stream *MuxedStream) error {
-	select {
-	case <-ctx.Done():
-		return ErrResponseHeadersTimeout
-	case <-m.abortChan:
-		return ErrResponseHeadersConnectionClosed
-	case <-stream.responseHeadersReceived:
-		return nil
-	}
-}
-
-func (m *Muxer) Metrics() *MuxerMetrics {
-	return m.muxMetricsUpdater.metrics()
-}
-
-func (m *Muxer) abort() {
-	m.abortOnce.Do(func() {
-		close(m.abortChan)
-		m.readyList.Close()
-		m.streams.Abort()
-	})
-}
-
-// Return how many retries/ticks since the connection was last marked active
-func (m *Muxer) TimerRetries() uint64 {
-	return m.muxWriter.idleTimer.RetryCount()
-}
-
-func IsRPCStreamResponse(stream *MuxedStream) bool {
-	headers := stream.Headers
-	return len(headers) == 1 &&
-		headers[0].Name == ":status" &&
-		headers[0].Value == "200"
-}

h2mux/h2mux_test.go

@@ -1,909 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"math/rand"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
-	"github.com/stretchr/testify/assert"
-	"golang.org/x/sync/errgroup"
-)
-
-const (
-	testOpenStreamTimeout = time.Millisecond * 5000
-	testHandshakeTimeout  = time.Millisecond * 1000
-)
-
-var log = zerolog.Nop()
-
-func TestMain(m *testing.M) {
-	if os.Getenv("VERBOSE") == "1" {
-		//TODO: set log level
-	}
-	os.Exit(m.Run())
-}
-
-type DefaultMuxerPair struct {
-	OriginMuxConfig MuxerConfig
-	OriginMux       *Muxer
-	OriginConn      net.Conn
-	EdgeMuxConfig   MuxerConfig
-	EdgeMux         *Muxer
-	EdgeConn        net.Conn
-	doneC           chan struct{}
-}
-
-func NewDefaultMuxerPair(t assert.TestingT, testName string, f MuxedStreamFunc) *DefaultMuxerPair {
-	origin, edge := net.Pipe()
-	p := &DefaultMuxerPair{
-		OriginMuxConfig: MuxerConfig{
-			Timeout:                 testHandshakeTimeout,
-			Handler:                 f,
-			IsClient:                true,
-			Name:                    "origin",
-			Log:                     &log,
-			DefaultWindowSize:       (1 << 8) - 1,
-			MaxWindowSize:           (1 << 15) - 1,
-			StreamWriteBufferMaxLen: 1024,
-			HeartbeatInterval:       defaultTimeout,
-			MaxHeartbeats:           defaultRetries,
-		},
-		OriginConn: origin,
-		EdgeMuxConfig: MuxerConfig{
-			Timeout:                 testHandshakeTimeout,
-			IsClient:                false,
-			Name:                    "edge",
-			Log:                     &log,
-			DefaultWindowSize:       (1 << 8) - 1,
-			MaxWindowSize:           (1 << 15) - 1,
-			StreamWriteBufferMaxLen: 1024,
-			HeartbeatInterval:       defaultTimeout,
-			MaxHeartbeats:           defaultRetries,
-		},
-		EdgeConn: edge,
-		doneC:    make(chan struct{}),
-	}
-	assert.NoError(t, p.Handshake(testName))
-	return p
-}
-
-func NewCompressedMuxerPair(t assert.TestingT, testName string, quality CompressionSetting, f MuxedStreamFunc) *DefaultMuxerPair {
-	origin, edge := net.Pipe()
-	p := &DefaultMuxerPair{
-		OriginMuxConfig: MuxerConfig{
-			Timeout:            time.Second,
-			Handler:            f,
-			IsClient:           true,
-			Name:               "origin",
-			CompressionQuality: quality,
-			Log:                &log,
-			HeartbeatInterval:  defaultTimeout,
-			MaxHeartbeats:      defaultRetries,
-		},
-		OriginConn: origin,
-		EdgeMuxConfig: MuxerConfig{
-			Timeout:            time.Second,
-			IsClient:           false,
-			Name:               "edge",
-			CompressionQuality: quality,
-			Log:                &log,
-			HeartbeatInterval:  defaultTimeout,
-			MaxHeartbeats:      defaultRetries,
-		},
-		EdgeConn: edge,
-		doneC:    make(chan struct{}),
-	}
-	assert.NoError(t, p.Handshake(testName))
-	return p
-}
-
-func (p *DefaultMuxerPair) Handshake(testName string) error {
-	ctx, cancel := context.WithTimeout(context.Background(), testHandshakeTimeout)
-	defer cancel()
-	errGroup, _ := errgroup.WithContext(ctx)
-	errGroup.Go(func() (err error) {
-		p.EdgeMux, err = Handshake(p.EdgeConn, p.EdgeConn, p.EdgeMuxConfig, ActiveStreams)
-		return errors.Wrap(err, "edge handshake failure")
-	})
-	errGroup.Go(func() (err error) {
-		p.OriginMux, err = Handshake(p.OriginConn, p.OriginConn, p.OriginMuxConfig, ActiveStreams)
-		return errors.Wrap(err, "origin handshake failure")
-	})
-
-	return errGroup.Wait()
-}
-
-func (p *DefaultMuxerPair) Serve(t assert.TestingT) {
-	ctx := context.Background()
-	var wg sync.WaitGroup
-	wg.Add(2)
-	go func() {
-		err := p.EdgeMux.Serve(ctx)
-		if err != nil && err != io.EOF && err != io.ErrClosedPipe {
-			t.Errorf("error in edge muxer Serve(): %s", err)
-		}
-		p.OriginMux.Shutdown()
-		wg.Done()
-	}()
-	go func() {
-		err := p.OriginMux.Serve(ctx)
-		if err != nil && err != io.EOF && err != io.ErrClosedPipe {
-			t.Errorf("error in origin muxer Serve(): %s", err)
-		}
-		p.EdgeMux.Shutdown()
-		wg.Done()
-	}()
-	go func() {
-		// notify when both muxes have stopped serving
-		wg.Wait()
-		close(p.doneC)
-	}()
-}
-
-func (p *DefaultMuxerPair) Wait(t *testing.T) {
-	select {
-	case <-p.doneC:
-		return
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout waiting for shutdown")
-	}
-}
-
-func (p *DefaultMuxerPair) OpenEdgeMuxStream(headers []Header, body io.Reader) (*MuxedStream, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), testOpenStreamTimeout)
-	defer cancel()
-	return p.EdgeMux.OpenStream(ctx, headers, body)
-}
-
-func TestHandshake(t *testing.T) {
-	f := func(stream *MuxedStream) error {
-		return nil
-	}
-	muxPair := NewDefaultMuxerPair(t, t.Name(), f)
-	AssertIfPipeReadable(t, muxPair.OriginConn)
-	AssertIfPipeReadable(t, muxPair.EdgeConn)
-}
-
-func TestSingleStream(t *testing.T) {
-	f := MuxedStreamFunc(func(stream *MuxedStream) error {
-		if len(stream.Headers) != 1 {
-			t.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-		}
-		if stream.Headers[0].Name != "test-header" {
-			t.Fatalf("expected header name %s, got %s", "test-header", stream.Headers[0].Name)
-		}
-		if stream.Headers[0].Value != "headerValue" {
-			t.Fatalf("expected header value %s, got %s", "headerValue", stream.Headers[0].Value)
-		}
-		_ = stream.WriteHeaders([]Header{
-			{Name: "response-header", Value: "responseValue"},
-		})
-		buf := []byte("Hello world")
-		_, _ = stream.Write(buf)
-		n, err := io.ReadFull(stream, buf)
-		if n > 0 {
-			t.Fatalf("read %d bytes after EOF", n)
-		}
-		if err != io.EOF {
-			t.Fatalf("expected EOF, got %s", err)
-		}
-		return nil
-	})
-	muxPair := NewDefaultMuxerPair(t, t.Name(), f)
-	muxPair.Serve(t)
-
-	stream, err := muxPair.OpenEdgeMuxStream(
-		[]Header{{Name: "test-header", Value: "headerValue"}},
-		nil,
-	)
-	if err != nil {
-		t.Fatalf("error in OpenStream: %s", err)
-	}
-	if len(stream.Headers) != 1 {
-		t.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-	}
-	if stream.Headers[0].Name != "response-header" {
-		t.Fatalf("expected header name %s, got %s", "response-header", stream.Headers[0].Name)
-	}
-	if stream.Headers[0].Value != "responseValue" {
-		t.Fatalf("expected header value %s, got %s", "responseValue", stream.Headers[0].Value)
-	}
-	responseBody := make([]byte, 11)
-	n, err := io.ReadFull(stream, responseBody)
-	if err != nil {
-		t.Fatalf("error from (*MuxedStream).Read: %s", err)
-	}
-	if n != len(responseBody) {
-		t.Fatalf("expected response body to have %d bytes, got %d", len(responseBody), n)
-	}
-	if string(responseBody) != "Hello world" {
-		t.Fatalf("expected response body %s, got %s", "Hello world", responseBody)
-	}
-	_ = stream.Close()
-	n, err = stream.Write([]byte("aaaaa"))
-	if n > 0 {
-		t.Fatalf("wrote %d bytes after EOF", n)
-	}
-	if err != io.EOF {
-		t.Fatalf("expected EOF, got %s", err)
-	}
-}
-
-func TestSingleStreamLargeResponseBody(t *testing.T) {
-	bodySize := 1 << 24
-	f := MuxedStreamFunc(func(stream *MuxedStream) error {
-		if len(stream.Headers) != 1 {
-			t.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-		}
-		if stream.Headers[0].Name != "test-header" {
-			t.Fatalf("expected header name %s, got %s", "test-header", stream.Headers[0].Name)
-		}
-		if stream.Headers[0].Value != "headerValue" {
-			t.Fatalf("expected header value %s, got %s", "headerValue", stream.Headers[0].Value)
-		}
-		_ = stream.WriteHeaders([]Header{
-			{Name: "response-header", Value: "responseValue"},
-		})
-		payload := make([]byte, bodySize)
-		for i := range payload {
-			payload[i] = byte(i % 256)
-		}
-		t.Log("Writing payload...")
-		n, err := stream.Write(payload)
-		t.Logf("Wrote %d bytes into the stream", n)
-		if err != nil {
-			t.Fatalf("origin write error: %s", err)
-		}
-		if n != len(payload) {
-			t.Fatalf("origin short write: %d/%d bytes", n, len(payload))
-		}
-
-		return nil
-	})
-	muxPair := NewDefaultMuxerPair(t, t.Name(), f)
-	muxPair.Serve(t)
-
-	stream, err := muxPair.OpenEdgeMuxStream(
-		[]Header{{Name: "test-header", Value: "headerValue"}},
-		nil,
-	)
-	if err != nil {
-		t.Fatalf("error in OpenStream: %s", err)
-	}
-	if len(stream.Headers) != 1 {
-		t.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-	}
-	if stream.Headers[0].Name != "response-header" {
-		t.Fatalf("expected header name %s, got %s", "response-header", stream.Headers[0].Name)
-	}
-	if stream.Headers[0].Value != "responseValue" {
-		t.Fatalf("expected header value %s, got %s", "responseValue", stream.Headers[0].Value)
-	}
-	responseBody := make([]byte, bodySize)
-
-	n, err := io.ReadFull(stream, responseBody)
-	if err != nil {
-		t.Fatalf("error from (*MuxedStream).Read: %s", err)
-	}
-	if n != len(responseBody) {
-		t.Fatalf("expected response body to have %d bytes, got %d", len(responseBody), n)
-	}
-}
-
-func TestMultipleStreams(t *testing.T) {
-	f := MuxedStreamFunc(func(stream *MuxedStream) error {
-		if len(stream.Headers) != 1 {
-			t.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-		}
-		if stream.Headers[0].Name != "client-token" {
-			t.Fatalf("expected header name %s, got %s", "client-token", stream.Headers[0].Name)
-		}
-		log.Debug().Msgf("Got request for stream %s", stream.Headers[0].Value)
-		_ = stream.WriteHeaders([]Header{
-			{Name: "response-token", Value: stream.Headers[0].Value},
-		})
-		log.Debug().Msgf("Wrote headers for stream %s", stream.Headers[0].Value)
-		_, _ = stream.Write([]byte("OK"))
-		log.Debug().Msgf("Wrote body for stream %s", stream.Headers[0].Value)
-		return nil
-	})
-	muxPair := NewDefaultMuxerPair(t, t.Name(), f)
-	muxPair.Serve(t)
-
-	maxStreams := 64
-	errorsC := make(chan error, maxStreams)
-	var wg sync.WaitGroup
-	wg.Add(maxStreams)
-	for i := 0; i < maxStreams; i++ {
-		go func(tokenId int) {
-			defer wg.Done()
-			tokenString := fmt.Sprintf("%d", tokenId)
-			stream, err := muxPair.OpenEdgeMuxStream(
-				[]Header{{Name: "client-token", Value: tokenString}},
-				nil,
-			)
-			log.Debug().Msgf("Got headers for stream %d", tokenId)
-			if err != nil {
-				errorsC <- err
-				return
-			}
-			if len(stream.Headers) != 1 {
-				errorsC <- fmt.Errorf("stream %d has error: expected %d headers, got %d", stream.streamID, 1, len(stream.Headers))
-				return
-			}
-			if stream.Headers[0].Name != "response-token" {
-				errorsC <- fmt.Errorf("stream %d has error: expected header name %s, got %s", stream.streamID, "response-token", stream.Headers[0].Name)
-				return
-			}
-			if stream.Headers[0].Value != tokenString {
-				errorsC <- fmt.Errorf("stream %d has error: expected header value %s, got %s", stream.streamID, tokenString, stream.Headers[0].Value)
-				return
-			}
-			responseBody := make([]byte, 2)
-			n, err := io.ReadFull(stream, responseBody)
-			if err != nil {
-				errorsC <- fmt.Errorf("stream %d has error: error from (*MuxedStream).Read: %s", stream.streamID, err)
-				return
-			}
-			if n != len(responseBody) {
-				errorsC <- fmt.Errorf("stream %d has error: expected response body to have %d bytes, got %d", stream.streamID, len(responseBody), n)
-				return
-			}
-			if string(responseBody) != "OK" {
-				errorsC <- fmt.Errorf("stream %d has error: expected response body %s, got %s", stream.streamID, "OK", responseBody)
-				return
-			}
-		}(i)
-	}
-	wg.Wait()
-	close(errorsC)
-	testFail := false
-	for err := range errorsC {
-		testFail = true
-		log.Error().Msgf("%s", err)
-	}
-	if testFail {
-		t.Fatalf("TestMultipleStreams failed")
-	}
-}
-
-func TestMultipleStreamsFlowControl(t *testing.T) {
-	maxStreams := 32
-	responseSizes := make([]int32, maxStreams)
-	for i := 0; i < maxStreams; i++ {
-		responseSizes[i] = rand.Int31n(int32(defaultWindowSize << 4))
-	}
-
-	f := MuxedStreamFunc(func(stream *MuxedStream) error {
-		if len(stream.Headers) != 1 {
-			t.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-		}
-		if stream.Headers[0].Name != "test-header" {
-			t.Fatalf("expected header name %s, got %s", "test-header", stream.Headers[0].Name)
-		}
-		if stream.Headers[0].Value != "headerValue" {
-			t.Fatalf("expected header value %s, got %s", "headerValue", stream.Headers[0].Value)
-		}
-		_ = stream.WriteHeaders([]Header{
-			{Name: "response-header", Value: "responseValue"},
-		})
-		payload := make([]byte, responseSizes[(stream.streamID-2)/2])
-		for i := range payload {
-			payload[i] = byte(i % 256)
-		}
-		n, err := stream.Write(payload)
-		if err != nil {
-			t.Fatalf("origin write error: %s", err)
-		}
-		if n != len(payload) {
-			t.Fatalf("origin short write: %d/%d bytes", n, len(payload))
-		}
-		return nil
-	})
-	muxPair := NewDefaultMuxerPair(t, t.Name(), f)
-	muxPair.Serve(t)
-
-	errGroup, _ := errgroup.WithContext(context.Background())
-	for i := 0; i < maxStreams; i++ {
-		errGroup.Go(func() error {
-			stream, err := muxPair.OpenEdgeMuxStream(
-				[]Header{{Name: "test-header", Value: "headerValue"}},
-				nil,
-			)
-			if err != nil {
-				return fmt.Errorf("error in OpenStream: %d %s", stream.streamID, err)
-			}
-			if len(stream.Headers) != 1 {
-				return fmt.Errorf("stream %d expected %d headers, got %d", stream.streamID, 1, len(stream.Headers))
-			}
-			if stream.Headers[0].Name != "response-header" {
-				return fmt.Errorf("stream %d expected header name %s, got %s", stream.streamID, "response-header", stream.Headers[0].Name)
-			}
-			if stream.Headers[0].Value != "responseValue" {
-				return fmt.Errorf("stream %d expected header value %s, got %s", stream.streamID, "responseValue", stream.Headers[0].Value)
-			}
-
-			responseBody := make([]byte, responseSizes[(stream.streamID-2)/2])
-			n, err := io.ReadFull(stream, responseBody)
-			if err != nil {
-				return fmt.Errorf("stream %d error from (*MuxedStream).Read: %s", stream.streamID, err)
-			}
-			if n != len(responseBody) {
-				return fmt.Errorf("stream %d expected response body to have %d bytes, got %d", stream.streamID, len(responseBody), n)
-			}
-			return nil
-		})
-	}
-	assert.NoError(t, errGroup.Wait())
-}
-
-func TestGracefulShutdown(t *testing.T) {
-	sendC := make(chan struct{})
-	responseBuf := bytes.Repeat([]byte("Hello world"), 65536)
-
-	f := MuxedStreamFunc(func(stream *MuxedStream) error {
-		_ = stream.WriteHeaders([]Header{
-			{Name: "response-header", Value: "responseValue"},
-		})
-		<-sendC
-		log.Debug().Msgf("Writing %d bytes", len(responseBuf))
-		_, _ = stream.Write(responseBuf)
-		_ = stream.CloseWrite()
-		log.Debug().Msgf("Wrote %d bytes", len(responseBuf))
-		// Reading from the stream will block until the edge closes its end of the stream.
-		// Otherwise, we'll close the whole connection before receiving the 'stream closed'
-		// message from the edge.
-		// Graceful shutdown works if you omit this, it just gives spurious errors for now -
-		// TODO ignore errors when writing 'stream closed' and we're shutting down.
-		_, _ = stream.Read([]byte{0})
-		log.Debug().Msgf("Handler ends")
-		return nil
-	})
-	muxPair := NewDefaultMuxerPair(t, t.Name(), f)
-	muxPair.Serve(t)
-
-	stream, err := muxPair.OpenEdgeMuxStream(
-		[]Header{{Name: "test-header", Value: "headerValue"}},
-		nil,
-	)
-	if err != nil {
-		t.Fatalf("error in OpenStream: %s", err)
-	}
-	// Start graceful shutdown of the edge mux - this should also close the origin mux when done
-	muxPair.EdgeMux.Shutdown()
-	close(sendC)
-	responseBody := make([]byte, len(responseBuf))
-	log.Debug().Msgf("Waiting for %d bytes", len(responseBuf))
-	n, err := io.ReadFull(stream, responseBody)
-	if err != nil {
-		t.Fatalf("error from (*MuxedStream).Read with %d bytes read: %s", n, err)
-	}
-	if n != len(responseBody) {
-		t.Fatalf("expected response body to have %d bytes, got %d", len(responseBody), n)
-	}
-	if !bytes.Equal(responseBuf, responseBody) {
-		t.Fatalf("response body mismatch")
-	}
-	_ = stream.Close()
-	muxPair.Wait(t)
-}
-
-func TestUnexpectedShutdown(t *testing.T) {
-	sendC := make(chan struct{})
-	handlerFinishC := make(chan struct{})
-	responseBuf := bytes.Repeat([]byte("Hello world"), 65536)
-
-	f := MuxedStreamFunc(func(stream *MuxedStream) error {
-		defer close(handlerFinishC)
-		_ = stream.WriteHeaders([]Header{
-			{Name: "response-header", Value: "responseValue"},
-		})
-		<-sendC
-		n, err := stream.Read([]byte{0})
-		if err != io.EOF {
-			t.Fatalf("unexpected error from (*MuxedStream).Read: %s", err)
-		}
-		if n != 0 {
-			t.Fatalf("expected empty read, got %d bytes", n)
-		}
-		// Write comes after read, because write buffers data before it is flushed. It wouldn't know about EOF
-		// until some time later. Calling read first forces it to know about EOF now.
-		_, err = stream.Write(responseBuf)
-		if err != io.EOF {
-			t.Fatalf("unexpected error from (*MuxedStream).Write: %s", err)
-		}
-		return nil
-	})
-	muxPair := NewDefaultMuxerPair(t, t.Name(), f)
-	muxPair.Serve(t)
-
-	stream, err := muxPair.OpenEdgeMuxStream(
-		[]Header{{Name: "test-header", Value: "headerValue"}},
-		nil,
-	)
-	// Close the underlying connection before telling the origin to write.
-	_ = muxPair.EdgeConn.Close()
-	close(sendC)
-	if err != nil {
-		t.Fatalf("error in OpenStream: %s", err)
-	}
-	responseBody := make([]byte, len(responseBuf))
-	n, err := io.ReadFull(stream, responseBody)
-	if err != io.EOF {
-		t.Fatalf("unexpected error from (*MuxedStream).Read: %s", err)
-	}
-	if n != 0 {
-		t.Fatalf("expected response body to have %d bytes, got %d", 0, n)
-	}
-	// The write ordering requirement explained in the origin handler applies here too.
-	_, err = stream.Write(responseBuf)
-	if err != io.EOF {
-		t.Fatalf("unexpected error from (*MuxedStream).Write: %s", err)
-	}
-	<-handlerFinishC
-}
-
-func EchoHandler(stream *MuxedStream) error {
-	var buf bytes.Buffer
-	_, _ = fmt.Fprintf(&buf, "Hello, world!\n\n# REQUEST HEADERS:\n\n")
-	for _, header := range stream.Headers {
-		_, _ = fmt.Fprintf(&buf, "[%s] = %s\n", header.Name, header.Value)
-	}
-	_ = stream.WriteHeaders([]Header{
-		{Name: ":status", Value: "200"},
-		{Name: "server", Value: "Echo-server/1.0"},
-		{Name: "date", Value: time.Now().Format(time.RFC850)},
-		{Name: "content-type", Value: "text/html; charset=utf-8"},
-		{Name: "content-length", Value: strconv.Itoa(buf.Len())},
-	})
-	_, _ = buf.WriteTo(stream)
-	return nil
-}
-
-func TestOpenAfterDisconnect(t *testing.T) {
-	for i := 0; i < 3; i++ {
-		muxPair := NewDefaultMuxerPair(t, fmt.Sprintf("%s_%d", t.Name(), i), EchoHandler)
-		muxPair.Serve(t)
-
-		switch i {
-		case 0:
-			// Close both directions of the connection to cause EOF on both peers.
-			_ = muxPair.OriginConn.Close()
-			_ = muxPair.EdgeConn.Close()
-		case 1:
-			// Close origin conn to cause EOF on origin first.
-			_ = muxPair.OriginConn.Close()
-		case 2:
-			// Close edge conn to cause EOF on edge first.
-			_ = muxPair.EdgeConn.Close()
-		}
-
-		_, err := muxPair.OpenEdgeMuxStream(
-			[]Header{{Name: "test-header", Value: "headerValue"}},
-			nil,
-		)
-		if err != ErrStreamRequestConnectionClosed && err != ErrResponseHeadersConnectionClosed {
-			t.Fatalf("case %v: unexpected error in OpenStream: %v", i, err)
-		}
-	}
-}
-
-func TestHPACK(t *testing.T) {
-	muxPair := NewDefaultMuxerPair(t, t.Name(), EchoHandler)
-	muxPair.Serve(t)
-
-	stream, err := muxPair.OpenEdgeMuxStream(
-		[]Header{
-			{Name: ":method", Value: "RPC"},
-			{Name: ":scheme", Value: "capnp"},
-			{Name: ":path", Value: "*"},
-		},
-		nil,
-	)
-	if err != nil {
-		t.Fatalf("error in OpenStream: %s", err)
-	}
-	_ = stream.Close()
-
-	for i := 0; i < 3; i++ {
-		stream, err := muxPair.OpenEdgeMuxStream(
-			[]Header{
-				{Name: ":method", Value: "GET"},
-				{Name: ":scheme", Value: "https"},
-				{Name: ":authority", Value: "tunnel.otterlyadorable.co.uk"},
-				{Name: ":path", Value: "/get"},
-				{Name: "accept-encoding", Value: "gzip"},
-				{Name: "cf-ray", Value: "378948953f044408-SFO-DOG"},
-				{Name: "cf-visitor", Value: "{\"scheme\":\"https\"}"},
-				{Name: "cf-connecting-ip", Value: "2400:cb00:0025:010d:0000:0000:0000:0001"},
-				{Name: "x-forwarded-for", Value: "2400:cb00:0025:010d:0000:0000:0000:0001"},
-				{Name: "x-forwarded-proto", Value: "https"},
-				{Name: "accept-language", Value: "en-gb"},
-				{Name: "referer", Value: "https://tunnel.otterlyadorable.co.uk/"},
-				{Name: "cookie", Value: "__cfduid=d4555095065f92daedc059490771967d81493032162"},
-				{Name: "connection", Value: "Keep-Alive"},
-				{Name: "cf-ipcountry", Value: "US"},
-				{Name: "accept", Value: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"},
-				{Name: "user-agent", Value: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4"},
-			},
-			nil,
-		)
-		if err != nil {
-			t.Fatalf("error in OpenStream: %s", err)
-		}
-		if len(stream.Headers) == 0 {
-			t.Fatal("response has no headers")
-		}
-		if stream.Headers[0].Name != ":status" {
-			t.Fatalf("first header should be status, found %s instead", stream.Headers[0].Name)
-		}
-		if stream.Headers[0].Value != "200" {
-			t.Fatalf("expected status 200, got %s", stream.Headers[0].Value)
-		}
-		_, _ = io.ReadAll(stream)
-		_ = stream.Close()
-	}
-}
-
-func AssertIfPipeReadable(t *testing.T, pipe io.ReadCloser) {
-	errC := make(chan error)
-	go func() {
-		b := []byte{0}
-		n, err := pipe.Read(b)
-		if n > 0 {
-			t.Errorf("read pipe was not empty")
-			return
-		}
-		errC <- err
-	}()
-	select {
-	case err := <-errC:
-		if err != nil {
-			t.Fatalf("read error: %s", err)
-		}
-	case <-time.After(100 * time.Millisecond):
-		// nothing to read
-	}
-}
-
-func sampleSiteHandler(files map[string][]byte) MuxedStreamFunc {
-	return func(stream *MuxedStream) error {
-		var contentType string
-		var pathHeader Header
-
-		for _, h := range stream.Headers {
-			if h.Name == ":path" {
-				pathHeader = h
-				break
-			}
-		}
-
-		if pathHeader.Name != ":path" {
-			return fmt.Errorf("Couldn't find :path header in test")
-		}
-
-		if strings.Contains(pathHeader.Value, "html") {
-			contentType = "text/html; charset=utf-8"
-		} else if strings.Contains(pathHeader.Value, "js") {
-			contentType = "application/javascript"
-		} else if strings.Contains(pathHeader.Value, "css") {
-			contentType = "text/css"
-		} else {
-			contentType = "img/gif"
-		}
-		_ = stream.WriteHeaders([]Header{
-			{Name: "content-type", Value: contentType},
-		})
-		log.Debug().Msgf("Wrote headers for stream %s", pathHeader.Value)
-		file, ok := files[pathHeader.Value]
-		if !ok {
-			return fmt.Errorf("%s content is not preloaded", pathHeader.Value)
-		}
-		_, _ = stream.Write(file)
-		log.Debug().Msgf("Wrote body for stream %s", pathHeader.Value)
-		return nil
-	}
-}
-
-func sampleSiteTest(muxPair *DefaultMuxerPair, path string, files map[string][]byte) error {
-	stream, err := muxPair.OpenEdgeMuxStream(
-		[]Header{
-			{Name: ":method", Value: "GET"},
-			{Name: ":scheme", Value: "https"},
-			{Name: ":authority", Value: "tunnel.otterlyadorable.co.uk"},
-			{Name: ":path", Value: path},
-			{Name: "accept-encoding", Value: "br, gzip"},
-			{Name: "cf-ray", Value: "378948953f044408-SFO-DOG"},
-		},
-		nil,
-	)
-	if err != nil {
-		return fmt.Errorf("error in OpenStream: %v", err)
-	}
-	file, ok := files[path]
-	if !ok {
-		return fmt.Errorf("%s content is not preloaded", path)
-	}
-	responseBody := make([]byte, len(file))
-	n, err := io.ReadFull(stream, responseBody)
-	if err != nil {
-		return fmt.Errorf("error from (*MuxedStream).Read: %v", err)
-	}
-	if n != len(file) {
-		return fmt.Errorf("expected response body to have %d bytes, got %d", len(file), n)
-	}
-	if string(responseBody[:n]) != string(file) {
-		return fmt.Errorf("expected response body %s, got %s", file, responseBody[:n])
-	}
-	return nil
-}
-
-func loadSampleFiles(paths []string) (map[string][]byte, error) {
-	files := make(map[string][]byte)
-	for _, path := range paths {
-		if _, ok := files[path]; !ok {
-			expectBody, err := os.ReadFile(path)
-			if err != nil {
-				return nil, err
-			}
-			files[path] = expectBody
-		}
-	}
-	return files, nil
-}
-
-func BenchmarkOpenStream(b *testing.B) {
-	const streams = 5000
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		f := MuxedStreamFunc(func(stream *MuxedStream) error {
-			if len(stream.Headers) != 1 {
-				b.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-			}
-			if stream.Headers[0].Name != "test-header" {
-				b.Fatalf("expected header name %s, got %s", "test-header", stream.Headers[0].Name)
-			}
-			if stream.Headers[0].Value != "headerValue" {
-				b.Fatalf("expected header value %s, got %s", "headerValue", stream.Headers[0].Value)
-			}
-			_ = stream.WriteHeaders([]Header{
-				{Name: "response-header", Value: "responseValue"},
-			})
-			return nil
-		})
-		muxPair := NewDefaultMuxerPair(b, fmt.Sprintf("%s_%d", b.Name(), i), f)
-		muxPair.Serve(b)
-		b.StartTimer()
-		openStreams(b, muxPair, streams)
-	}
-}
-
-func openStreams(b *testing.B, muxPair *DefaultMuxerPair, n int) {
-	errGroup, _ := errgroup.WithContext(context.Background())
-	for i := 0; i < n; i++ {
-		errGroup.Go(func() error {
-			_, err := muxPair.OpenEdgeMuxStream(
-				[]Header{{Name: "test-header", Value: "headerValue"}},
-				nil,
-			)
-			return err
-		})
-	}
-	assert.NoError(b, errGroup.Wait())
-}
-
-func BenchmarkSingleStreamLargeResponseBody(b *testing.B) {
-	const bodySize = 1 << 24
-
-	const writeBufferSize = 16 << 10
-	const writeN = bodySize / writeBufferSize
-	payload := make([]byte, writeBufferSize)
-	for i := range payload {
-		payload[i] = byte(i % 256)
-	}
-
-	const readBufferSize = 16 << 10
-	const readN = bodySize / readBufferSize
-	responseBody := make([]byte, readBufferSize)
-
-	f := MuxedStreamFunc(func(stream *MuxedStream) error {
-		if len(stream.Headers) != 1 {
-			b.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-		}
-		if stream.Headers[0].Name != "test-header" {
-			b.Fatalf("expected header name %s, got %s", "test-header", stream.Headers[0].Name)
-		}
-		if stream.Headers[0].Value != "headerValue" {
-			b.Fatalf("expected header value %s, got %s", "headerValue", stream.Headers[0].Value)
-		}
-		_ = stream.WriteHeaders([]Header{
-			{Name: "response-header", Value: "responseValue"},
-		})
-		for i := 0; i < writeN; i++ {
-			n, err := stream.Write(payload)
-			if err != nil {
-				b.Fatalf("origin write error: %s", err)
-			}
-			if n != len(payload) {
-				b.Fatalf("origin short write: %d/%d bytes", n, len(payload))
-			}
-		}
-
-		return nil
-	})
-
-	name := fmt.Sprintf("%s_%d", b.Name(), rand.Int())
-	origin, edge := net.Pipe()
-
-	muxPair := &DefaultMuxerPair{
-		OriginMuxConfig: MuxerConfig{
-			Timeout:                 testHandshakeTimeout,
-			Handler:                 f,
-			IsClient:                true,
-			Name:                    "origin",
-			Log:                     &log,
-			DefaultWindowSize:       defaultWindowSize,
-			MaxWindowSize:           maxWindowSize,
-			StreamWriteBufferMaxLen: defaultWriteBufferMaxLen,
-			HeartbeatInterval:       defaultTimeout,
-			MaxHeartbeats:           defaultRetries,
-		},
-		OriginConn: origin,
-		EdgeMuxConfig: MuxerConfig{
-			Timeout:                 testHandshakeTimeout,
-			IsClient:                false,
-			Name:                    "edge",
-			Log:                     &log,
-			DefaultWindowSize:       defaultWindowSize,
-			MaxWindowSize:           maxWindowSize,
-			StreamWriteBufferMaxLen: defaultWriteBufferMaxLen,
-			HeartbeatInterval:       defaultTimeout,
-			MaxHeartbeats:           defaultRetries,
-		},
-		EdgeConn: edge,
-		doneC:    make(chan struct{}),
-	}
-	assert.NoError(b, muxPair.Handshake(name))
-	muxPair.Serve(b)
-
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		stream, err := muxPair.OpenEdgeMuxStream(
-			[]Header{{Name: "test-header", Value: "headerValue"}},
-			nil,
-		)
-		if err != nil {
-			b.Fatalf("error in OpenStream: %s", err)
-		}
-		if len(stream.Headers) != 1 {
-			b.Fatalf("expected %d headers, got %d", 1, len(stream.Headers))
-		}
-		if stream.Headers[0].Name != "response-header" {
-			b.Fatalf("expected header name %s, got %s", "response-header", stream.Headers[0].Name)
-		}
-		if stream.Headers[0].Value != "responseValue" {
-			b.Fatalf("expected header value %s, got %s", "responseValue", stream.Headers[0].Value)
-		}
-
-		for k := 0; k < readN; k++ {
-			n, err := io.ReadFull(stream, responseBody)
-			if err != nil {
-				b.Fatalf("error from (*MuxedStream).Read: %s", err)
-			}
-			if n != len(responseBody) {
-				b.Fatalf("expected response body to have %d bytes, got %d", len(responseBody), n)
-			}
-		}
-	}
-}

h2mux/idletimer.go

@@ -1,81 +0,0 @@
-package h2mux
-
-import (
-	"math/rand"
-	"sync"
-	"time"
-)
-
-// IdleTimer is a type of Timer designed for managing heartbeats on an idle connection.
-// The timer ticks on an interval with added jitter to avoid accidental synchronisation
-// between two endpoints. It tracks the number of retries/ticks since the connection was
-// last marked active.
-//
-// The methods of IdleTimer must not be called while a goroutine is reading from C.
-type IdleTimer struct {
-	// The channel on which ticks are delivered.
-	C <-chan time.Time
-
-	// A timer used to measure idle connection time. Reset after sending data.
-	idleTimer *time.Timer
-	// The maximum length of time a connection is idle before sending a ping.
-	idleDuration time.Duration
-	// A pseudorandom source used to add jitter to the idle duration.
-	randomSource *rand.Rand
-	// The maximum number of retries allowed.
-	maxRetries uint64
-	// The number of retries since the connection was last marked active.
-	retries uint64
-	// A lock to prevent race condition while checking retries
-	stateLock sync.RWMutex
-}
-
-func NewIdleTimer(idleDuration time.Duration, maxRetries uint64) *IdleTimer {
-	t := &IdleTimer{
-		idleTimer:    time.NewTimer(idleDuration),
-		idleDuration: idleDuration,
-		randomSource: rand.New(rand.NewSource(time.Now().Unix())),
-		maxRetries:   maxRetries,
-	}
-	t.C = t.idleTimer.C
-	return t
-}
-
-// Retry should be called when retrying the idle timeout. If the maximum number of retries
-// has been met, returns false.
-// After calling this function and sending a heartbeat, call ResetTimer. Since sending the
-// heartbeat could be a blocking operation, we resetting the timer after the write completes
-// to avoid it expiring during the write.
-func (t *IdleTimer) Retry() bool {
-	t.stateLock.Lock()
-	defer t.stateLock.Unlock()
-	if t.retries >= t.maxRetries {
-		return false
-	}
-	t.retries++
-	return true
-}
-
-func (t *IdleTimer) RetryCount() uint64 {
-	t.stateLock.RLock()
-	defer t.stateLock.RUnlock()
-	return t.retries
-}
-
-// MarkActive resets the idle connection timer and suppresses any outstanding idle events.
-func (t *IdleTimer) MarkActive() {
-	if !t.idleTimer.Stop() {
-		// eat the timer event to prevent spurious pings
-		<-t.idleTimer.C
-	}
-	t.stateLock.Lock()
-	t.retries = 0
-	t.stateLock.Unlock()
-	t.ResetTimer()
-}
-
-// Reset the idle timer according to the configured duration, with some added jitter.
-func (t *IdleTimer) ResetTimer() {
-	jitter := time.Duration(t.randomSource.Int63n(int64(t.idleDuration)))
-	t.idleTimer.Reset(t.idleDuration + jitter)
-}

h2mux/idletimer_test.go

@@ -1,31 +0,0 @@
-package h2mux
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRetry(t *testing.T) {
-	timer := NewIdleTimer(time.Second, 2)
-	assert.Equal(t, uint64(0), timer.RetryCount())
-	ok := timer.Retry()
-	assert.True(t, ok)
-	assert.Equal(t, uint64(1), timer.RetryCount())
-	ok = timer.Retry()
-	assert.True(t, ok)
-	assert.Equal(t, uint64(2), timer.RetryCount())
-	ok = timer.Retry()
-	assert.False(t, ok)
-}
-
-func TestMarkActive(t *testing.T) {
-	timer := NewIdleTimer(time.Second, 2)
-	assert.Equal(t, uint64(0), timer.RetryCount())
-	ok := timer.Retry()
-	assert.True(t, ok)
-	assert.Equal(t, uint64(1), timer.RetryCount())
-	timer.MarkActive()
-	assert.Equal(t, uint64(0), timer.RetryCount())
-}

h2mux/muxedstream.go

@@ -1,457 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"io"
-	"sync"
-)
-
-type ReadWriteLengther interface {
-	io.ReadWriter
-	Reset()
-	Len() int
-}
-
-type ReadWriteClosedCloser interface {
-	io.ReadWriteCloser
-	Closed() bool
-}
-
-// MuxedStreamDataSignaller is a write-only *ReadyList
-type MuxedStreamDataSignaller interface {
-	// Non-blocking: call this when data is ready to be sent for the given stream ID.
-	Signal(ID uint32)
-}
-
-type Header struct {
-	Name, Value string
-}
-
-// MuxedStream is logically an HTTP/2 stream, with an additional buffer for outgoing data.
-type MuxedStream struct {
-	streamID uint32
-
-	// The "Receive" end of the stream
-	readBufferLock sync.RWMutex
-	readBuffer     ReadWriteClosedCloser
-	// This is the amount of bytes that are in our receive window
-	// (how much data we can receive into this stream).
-	receiveWindow uint32
-	// current receive window size limit. Exponentially increase it when it's exhausted
-	receiveWindowCurrentMax uint32
-	// hard limit set in http2 spec. 2^31-1
-	receiveWindowMax uint32
-	// The desired size increment for receiveWindow.
-	// If this is nonzero, a WINDOW_UPDATE frame needs to be sent.
-	windowUpdate uint32
-	// The headers that were most recently received.
-	// Particularly:
-	//     * for an eyeball-initiated stream (as passed to TunnelHandler::ServeStream),
-	//       these are the request headers
-	//     * for a cloudflared-initiated stream (as created by Register/UnregisterTunnel),
-	//       these are the response headers.
-	// They are useful in both of these contexts; hence `Headers` is public.
-	Headers []Header
-	// For use in the context of a cloudflared-initiated stream.
-	responseHeadersReceived chan struct{}
-
-	// The "Send" end of the stream
-	writeLock   sync.Mutex
-	writeBuffer ReadWriteLengther
-	// The maximum capacity that the send buffer should grow to.
-	writeBufferMaxLen int
-	// A channel to be notified when the send buffer is not full.
-	writeBufferHasSpace chan struct{}
-	// This is the amount of bytes that are in the peer's receive window
-	// (how much data we can send from this stream).
-	sendWindow uint32
-	// The muxer's readyList
-	readyList MuxedStreamDataSignaller
-	// The headers that should be sent, and a flag so we only send them once.
-	headersSent  bool
-	writeHeaders []Header
-
-	// EOF-related fields
-	// true if the write end of this stream has been closed
-	writeEOF bool
-	// true if we have sent EOF to the peer
-	sentEOF bool
-	// true if the peer sent us an EOF
-	receivedEOF bool
-	// Compression-related fields
-	receivedUseDict bool
-	method          string
-	contentType     string
-	path            string
-	dictionaries    h2Dictionaries
-}
-
-type TunnelHostname string
-
-func (th TunnelHostname) String() string {
-	return string(th)
-}
-
-func (th TunnelHostname) IsSet() bool {
-	return th != ""
-}
-
-func NewStream(config MuxerConfig, writeHeaders []Header, readyList MuxedStreamDataSignaller, dictionaries h2Dictionaries) *MuxedStream {
-	return &MuxedStream{
-		responseHeadersReceived: make(chan struct{}),
-		readBuffer:              NewSharedBuffer(),
-		writeBuffer:             &bytes.Buffer{},
-		writeBufferMaxLen:       config.StreamWriteBufferMaxLen,
-		writeBufferHasSpace:     make(chan struct{}, 1),
-		receiveWindow:           config.DefaultWindowSize,
-		receiveWindowCurrentMax: config.DefaultWindowSize,
-		receiveWindowMax:        config.MaxWindowSize,
-		sendWindow:              config.DefaultWindowSize,
-		readyList:               readyList,
-		writeHeaders:            writeHeaders,
-		dictionaries:            dictionaries,
-	}
-}
-
-func (s *MuxedStream) Read(p []byte) (n int, err error) {
-	var readBuffer ReadWriteClosedCloser
-	if s.dictionaries.read != nil {
-		s.readBufferLock.RLock()
-		readBuffer = s.readBuffer
-		s.readBufferLock.RUnlock()
-	} else {
-		readBuffer = s.readBuffer
-	}
-	n, err = readBuffer.Read(p)
-	s.replenishReceiveWindow(uint32(n))
-	return
-}
-
-// Blocks until len(p) bytes have been written to the buffer
-func (s *MuxedStream) Write(p []byte) (int, error) {
-	// If assignDictToStream returns success, then it will have acquired the
-	// writeLock. Otherwise we must acquire it ourselves.
-	ok := assignDictToStream(s, p)
-	if !ok {
-		s.writeLock.Lock()
-	}
-	defer s.writeLock.Unlock()
-
-	if s.writeEOF {
-		return 0, io.EOF
-	}
-
-	// pre-allocate some space in the write buffer if possible
-	if buffer, ok := s.writeBuffer.(*bytes.Buffer); ok {
-		if buffer.Cap() == 0 {
-			buffer.Grow(writeBufferInitialSize)
-		}
-	}
-
-	totalWritten := 0
-	for totalWritten < len(p) {
-		// If the buffer is full, block till there is more room.
-		// Use a loop to recheck the buffer size after the lock is reacquired.
-		for s.writeBufferMaxLen <= s.writeBuffer.Len() {
-			s.awaitWriteBufferHasSpace()
-			if s.writeEOF {
-				return totalWritten, io.EOF
-			}
-		}
-		amountToWrite := len(p) - totalWritten
-		spaceAvailable := s.writeBufferMaxLen - s.writeBuffer.Len()
-		if spaceAvailable < amountToWrite {
-			amountToWrite = spaceAvailable
-		}
-		amountWritten, err := s.writeBuffer.Write(p[totalWritten : totalWritten+amountToWrite])
-		totalWritten += amountWritten
-		if err != nil {
-			return totalWritten, err
-		}
-		s.writeNotify()
-	}
-	return totalWritten, nil
-}
-
-func (s *MuxedStream) Close() error {
-	// TUN-115: Close the write buffer before the read buffer.
-	// In the case of shutdown, read will not get new data, but the write buffer can still receive
-	// new data. Closing read before write allows application to race between a failed read and a
-	// successful write, even though this close should appear to be atomic.
-	// This can't happen the other way because reads may succeed after a failed write; if we read
-	// past EOF the application will block until we close the buffer.
-	err := s.CloseWrite()
-	if err != nil {
-		if s.CloseRead() == nil {
-			// don't bother the caller with errors if at least one close succeeded
-			return nil
-		}
-		return err
-	}
-	return s.CloseRead()
-}
-
-func (s *MuxedStream) CloseRead() error {
-	return s.readBuffer.Close()
-}
-
-func (s *MuxedStream) CloseWrite() error {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	if s.writeEOF {
-		return io.EOF
-	}
-	s.writeEOF = true
-	if c, ok := s.writeBuffer.(io.Closer); ok {
-		c.Close()
-	}
-	// Allow MuxedStream::Write() to terminate its loop with err=io.EOF, if needed
-	s.notifyWriteBufferHasSpace()
-	// We need to send something over the wire, even if it's an END_STREAM with no data
-	s.writeNotify()
-	return nil
-}
-
-func (s *MuxedStream) WriteClosed() bool {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	return s.writeEOF
-}
-
-func (s *MuxedStream) WriteHeaders(headers []Header) error {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	if s.writeHeaders != nil {
-		return ErrStreamHeadersSent
-	}
-
-	if s.dictionaries.write != nil {
-		dictWriter := s.dictionaries.write.getDictWriter(s, headers)
-		if dictWriter != nil {
-			s.writeBuffer = dictWriter
-		}
-
-	}
-
-	s.writeHeaders = headers
-	s.headersSent = false
-	s.writeNotify()
-	return nil
-}
-
-// IsRPCStream returns if the stream is used to transport RPC.
-func (s *MuxedStream) IsRPCStream() bool {
-	rpcHeaders := RPCHeaders()
-	if len(s.Headers) != len(rpcHeaders) {
-		return false
-	}
-	// The headers order matters, so RPC stream should be opened with OpenRPCStream method and let MuxWriter serializes the headers.
-	for i, rpcHeader := range rpcHeaders {
-		if s.Headers[i] != rpcHeader {
-			return false
-		}
-	}
-	return true
-}
-
-// Block until a value is sent on writeBufferHasSpace.
-// Must be called while holding writeLock
-func (s *MuxedStream) awaitWriteBufferHasSpace() {
-	s.writeLock.Unlock()
-	<-s.writeBufferHasSpace
-	s.writeLock.Lock()
-}
-
-// Send a value on writeBufferHasSpace without blocking.
-// Must be called while holding writeLock
-func (s *MuxedStream) notifyWriteBufferHasSpace() {
-	select {
-	case s.writeBufferHasSpace <- struct{}{}:
-	default:
-	}
-}
-
-func (s *MuxedStream) getReceiveWindow() uint32 {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	return s.receiveWindow
-}
-
-func (s *MuxedStream) getSendWindow() uint32 {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	return s.sendWindow
-}
-
-// writeNotify must happen while holding writeLock.
-func (s *MuxedStream) writeNotify() {
-	s.readyList.Signal(s.streamID)
-}
-
-// Call by muxreader when it gets a WindowUpdateFrame. This is an update of the peer's
-// receive window (how much data we can send).
-func (s *MuxedStream) replenishSendWindow(bytes uint32) {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	s.sendWindow += bytes
-	s.writeNotify()
-}
-
-// Call by muxreader when it receives a data frame
-func (s *MuxedStream) consumeReceiveWindow(bytes uint32) bool {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	// received data size is greater than receive window/buffer
-	if s.receiveWindow < bytes {
-		return false
-	}
-	s.receiveWindow -= bytes
-	if s.receiveWindow < s.receiveWindowCurrentMax/2 && s.receiveWindowCurrentMax < s.receiveWindowMax {
-		// exhausting client send window (how much data client can send)
-		// and there is room to grow the receive window
-		newMax := s.receiveWindowCurrentMax << 1
-		if newMax > s.receiveWindowMax {
-			newMax = s.receiveWindowMax
-		}
-		s.windowUpdate += newMax - s.receiveWindowCurrentMax
-		s.receiveWindowCurrentMax = newMax
-		// notify MuxWriter to write WINDOW_UPDATE frame
-		s.writeNotify()
-	}
-	return true
-}
-
-// Arranges for the MuxWriter to send a WINDOW_UPDATE
-// Called by MuxedStream::Read when data has left the read buffer.
-func (s *MuxedStream) replenishReceiveWindow(bytes uint32) {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	s.windowUpdate += bytes
-	s.writeNotify()
-}
-
-// receiveEOF should be called when the peer indicates no more data will be sent.
-// Returns true if the socket is now closed (i.e. the write side is already closed).
-func (s *MuxedStream) receiveEOF() (closed bool) {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	s.receivedEOF = true
-	s.CloseRead()
-	return s.writeEOF && s.writeBuffer.Len() == 0
-}
-
-func (s *MuxedStream) gotReceiveEOF() bool {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-	return s.receivedEOF
-}
-
-// MuxedStreamReader implements io.ReadCloser for the read end of the stream.
-// This is useful for passing to functions that close the object after it is done reading,
-// but you still want to be able to write data afterwards (e.g. http.Client).
-type MuxedStreamReader struct {
-	*MuxedStream
-}
-
-func (s MuxedStreamReader) Read(p []byte) (n int, err error) {
-	return s.MuxedStream.Read(p)
-}
-
-func (s MuxedStreamReader) Close() error {
-	return s.MuxedStream.CloseRead()
-}
-
-// streamChunk represents a chunk of data to be written.
-type streamChunk struct {
-	streamID uint32
-	// true if a HEADERS frame should be sent
-	sendHeaders bool
-	headers     []Header
-	// nonzero if a WINDOW_UPDATE frame should be sent;
-	// in that case, it is the increment value to use
-	windowUpdate uint32
-	// true if data frames should be sent
-	sendData bool
-	eof      bool
-
-	buffer []byte
-	offset int
-}
-
-// getChunk atomically extracts a chunk of data to be written by MuxWriter.
-// The data returned will not exceed the send window for this stream.
-func (s *MuxedStream) getChunk() *streamChunk {
-	s.writeLock.Lock()
-	defer s.writeLock.Unlock()
-
-	chunk := &streamChunk{
-		streamID:     s.streamID,
-		sendHeaders:  !s.headersSent,
-		headers:      s.writeHeaders,
-		windowUpdate: s.windowUpdate,
-		sendData:     !s.sentEOF,
-		eof:          s.writeEOF && uint32(s.writeBuffer.Len()) <= s.sendWindow,
-	}
-	// Copy at most s.sendWindow bytes, adjust the sendWindow accordingly
-	toCopy := int(s.sendWindow)
-	if toCopy > s.writeBuffer.Len() {
-		toCopy = s.writeBuffer.Len()
-	}
-
-	if toCopy > 0 {
-		buf := make([]byte, toCopy)
-		writeLen, _ := s.writeBuffer.Read(buf)
-		chunk.buffer = buf[:writeLen]
-		s.sendWindow -= uint32(writeLen)
-	}
-
-	// Allow MuxedStream::Write() to continue, if needed
-	if s.writeBuffer.Len() < s.writeBufferMaxLen {
-		s.notifyWriteBufferHasSpace()
-	}
-
-	// When we write the chunk, we'll write the WINDOW_UPDATE frame if needed
-	s.receiveWindow += s.windowUpdate
-	s.windowUpdate = 0
-
-	// When we write the chunk, we'll write the headers if needed
-	s.headersSent = true
-
-	// if this chunk contains the end of the stream, close the stream now
-	if chunk.sendData && chunk.eof {
-		s.sentEOF = true
-	}
-
-	return chunk
-}
-
-func (c *streamChunk) sendHeadersFrame() bool {
-	return c.sendHeaders
-}
-
-func (c *streamChunk) sendWindowUpdateFrame() bool {
-	return c.windowUpdate > 0
-}
-
-func (c *streamChunk) sendDataFrame() bool {
-	return c.sendData
-}
-
-func (c *streamChunk) nextDataFrame(frameSize int) (payload []byte, endStream bool) {
-	bytesLeft := len(c.buffer) - c.offset
-	if frameSize > bytesLeft {
-		frameSize = bytesLeft
-	}
-	nextOffset := c.offset + frameSize
-	payload = c.buffer[c.offset:nextOffset]
-	c.offset = nextOffset
-
-	if c.offset == len(c.buffer) {
-		// this is the last data frame in this chunk
-		c.sendData = false
-		if c.eof {
-			endStream = true
-		}
-	}
-	return
-}

h2mux/muxedstream_test.go

@@ -1,127 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"io"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-const testWindowSize uint32 = 65535
-const testMaxWindowSize uint32 = testWindowSize << 2
-
-// Only sending WINDOW_UPDATE frame, so sendWindow should never change
-func TestFlowControlSingleStream(t *testing.T) {
-	stream := &MuxedStream{
-		responseHeadersReceived: make(chan struct{}),
-		readBuffer:              NewSharedBuffer(),
-		writeBuffer:             &bytes.Buffer{},
-		receiveWindow:           testWindowSize,
-		receiveWindowCurrentMax: testWindowSize,
-		receiveWindowMax:        testMaxWindowSize,
-		sendWindow:              testWindowSize,
-		readyList:               NewReadyList(),
-	}
-	var tempWindowUpdate uint32
-	var tempStreamChunk *streamChunk
-
-	assert.True(t, stream.consumeReceiveWindow(testWindowSize/2))
-	dataSent := testWindowSize / 2
-	assert.Equal(t, testWindowSize-dataSent, stream.receiveWindow)
-	assert.Equal(t, testWindowSize, stream.receiveWindowCurrentMax)
-	assert.Equal(t, testWindowSize, stream.sendWindow)
-	assert.Equal(t, uint32(0), stream.windowUpdate)
-
-	tempStreamChunk = stream.getChunk()
-	assert.Equal(t, uint32(0), tempStreamChunk.windowUpdate)
-	assert.Equal(t, testWindowSize-dataSent, stream.receiveWindow)
-	assert.Equal(t, testWindowSize, stream.receiveWindowCurrentMax)
-	assert.Equal(t, testWindowSize, stream.sendWindow)
-	assert.Equal(t, uint32(0), stream.windowUpdate)
-
-	assert.True(t, stream.consumeReceiveWindow(2))
-	dataSent += 2
-	assert.Equal(t, testWindowSize-dataSent, stream.receiveWindow)
-	assert.Equal(t, testWindowSize<<1, stream.receiveWindowCurrentMax)
-	assert.Equal(t, testWindowSize, stream.sendWindow)
-	assert.Equal(t, testWindowSize, stream.windowUpdate)
-	tempWindowUpdate = stream.windowUpdate
-
-	tempStreamChunk = stream.getChunk()
-	assert.Equal(t, tempWindowUpdate, tempStreamChunk.windowUpdate)
-	assert.Equal(t, (testWindowSize<<1)-dataSent, stream.receiveWindow)
-	assert.Equal(t, testWindowSize<<1, stream.receiveWindowCurrentMax)
-	assert.Equal(t, testWindowSize, stream.sendWindow)
-	assert.Equal(t, uint32(0), stream.windowUpdate)
-
-	assert.True(t, stream.consumeReceiveWindow(testWindowSize+10))
-	dataSent += testWindowSize + 10
-	assert.Equal(t, (testWindowSize<<1)-dataSent, stream.receiveWindow)
-	assert.Equal(t, testWindowSize<<2, stream.receiveWindowCurrentMax)
-	assert.Equal(t, testWindowSize, stream.sendWindow)
-	assert.Equal(t, testWindowSize<<1, stream.windowUpdate)
-	tempWindowUpdate = stream.windowUpdate
-
-	tempStreamChunk = stream.getChunk()
-	assert.Equal(t, tempWindowUpdate, tempStreamChunk.windowUpdate)
-	assert.Equal(t, (testWindowSize<<2)-dataSent, stream.receiveWindow)
-	assert.Equal(t, testWindowSize<<2, stream.receiveWindowCurrentMax)
-	assert.Equal(t, testWindowSize, stream.sendWindow)
-	assert.Equal(t, uint32(0), stream.windowUpdate)
-
-	assert.False(t, stream.consumeReceiveWindow(testMaxWindowSize+1))
-	assert.Equal(t, (testWindowSize<<2)-dataSent, stream.receiveWindow)
-	assert.Equal(t, testMaxWindowSize, stream.receiveWindowCurrentMax)
-}
-
-func TestMuxedStreamEOF(t *testing.T) {
-	for i := 0; i < 4096; i++ {
-		readyList := NewReadyList()
-		stream := &MuxedStream{
-			streamID:         1,
-			readBuffer:       NewSharedBuffer(),
-			receiveWindow:    65536,
-			receiveWindowMax: 65536,
-			sendWindow:       65536,
-			readyList:        readyList,
-		}
-
-		go func() { stream.Close() }()
-		n, err := stream.Read([]byte{0})
-		assert.Equal(t, io.EOF, err)
-		assert.Equal(t, 0, n)
-		// Write comes after read, because write buffers data before it is flushed. It wouldn't know about EOF
-		// until some time later. Calling read first forces it to know about EOF now.
-		n, err = stream.Write([]byte{1})
-		assert.Equal(t, io.EOF, err)
-		assert.Equal(t, 0, n)
-	}
-}
-
-func TestIsRPCStream(t *testing.T) {
-	tests := []struct {
-		stream      *MuxedStream
-		isRPCStream bool
-	}{
-		{
-			stream:      &MuxedStream{},
-			isRPCStream: false,
-		},
-		{
-			stream:      &MuxedStream{Headers: RPCHeaders()},
-			isRPCStream: true,
-		},
-		{
-			stream: &MuxedStream{Headers: []Header{
-				{Name: ":method", Value: "rpc"},
-				{Name: ":scheme", Value: "Capnp"},
-				{Name: ":path", Value: "/"},
-			}},
-			isRPCStream: false,
-		},
-	}
-	for _, test := range tests {
-		assert.Equal(t, test.isRPCStream, test.stream.IsRPCStream())
-	}
-}

h2mux/muxmetrics.go

@@ -1,296 +0,0 @@
-package h2mux
-
-import (
-	"sync"
-	"time"
-
-	"github.com/golang-collections/collections/queue"
-	"github.com/rs/zerolog"
-)
-
-// data points used to compute average receive window and send window size
-const (
-	// data points used to compute average receive window and send window size
-	dataPoints = 100
-	// updateFreq is set to 1 sec so we can get inbound & outbound byes/sec
-	updateFreq = time.Second
-)
-
-type muxMetricsUpdater interface {
-	// metrics returns the latest metrics
-	metrics() *MuxerMetrics
-	// run is a blocking call to start the event loop
-	run(log *zerolog.Logger) error
-	// updateRTTChan is called by muxReader to report new RTT measurements
-	updateRTT(rtt *roundTripMeasurement)
-	//updateReceiveWindowChan is called by muxReader and muxWriter when receiveWindow size is updated
-	updateReceiveWindow(receiveWindow uint32)
-	//updateSendWindowChan is called by muxReader and muxWriter when sendWindow size is updated
-	updateSendWindow(sendWindow uint32)
-	// updateInBoundBytesChan is called  periodicallyby muxReader to report bytesRead
-	updateInBoundBytes(inBoundBytes uint64)
-	// updateOutBoundBytesChan is called periodically by muxWriter to report bytesWrote
-	updateOutBoundBytes(outBoundBytes uint64)
-}
-
-type muxMetricsUpdaterImpl struct {
-	// rttData keeps record of rtt, rttMin, rttMax and last measured time
-	rttData *rttData
-	// receiveWindowData keeps record of receive window measurement
-	receiveWindowData *flowControlData
-	// sendWindowData keeps record of send window measurement
-	sendWindowData *flowControlData
-	// inBoundRate is incoming bytes/sec
-	inBoundRate *rate
-	// outBoundRate is outgoing bytes/sec
-	outBoundRate *rate
-	// updateRTTChan is the channel to receive new RTT measurement
-	updateRTTChan chan *roundTripMeasurement
-	//updateReceiveWindowChan is the channel to receive updated receiveWindow size
-	updateReceiveWindowChan chan uint32
-	//updateSendWindowChan is the channel to receive updated sendWindow size
-	updateSendWindowChan chan uint32
-	// updateInBoundBytesChan us the channel to receive bytesRead
-	updateInBoundBytesChan chan uint64
-	// updateOutBoundBytesChan us the channel to receive bytesWrote
-	updateOutBoundBytesChan chan uint64
-	// shutdownC is to signal the muxerMetricsUpdater to shutdown
-	abortChan <-chan struct{}
-
-	compBytesBefore, compBytesAfter *AtomicCounter
-}
-
-type MuxerMetrics struct {
-	RTT, RTTMin, RTTMax                                              time.Duration
-	ReceiveWindowAve, SendWindowAve                                  float64
-	ReceiveWindowMin, ReceiveWindowMax, SendWindowMin, SendWindowMax uint32
-	InBoundRateCurr, InBoundRateMin, InBoundRateMax                  uint64
-	OutBoundRateCurr, OutBoundRateMin, OutBoundRateMax               uint64
-	CompBytesBefore, CompBytesAfter                                  *AtomicCounter
-}
-
-func (m *MuxerMetrics) CompRateAve() float64 {
-	if m.CompBytesBefore.Value() == 0 {
-		return 1.
-	}
-	return float64(m.CompBytesAfter.Value()) / float64(m.CompBytesBefore.Value())
-}
-
-type roundTripMeasurement struct {
-	receiveTime, sendTime time.Time
-}
-
-type rttData struct {
-	rtt, rttMin, rttMax time.Duration
-	lastMeasurementTime time.Time
-	lock                sync.RWMutex
-}
-
-type flowControlData struct {
-	sum      uint64
-	min, max uint32
-	queue    *queue.Queue
-	lock     sync.RWMutex
-}
-
-type rate struct {
-	curr     uint64
-	min, max uint64
-	lock     sync.RWMutex
-}
-
-func newMuxMetricsUpdater(
-	abortChan <-chan struct{},
-	compBytesBefore, compBytesAfter *AtomicCounter,
-) muxMetricsUpdater {
-	updateRTTChan := make(chan *roundTripMeasurement, 1)
-	updateReceiveWindowChan := make(chan uint32, 1)
-	updateSendWindowChan := make(chan uint32, 1)
-	updateInBoundBytesChan := make(chan uint64)
-	updateOutBoundBytesChan := make(chan uint64)
-
-	return &muxMetricsUpdaterImpl{
-		rttData:                 newRTTData(),
-		receiveWindowData:       newFlowControlData(),
-		sendWindowData:          newFlowControlData(),
-		inBoundRate:             newRate(),
-		outBoundRate:            newRate(),
-		updateRTTChan:           updateRTTChan,
-		updateReceiveWindowChan: updateReceiveWindowChan,
-		updateSendWindowChan:    updateSendWindowChan,
-		updateInBoundBytesChan:  updateInBoundBytesChan,
-		updateOutBoundBytesChan: updateOutBoundBytesChan,
-		abortChan:               abortChan,
-		compBytesBefore:         compBytesBefore,
-		compBytesAfter:          compBytesAfter,
-	}
-}
-
-func (updater *muxMetricsUpdaterImpl) metrics() *MuxerMetrics {
-	m := &MuxerMetrics{}
-	m.RTT, m.RTTMin, m.RTTMax = updater.rttData.metrics()
-	m.ReceiveWindowAve, m.ReceiveWindowMin, m.ReceiveWindowMax = updater.receiveWindowData.metrics()
-	m.SendWindowAve, m.SendWindowMin, m.SendWindowMax = updater.sendWindowData.metrics()
-	m.InBoundRateCurr, m.InBoundRateMin, m.InBoundRateMax = updater.inBoundRate.get()
-	m.OutBoundRateCurr, m.OutBoundRateMin, m.OutBoundRateMax = updater.outBoundRate.get()
-	m.CompBytesBefore, m.CompBytesAfter = updater.compBytesBefore, updater.compBytesAfter
-	return m
-}
-
-func (updater *muxMetricsUpdaterImpl) run(log *zerolog.Logger) error {
-	defer log.Debug().Msg("mux - metrics: event loop finished")
-	for {
-		select {
-		case <-updater.abortChan:
-			log.Debug().Msgf("mux - metrics: Stopping mux metrics updater")
-			return nil
-		case roundTripMeasurement := <-updater.updateRTTChan:
-			go updater.rttData.update(roundTripMeasurement)
-			log.Debug().Msg("mux - metrics: Update rtt")
-		case receiveWindow := <-updater.updateReceiveWindowChan:
-			go updater.receiveWindowData.update(receiveWindow)
-			log.Debug().Msg("mux - metrics: Update receive window")
-		case sendWindow := <-updater.updateSendWindowChan:
-			go updater.sendWindowData.update(sendWindow)
-			log.Debug().Msg("mux - metrics: Update send window")
-		case inBoundBytes := <-updater.updateInBoundBytesChan:
-			// inBoundBytes is bytes/sec because the update interval is 1 sec
-			go updater.inBoundRate.update(inBoundBytes)
-			log.Debug().Msgf("mux - metrics: Inbound bytes %d", inBoundBytes)
-		case outBoundBytes := <-updater.updateOutBoundBytesChan:
-			// outBoundBytes is bytes/sec because the update interval is 1 sec
-			go updater.outBoundRate.update(outBoundBytes)
-			log.Debug().Msgf("mux - metrics: Outbound bytes %d", outBoundBytes)
-		}
-	}
-}
-
-func (updater *muxMetricsUpdaterImpl) updateRTT(rtt *roundTripMeasurement) {
-	select {
-	case updater.updateRTTChan <- rtt:
-	case <-updater.abortChan:
-	}
-
-}
-
-func (updater *muxMetricsUpdaterImpl) updateReceiveWindow(receiveWindow uint32) {
-	select {
-	case updater.updateReceiveWindowChan <- receiveWindow:
-	case <-updater.abortChan:
-	}
-}
-
-func (updater *muxMetricsUpdaterImpl) updateSendWindow(sendWindow uint32) {
-	select {
-	case updater.updateSendWindowChan <- sendWindow:
-	case <-updater.abortChan:
-	}
-}
-
-func (updater *muxMetricsUpdaterImpl) updateInBoundBytes(inBoundBytes uint64) {
-	select {
-	case updater.updateInBoundBytesChan <- inBoundBytes:
-	case <-updater.abortChan:
-	}
-
-}
-
-func (updater *muxMetricsUpdaterImpl) updateOutBoundBytes(outBoundBytes uint64) {
-	select {
-	case updater.updateOutBoundBytesChan <- outBoundBytes:
-	case <-updater.abortChan:
-	}
-}
-
-func newRTTData() *rttData {
-	return &rttData{}
-}
-
-func (r *rttData) update(measurement *roundTripMeasurement) {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-	// discard pings before lastMeasurementTime
-	if r.lastMeasurementTime.After(measurement.sendTime) {
-		return
-	}
-	r.lastMeasurementTime = measurement.sendTime
-	r.rtt = measurement.receiveTime.Sub(measurement.sendTime)
-	if r.rttMax < r.rtt {
-		r.rttMax = r.rtt
-	}
-	if r.rttMin == 0 || r.rttMin > r.rtt {
-		r.rttMin = r.rtt
-	}
-}
-
-func (r *rttData) metrics() (rtt, rttMin, rttMax time.Duration) {
-	r.lock.RLock()
-	defer r.lock.RUnlock()
-	return r.rtt, r.rttMin, r.rttMax
-}
-
-func newFlowControlData() *flowControlData {
-	return &flowControlData{queue: queue.New()}
-}
-
-func (f *flowControlData) update(measurement uint32) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-	var firstItem uint32
-	// store new data into queue, remove oldest data if queue is full
-	f.queue.Enqueue(measurement)
-	if f.queue.Len() > dataPoints {
-		// data type should always be uint32
-		firstItem = f.queue.Dequeue().(uint32)
-	}
-	// if (measurement - firstItem) < 0, uint64(measurement - firstItem)
-	// will overflow and become a large positive number
-	f.sum += uint64(measurement)
-	f.sum -= uint64(firstItem)
-	if measurement > f.max {
-		f.max = measurement
-	}
-	if f.min == 0 || measurement < f.min {
-		f.min = measurement
-	}
-}
-
-// caller of ave() should acquire lock first
-func (f *flowControlData) ave() float64 {
-	if f.queue.Len() == 0 {
-		return 0
-	}
-	return float64(f.sum) / float64(f.queue.Len())
-}
-
-func (f *flowControlData) metrics() (ave float64, min, max uint32) {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
-	return f.ave(), f.min, f.max
-}
-
-func newRate() *rate {
-	return &rate{}
-}
-
-func (r *rate) update(measurement uint64) {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-	r.curr = measurement
-	// if measurement is 0, then there is no incoming/outgoing connection, don't update min/max
-	if r.curr == 0 {
-		return
-	}
-	if measurement > r.max {
-		r.max = measurement
-	}
-	if r.min == 0 || measurement < r.min {
-		r.min = measurement
-	}
-}
-
-func (r *rate) get() (curr, min, max uint64) {
-	r.lock.RLock()
-	defer r.lock.RUnlock()
-	return r.curr, r.min, r.max
-}

h2mux/muxmetrics_test.go

@@ -1,169 +0,0 @@
-package h2mux
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/rs/zerolog"
-	"github.com/stretchr/testify/assert"
-)
-
-func ave(sum uint64, len int) float64 {
-	return float64(sum) / float64(len)
-}
-
-func TestRTTUpdate(t *testing.T) {
-	r := newRTTData()
-	start := time.Now()
-	// send at 0 ms, receive at 2 ms, RTT = 2ms
-	m := &roundTripMeasurement{receiveTime: start.Add(2 * time.Millisecond), sendTime: start}
-	r.update(m)
-	assert.Equal(t, start, r.lastMeasurementTime)
-	assert.Equal(t, 2*time.Millisecond, r.rtt)
-	assert.Equal(t, 2*time.Millisecond, r.rttMin)
-	assert.Equal(t, 2*time.Millisecond, r.rttMax)
-
-	// send at 3 ms, receive at 6 ms, RTT = 3ms
-	m = &roundTripMeasurement{receiveTime: start.Add(6 * time.Millisecond), sendTime: start.Add(3 * time.Millisecond)}
-	r.update(m)
-	assert.Equal(t, start.Add(3*time.Millisecond), r.lastMeasurementTime)
-	assert.Equal(t, 3*time.Millisecond, r.rtt)
-	assert.Equal(t, 2*time.Millisecond, r.rttMin)
-	assert.Equal(t, 3*time.Millisecond, r.rttMax)
-
-	// send at 7 ms, receive at 8 ms, RTT = 1ms
-	m = &roundTripMeasurement{receiveTime: start.Add(8 * time.Millisecond), sendTime: start.Add(7 * time.Millisecond)}
-	r.update(m)
-	assert.Equal(t, start.Add(7*time.Millisecond), r.lastMeasurementTime)
-	assert.Equal(t, 1*time.Millisecond, r.rtt)
-	assert.Equal(t, 1*time.Millisecond, r.rttMin)
-	assert.Equal(t, 3*time.Millisecond, r.rttMax)
-
-	// send at -4 ms, receive at 0 ms, RTT = 4ms, but this ping is before last measurement
-	// so it will be discarded
-	m = &roundTripMeasurement{receiveTime: start, sendTime: start.Add(-2 * time.Millisecond)}
-	r.update(m)
-	assert.Equal(t, start.Add(7*time.Millisecond), r.lastMeasurementTime)
-	assert.Equal(t, 1*time.Millisecond, r.rtt)
-	assert.Equal(t, 1*time.Millisecond, r.rttMin)
-	assert.Equal(t, 3*time.Millisecond, r.rttMax)
-}
-
-func TestFlowControlDataUpdate(t *testing.T) {
-	f := newFlowControlData()
-	assert.Equal(t, 0, f.queue.Len())
-	assert.Equal(t, float64(0), f.ave())
-
-	var sum uint64
-	min := maxWindowSize - dataPoints
-	max := maxWindowSize
-	for i := 1; i <= dataPoints; i++ {
-		size := maxWindowSize - uint32(i)
-		f.update(size)
-		assert.Equal(t, max-uint32(1), f.max)
-		assert.Equal(t, size, f.min)
-
-		assert.Equal(t, i, f.queue.Len())
-
-		sum += uint64(size)
-		assert.Equal(t, sum, f.sum)
-		assert.Equal(t, ave(sum, f.queue.Len()), f.ave())
-	}
-
-	// queue is full, should start to dequeue first element
-	for i := 1; i <= dataPoints; i++ {
-		f.update(max)
-		assert.Equal(t, max, f.max)
-		assert.Equal(t, min, f.min)
-
-		assert.Equal(t, dataPoints, f.queue.Len())
-
-		sum += uint64(i)
-		assert.Equal(t, sum, f.sum)
-		assert.Equal(t, ave(sum, dataPoints), f.ave())
-	}
-}
-
-func TestMuxMetricsUpdater(t *testing.T) {
-	t.Skip("Inherently racy test due to muxMetricsUpdaterImpl.run()")
-	errChan := make(chan error)
-	abortChan := make(chan struct{})
-	compBefore, compAfter := NewAtomicCounter(0), NewAtomicCounter(0)
-	m := newMuxMetricsUpdater(abortChan, compBefore, compAfter)
-	log := zerolog.Nop()
-
-	go func() {
-		errChan <- m.run(&log)
-	}()
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	// mock muxReader
-	readerStart := time.Now()
-	rm := &roundTripMeasurement{receiveTime: readerStart, sendTime: readerStart}
-	m.updateRTT(rm)
-	go func() {
-		defer wg.Done()
-		assert.Equal(t, 0, dataPoints%4,
-			"dataPoints is not divisible by 4; this test should be adjusted accordingly")
-		readerSend := readerStart.Add(time.Millisecond)
-		for i := 1; i <= dataPoints/4; i++ {
-			readerReceive := readerSend.Add(time.Duration(i) * time.Millisecond)
-			rm := &roundTripMeasurement{receiveTime: readerReceive, sendTime: readerSend}
-			m.updateRTT(rm)
-			readerSend = readerReceive.Add(time.Millisecond)
-			m.updateReceiveWindow(uint32(i))
-			m.updateSendWindow(uint32(i))
-
-			m.updateInBoundBytes(uint64(i))
-		}
-	}()
-
-	// mock muxWriter
-	go func() {
-		defer wg.Done()
-		assert.Equal(t, 0, dataPoints%4,
-			"dataPoints is not divisible by 4; this test should be adjusted accordingly")
-		for j := dataPoints/4 + 1; j <= dataPoints/2; j++ {
-			m.updateReceiveWindow(uint32(j))
-			m.updateSendWindow(uint32(j))
-
-			// should always be discarded since the send time is before readerSend
-			rm := &roundTripMeasurement{receiveTime: readerStart, sendTime: readerStart.Add(-time.Duration(j*dataPoints) * time.Millisecond)}
-			m.updateRTT(rm)
-
-			m.updateOutBoundBytes(uint64(j))
-		}
-
-	}()
-	wg.Wait()
-
-	metrics := m.metrics()
-	points := dataPoints / 2
-	assert.Equal(t, time.Millisecond, metrics.RTTMin)
-	assert.Equal(t, time.Duration(dataPoints/4)*time.Millisecond, metrics.RTTMax)
-
-	// sum(1..i) = i*(i+1)/2, ave(1..i) = i*(i+1)/2/i = (i+1)/2
-	assert.Equal(t, float64(points+1)/float64(2), metrics.ReceiveWindowAve)
-	assert.Equal(t, uint32(1), metrics.ReceiveWindowMin)
-	assert.Equal(t, uint32(points), metrics.ReceiveWindowMax)
-
-	assert.Equal(t, float64(points+1)/float64(2), metrics.SendWindowAve)
-	assert.Equal(t, uint32(1), metrics.SendWindowMin)
-	assert.Equal(t, uint32(points), metrics.SendWindowMax)
-
-	assert.Equal(t, uint64(dataPoints/4), metrics.InBoundRateCurr)
-	assert.Equal(t, uint64(1), metrics.InBoundRateMin)
-	assert.Equal(t, uint64(dataPoints/4), metrics.InBoundRateMax)
-
-	assert.Equal(t, uint64(dataPoints/2), metrics.OutBoundRateCurr)
-	assert.Equal(t, uint64(dataPoints/4+1), metrics.OutBoundRateMin)
-	assert.Equal(t, uint64(dataPoints/2), metrics.OutBoundRateMax)
-
-	close(abortChan)
-	assert.Nil(t, <-errChan)
-	close(errChan)
-
-}

h2mux/muxreader.go

@@ -1,508 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"net/url"
-	"time"
-
-	"github.com/rs/zerolog"
-	"golang.org/x/net/http2"
-)
-
-type MuxReader struct {
-	// f is used to read HTTP2 frames.
-	f *http2.Framer
-	// handler provides a callback to receive new streams. if nil, new streams cannot be accepted.
-	handler MuxedStreamHandler
-	// streams tracks currently-open streams.
-	streams *activeStreamMap
-	// readyList is used to signal writable streams.
-	readyList *ReadyList
-	// streamErrors lets us report stream errors to the MuxWriter.
-	streamErrors *StreamErrorMap
-	// goAwayChan is used to tell the writer to send a GOAWAY message.
-	goAwayChan chan<- http2.ErrCode
-	// abortChan is used when shutting down ungracefully. When this becomes readable, all activity should stop.
-	abortChan <-chan struct{}
-	// pingTimestamp is an atomic value containing the latest received ping timestamp.
-	pingTimestamp *PingTimestamp
-	// connActive is used to signal to the writer that something happened on the connection.
-	// This is used to clear idle timeout disconnection deadlines.
-	connActive Signal
-	// The initial value for the send and receive window of a new stream.
-	initialStreamWindow uint32
-	// The max value for the send window of a stream.
-	streamWindowMax uint32
-	// The max size for the write buffer of a stream
-	streamWriteBufferMaxLen int
-	// r is a reference to the underlying connection used when shutting down.
-	r io.Closer
-	// metricsUpdater is used to report metrics
-	metricsUpdater muxMetricsUpdater
-	// bytesRead is the amount of bytes read from data frames since the last time we called metricsUpdater.updateInBoundBytes()
-	bytesRead *AtomicCounter
-	// dictionaries holds the h2 cross-stream compression dictionaries
-	dictionaries h2Dictionaries
-}
-
-// Shutdown blocks new streams from being created.
-// It returns a channel that is closed once the last stream has closed.
-func (r *MuxReader) Shutdown() <-chan struct{} {
-	done, alreadyInProgress := r.streams.Shutdown()
-	if alreadyInProgress {
-		return done
-	}
-	r.sendGoAway(http2.ErrCodeNo)
-	go func() {
-		// close reader side when last stream ends; this will cause the writer to abort
-		<-done
-		r.r.Close()
-	}()
-	return done
-}
-
-func (r *MuxReader) run(log *zerolog.Logger) error {
-	defer log.Debug().Msg("mux - read: event loop finished")
-
-	// routine to periodically update bytesRead
-	go func() {
-		ticker := time.NewTicker(updateFreq)
-		defer ticker.Stop()
-		for {
-			select {
-			case <-r.abortChan:
-				return
-			case <-ticker.C:
-				r.metricsUpdater.updateInBoundBytes(r.bytesRead.Count())
-			}
-		}
-	}()
-
-	for {
-		frame, err := r.f.ReadFrame()
-		if err != nil {
-			errorString := fmt.Sprintf("mux - read: %s", err)
-			if errorDetail := r.f.ErrorDetail(); errorDetail != nil {
-				errorString = fmt.Sprintf("%s: errorDetail: %s", errorString, errorDetail)
-			}
-			switch e := err.(type) {
-			case http2.StreamError:
-				log.Info().Msgf("%s: stream error", errorString)
-				// Ideally we wouldn't return here, since that aborts the muxer.
-				// We should communicate the error to the relevant MuxedStream
-				// data structure, so that callers of MuxedStream.Read() and
-				// MuxedStream.Write() would see it. Then we could `continue`
-				// and keep the muxer going.
-				return r.streamError(e.StreamID, e.Code)
-			case http2.ConnectionError:
-				log.Info().Msgf("%s: stream error", errorString)
-				return r.connectionError(err)
-			default:
-				if isConnectionClosedError(err) {
-					if r.streams.Len() == 0 {
-						// don't log the error here -- that would just be extra noise
-						log.Debug().Msg("mux - read: shutting down")
-						return nil
-					}
-					log.Info().Msgf("%s: connection closed unexpectedly", errorString)
-					return err
-				} else {
-					log.Info().Msgf("%s: frame read error", errorString)
-					return r.connectionError(err)
-				}
-			}
-		}
-		r.connActive.Signal()
-		log.Debug().Msgf("mux - read: read frame: data %v", frame)
-		switch f := frame.(type) {
-		case *http2.DataFrame:
-			err = r.receiveFrameData(f, log)
-		case *http2.MetaHeadersFrame:
-			err = r.receiveHeaderData(f)
-		case *http2.RSTStreamFrame:
-			streamID := f.Header().StreamID
-			if streamID == 0 {
-				return ErrInvalidStream
-			}
-			if stream, ok := r.streams.Get(streamID); ok {
-				stream.Close()
-			}
-			r.streams.Delete(streamID)
-		case *http2.PingFrame:
-			r.receivePingData(f)
-		case *http2.GoAwayFrame:
-			err = r.receiveGoAway(f)
-		// The receiver of a flow-controlled frame sends a WINDOW_UPDATE frame as it
-		// consumes data and frees up space in flow-control windows
-		case *http2.WindowUpdateFrame:
-			err = r.updateStreamWindow(f)
-		case *http2.UnknownFrame:
-			switch f.Header().Type {
-			case FrameUseDictionary:
-				err = r.receiveUseDictionary(f)
-			case FrameSetDictionary:
-				err = r.receiveSetDictionary(f)
-			default:
-				err = ErrUnexpectedFrameType
-			}
-		default:
-			err = ErrUnexpectedFrameType
-		}
-		if err != nil {
-			log.Debug().Msgf("mux - read: read error: data %v", frame)
-			return r.connectionError(err)
-		}
-	}
-}
-
-func (r *MuxReader) newMuxedStream(streamID uint32) *MuxedStream {
-	return &MuxedStream{
-		streamID:                streamID,
-		readBuffer:              NewSharedBuffer(),
-		writeBuffer:             &bytes.Buffer{},
-		writeBufferMaxLen:       r.streamWriteBufferMaxLen,
-		writeBufferHasSpace:     make(chan struct{}, 1),
-		receiveWindow:           r.initialStreamWindow,
-		receiveWindowCurrentMax: r.initialStreamWindow,
-		receiveWindowMax:        r.streamWindowMax,
-		sendWindow:              r.initialStreamWindow,
-		readyList:               r.readyList,
-		dictionaries:            r.dictionaries,
-	}
-}
-
-// getStreamForFrame returns a stream if valid, or an error describing why the stream could not be returned.
-func (r *MuxReader) getStreamForFrame(frame http2.Frame) (*MuxedStream, error) {
-	sid := frame.Header().StreamID
-	if sid == 0 {
-		return nil, ErrUnexpectedFrameType
-	}
-	if stream, ok := r.streams.Get(sid); ok {
-		return stream, nil
-	}
-	if r.streams.IsLocalStreamID(sid) {
-		// no stream available, but no error
-		return nil, ErrClosedStream
-	}
-	if sid < r.streams.LastPeerStreamID() {
-		// no stream available, stream closed error
-		return nil, ErrClosedStream
-	}
-	return nil, ErrUnknownStream
-}
-
-func (r *MuxReader) defaultStreamErrorHandler(err error, header http2.FrameHeader) error {
-	if header.Flags.Has(http2.FlagHeadersEndStream) {
-		return nil
-	} else if err == ErrUnknownStream || err == ErrClosedStream {
-		return r.streamError(header.StreamID, http2.ErrCodeStreamClosed)
-	} else {
-		return err
-	}
-}
-
-// Receives header frames from a stream. A non-nil error is a connection error.
-func (r *MuxReader) receiveHeaderData(frame *http2.MetaHeadersFrame) error {
-	var stream *MuxedStream
-	sid := frame.Header().StreamID
-	if sid == 0 {
-		return ErrUnexpectedFrameType
-	}
-	newStream := r.streams.IsPeerStreamID(sid)
-	if newStream {
-		// header request
-		// TODO support trailers (if stream exists)
-		ok, err := r.streams.AcquirePeerID(sid)
-		if !ok {
-			// ignore new streams while shutting down
-			return r.streamError(sid, err)
-		}
-		stream = r.newMuxedStream(sid)
-		// Set stream. Returns false if a stream already existed with that ID or we are shutting down, return false.
-		if !r.streams.Set(stream) {
-			// got HEADERS frame for an existing stream
-			// TODO support trailers
-			return r.streamError(sid, http2.ErrCodeInternal)
-		}
-	} else {
-		// header response
-		var err error
-		if stream, err = r.getStreamForFrame(frame); err != nil {
-			return r.defaultStreamErrorHandler(err, frame.Header())
-		}
-	}
-	headers := make([]Header, 0, len(frame.Fields))
-	for _, header := range frame.Fields {
-		switch header.Name {
-		case ":method":
-			stream.method = header.Value
-		case ":path":
-			u, err := url.Parse(header.Value)
-			if err == nil {
-				stream.path = u.Path
-			}
-		case "accept-encoding":
-			// remove accept-encoding if dictionaries are enabled
-			if r.dictionaries.write != nil {
-				continue
-			}
-		}
-		headers = append(headers, Header{Name: header.Name, Value: header.Value})
-	}
-	stream.Headers = headers
-	if frame.Header().Flags.Has(http2.FlagHeadersEndStream) {
-		stream.receiveEOF()
-		return nil
-	}
-	if newStream {
-		go r.handleStream(stream)
-	} else {
-		close(stream.responseHeadersReceived)
-	}
-	return nil
-}
-
-func (r *MuxReader) handleStream(stream *MuxedStream) {
-	defer stream.Close()
-	r.handler.ServeStream(stream)
-}
-
-// Receives a data frame from a stream. A non-nil error is a connection error.
-func (r *MuxReader) receiveFrameData(frame *http2.DataFrame, log *zerolog.Logger) error {
-	stream, err := r.getStreamForFrame(frame)
-	if err != nil {
-		return r.defaultStreamErrorHandler(err, frame.Header())
-	}
-	data := frame.Data()
-	if len(data) > 0 {
-		n, err := stream.readBuffer.Write(data)
-		if err != nil {
-			return r.streamError(stream.streamID, http2.ErrCodeInternal)
-		}
-		r.bytesRead.IncrementBy(uint64(n))
-	}
-	if frame.Header().Flags.Has(http2.FlagDataEndStream) {
-		if stream.receiveEOF() {
-			r.streams.Delete(stream.streamID)
-			log.Debug().Msgf("mux - read: stream closed: streamID: %d", frame.Header().StreamID)
-		} else {
-			log.Debug().Msgf("mux - read: shutdown receive side: streamID: %d", frame.Header().StreamID)
-		}
-		return nil
-	}
-	if !stream.consumeReceiveWindow(uint32(len(data))) {
-		return r.streamError(stream.streamID, http2.ErrCodeFlowControl)
-	}
-	r.metricsUpdater.updateReceiveWindow(stream.getReceiveWindow())
-	return nil
-}
-
-// Receive a PING from the peer. Update RTT and send/receive window metrics if it's an ACK.
-func (r *MuxReader) receivePingData(frame *http2.PingFrame) {
-	ts := int64(binary.LittleEndian.Uint64(frame.Data[:]))
-	if !frame.IsAck() {
-		r.pingTimestamp.Set(ts)
-		return
-	}
-
-	// Update the computed RTT aggregations with a new measurement.
-	// `ts` is the time that the probe was sent.
-	// We assume that `time.Now()` is the time we received that probe.
-	r.metricsUpdater.updateRTT(&roundTripMeasurement{
-		receiveTime: time.Now(),
-		sendTime:    time.Unix(0, ts),
-	})
-}
-
-// Receive a GOAWAY from the peer. Gracefully shut down our connection.
-func (r *MuxReader) receiveGoAway(frame *http2.GoAwayFrame) error {
-	r.Shutdown()
-	// Close all streams above the last processed stream
-	lastStream := r.streams.LastLocalStreamID()
-	for i := frame.LastStreamID + 2; i <= lastStream; i++ {
-		if stream, ok := r.streams.Get(i); ok {
-			stream.Close()
-		}
-	}
-	return nil
-}
-
-// Receive a USE_DICTIONARY from the peer. Setup dictionary for stream.
-func (r *MuxReader) receiveUseDictionary(frame *http2.UnknownFrame) error {
-	payload := frame.Payload()
-	streamID := frame.StreamID
-
-	// Check frame is formatted properly
-	if len(payload) != 1 {
-		return r.streamError(streamID, http2.ErrCodeProtocol)
-	}
-
-	stream, err := r.getStreamForFrame(frame)
-	if err != nil {
-		return err
-	}
-
-	if stream.receivedUseDict == true || stream.dictionaries.read == nil {
-		return r.streamError(streamID, http2.ErrCodeInternal)
-	}
-
-	stream.receivedUseDict = true
-	dictID := payload[0]
-
-	dictReader := stream.dictionaries.read.newReader(stream.readBuffer.(*SharedBuffer), dictID)
-	if dictReader == nil {
-		return r.streamError(streamID, http2.ErrCodeInternal)
-	}
-
-	stream.readBufferLock.Lock()
-	stream.readBuffer = dictReader
-	stream.readBufferLock.Unlock()
-
-	return nil
-}
-
-// Receive a SET_DICTIONARY from the peer. Update dictionaries accordingly.
-func (r *MuxReader) receiveSetDictionary(frame *http2.UnknownFrame) (err error) {
-
-	payload := frame.Payload()
-	flags := frame.Flags
-
-	stream, err := r.getStreamForFrame(frame)
-	if err != nil && err != ErrClosedStream {
-		return err
-	}
-	reader, ok := stream.readBuffer.(*h2DictionaryReader)
-	if !ok {
-		return r.streamError(frame.StreamID, http2.ErrCodeProtocol)
-	}
-
-	// A SetDictionary frame consists of several
-	// Dictionary-Entries that specify how existing dictionaries
-	// are to be updated using the current stream data
-	// +---------------+---------------+
-	// |   Dictionary-Entry (+)    ...
-	// +---------------+---------------+
-
-	for {
-		// Each Dictionary-Entry is formatted as follows:
-		// +-------------------------------+
-		// |       Dictionary-ID (8)       |
-		// +---+---------------------------+
-		// | P |        Size (7+)          |
-		// +---+---------------------------+
-		// | E?| D?|  Truncate? (6+)       |
-		// +---+---------------------------+
-		// |           Offset? (8+)        |
-		// +-------------------------------+
-
-		var size, truncate, offset uint64
-		var p, e, d bool
-
-		// Parse a single Dictionary-Entry
-		if len(payload) < 2 { // Must have at least id and size
-			return MuxerStreamError{"unexpected EOF", http2.ErrCodeProtocol}
-		}
-
-		dictID := uint8(payload[0])
-		p = (uint8(payload[1]) >> 7) == 1
-		payload, size, err = http2ReadVarInt(7, payload[1:])
-		if err != nil {
-			return
-		}
-
-		if flags.Has(FlagSetDictionaryAppend) {
-			// Presence of FlagSetDictionaryAppend means we expect e, d and truncate
-			if len(payload) < 1 {
-				return MuxerStreamError{"unexpected EOF", http2.ErrCodeProtocol}
-			}
-			e = (uint8(payload[0]) >> 7) == 1
-			d = (uint8((payload[0])>>6) & 1) == 1
-			payload, truncate, err = http2ReadVarInt(6, payload)
-			if err != nil {
-				return
-			}
-		}
-
-		if flags.Has(FlagSetDictionaryOffset) {
-			// Presence of FlagSetDictionaryOffset means we expect offset
-			if len(payload) < 1 {
-				return MuxerStreamError{"unexpected EOF", http2.ErrCodeProtocol}
-			}
-			payload, offset, err = http2ReadVarInt(8, payload)
-			if err != nil {
-				return
-			}
-		}
-
-		setdict := setDictRequest{streamID: stream.streamID,
-			dictID:   dictID,
-			dictSZ:   size,
-			truncate: truncate,
-			offset:   offset,
-			P:        p,
-			E:        e,
-			D:        d}
-
-		// Find the right dictionary
-		dict, err := r.dictionaries.read.getDictByID(dictID)
-		if err != nil {
-			return err
-		}
-
-		// Register a dictionary update order for the dictionary and reader
-		updateEntry := &dictUpdate{reader: reader, dictionary: dict, s: setdict}
-		dict.queue = append(dict.queue, updateEntry)
-		reader.queue = append(reader.queue, updateEntry)
-		// End of frame
-		if len(payload) == 0 {
-			break
-		}
-	}
-	return nil
-}
-
-// Receives header frames from a stream. A non-nil error is a connection error.
-func (r *MuxReader) updateStreamWindow(frame *http2.WindowUpdateFrame) error {
-	stream, err := r.getStreamForFrame(frame)
-	if err != nil && err != ErrUnknownStream && err != ErrClosedStream {
-		return err
-	}
-	if stream == nil {
-		// ignore window updates on closed streams
-		return nil
-	}
-	stream.replenishSendWindow(frame.Increment)
-	r.metricsUpdater.updateSendWindow(stream.getSendWindow())
-	return nil
-}
-
-// Raise a stream processing error, closing the stream. Runs on the write thread.
-func (r *MuxReader) streamError(streamID uint32, e http2.ErrCode) error {
-	r.streamErrors.RaiseError(streamID, e)
-	return nil
-}
-
-func (r *MuxReader) connectionError(err error) error {
-	http2Code := http2.ErrCodeInternal
-	switch e := err.(type) {
-	case http2.ConnectionError:
-		http2Code = http2.ErrCode(e)
-	case MuxerProtocolError:
-		http2Code = e.h2code
-	}
-	r.sendGoAway(http2Code)
-	return err
-}
-
-// Instruct the writer to send a GOAWAY message if possible. This may fail in
-// the case where an existing GOAWAY message is in flight or the writer event
-// loop already ended.
-func (r *MuxReader) sendGoAway(errCode http2.ErrCode) {
-	select {
-	case r.goAwayChan <- errCode:
-	default:
-	}
-}

h2mux/muxreader_test.go

@@ -1,88 +0,0 @@
-package h2mux
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-var (
-	methodHeader = Header{
-		Name:  ":method",
-		Value: "GET",
-	}
-	schemeHeader = Header{
-		Name:  ":scheme",
-		Value: "https",
-	}
-	pathHeader = Header{
-		Name:  ":path",
-		Value: "/api/tunnels",
-	}
-	respStatusHeader = Header{
-		Name:  ":status",
-		Value: "200",
-	}
-)
-
-type mockOriginStreamHandler struct {
-	stream *MuxedStream
-}
-
-func (mosh *mockOriginStreamHandler) ServeStream(stream *MuxedStream) error {
-	mosh.stream = stream
-	// Echo tunnel hostname in header
-	stream.WriteHeaders([]Header{respStatusHeader})
-	return nil
-}
-
-func assertOpenStreamSucceed(t *testing.T, stream *MuxedStream, err error) {
-	assert.NoError(t, err)
-	assert.Len(t, stream.Headers, 1)
-	assert.Equal(t, respStatusHeader, stream.Headers[0])
-}
-
-func TestMissingHeaders(t *testing.T) {
-	originHandler := &mockOriginStreamHandler{}
-	muxPair := NewDefaultMuxerPair(t, t.Name(), originHandler.ServeStream)
-	muxPair.Serve(t)
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	defer cancel()
-
-	reqHeaders := []Header{
-		{
-			Name:  "content-type",
-			Value: "application/json",
-		},
-	}
-
-	stream, err := muxPair.EdgeMux.OpenStream(ctx, reqHeaders, nil)
-	assertOpenStreamSucceed(t, stream, err)
-
-	assert.Empty(t, originHandler.stream.method)
-	assert.Empty(t, originHandler.stream.path)
-}
-
-func TestReceiveHeaderData(t *testing.T) {
-	originHandler := &mockOriginStreamHandler{}
-	muxPair := NewDefaultMuxerPair(t, t.Name(), originHandler.ServeStream)
-	muxPair.Serve(t)
-
-	reqHeaders := []Header{
-		methodHeader,
-		schemeHeader,
-		pathHeader,
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	defer cancel()
-
-	stream, err := muxPair.EdgeMux.OpenStream(ctx, reqHeaders, nil)
-	assertOpenStreamSucceed(t, stream, err)
-
-	assert.Equal(t, methodHeader.Value, originHandler.stream.method)
-	assert.Equal(t, pathHeader.Value, originHandler.stream.path)
-}

h2mux/muxwriter.go

@@ -1,311 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io"
-	"time"
-
-	"github.com/rs/zerolog"
-
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-)
-
-type MuxWriter struct {
-	// f is used to write HTTP2 frames.
-	f *http2.Framer
-	// streams tracks currently-open streams.
-	streams *activeStreamMap
-	// streamErrors receives stream errors raised by the MuxReader.
-	streamErrors *StreamErrorMap
-	// readyStreamChan is used to multiplex writable streams onto the single connection.
-	// When a stream becomes writable its ID is sent on this channel.
-	readyStreamChan <-chan uint32
-	// newStreamChan is used to create new streams with a given set of headers.
-	newStreamChan <-chan MuxedStreamRequest
-	// goAwayChan is used to send a single GOAWAY message to the peer. The element received
-	// is the HTTP/2 error code to send.
-	goAwayChan <-chan http2.ErrCode
-	// abortChan is used when shutting down ungracefully. When this becomes readable, all activity should stop.
-	abortChan <-chan struct{}
-	// pingTimestamp is an atomic value containing the latest received ping timestamp.
-	pingTimestamp *PingTimestamp
-	// A timer used to measure idle connection time. Reset after sending data.
-	idleTimer *IdleTimer
-	// connActiveChan receives a signal that the connection received some (read) activity.
-	connActiveChan <-chan struct{}
-	// Maximum size of all frames that can be sent on this connection.
-	maxFrameSize uint32
-	// headerEncoder is the stateful header encoder for this connection
-	headerEncoder *hpack.Encoder
-	// headerBuffer is the temporary buffer used by headerEncoder.
-	headerBuffer bytes.Buffer
-
-	// metricsUpdater is used to report metrics
-	metricsUpdater muxMetricsUpdater
-	// bytesWrote is the amount of bytes written to data frames since the last time we called metricsUpdater.updateOutBoundBytes()
-	bytesWrote *AtomicCounter
-
-	useDictChan <-chan useDictRequest
-}
-
-type MuxedStreamRequest struct {
-	stream *MuxedStream
-	body   io.Reader
-}
-
-func NewMuxedStreamRequest(stream *MuxedStream, body io.Reader) MuxedStreamRequest {
-	return MuxedStreamRequest{
-		stream: stream,
-		body:   body,
-	}
-}
-
-func (r *MuxedStreamRequest) flushBody() {
-	io.Copy(r.stream, r.body)
-	r.stream.CloseWrite()
-}
-
-func tsToPingData(ts int64) [8]byte {
-	pingData := [8]byte{}
-	binary.LittleEndian.PutUint64(pingData[:], uint64(ts))
-	return pingData
-}
-
-func (w *MuxWriter) run(log *zerolog.Logger) error {
-	defer log.Debug().Msg("mux - write: event loop finished")
-
-	// routine to periodically communicate bytesWrote
-	go func() {
-		ticker := time.NewTicker(updateFreq)
-		defer ticker.Stop()
-		for {
-			select {
-			case <-w.abortChan:
-				return
-			case <-ticker.C:
-				w.metricsUpdater.updateOutBoundBytes(w.bytesWrote.Count())
-			}
-		}
-	}()
-
-	for {
-		select {
-		case <-w.abortChan:
-			log.Debug().Msg("mux - write: aborting writer thread")
-			return nil
-		case errCode := <-w.goAwayChan:
-			log.Debug().Msgf("mux - write: sending GOAWAY code %v", errCode)
-			err := w.f.WriteGoAway(w.streams.LastPeerStreamID(), errCode, []byte{})
-			if err != nil {
-				return err
-			}
-			w.idleTimer.MarkActive()
-		case <-w.pingTimestamp.GetUpdateChan():
-			log.Debug().Msg("mux - write: sending PING ACK")
-			err := w.f.WritePing(true, tsToPingData(w.pingTimestamp.Get()))
-			if err != nil {
-				return err
-			}
-			w.idleTimer.MarkActive()
-		case <-w.idleTimer.C:
-			if !w.idleTimer.Retry() {
-				return ErrConnectionDropped
-			}
-			log.Debug().Msg("mux - write: sending PING")
-			err := w.f.WritePing(false, tsToPingData(time.Now().UnixNano()))
-			if err != nil {
-				return err
-			}
-			w.idleTimer.ResetTimer()
-		case <-w.connActiveChan:
-			w.idleTimer.MarkActive()
-		case <-w.streamErrors.GetSignalChan():
-			for streamID, errCode := range w.streamErrors.GetErrors() {
-				log.Debug().Msgf("mux - write: resetting stream with code: %v streamID: %d", errCode, streamID)
-				err := w.f.WriteRSTStream(streamID, errCode)
-				if err != nil {
-					return err
-				}
-			}
-			w.idleTimer.MarkActive()
-		case streamRequest := <-w.newStreamChan:
-			streamID := w.streams.AcquireLocalID()
-			streamRequest.stream.streamID = streamID
-			if !w.streams.Set(streamRequest.stream) {
-				// Race between OpenStream and Shutdown, and Shutdown won. Let Shutdown (and the eventual abort) take
-				// care of this stream. Ideally we'd pass the error directly to the stream object somehow so the
-				// caller can be unblocked sooner, but the value of that optimisation is minimal for most of the
-				// reasons why you'd call Shutdown anyway.
-				continue
-			}
-			if streamRequest.body != nil {
-				go streamRequest.flushBody()
-			}
-			err := w.writeStreamData(streamRequest.stream, log)
-			if err != nil {
-				return err
-			}
-			w.idleTimer.MarkActive()
-		case streamID := <-w.readyStreamChan:
-			stream, ok := w.streams.Get(streamID)
-			if !ok {
-				continue
-			}
-			err := w.writeStreamData(stream, log)
-			if err != nil {
-				return err
-			}
-			w.idleTimer.MarkActive()
-		case useDict := <-w.useDictChan:
-			err := w.writeUseDictionary(useDict)
-			if err != nil {
-				log.Error().Msgf("mux - write: error writing use dictionary: %s", err)
-				return err
-			}
-			w.idleTimer.MarkActive()
-		}
-	}
-}
-
-func (w *MuxWriter) writeStreamData(stream *MuxedStream, log *zerolog.Logger) error {
-	log.Debug().Msgf("mux - write: writable: streamID: %d", stream.streamID)
-	chunk := stream.getChunk()
-	w.metricsUpdater.updateReceiveWindow(stream.getReceiveWindow())
-	w.metricsUpdater.updateSendWindow(stream.getSendWindow())
-	if chunk.sendHeadersFrame() {
-		err := w.writeHeaders(chunk.streamID, chunk.headers)
-		if err != nil {
-			log.Error().Msgf("mux - write: error writing headers: %s: streamID: %d", err, stream.streamID)
-			return err
-		}
-		log.Debug().Msgf("mux - write: output headers: streamID: %d", stream.streamID)
-	}
-
-	if chunk.sendWindowUpdateFrame() {
-		// Send a WINDOW_UPDATE frame to update our receive window.
-		// If the Stream ID is zero, the window update applies to the connection as a whole
-		// RFC7540 section-6.9.1 "A receiver that receives a flow-controlled frame MUST
-		// always account for  its contribution against the connection flow-control
-		// window, unless the receiver treats this as a connection error"
-		err := w.f.WriteWindowUpdate(chunk.streamID, chunk.windowUpdate)
-		if err != nil {
-			log.Error().Msgf("mux - write: error writing window update: %s: streamID: %d", err, stream.streamID)
-			return err
-		}
-		log.Debug().Msgf("mux - write: increment receive window by %d streamID: %d", chunk.windowUpdate, stream.streamID)
-	}
-
-	for chunk.sendDataFrame() {
-		payload, sentEOF := chunk.nextDataFrame(int(w.maxFrameSize))
-		err := w.f.WriteData(chunk.streamID, sentEOF, payload)
-		if err != nil {
-			log.Error().Msgf("mux - write: error writing data: %s: streamID: %d", err, stream.streamID)
-			return err
-		}
-		// update the amount of data wrote
-		w.bytesWrote.IncrementBy(uint64(len(payload)))
-		log.Debug().Msgf("mux - write: output data: %d: streamID: %d", len(payload), stream.streamID)
-
-		if sentEOF {
-			if stream.readBuffer.Closed() {
-				// transition into closed state
-				if !stream.gotReceiveEOF() {
-					// the peer may send data that we no longer want to receive. Force them into the
-					// closed state.
-					log.Debug().Msgf("mux - write: resetting stream: streamID: %d", stream.streamID)
-					w.f.WriteRSTStream(chunk.streamID, http2.ErrCodeNo)
-				} else {
-					// Half-open stream transitioned into closed
-					log.Debug().Msgf("mux - write: closing stream: streamID: %d", stream.streamID)
-				}
-				w.streams.Delete(chunk.streamID)
-			} else {
-				log.Debug().Msgf("mux - write: closing stream write side: streamID: %d", stream.streamID)
-			}
-		}
-	}
-	return nil
-}
-
-func (w *MuxWriter) encodeHeaders(headers []Header) ([]byte, error) {
-	w.headerBuffer.Reset()
-	for _, header := range headers {
-		err := w.headerEncoder.WriteField(hpack.HeaderField{
-			Name:  header.Name,
-			Value: header.Value,
-		})
-		if err != nil {
-			return nil, err
-		}
-	}
-	return w.headerBuffer.Bytes(), nil
-}
-
-// writeHeaders writes a block of encoded headers, splitting it into multiple frames if necessary.
-func (w *MuxWriter) writeHeaders(streamID uint32, headers []Header) error {
-	encodedHeaders, err := w.encodeHeaders(headers)
-	if err != nil || len(encodedHeaders) == 0 {
-		return err
-	}
-
-	blockSize := int(w.maxFrameSize)
-	// CONTINUATION is unnecessary; the headers fit within the blockSize
-	if len(encodedHeaders) < blockSize {
-		return w.f.WriteHeaders(http2.HeadersFrameParam{
-			StreamID:      streamID,
-			EndHeaders:    true,
-			BlockFragment: encodedHeaders,
-		})
-	}
-
-	choppedHeaders := chopEncodedHeaders(encodedHeaders, blockSize)
-	// len(choppedHeaders) is at least 2
-	if err := w.f.WriteHeaders(http2.HeadersFrameParam{StreamID: streamID, EndHeaders: false, BlockFragment: choppedHeaders[0]}); err != nil {
-		return err
-	}
-	for i := 1; i < len(choppedHeaders)-1; i++ {
-		if err := w.f.WriteContinuation(streamID, false, choppedHeaders[i]); err != nil {
-			return err
-		}
-	}
-	if err := w.f.WriteContinuation(streamID, true, choppedHeaders[len(choppedHeaders)-1]); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Partition a slice of bytes into `len(slice) / blockSize` slices of length `blockSize`
-func chopEncodedHeaders(headers []byte, chunkSize int) [][]byte {
-	var divided [][]byte
-
-	for i := 0; i < len(headers); i += chunkSize {
-		end := i + chunkSize
-
-		if end > len(headers) {
-			end = len(headers)
-		}
-
-		divided = append(divided, headers[i:end])
-	}
-
-	return divided
-}
-
-func (w *MuxWriter) writeUseDictionary(dictRequest useDictRequest) error {
-	err := w.f.WriteRawFrame(FrameUseDictionary, 0, dictRequest.streamID, []byte{byte(dictRequest.dictID)})
-	if err != nil {
-		return err
-	}
-	payload := make([]byte, 0, 64)
-	for _, set := range dictRequest.setDict {
-		payload = append(payload, byte(set.dictID))
-		payload = appendVarInt(payload, 7, uint64(set.dictSZ))
-		payload = append(payload, 0x80) // E = 1, D = 0, Truncate = 0
-	}
-
-	err = w.f.WriteRawFrame(FrameSetDictionary, FlagSetDictionaryAppend, dictRequest.streamID, payload)
-	return err
-}

h2mux/muxwriter_test.go

@@ -1,26 +0,0 @@
-package h2mux
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestChopEncodedHeaders(t *testing.T) {
-	mockEncodedHeaders := make([]byte, 5)
-	for i := range mockEncodedHeaders {
-		mockEncodedHeaders[i] = byte(i)
-	}
-	chopped := chopEncodedHeaders(mockEncodedHeaders, 4)
-
-	assert.Equal(t, 2, len(chopped))
-	assert.Equal(t, []byte{0, 1, 2, 3}, chopped[0])
-	assert.Equal(t, []byte{4}, chopped[1])
-}
-
-func TestChopEncodedEmptyHeaders(t *testing.T) {
-	mockEncodedHeaders := make([]byte, 0)
-	chopped := chopEncodedHeaders(mockEncodedHeaders, 3)
-
-	assert.Equal(t, 0, len(chopped))
-}

h2mux/readylist.go

@@ -1,151 +0,0 @@
-package h2mux
-
-import "sync"
-
-// ReadyList multiplexes several event signals onto a single channel.
-type ReadyList struct {
-	// signalC is used to signal that a stream can be enqueued
-	signalC chan uint32
-	// waitC is used to signal the ID of the first ready descriptor
-	waitC chan uint32
-	// doneC is used to signal that run should terminate
-	doneC     chan struct{}
-	closeOnce sync.Once
-}
-
-func NewReadyList() *ReadyList {
-	rl := &ReadyList{
-		signalC: make(chan uint32),
-		waitC:   make(chan uint32),
-		doneC:   make(chan struct{}),
-	}
-	go rl.run()
-	return rl
-}
-
-// ID is the stream ID
-func (r *ReadyList) Signal(ID uint32) {
-	select {
-	case r.signalC <- ID:
-	// ReadyList already closed
-	case <-r.doneC:
-	}
-}
-
-func (r *ReadyList) ReadyChannel() <-chan uint32 {
-	return r.waitC
-}
-
-func (r *ReadyList) Close() {
-	r.closeOnce.Do(func() {
-		close(r.doneC)
-	})
-}
-
-func (r *ReadyList) run() {
-	defer close(r.waitC)
-	var queue readyDescriptorQueue
-	var firstReady *readyDescriptor
-	activeDescriptors := newReadyDescriptorMap()
-	for {
-		if firstReady == nil {
-			select {
-			case i := <-r.signalC:
-				firstReady = activeDescriptors.SetIfMissing(i)
-			case <-r.doneC:
-				return
-			}
-		}
-		select {
-		case r.waitC <- firstReady.ID:
-			activeDescriptors.Delete(firstReady.ID)
-			firstReady = queue.Dequeue()
-		case i := <-r.signalC:
-			newReady := activeDescriptors.SetIfMissing(i)
-			if newReady != nil {
-				// key doesn't exist
-				queue.Enqueue(newReady)
-			}
-		case <-r.doneC:
-			return
-		}
-	}
-}
-
-type readyDescriptor struct {
-	ID   uint32
-	Next *readyDescriptor
-}
-
-// readyDescriptorQueue is a queue of readyDescriptors in the form of a singly-linked list.
-// The nil readyDescriptorQueue is an empty queue ready for use.
-type readyDescriptorQueue struct {
-	Head *readyDescriptor
-	Tail *readyDescriptor
-}
-
-func (q *readyDescriptorQueue) Empty() bool {
-	return q.Head == nil
-}
-
-func (q *readyDescriptorQueue) Enqueue(x *readyDescriptor) {
-	if x.Next != nil {
-		panic("enqueued already queued item")
-	}
-	if q.Empty() {
-		q.Head = x
-		q.Tail = x
-	} else {
-		q.Tail.Next = x
-		q.Tail = x
-	}
-}
-
-// Dequeue returns the first readyDescriptor in the queue, or nil if empty.
-func (q *readyDescriptorQueue) Dequeue() *readyDescriptor {
-	if q.Empty() {
-		return nil
-	}
-	x := q.Head
-	q.Head = x.Next
-	x.Next = nil
-	return x
-}
-
-// readyDescriptorQueue is a map of readyDescriptors keyed by ID.
-// It maintains a free list of deleted ready descriptors.
-type readyDescriptorMap struct {
-	descriptors map[uint32]*readyDescriptor
-	free        []*readyDescriptor
-}
-
-func newReadyDescriptorMap() *readyDescriptorMap {
-	return &readyDescriptorMap{descriptors: make(map[uint32]*readyDescriptor)}
-}
-
-// create or reuse a readyDescriptor if the stream is not in the queue.
-// This avoid stream starvation caused by a single high-bandwidth stream monopolising the writer goroutine
-func (m *readyDescriptorMap) SetIfMissing(key uint32) *readyDescriptor {
-	if _, ok := m.descriptors[key]; ok {
-		return nil
-	}
-
-	var newDescriptor *readyDescriptor
-	if len(m.free) > 0 {
-		// reuse deleted ready descriptors
-		newDescriptor = m.free[len(m.free)-1]
-		m.free = m.free[:len(m.free)-1]
-	} else {
-		newDescriptor = &readyDescriptor{}
-	}
-	newDescriptor.ID = key
-	m.descriptors[key] = newDescriptor
-	return newDescriptor
-}
-
-func (m *readyDescriptorMap) Delete(key uint32) {
-	if descriptor, ok := m.descriptors[key]; ok {
-		m.free = append(m.free, descriptor)
-		delete(m.descriptors, key)
-	}
-}

h2mux/readylist_test.go

@@ -1,171 +0,0 @@
-package h2mux
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func assertEmpty(t *testing.T, rl *ReadyList) {
-	select {
-	case <-rl.ReadyChannel():
-		t.Fatal("Spurious wakeup")
-	default:
-	}
-}
-
-func assertClosed(t *testing.T, rl *ReadyList) {
-	select {
-	case _, ok := <-rl.ReadyChannel():
-		assert.False(t, ok, "ReadyChannel was not closed")
-	case <-time.After(100 * time.Millisecond):
-		t.Fatalf("Timeout")
-	}
-}
-
-func receiveWithTimeout(t *testing.T, rl *ReadyList) uint32 {
-	select {
-	case i := <-rl.ReadyChannel():
-		return i
-	case <-time.After(100 * time.Millisecond):
-		t.Fatalf("Timeout")
-		return 0
-	}
-}
-
-func TestReadyListEmpty(t *testing.T) {
-	rl := NewReadyList()
-
-	// no signals, receive should fail
-	assertEmpty(t, rl)
-}
-func TestReadyListSignal(t *testing.T) {
-	rl := NewReadyList()
-	assertEmpty(t, rl)
-
-	rl.Signal(0)
-	if receiveWithTimeout(t, rl) != 0 {
-		t.Fatalf("Received wrong ID of signalled event")
-	}
-
-	assertEmpty(t, rl)
-}
-
-func TestReadyListMultipleSignals(t *testing.T) {
-	rl := NewReadyList()
-	assertEmpty(t, rl)
-
-	// Signals should not block;
-	// Duplicate unhandled signals should not cause multiple wakeups
-	signalled := [5]bool{}
-	for i := range signalled {
-		rl.Signal(uint32(i))
-		rl.Signal(uint32(i))
-	}
-	// All signals should be received once (in any order)
-	for range signalled {
-		i := receiveWithTimeout(t, rl)
-		if signalled[i] {
-			t.Fatalf("Received signal %d more than once", i)
-		}
-		signalled[i] = true
-	}
-	for i := range signalled {
-		if !signalled[i] {
-			t.Fatalf("Never received signal %d", i)
-		}
-	}
-	assertEmpty(t, rl)
-}
-
-func TestReadyListClose(t *testing.T) {
-	rl := NewReadyList()
-	rl.Close()
-
-	// readyList.run() occurs in a separate goroutine,
-	// so there's no way to directly check that run() has terminated.
-	// Perform an indirect check: is the ready channel closed?
-	assertClosed(t, rl)
-
-	// a second rl.Close() shouldn't cause a panic
-	rl.Close()
-
-	// Signal shouldn't block after Close()
-	done := make(chan struct{})
-	go func() {
-		for i := 0; i < 5; i++ {
-			rl.Signal(uint32(i))
-		}
-		close(done)
-	}()
-	select {
-	case <-done:
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("Test timed out")
-	}
-}
-
-func TestReadyDescriptorQueue(t *testing.T) {
-	var queue readyDescriptorQueue
-	items := [4]readyDescriptor{}
-	for i := range items {
-		items[i].ID = uint32(i)
-	}
-
-	if !queue.Empty() {
-		t.Fatalf("nil queue should be empty")
-	}
-	queue.Enqueue(&items[3])
-	queue.Enqueue(&items[1])
-	queue.Enqueue(&items[0])
-	queue.Enqueue(&items[2])
-	if queue.Empty() {
-		t.Fatalf("Empty should be false after enqueue")
-	}
-	i := queue.Dequeue().ID
-	if i != 3 {
-		t.Fatalf("item 3 should have been dequeued, got %d instead", i)
-	}
-	i = queue.Dequeue().ID
-	if i != 1 {
-		t.Fatalf("item 1 should have been dequeued, got %d instead", i)
-	}
-	i = queue.Dequeue().ID
-	if i != 0 {
-		t.Fatalf("item 0 should have been dequeued, got %d instead", i)
-	}
-	i = queue.Dequeue().ID
-	if i != 2 {
-		t.Fatalf("item 2 should have been dequeued, got %d instead", i)
-	}
-	if !queue.Empty() {
-		t.Fatal("queue should be empty after dequeuing all items")
-	}
-	if queue.Dequeue() != nil {
-		t.Fatal("dequeue on empty queue should return nil")
-	}
-}
-
-func TestReadyDescriptorMap(t *testing.T) {
-	m := newReadyDescriptorMap()
-	m.Delete(42)
-	// (delete of missing key should be a noop)
-	x := m.SetIfMissing(42)
-	if x == nil {
-		t.Fatal("SetIfMissing for new key returned nil")
-	}
-	if m.SetIfMissing(42) != nil {
-		t.Fatal("SetIfMissing for existing key returned non-nil")
-	}
-	// this delete has effect
-	m.Delete(42)
-	// the next set should reuse the old object
-	y := m.SetIfMissing(666)
-	if y == nil {
-		t.Fatal("SetIfMissing for new key returned nil")
-	}
-	if x != y {
-		t.Fatal("SetIfMissing didn't reuse freed object")
-	}
-}

h2mux/rtt.go

@@ -1,29 +0,0 @@
-package h2mux
-
-import (
-	"sync/atomic"
-)
-
-// PingTimestamp is an atomic interface around ping timestamping and signalling.
-type PingTimestamp struct {
-	ts     int64
-	signal Signal
-}
-
-func NewPingTimestamp() *PingTimestamp {
-	return &PingTimestamp{signal: NewSignal()}
-}
-
-func (pt *PingTimestamp) Set(v int64) {
-	if atomic.SwapInt64(&pt.ts, v) != 0 {
-		pt.signal.Signal()
-	}
-}
-
-func (pt *PingTimestamp) Get() int64 {
-	return atomic.SwapInt64(&pt.ts, 0)
-}
-
-func (pt *PingTimestamp) GetUpdateChan() <-chan struct{} {
-	return pt.signal.WaitChannel()
-}

h2mux/sample/ghost-url.min.js

@@ -1 +0,0 @@
-!function(){"use strict";function a(a){var b,c=[];if(!a)return"";for(b in a)a.hasOwnProperty(b)&&(a[b]||a[b]===!1)&&c.push(b+"="+encodeURIComponent(a[b]));return c.length?"?"+c.join("&"):""}var b,c,d,e,f="https://cloudflare.ghost.io/ghost/api/v0.1/";d={api:function(){var d,e=Array.prototype.slice.call(arguments),g=f;return d=e.pop(),d&&"object"!=typeof d&&(e.push(d),d={}),d=d||{},d.client_id=b,d.client_secret=c,e.length&&e.forEach(function(a){g+=a.replace(/^\/|\/$/g,"")+"/"}),g+a(d)}},e=function(a){b=a.clientId?a.clientId:"",c=a.clientSecret?a.clientSecret:"",f=a.url?a.url:f.match(/{\{api-url}}/)?"":f},"undefined"!=typeof window&&(window.ghost=window.ghost||{},window.ghost.url=d,window.ghost.init=e),"undefined"!=typeof module&&(module.exports={url:d,init:e})}();

h2mux/sample/index.html

@@ -1,537 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-    <title>Cloudflare Blog</title>
-    <meta name="description" content="" />
-    <meta name="HandheldFriendly" content="True">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="msvalidate.01" content="CF295E1604697F9CAD18B5A232E871F6" />
-
-    <link rel="shortcut icon" href="/assets/images/favicon.ico?v=b6cf3f99a6">
-    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="/assets/images/apple-touch-icon-57x57-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/assets/images/apple-touch-icon-72x72-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/images/apple-touch-icon-114x114-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/assets/images/apple-touch-icon-144x144-precomposed.png?v=b6cf3f99a6" />
-
-    <link rel="stylesheet" type="text/css" href="/assets/css/screen.css?v=b6cf3f99a6" />
-    <!--[if lt IE 9]><link rel="stylesheet" type="text/css" href="/assets/css/ie.css?v=b6cf3f99a6" /><![endif]-->
-
-    <!--<link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,700,300,600" rel="stylesheet" type="text/css">-->
-
-    <script>(function(G,o,O,g,l){G.GoogleAnalyticsObject=O;G[O]||(G[O]=function(){(G[O].q=G[O].q||[]).push(arguments)});G[O].l=+new Date;g=o.createElement('script'),l=o.scripts[0];g.src='//www.google-analytics.com/analytics.js';l.parentNode.insertBefore(g,l)}(this,document,'ga'));ga('create','UA-10218544-12', 'auto');ga('send','pageview')</script>
-
-    <link rel="canonical" href="http://blog.cloudflare.com/" />
-    <meta name="referrer" content="no-referrer-when-downgrade" />
-    <link rel="next" href="https://blog.cloudflare.com/page/2/" />
-    
-    <meta property="og:site_name" content="Cloudflare Blog" />
-    <meta property="og:type" content="website" />
-    <meta property="og:title" content="Cloudflare Blog" />
-    <meta property="og:url" content="http://blog.cloudflare.com/" />
-    <meta property="og:image" content="http://blog.cloudflare.com/content/images/2016/09/logo-for-blog_thumb-1.png" />
-    <meta property="article:publisher" content="https://www.facebook.com/Cloudflare" />
-    <meta name="twitter:card" content="summary_large_image" />
-    <meta name="twitter:title" content="Cloudflare Blog" />
-    <meta name="twitter:url" content="http://blog.cloudflare.com/" />
-    <meta name="twitter:image" content="http://blog.cloudflare.com/content/images/2016/09/logo-for-blog_thumb-1.png" />
-    <meta name="twitter:site" content="@cloudflare" />
-    <meta property="og:image:width" content="189" />
-    <meta property="og:image:height" content="47" />
-    
-    <script type="application/ld+json">
-{
-    "@context": "https://schema.org",
-    "@type": "Website",
-    "publisher": {
-        "@type": "Organization",
-        "name": "Cloudflare Blog",
-        "logo": {
-            "@type": "ImageObject",
-            "url": "http://blog.cloudflare.com/content/images/2016/09/logo-for-blog_thumb.png",
-            "width": 189,
-            "height": 47
-        }
-    },
-    "url": "https://blog.cloudflare.com/",
-    "image": {
-        "@type": "ImageObject",
-        "url": "http://blog.cloudflare.com/content/images/2016/09/logo-for-blog_thumb-1.png",
-        "width": 189,
-        "height": 47
-    },
-    "mainEntityOfPage": {
-        "@type": "WebPage",
-        "@id": "http://blog.cloudflare.com"
-    }
-}
-    </script>
-
-    <script type="text/javascript" src="/shared/ghost-url.min.js?v=b6cf3f99a6"></script>
-<script type="text/javascript">
-ghost.init({
-	clientId: "ghost-frontend",
-	clientSecret: "cf0df60d1ab4"
-});
-</script>
-    <meta name="generator" content="Ghost 0.11" />
-    <link rel="alternate" type="application/rss+xml" title="Cloudflare Blog" href="https://blog.cloudflare.com/rss/" />
-    <meta name="msvalidate.01" content="CF295E1604697F9CAD18B5A232E871F6" />
-<meta class="swiftype" name="language" data-type="string" content="en" />
-<script src="https://blog.cloudflare.com/assets/js/index.js"></script>
-<script type="text/javascript" src="//cdn.bizible.com/scripts/bizible.js" async=""></script>
-<script>
-var trackRecruitingLink = function(role, url) {
-   ga('send', 'event', 'recruiting', 'jobscore-click', role, {
-     'transport': 'beacon',
-     'hitCallback': function(){document.location = url;}
-   });
-}
-</script> 
-<script type="text/javascript">
-	(function() {
-		var didInit = false;
-		function initMunchkin() {
-			if(didInit === false) {
-				didInit = true;
-				Munchkin.init('713-XSC-918');
-			}
-		}
-		var s = document.createElement('script');
-		s.type = 'text/javascript';
-		s.async = true;
-		s.src = '//munchkin.marketo.net/munchkin.js';
-		s.onreadystatechange = function() {
-			if (this.readyState == 'complete' || this.readyState == 'loaded') {
-				initMunchkin();
-			}
-		};
-		s.onload = initMunchkin;
-		document.getElementsByTagName('head')[0].appendChild(s);
-		})();
-</script>
-<script>
-var HTMLAttrToAdd = document.querySelector("html");
-HTMLAttrToAdd.setAttribute("lang", "en");
-</script>
-<style>
-    table {
-        background-color: transparent;
-    }
-    td {
-		padding: 5px 1em;
-    }
-    pre {
-        max-height: 500px;
-        overflow-y: scroll;
-    }
-</style>
-<link href="https://blog.cloudflare.com/assets/css/screen.css" rel="stylesheet">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.8.1/themes/prism.min.css" rel="stylesheet">
-
-    <style>
-        .st-default-search-input {
-            font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
-            font-size: 14px;
-            line-height: 16px;
-            font-weight: 400;
-            -moz-transition: opacity 0.2s;
-            -o-transition: opacity 0.2s;
-            -webkit-transition: opacity 0.2s;
-            transition: opacity 0.2s;
-            display: inline-block;
-            width: 190px;
-            height: 16px;
-            padding: 7px 11px 7px 28px;
-            border: 1px solid rgba(0, 0, 0, 0.25);
-            color: #444;
-            -moz-box-sizing: content-box;
-            box-sizing: content-box;
-            -moz-border-radius: 5px;
-            -webkit-border-radius: 5px;
-            border-radius: 5px;
-            background: #fff 8px 8px no-repeat url("data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAYAAABy6%2BR8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAG11AABzoAAA%2FN0AAINkAABw6AAA7GgAADA%2BAAAQkOTsmeoAAAESSURBVHjajNCxS9VRGMbxz71E4OwgoXPQxVEpXCI47%2BZqGP0LCoJO7UVD3QZzb3SwcHB7F3Uw3Zpd%2FAPCcJKG7Dj4u%2FK7Pwp94HDg5Xyf5z1Pr9YKImKANTzFXxzjU2ae6qhXaxURr%2FAFl9hHDy%2FwEK8z89sYVEp5gh84wMvMvGiSJ%2FEV85jNzLMR1McqfmN5BEBmnmMJFSvtpH7jdJiZv7q7Z%2BZPfMdcF6rN%2FT%2F1m2LGBkd4HhFT3dcRMY2FpskxaLNpayciHrWAGeziD7b%2BVfkithuTk8bkGa4wgWFmbrSTZOYeBvjc%2BucQj%2FEe6xHx4Taq1nrnKaW8K6XUUsrHWuvNevdRRLzFGwzvDbXAB9cDAHvhedDruuxSAAAAAElFTkSuQmCC")
-        }
-
-        .st-ui-close-button {
-            -moz-transition: none;
-            -o-transition: none;
-            -webkit-transition: none;
-            transition: none
-        }
-    </style>
-</head>
-<body class="home-template">
-<div id="fb-root"></div>
-<header id="header" class="header">
-    <div class="wrapper">
-        <a href="https://www.cloudflare.com" class="logo logo-header">Cloudflare</a>
-        <nav id="main-menu" class="header-navigation navigation" role="navigation">
-            <ul class="menu menu-header">
-                <li><a href="https://blog.cloudflare.com/">Blog home</a></li>
-                <li><a href="https://www.cloudflare.com/overview" tabindex="1">What we do</a></li>
-                <li><a href="https://www.cloudflare.com/support" tabindex="9">Support</a></li>
-                <li><a href="https://www.cloudflare.com/community" tabindex="9">Community</a></li>
-                <li><a href="https://www.cloudflare.com/login" tabindex="10">Login</a></li>
-                <li><a href="https://www.cloudflare.com/sign-up" class="btn btn-success" tabindex="11">Sign up</a></li>
-            </ul>
-        </nav>
-    </div>
-</header>
-
-<div class="wrapper reverse-sidebar">
-    <section class="primary-content" role="main">
-
-        
-
-<article class="post tag-google-cloud tag-cloud-computing tag-internet-summit">
-    <header class="post-header">
-        <h2 class="title"><a href="/living-in-a-multi-cloud-world/">Living In A Multi-Cloud World</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 21st, 2017 4:30PM">November 21st, 2017 4:30PM</time>
-            by <a href="/author/sergi/">Sergi Isasi</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>A few months ago at Cloudflare’s Internet Summit, we hosted a discussion on A Cloud Without Handcuffs with Joe Beda, one of the creators of Kubernetes, and Brandon Phillips, the co-founder of CoreOS. The conversation touched on multiple areas, but it’s clear that more and more companies are recognizing the need to have some strategy around hosting their applications on multiple cloud providers. Earlier this year,&hellip;</p>
-    </div>
-    <footer>
-        <a href="/living-in-a-multi-cloud-world/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/living-in-a-multi-cloud-world/#disqus_thread">Comments</a> | tagged with <a href="/tag/google-cloud/">Google Cloud</a>, <a href="/tag/cloud-computing/">Cloud Computing</a>, <a href="/tag/internet-summit/">Internet Summit</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<article class="post tag-legal tag-jengo tag-patents">
-    <header class="post-header">
-        <h2 class="title"><a href="/supreme-court-wanders-into-patent-troll-fight/">The Supreme Court Wanders into the Patent Troll Fight</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 20th, 2017 6:18PM">November 20th, 2017 6:18PM</time>
-            by <a href="/author/edo-royker/">Edo Royker</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>Next Monday, the US Supreme Court will hear oral arguments in Oil States Energy Services, LLC vs. Greene’s Energy Group, LLC, which is a case to determine whether the Inter Partes Review (IPR) administrative process at the US Patent and Trademark Office (USPTO) used to determine the validity of patents is constitutional.  The constitutionality of the IPR process is one of the biggest legal issues facing innovative&hellip;</p>
-    </div>
-    <footer>
-        <a href="/supreme-court-wanders-into-patent-troll-fight/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/supreme-court-wanders-into-patent-troll-fight/#disqus_thread">Comments</a> | tagged with <a href="/tag/legal/">Legal</a>, <a href="/tag/jengo/">Jengo</a>, <a href="/tag/patents/">Patents</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<article class="post tag-cloudflare-apps tag-developers tag-user-engagement">
-    <header class="post-header">
-        <h2 class="title"><a href="/7cloudflareappsengagement/">7 Cloudflare Apps Which Increase User Engagement on Your Site</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 14th, 2017 8:21PM">November 14th, 2017 8:21PM</time>
-            by <a href="/author/andrew/">Andrew Fitch</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>Cloudflare Apps now lists 95 apps  from apps which grow email lists to apps which acquire new customers to apps which help site owners make more money. The great thing about these apps is that users don't have to have any coding or development skills. They can just sign up for the app and start using it on their sites.   Let’s take a moment to highlight some&hellip;</p>
-    </div>
-    <footer>
-        <a href="/7cloudflareappsengagement/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/7cloudflareappsengagement/#disqus_thread">Comments</a> | tagged with <a href="/tag/cloudflare-apps/">Cloudflare Apps</a>, <a href="/tag/developers/">Developers</a>, <a href="/tag/user-engagement/">User Engagement</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<article class="post tag-acquisitions tag-cloudflare-team tag-mobile tag-neumob">
-    <header class="post-header">
-        <h2 class="title"><a href="/neumob-optimizing-mobile/">The Super Secret Cloudflare Master Plan, or why we acquired Neumob</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 14th, 2017 2:00PM">November 14th, 2017 2:00PM</time>
-            by <a href="/author/john-graham-cumming/">John Graham-Cumming</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>We announced today that Cloudflare has acquired Neumob. Neumob’s team built exceptional technology to speed up mobile apps, reduce errors on challenging mobile networks, and increase conversions. Cloudflare will integrate the Neumob technology with our global network to give Neumob truly global reach.  It’s tempting to think of the Neumob acquisition as a point product added to the Cloudflare portfolio. But it actually represents a key&hellip;</p>
-    </div>
-    <footer>
-        <a href="/neumob-optimizing-mobile/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/neumob-optimizing-mobile/#disqus_thread">Comments</a> | tagged with <a href="/tag/acquisitions/">Acquisitions</a>, <a href="/tag/cloudflare-team/">Cloudflare Team</a>, <a href="/tag/mobile/">Mobile</a>, <a href="/tag/neumob/">Neumob</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<article class="post tag-security tag-legal tag-privacy tag-attacks">
-    <header class="post-header">
-        <h2 class="title"><a href="/thwarting-the-tactics-of-the-equifax-attackers/">Thwarting the Tactics of the Equifax Attackers</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 13th, 2017 4:09PM">November 13th, 2017 4:09PM</time>
-            by <a href="/author/alex-cruz-farmer/">Alex Cruz Farmer</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>We are now 3 months on from one of the biggest, most significant data breaches in history, but has it redefined people's awareness on security? The answer to that is absolutely yes, awareness is at an all-time high. Awareness, however, does not always result in positive action. The fallacy which is often assumed is "surely, if I keep my software up to date with all the patches, that's&hellip;</p>
-    </div>
-    <footer>
-        <a href="/thwarting-the-tactics-of-the-equifax-attackers/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/thwarting-the-tactics-of-the-equifax-attackers/#disqus_thread">Comments</a> | tagged with <a href="/tag/security/">Security</a>, <a href="/tag/legal/">Legal</a>, <a href="/tag/privacy/">Privacy</a>, <a href="/tag/attacks/">Attacks</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<article class="post tag-go tag-performance tag-golang tag-developers">
-    <header class="post-header">
-        <h2 class="title"><a href="/go-dont-collect-my-garbage/">Go, don&#x27;t collect my garbage</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 13th, 2017 10:31AM">November 13th, 2017 10:31AM</time>
-            by <a href="/author/vlad-krasnov/">Vlad Krasnov</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>Not long ago I needed to benchmark the performance of Golang on a many-core machine. I took several of the benchmarks that are bundled with the Go source code, copied them, and modified them to run on all available threads. In that case the machine has 24 cores and 48 threads. CC BY-SA 2.0 image by sponki25 I started with ECDSA P256 Sign, probably because I have&hellip;</p>
-    </div>
-    <footer>
-        <a href="/go-dont-collect-my-garbage/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/go-dont-collect-my-garbage/#disqus_thread">Comments</a> | tagged with <a href="/tag/go/">Go</a>, <a href="/tag/performance/">Performance</a>, <a href="/tag/golang/">golang</a>, <a href="/tag/developers/">Developers</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<article class="post tag-developers tag-javascript tag-php tag-lua tag-go tag-meetup tag-cloudflare-meetups tag-community tag-pizza">
-    <header class="post-header">
-        <h2 class="title"><a href="/cloudflare-wants-to-buy-your-meetup-group-pizza/">Cloudflare Wants to Buy Your Meetup Group Pizza</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 10th, 2017 3:00PM">November 10th, 2017 3:00PM</time>
-            by <a href="/author/andrew/">Andrew Fitch</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>If you’re a web dev / devops / etc. meetup group that also works toward building a faster, safer Internet, I want to support your awesome group by buying you pizza. If your group’s focus falls within one of the subject categories below and you’re willing to give us a 30 second shout out and tweet a photo of your group and @Cloudflare, your meetup’s pizza&hellip;</p>
-    </div>
-    <footer>
-        <a href="/cloudflare-wants-to-buy-your-meetup-group-pizza/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/cloudflare-wants-to-buy-your-meetup-group-pizza/#disqus_thread">Comments</a> | tagged with <a href="/tag/developers/">Developers</a>, <a href="/tag/javascript/">javascript</a>, <a href="/tag/php/">php</a>, <a href="/tag/lua/">lua</a>, <a href="/tag/go/">Go</a>, <a href="/tag/meetup/">MeetUp</a>, <a href="/tag/cloudflare-meetups/">Cloudflare Meetups</a>, <a href="/tag/community/">Community</a>, <a href="/tag/pizza/">Pizza</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<article class="post">
-    <header class="post-header">
-        <h2 class="title"><a href="/on-the-dangers-of-intels-frequency-scaling/">On the dangers of Intel&#x27;s frequency scaling</a></h2>
-        <div class="meta">
-            Published on <time class="meta-date" datetime="November 10th, 2017 11:06AM">November 10th, 2017 11:06AM</time>
-            by <a href="/author/vlad-krasnov/">Vlad Krasnov</a>.
-        </div>
-    </header>
-    <div class="post-excerpt">
-        <p>While I was writing the post comparing the new Qualcomm server chip, Centriq, to our current stock of Intel Skylake-based Xeons, I noticed a disturbing phenomena. When benchmarking OpenSSL 1.1.1dev, I discovered that the performance of the cipher ChaCha20-Poly1305 does not scale very well. On a single thread, it performed at the speed of approximately 2.89GB/s, whereas on 24 cores, and 48 threads it&hellip;</p>
-    </div>
-    <footer>
-        <a href="/on-the-dangers-of-intels-frequency-scaling/" class="more">Read more &raquo; </a><br>
-        <small>
-            <span class="post-meta">
-                <a href="/on-the-dangers-of-intels-frequency-scaling/#disqus_thread">Comments</a>
-            </span>
-        </small>
-    </footer>
-</article>
-
-
-
-<section class="clearfix" role="navigation">
-        <a class="newer-posts btn" href="/page/2/">Older &raquo;</a>
-</section>
-
-    </section>
-
-    <aside class="sidebar">
-    <div class="widget">
-      <input type="text" placeholder="Search the blog" class="st-default-search-input"></input>
-      <script type="text/javascript">
-          (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
-          (w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t);
-          e=d.getElementsByTagName(t)[0];s.async=0;s.src=u;e.parentNode.insertBefore(s,e);
-          })(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st');
-        _st('install','_KobMC_zsd_tDx_7NWiX','2.0.0');
-      </script>
-    </div>
-    <div class="widget">
-        <h4 class="widget-title">Cloudflare blog</h4>
-        <p style="margin-top: 20px">
-            <a href="https://www.cloudflare.com/enterprise-service-request" class="btn btn-success" tabindex="11" target="_blank">Contact our team</a>
-        </p>
-        <p>
-            <strong>US callers</strong><br/>
-            1 (888) 99-FLARE <br/>
-            <strong>UK callers</strong><br/>
-            +44 (0)20 3514 6970<br/>
-            <strong>International callers</strong><br/>
-            +1 (650) 319-8930 <BR/><BR/>
-            <a href="https://www.cloudflare.com/plans" target="_blank">Full feature list and plan types</a>
-        </p>
-        <p>Cloudflare provides performance and security for any website. More than 6 million websites use Cloudflare.</p>
-        <p>There is no hardware or software. Cloudflare works at the DNS level. It takes only 5 minutes to sign up. To learn more, please visit our website</p>
-    </div>
-    <div class="widget">
-        <h4 class="widget-title">Cloudflare features</h4>
-        <ul class="menu menu-sidebar">
-            <li><a href="https://www.cloudflare.com/">Overview</a></li>
-            <li><a href="https://www.cloudflare.com/cdn/">CDN</a></li>
-            <li><a href="https://www.cloudflare.com/website-optimization/">Optimizer</a></li>
-            <li><a href="https://www.cloudflare.com/security/">Security</a></li>
-            <li><a href="https://www.cloudflare.com/analytics/">Analytics</a></li>
-            <li><a href="https://www.cloudflare.com/apps">Apps</a></li>
-            <li><a href="https://www.cloudflare.com/network/">Network map</a></li>
-            <li><a href="https://www.cloudflarestatus.com">System status</a></li>
-        </ul>
-    </div>
-    <div id="mc_embed_signup" class="widget">
-        <form action="https://cloudflare.us5.list-manage.com/subscribe/post?u=d80d4d74266c0c044b0bcd7ca&amp;id=8dc0bf9dea" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
-            <input type="email" value="" name="EMAIL" class="width-full required email" id="mce-EMAIL" placeholder="Enter your email address"/>
-            <div id="mce-responses" class="clearfix">
-            <div class="response" id="mce-error-response" style="display:none"></div>
-            <div class="response" id="mce-success-response" style="display:none"></div>
-            </div>
-            <div class="clearfix">
-                <button type="submit" name="subscribe" id="mc-embedded-subscribe" class="btn btn-primary width-full">Sign up for email updates</button>
-            </div>
-        </form>
-    </div>
-</aside>
-</div>
-
-<footer id="footer" class="footer">
-    <div class="wrapper">
-        <nav class="navigation footer-nav">
-            <ul role="navigation">
-                <li id="cf_nav_menu-2" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">What We Do</h6>
-                    <div class="menu-what-we-do-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/plans">Plans</a></li>
-                            <li><a href="https://www.cloudflare.com/performance/">Performance</a></li>
-                            <li><a href="https://www.cloudflare.com/security/">Security</a></li>
-                            <li><a href="https://www.cloudflare.com/reliability/">Reliability</a></li>
-                            <li><a href="https://www.cloudflare.com/apps">Apps</a></li>
-                            <li><a href="https://www.cloudflare.com/network-map">Network</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-3" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Resources</h6>
-                    <div class="menu-support-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/support">Help Center</a></li>
-                            <li><a href="https://www.cloudflare.com/community">Community</a></li>
-                            <li><a href="https://www.cloudflare.com/video">Video Guides</a></li>
-                            <li><a href="https://www.cloudflarestatus.com">System Status</a></li>
-                            <li><a href="https://www.cloudflare.com/contact">Contact Us</a></li>
-
-                            <li class="active"><a href="/">Blog</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-4" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Not a Developer?</h6>
-                    <div class="menu-resources-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/case-studies">Case Studies</a></li>
-                            <li><a href="https://www.cloudflare.com/resources/">White Papers</a></li>
-                            <li><a href="https://www.cloudflare.com/internet-summit/">Internet Summit</a></li>
-                            <li><a href="https://www.cloudflare.com/hosting-partners">Partners</a></li>
-                            <li><a href="https://www.cloudflare.com/hosting-partners">Integrations</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-5" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">About Us</h6>
-                    <div class="menu-about-us-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/people">Our Team</a></li>
-                            <li><a href="https://www.cloudflare.com/join-our-team">Careers</a></li>
-                            <li><a href="https://www.cloudflare.com/press-center">Press</a></li>
-                            <li><a href="https://www.cloudflare.com/terms">Terms of Service</a></li>
-                            <li><a href="https://www.cloudflare.com/security-policy/">Privacy &amp; Security</a></li>
-                            <li><a href="https://www.cloudflare.com/abuse/">Trust &amp; Safety</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-6" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Connect</h6>
-                    <div class="menu-connect-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="http://twitter.com/cloudflare">Twitter</a></li>
-                            <li><a href="https://www.facebook.com/Cloudflare">Facebook</a></li>
-                            <li><a href="https://www.linkedin.com/company/cloudflare-inc-">LinkedIn</a></li>
-                            <li><a href="https://www.youtube.com/cloudflare-">YouTube</a></li>
-                            <li><a href="https://plus.google.com/+cloudflare/posts">Google+</a></li>
-                            <li><a href="/rss/">RSS</a></li>
-                        </ul>
-                    </div>
-                </li>
-            </ul>
-            <div class="credits">All content &copy; 2017 <a href="https://cloudflare.com">Cloudflare</a>. Proudly published with <a href="https://ghost.org">Ghost</a>.</div>
-        </nav>
-    </div>
-</footer>
-
-<script>
-    var links = document.links;
-
-    for (var i = 0, linksLength = links.length; i < linksLength; i++) {  
-       if (links[i].hostname != window.location.hostname) {
-           links[i].target = '_blank';
-       } 
-    } 
-</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.8.1/prism.min.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.fitvids.js?v=b6cf3f99a6"></script>
-<script type="text/javascript">
-    $(document).ready(function(){ $(".post-content").fitVids(); });
-</script>
-
-<script type="text/javascript">
-
-    var disqus_shortname = 'cloudflare';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-
-</body>
-</html>

h2mux/sample/index1.html

@@ -1,515 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-    <title>Living In A Multi-Cloud World</title>
-    <meta name="description" content="At our recent Internet Summit, we hosted a discussion on A Cloud Without Handcuffs with Joe Beda, one of the creators of Kubernetes, and Brandon Phillips, the co-founder of CoreOS." />
-    <meta name="HandheldFriendly" content="True">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="msvalidate.01" content="CF295E1604697F9CAD18B5A232E871F6" />
-
-    <link rel="shortcut icon" href="/assets/images/favicon.ico?v=b6cf3f99a6">
-    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="/assets/images/apple-touch-icon-57x57-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/assets/images/apple-touch-icon-72x72-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/images/apple-touch-icon-114x114-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/assets/images/apple-touch-icon-144x144-precomposed.png?v=b6cf3f99a6" />
-
-    <link rel="stylesheet" type="text/css" href="/assets/css/screen.css?v=b6cf3f99a6" />
-    <!--[if lt IE 9]><link rel="stylesheet" type="text/css" href="/assets/css/ie.css?v=b6cf3f99a6" /><![endif]-->
-
-    <!--<link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,700,300,600" rel="stylesheet" type="text/css">-->
-
-    <script>(function(G,o,O,g,l){G.GoogleAnalyticsObject=O;G[O]||(G[O]=function(){(G[O].q=G[O].q||[]).push(arguments)});G[O].l=+new Date;g=o.createElement('script'),l=o.scripts[0];g.src='//www.google-analytics.com/analytics.js';l.parentNode.insertBefore(g,l)}(this,document,'ga'));ga('create','UA-10218544-12', 'auto');ga('send','pageview')</script>
-
-    <link rel="canonical" href="http://blog.cloudflare.com/living-in-a-multi-cloud-world/" />
-    <meta name="referrer" content="no-referrer-when-downgrade" />
-    <link rel="amphtml" href="http://blog.cloudflare.com/living-in-a-multi-cloud-world/amp/" />
-    
-    <meta property="og:site_name" content="Cloudflare Blog" />
-    <meta property="og:type" content="article" />
-    <meta property="og:title" content="Living In A Multi-Cloud World" />
-    <meta property="og:description" content="At our recent Internet Summit, we hosted a discussion on A Cloud Without Handcuffs with Joe Beda, one of the creators of Kubernetes, and Brandon Phillips, the co-founder of CoreOS." />
-    <meta property="og:url" content="http://blog.cloudflare.com/living-in-a-multi-cloud-world/" />
-    <meta property="og:image" content="http://blog.cloudflare.com/content/images/2017/11/Cloudflare_Multi_Cloud-1.png" />
-    <meta property="article:published_time" content="2017-11-21T16:30:00.000Z" />
-    <meta property="article:modified_time" content="2017-11-21T16:35:36.000Z" />
-    <meta property="article:tag" content="Google Cloud" />
-    <meta property="article:tag" content="Cloud Computing" />
-    <meta property="article:tag" content="Internet Summit" />
-    
-    <meta property="article:publisher" content="https://www.facebook.com/Cloudflare" />
-    <meta name="twitter:card" content="summary_large_image" />
-    <meta name="twitter:title" content="Living In A Multi-Cloud World" />
-    <meta name="twitter:description" content="At our recent Internet Summit, we hosted a discussion on A Cloud Without Handcuffs with Joe Beda, one of the creators of Kubernetes, and Brandon Phillips, the co-founder of CoreOS." />
-    <meta name="twitter:url" content="http://blog.cloudflare.com/living-in-a-multi-cloud-world/" />
-    <meta name="twitter:image" content="http://blog.cloudflare.com/content/images/2017/11/Cloudflare_Multi_Cloud-1.png" />
-    <meta name="twitter:label1" content="Written by" />
-    <meta name="twitter:data1" content="Sergi Isasi" />
-    <meta name="twitter:label2" content="Filed under" />
-    <meta name="twitter:data2" content="Google Cloud, Cloud Computing, Internet Summit" />
-    <meta name="twitter:site" content="@cloudflare" />
-    <meta name="twitter:creator" content="@sgisasi" />
-    <meta property="og:image:width" content="2002" />
-    <meta property="og:image:height" content="934" />
-    
-    <script type="application/ld+json">
-{
-    "@context": "https://schema.org",
-    "@type": "Article",
-    "publisher": {
-        "@type": "Organization",
-        "name": "Cloudflare Blog",
-        "logo": {
-            "@type": "ImageObject",
-            "url": "http://blog.cloudflare.com/content/images/2016/09/logo-for-blog_thumb.png",
-            "width": 189,
-            "height": 47
-        }
-    },
-    "author": {
-        "@type": "Person",
-        "name": "Sergi Isasi",
-        "image": {
-            "@type": "ImageObject",
-            "url": "http://blog.cloudflare.com/content/images/2017/11/FullSizeRender_jpeg.png",
-            "width": 487,
-            "height": 487
-        },
-        "url": "http://blog.cloudflare.com/author/sergi/",
-        "sameAs": [
-            "https://twitter.com/sgisasi"
-        ],
-        "description": "Product Management @ Cloudflare. "
-    },
-    "headline": "Living In A Multi-Cloud World",
-    "url": "https://blog.cloudflare.com/living-in-a-multi-cloud-world/",
-    "datePublished": "2017-11-21T16:30:00.000Z",
-    "dateModified": "2017-11-21T16:35:36.000Z",
-    "image": {
-        "@type": "ImageObject",
-        "url": "http://blog.cloudflare.com/content/images/2017/11/Cloudflare_Multi_Cloud-1.png",
-        "width": 2002,
-        "height": 934
-    },
-    "keywords": "Google Cloud, Cloud Computing, Internet Summit",
-    "description": "At our recent Internet Summit, we hosted a discussion on A Cloud Without Handcuffs with Joe Beda, one of the creators of Kubernetes, and Brandon Phillips, the co-founder of CoreOS.",
-    "mainEntityOfPage": {
-        "@type": "WebPage",
-        "@id": "http://blog.cloudflare.com"
-    }
-}
-    </script>
-
-    <script type="text/javascript" src="/shared/ghost-url.min.js?v=b6cf3f99a6"></script>
-<script type="text/javascript">
-ghost.init({
-	clientId: "ghost-frontend",
-	clientSecret: "cf0df60d1ab4"
-});
-</script>
-    <meta name="generator" content="Ghost 0.11" />
-    <link rel="alternate" type="application/rss+xml" title="Cloudflare Blog" href="https://blog.cloudflare.com/rss/" />
-    <meta name="msvalidate.01" content="CF295E1604697F9CAD18B5A232E871F6" />
-<meta class="swiftype" name="language" data-type="string" content="en" />
-<script src="https://blog.cloudflare.com/assets/js/index.js"></script>
-<script type="text/javascript" src="//cdn.bizible.com/scripts/bizible.js" async=""></script>
-<script>
-var trackRecruitingLink = function(role, url) {
-   ga('send', 'event', 'recruiting', 'jobscore-click', role, {
-     'transport': 'beacon',
-     'hitCallback': function(){document.location = url;}
-   });
-}
-</script> 
-<script type="text/javascript">
-	(function() {
-		var didInit = false;
-		function initMunchkin() {
-			if(didInit === false) {
-				didInit = true;
-				Munchkin.init('713-XSC-918');
-			}
-		}
-		var s = document.createElement('script');
-		s.type = 'text/javascript';
-		s.async = true;
-		s.src = '//munchkin.marketo.net/munchkin.js';
-		s.onreadystatechange = function() {
-			if (this.readyState == 'complete' || this.readyState == 'loaded') {
-				initMunchkin();
-			}
-		};
-		s.onload = initMunchkin;
-		document.getElementsByTagName('head')[0].appendChild(s);
-		})();
-</script>
-<script>
-var HTMLAttrToAdd = document.querySelector("html");
-HTMLAttrToAdd.setAttribute("lang", "en");
-</script>
-<style>
-    table {
-        background-color: transparent;
-    }
-    td {
-		padding: 5px 1em;
-    }
-    pre {
-        max-height: 500px;
-        overflow-y: scroll;
-    }
-</style>
-<link href="https://blog.cloudflare.com/assets/css/screen.css" rel="stylesheet">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.8.1/themes/prism.min.css" rel="stylesheet">
-
-    <style>
-        .st-default-search-input {
-            font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
-            font-size: 14px;
-            line-height: 16px;
-            font-weight: 400;
-            -moz-transition: opacity 0.2s;
-            -o-transition: opacity 0.2s;
-            -webkit-transition: opacity 0.2s;
-            transition: opacity 0.2s;
-            display: inline-block;
-            width: 190px;
-            height: 16px;
-            padding: 7px 11px 7px 28px;
-            border: 1px solid rgba(0, 0, 0, 0.25);
-            color: #444;
-            -moz-box-sizing: content-box;
-            box-sizing: content-box;
-            -moz-border-radius: 5px;
-            -webkit-border-radius: 5px;
-            border-radius: 5px;
-            background: #fff 8px 8px no-repeat url("data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAYAAABy6%2BR8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAG11AABzoAAA%2FN0AAINkAABw6AAA7GgAADA%2BAAAQkOTsmeoAAAESSURBVHjajNCxS9VRGMbxz71E4OwgoXPQxVEpXCI47%2BZqGP0LCoJO7UVD3QZzb3SwcHB7F3Uw3Zpd%2FAPCcJKG7Dj4u%2FK7Pwp94HDg5Xyf5z1Pr9YKImKANTzFXxzjU2ae6qhXaxURr%2FAFl9hHDy%2FwEK8z89sYVEp5gh84wMvMvGiSJ%2FEV85jNzLMR1McqfmN5BEBmnmMJFSvtpH7jdJiZv7q7Z%2BZPfMdcF6rN%2FT%2F1m2LGBkd4HhFT3dcRMY2FpskxaLNpayciHrWAGeziD7b%2BVfkithuTk8bkGa4wgWFmbrSTZOYeBvjc%2BucQj%2FEe6xHx4Taq1nrnKaW8K6XUUsrHWuvNevdRRLzFGwzvDbXAB9cDAHvhedDruuxSAAAAAElFTkSuQmCC")
-        }
-
-        .st-ui-close-button {
-            -moz-transition: none;
-            -o-transition: none;
-            -webkit-transition: none;
-            transition: none
-        }
-    </style>
-</head>
-<body class="post-template tag-google-cloud tag-cloud-computing tag-internet-summit">
-<div id="fb-root"></div>
-<header id="header" class="header">
-    <div class="wrapper">
-        <a href="https://www.cloudflare.com" class="logo logo-header">Cloudflare</a>
-        <nav id="main-menu" class="header-navigation navigation" role="navigation">
-            <ul class="menu menu-header">
-                <li><a href="https://blog.cloudflare.com/">Blog home</a></li>
-                <li><a href="https://www.cloudflare.com/overview" tabindex="1">What we do</a></li>
-                <li><a href="https://www.cloudflare.com/support" tabindex="9">Support</a></li>
-                <li><a href="https://www.cloudflare.com/community" tabindex="9">Community</a></li>
-                <li><a href="https://www.cloudflare.com/login" tabindex="10">Login</a></li>
-                <li><a href="https://www.cloudflare.com/sign-up" class="btn btn-success" tabindex="11">Sign up</a></li>
-            </ul>
-        </nav>
-    </div>
-</header>
-
-<div class="wrapper reverse-sidebar">
-    <section class="primary-content" role="main">
-
-        <article class="post tag-google-cloud tag-cloud-computing tag-internet-summit">
-
-
-        <header class="post-header">
-            <h1 class="title">Living In A Multi-Cloud World</h1>
-            <div class="meta">
-                <time class="meta-date" datetime="2017-11-21">21 Nov 2017</time>
-                by <a href="/author/sergi/">Sergi Isasi</a>.
-            </div>
-            <div class="social">
-                <div class="g-plusone" data-size="medium" data-href="https://blog.cloudflare.com/living-in-a-multi-cloud-world/"></div>
-                <script type="IN/Share" data-url="https://blog.cloudflare.com/living-in-a-multi-cloud-world/" data-counter="right"></script>
-                <div class="fb-like" data-href="https://blog.cloudflare.com/living-in-a-multi-cloud-world/" data-layout="button_count" data-action="like" data-show-faces="false" data-share="false"></div>
-                <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://blog.cloudflare.com/living-in-a-multi-cloud-world/" data-text="Living In A Multi-Cloud World" data-via="cloudflare" data-related="cloudflare">Tweet</a>
-            </div>
-        </header>
-
-        <div class="post-content">
-            <p>A few months ago at Cloudflare’s <a href="https://www.cloudflare.com/internet-summit/">Internet Summit</a>, we hosted a discussion on <a href="https://blog.cloudflare.com/a-cloud-without-handcuffs/">A Cloud Without Handcuffs</a> with Joe Beda, one of the creators of Kubernetes, and Brandon Phillips, the co-founder of CoreOS. The conversation touched on multiple areas, but it’s clear that more and more companies are recognizing the need to have some strategy around hosting their applications on multiple cloud providers.</p>
-
-<p>Earlier this year, Mary Meeker published her annual <a href="http://www.kpcb.com/internet-trends">Internet Trends</a> report which revealed that 22% of respondents viewed Cloud Vendor Lock-In as a top 3 concern, up from just 7% in 2012. This is in contrast to previous top concerns, Data Security and Cost &amp; Savings, both of which dropped amongst those surveyed.</p>
-
-<p><img src="/content/images/2017/11/Mary-Meeker-Internet-Trends-2017.png" alt="Internet Trends" /></p>
-
-<p>At Cloudflare, our mission is to help build a better internet. To fulfill this mission, our customers need to have consistent access to the best technology and services, over time. This is especially the case with respect to storage and compute providers. This means not becoming locked-in to any single provider and taking advantage of multiple cloud computing vendors (such as Amazon Web Services or Google Cloud Platform) for the same end user services. </p>
-
-<h3 id="thebenefitsofhavingmultiplecloudvendors">The Benefits of Having Multiple Cloud Vendors</h3>
-
-<p>There are a number of potential challenges when selecting a single cloud provider. Though there may be scenarios where it makes sense to consolidate on a single vendor, our belief is that it is important that customers are aware of their choice and downsides of being potentially locked-in to that particular vendor. In short, know what trade offs you are making should you decide to continue to consolidate parts of your network, compute, and storage with a single cloud provider. While not comprehensive, here are a few trade-offs you may be making if you are locked-in to one cloud.</p>
-
-<h4 id="costefficiences">Cost Efficiences</h4>
-
-<p>For some companies, there may be a cost savings involved in spreading traffic across multiple vendors. Some can take advantage of free or reduced cost tiers at lower volumes. Vendors may provide reduced costs for certain times of day that are lower utilized on their infrastructure. Applications can have varying compute requirements amongst layers of the application: some may require faster, immediate processing while others may benefit from delayed processing at a lower cost. </p>
-
-<h4 id="negotiationstrength">Negotiation Strength</h4>
-
-<p>One of the most important reasons to consider deploying in multiple cloud providers is to minimize your reliance on a single vendor’s technology for your critical business processes. As you become more vertically integrated with any vendor, your negotiation posture for pricing or favorable contract terms becomes diminished. Having production ready code available on multiple providers allows you to have less technical debt should you need to change. If you go a step further and are already sending traffic to multiple providers, you have minimized the technical debt required to switch and can negotiate from a position of strength.</p>
-
-<h4 id="businesscontinuityorhighavailability">Business Continuity or High Availability</h4>
-
-<p>While the major cloud providers are generally reliable, there have been a few notable outages in recent years. The most significant in recent memory being Amazon’s <a href="https://aws.amazon.com/message/41926/">US-EAST S3</a> outage in February. Some organizations may have a policy specifying multiple providers for high availability while others should consider it where necessary and feasible as a best practice. A multi-cloud strategy can lower operational risk from a single vendor’s mistakes causing a significant outage for a mission critical application.</p>
-
-<h4 id="experimentation">Experimentation</h4>
-
-<p>One of the exciting things about having competition in the space is the level of innovation and feature velocity of each provider. Every year there are major announcements of new products or features that may have a significant impact on improving your organization's competitive advantage. Having test and production environments in multiple providers gives your engineers the ability to understand and experiment with a new capability in the context of your technology stack and data. You may even try these features for a portion of your traffic and get real world data on any benefits realized.</p>
-
-<h3 id="cloudflaresrole">Cloudflare’s Role</h3>
-
-<p>Cloudflare is an independent third party in your multi-cloud strategy. Our goal is to minimize the layers of lock-in between you and a provider and lower the effort of change. In particular, one area where we can help right away is to minimize the operational changes necessary at the network, similar to what Kubernetes can do at the storage and compute level. As a benefit of our network, you can also have a centralized point for security and operational control.</p>
-
-<p><img src="/content/images/2017/11/Cloudflare_Multi_Cloud.png" alt="Cloudflare Multi Cloud" /></p>
-
-<p>Cloudflare’s Load Balancing can easily be configured to act as your global application traffic aggregator and distribute your traffic amongst origins at as many clouds as you choose to utilize. Active layer 7 health checks continually probe your origins and can automatically move traffic in the case of network or application failure. All consolidated web traffic can be inspected and acted upon by Cloudflare’s best of breed <a href="https://www.cloudflare.com/security/">Security</a> services, providing a single control point and visibility across all application traffic, regardless of which cloud the origin may be on. You also have the benefit of Cloudflare’s <a href="https://www.cloudflare.com/network/">Global Anycast Network</a>, providing for better speed and higher availability regardless of which clouds your origins are hosted on.</p>
-
-<h3 id="billforwardusingcloudflaretoimplementmulticloud">Billforward: Using Cloudflare to Implement Multi-Cloud</h3>
-
-<p>Billforward is a San Francisco and London based startup that is focused and mission driven on changing the way people bill and charge their customers, providing a solution to the complexities of Quote-to-Cash. Their platform is built on a number of Rest APIs that other developers call to bill and generate revenue for their own companies.  </p>
-
-<p>Billforward is using Cloudflare for its core customer facing application to failover traffic between Google Compute Engine and Amazon Web Services. Acting as a reverse proxy, Cloudflare receives all requests for and decides which of Billforward’s two configured cloud origins to use based upon the availability of that origin in near real-time. This allows Billforward to completely manage the connections to and from two disparate cloud providers using Cloudflare’s UI or API. Billforward is in the process of migrating all of their customer facing domains to a similar setup.</p>
-
-<h4 id="configuration">Configuration</h4>
-
-<p>Billforward has a single load balanced hostname with two available Pools. They’ve named the two Pools with “gce” and “aws” labels and each Pool has one Origin associated with it. All of the Pools are enabled and the entire LB/hostname is proxied through Cloudflare (as indicated by the orange cloud).</p>
-
-<p><img src="/content/images/2017/11/Billforward_Config_UI.png" alt="Billforward Configuration UI" /></p>
-
-<p>Cloudflare probes Billforward’s Origins once every minute from all of Cloudflare’s data centers around the world (a feature available to all Load Balancing Enterprise customers). If Billforward’s GCE Origin goes down, Cloudflare will quickly and automatically failover to the AWS Origin with no actions required from Billforward’s team.</p>
-
-<p>Google Compute Engine was chosen as the primary provider for this application by virtue of cost. Martin Lee, Site Reliability Engineer at Billforward says, “Essentially, GCE is cheaper for our general purpose computing needs but we're more experienced with deployments in AWS. This strategy allows us to switch back and forth at will and avoid being tied in to either platform.” It is likely that Billforward will change the priority as pricing models evolve. <br />
-<br>  </p>
-
-<blockquote>
-  <p>“It's a fairly fast moving world and features released by cloud providers can have a meaningful impact on performance and cost on a week by week basis - it helps to stay flexible,” says Martin. “We may also change priority based on features.”</p>
-</blockquote>
-
-<p><br>For orchestration of the compute and storage layers, Billforward uses <a href="https://www.docker.com/">Docker</a> containers managed through <a href="http://www.rancher.com/">Rancher</a>. They use distinct environments between cloud providers but are considering bridging an environment across cloud providers and using VPNs between them, which will enable them to move load between providers even more easily. “Our system is loosely coupled through a message queue,” adds Martin. “Having a container system across clouds means we can really take advantage of this - we can very easily move workloads across clouds without any danger of dropping tasks or ending up in an inconsistent state.”</p>
-
-<h4 id="benefits">Benefits</h4>
-
-<p>Billforward manages these connections at Cloudflare’s edge. Through this interface (or via the Cloudflare APIs), they can also manually move traffic from GCE to AWS by just disabling the GCE pool or by rearranging the Pool priority and make AWS the primary. These changes are near instant on the Cloudflare network and require no downtime to Billforward’s customer facing application. This allows them to act on potential advantageous pricing changes between the two cloud providers or move traffic to hit pricing tiers. </p>
-
-<p>In addition, Billforward is now not “locked-in” to either provider’s network; being able to move traffic and without any downtime means they can make traffic changes independent of Amazon or Google. They can also integrate additional cloud providers any time they deem fit: adding Microsoft Azure, for example, as a third Origin would be as simple as creating a new Pool and adding it to the Load Balancer. </p>
-
-<p>Billforward is a good example of a forward thinking company that is taking advantage of technologies from multiple providers to best serve their business and customers, while not being reliant on a single vendor. For further detail on their setup using Cloudflare, please check their <a href="https://www.billforward.net/blog/being-multi-cloud-with-cloudflare/">blog</a>.</p>
-        </div>
-        <footer>
-            <small>
-                Tagged with <a href="/tag/google-cloud/">Google Cloud</a>, <a href="/tag/cloud-computing/">Cloud Computing</a>, <a href="/tag/internet-summit/">Internet Summit</a>
-            </small>
-        </footer>
-        <aside class="section learn-more">
-            <h5>Want to learn more about Cloudflare?</h5>
-            <p><a href="https://www.cloudflare.com" class="btn btn-success">Learn more</a></p>
-        </aside>
-
-        <aside class="section comments">
-            <h3>Comments</h3>
-
-        </aside>
-
-
-    <div id="disqus_thread"></div>
-    <script type="text/javascript">
-        var disqus_shortname = 'cloudflare';
-        (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-    </script>
-    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-    <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-
-</article>
-
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');
-</script>
-<script>(function(d, s, id) {
-      var js, fjs = d.getElementsByTagName(s)[0];
-      if (d.getElementById(id)) return;
-      js = d.createElement(s); js.id = id;
-      js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=596756540369391";
-      fjs.parentNode.insertBefore(js, fjs);
-    }(document, 'script', 'facebook-jssdk'));
-</script>
-<script src="//platform.linkedin.com/in.js" type="text/javascript">lang: en_US</script>
-<script type="text/javascript">
-  (function() {
-    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-    po.src = 'https://apis.google.com/js/platform.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-  })();
-</script>
-
-
-    </section>
-
-    <aside class="sidebar">
-    <div class="widget">
-      <input type="text" placeholder="Search the blog" class="st-default-search-input"></input>
-      <script type="text/javascript">
-          (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
-          (w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t);
-          e=d.getElementsByTagName(t)[0];s.async=0;s.src=u;e.parentNode.insertBefore(s,e);
-          })(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st');
-        _st('install','_KobMC_zsd_tDx_7NWiX','2.0.0');
-      </script>
-    </div>
-    <div class="widget">
-        <h4 class="widget-title">Cloudflare blog</h4>
-        <p style="margin-top: 20px">
-            <a href="https://www.cloudflare.com/enterprise-service-request" class="btn btn-success" tabindex="11" target="_blank">Contact our team</a>
-        </p>
-        <p>
-            <strong>US callers</strong><br/>
-            1 (888) 99-FLARE <br/>
-            <strong>UK callers</strong><br/>
-            +44 (0)20 3514 6970<br/>
-            <strong>International callers</strong><br/>
-            +1 (650) 319-8930 <BR/><BR/>
-            <a href="https://www.cloudflare.com/plans" target="_blank">Full feature list and plan types</a>
-        </p>
-        <p>Cloudflare provides performance and security for any website. More than 6 million websites use Cloudflare.</p>
-        <p>There is no hardware or software. Cloudflare works at the DNS level. It takes only 5 minutes to sign up. To learn more, please visit our website</p>
-    </div>
-    <div class="widget">
-        <h4 class="widget-title">Cloudflare features</h4>
-        <ul class="menu menu-sidebar">
-            <li><a href="https://www.cloudflare.com/">Overview</a></li>
-            <li><a href="https://www.cloudflare.com/cdn/">CDN</a></li>
-            <li><a href="https://www.cloudflare.com/website-optimization/">Optimizer</a></li>
-            <li><a href="https://www.cloudflare.com/security/">Security</a></li>
-            <li><a href="https://www.cloudflare.com/analytics/">Analytics</a></li>
-            <li><a href="https://www.cloudflare.com/apps">Apps</a></li>
-            <li><a href="https://www.cloudflare.com/network/">Network map</a></li>
-            <li><a href="https://www.cloudflarestatus.com">System status</a></li>
-        </ul>
-    </div>
-    <div id="mc_embed_signup" class="widget">
-        <form action="https://cloudflare.us5.list-manage.com/subscribe/post?u=d80d4d74266c0c044b0bcd7ca&amp;id=8dc0bf9dea" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
-            <input type="email" value="" name="EMAIL" class="width-full required email" id="mce-EMAIL" placeholder="Enter your email address"/>
-            <div id="mce-responses" class="clearfix">
-            <div class="response" id="mce-error-response" style="display:none"></div>
-            <div class="response" id="mce-success-response" style="display:none"></div>
-            </div>
-            <div class="clearfix">
-                <button type="submit" name="subscribe" id="mc-embedded-subscribe" class="btn btn-primary width-full">Sign up for email updates</button>
-            </div>
-        </form>
-    </div>
-</aside>
-</div>
-
-<footer id="footer" class="footer">
-    <div class="wrapper">
-        <nav class="navigation footer-nav">
-            <ul role="navigation">
-                <li id="cf_nav_menu-2" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">What We Do</h6>
-                    <div class="menu-what-we-do-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/plans">Plans</a></li>
-                            <li><a href="https://www.cloudflare.com/performance/">Performance</a></li>
-                            <li><a href="https://www.cloudflare.com/security/">Security</a></li>
-                            <li><a href="https://www.cloudflare.com/reliability/">Reliability</a></li>
-                            <li><a href="https://www.cloudflare.com/apps">Apps</a></li>
-                            <li><a href="https://www.cloudflare.com/network-map">Network</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-3" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Resources</h6>
-                    <div class="menu-support-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/support">Help Center</a></li>
-                            <li><a href="https://www.cloudflare.com/community">Community</a></li>
-                            <li><a href="https://www.cloudflare.com/video">Video Guides</a></li>
-                            <li><a href="https://www.cloudflarestatus.com">System Status</a></li>
-                            <li><a href="https://www.cloudflare.com/contact">Contact Us</a></li>
-
-                            <li class="active"><a href="/">Blog</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-4" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Not a Developer?</h6>
-                    <div class="menu-resources-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/case-studies">Case Studies</a></li>
-                            <li><a href="https://www.cloudflare.com/resources/">White Papers</a></li>
-                            <li><a href="https://www.cloudflare.com/internet-summit/">Internet Summit</a></li>
-                            <li><a href="https://www.cloudflare.com/hosting-partners">Partners</a></li>
-                            <li><a href="https://www.cloudflare.com/hosting-partners">Integrations</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-5" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">About Us</h6>
-                    <div class="menu-about-us-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/people">Our Team</a></li>
-                            <li><a href="https://www.cloudflare.com/join-our-team">Careers</a></li>
-                            <li><a href="https://www.cloudflare.com/press-center">Press</a></li>
-                            <li><a href="https://www.cloudflare.com/terms">Terms of Service</a></li>
-                            <li><a href="https://www.cloudflare.com/security-policy/">Privacy &amp; Security</a></li>
-                            <li><a href="https://www.cloudflare.com/abuse/">Trust &amp; Safety</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-6" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Connect</h6>
-                    <div class="menu-connect-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="http://twitter.com/cloudflare">Twitter</a></li>
-                            <li><a href="https://www.facebook.com/Cloudflare">Facebook</a></li>
-                            <li><a href="https://www.linkedin.com/company/cloudflare-inc-">LinkedIn</a></li>
-                            <li><a href="https://www.youtube.com/cloudflare-">YouTube</a></li>
-                            <li><a href="https://plus.google.com/+cloudflare/posts">Google+</a></li>
-                            <li><a href="/rss/">RSS</a></li>
-                        </ul>
-                    </div>
-                </li>
-            </ul>
-            <div class="credits">All content &copy; 2017 <a href="https://cloudflare.com">Cloudflare</a>. Proudly published with <a href="https://ghost.org">Ghost</a>.</div>
-        </nav>
-    </div>
-</footer>
-
-<script>
-    var links = document.links;
-
-    for (var i = 0, linksLength = links.length; i < linksLength; i++) {  
-       if (links[i].hostname != window.location.hostname) {
-           links[i].target = '_blank';
-       } 
-    } 
-</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.8.1/prism.min.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.fitvids.js?v=b6cf3f99a6"></script>
-<script type="text/javascript">
-    $(document).ready(function(){ $(".post-content").fitVids(); });
-</script>
-
-<script type="text/javascript">
-
-    var disqus_shortname = 'cloudflare';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-
-</body>
-</html>

h2mux/sample/index2.html

@@ -1,502 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-    <title>SCOTUS Wanders into Patent Troll Fight</title>
-    <meta name="description" content="" />
-    <meta name="HandheldFriendly" content="True">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="msvalidate.01" content="CF295E1604697F9CAD18B5A232E871F6" />
-
-    <link rel="shortcut icon" href="/assets/images/favicon.ico?v=b6cf3f99a6">
-    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="/assets/images/apple-touch-icon-57x57-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/assets/images/apple-touch-icon-72x72-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/images/apple-touch-icon-114x114-precomposed.png?v=b6cf3f99a6" />
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/assets/images/apple-touch-icon-144x144-precomposed.png?v=b6cf3f99a6" />
-
-    <link rel="stylesheet" type="text/css" href="/assets/css/screen.css?v=b6cf3f99a6" />
-    <!--[if lt IE 9]><link rel="stylesheet" type="text/css" href="/assets/css/ie.css?v=b6cf3f99a6" /><![endif]-->
-
-    <!--<link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,700,300,600" rel="stylesheet" type="text/css">-->
-
-    <script>(function(G,o,O,g,l){G.GoogleAnalyticsObject=O;G[O]||(G[O]=function(){(G[O].q=G[O].q||[]).push(arguments)});G[O].l=+new Date;g=o.createElement('script'),l=o.scripts[0];g.src='//www.google-analytics.com/analytics.js';l.parentNode.insertBefore(g,l)}(this,document,'ga'));ga('create','UA-10218544-12', 'auto');ga('send','pageview')</script>
-
-    <link rel="canonical" href="http://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/" />
-    <meta name="referrer" content="no-referrer-when-downgrade" />
-    <link rel="amphtml" href="http://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/amp/" />
-    
-    <meta property="og:site_name" content="Cloudflare Blog" />
-    <meta property="og:type" content="article" />
-    <meta property="og:title" content="SCOTUS Wanders into Patent Troll Fight" />
-    <meta property="og:description" content="Next Monday, the US Supreme Court will hear oral arguments in Oil States Energy Services, LLC vs. Greene’s Energy Group, LLC, which is a case to determine whether the Inter Partes Review (IPR) administrative process at the US Patent and Trademark Office (USPTO) used to determine the validity of" />
-    <meta property="og:url" content="http://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/" />
-    <meta property="og:image" content="http://blog.cloudflare.com/content/images/2017/11/Thomas_Rowlandson_-_The_Privy_Council_of_a_King_-_Google_Art_Project--1-.jpg" />
-    <meta property="article:published_time" content="2017-11-20T18:18:00.000Z" />
-    <meta property="article:modified_time" content="2017-11-20T22:51:13.000Z" />
-    <meta property="article:tag" content="Legal" />
-    <meta property="article:tag" content="Jengo" />
-    <meta property="article:tag" content="Patents" />
-    
-    <meta property="article:publisher" content="https://www.facebook.com/Cloudflare" />
-    <meta name="twitter:card" content="summary_large_image" />
-    <meta name="twitter:title" content="SCOTUS Wanders into Patent Troll Fight" />
-    <meta name="twitter:description" content="Next Monday, the US Supreme Court will hear oral arguments in Oil States Energy Services, LLC vs. Greene’s Energy Group, LLC, which is a case to determine whether the Inter Partes Review (IPR) administrative process at the US Patent and Trademark Office (USPTO) used to determine the validity of" />
-    <meta name="twitter:url" content="http://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/" />
-    <meta name="twitter:image" content="http://blog.cloudflare.com/content/images/2017/11/Thomas_Rowlandson_-_The_Privy_Council_of_a_King_-_Google_Art_Project--1-.jpg" />
-    <meta name="twitter:label1" content="Written by" />
-    <meta name="twitter:data1" content="Edo Royker" />
-    <meta name="twitter:label2" content="Filed under" />
-    <meta name="twitter:data2" content="Legal, Jengo, Patents" />
-    <meta name="twitter:site" content="@cloudflare" />
-    <meta property="og:image:width" content="4468" />
-    <meta property="og:image:height" content="3183" />
-    
-    <script type="application/ld+json">
-{
-    "@context": "https://schema.org",
-    "@type": "Article",
-    "publisher": {
-        "@type": "Organization",
-        "name": "Cloudflare Blog",
-        "logo": {
-            "@type": "ImageObject",
-            "url": "http://blog.cloudflare.com/content/images/2016/09/logo-for-blog_thumb.png",
-            "width": 189,
-            "height": 47
-        }
-    },
-    "author": {
-        "@type": "Person",
-        "name": "Edo Royker",
-        "image": {
-            "@type": "ImageObject",
-            "url": "http://blog.cloudflare.com/content/images/2017/11/AAEAAQAAAAAAAAdiAAAAJDdiMzU0OWYxLTBmOTMtNGZhZi1hNDQ1LTBhNjJhZDdmMGRlZA.jpg",
-            "width": 200,
-            "height": 200
-        },
-        "url": "http://blog.cloudflare.com/author/edo-royker/",
-        "sameAs": []
-    },
-    "headline": "SCOTUS Wanders into Patent Troll Fight",
-    "url": "https://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/",
-    "datePublished": "2017-11-20T18:18:00.000Z",
-    "dateModified": "2017-11-20T22:51:13.000Z",
-    "image": {
-        "@type": "ImageObject",
-        "url": "http://blog.cloudflare.com/content/images/2017/11/Thomas_Rowlandson_-_The_Privy_Council_of_a_King_-_Google_Art_Project--1-.jpg",
-        "width": 4468,
-        "height": 3183
-    },
-    "keywords": "Legal, Jengo, Patents",
-    "description": "Next Monday, the US Supreme Court will hear oral arguments in Oil States Energy Services, LLC vs. Greene’s Energy Group, LLC, which is a case to determine whether the Inter Partes Review (IPR) administrative process at the US Patent and Trademark Office (USPTO) used to determine the validity of",
-    "mainEntityOfPage": {
-        "@type": "WebPage",
-        "@id": "http://blog.cloudflare.com"
-    }
-}
-    </script>
-
-    <script type="text/javascript" src="/shared/ghost-url.min.js?v=b6cf3f99a6"></script>
-<script type="text/javascript">
-ghost.init({
-	clientId: "ghost-frontend",
-	clientSecret: "cf0df60d1ab4"
-});
-</script>
-    <meta name="generator" content="Ghost 0.11" />
-    <link rel="alternate" type="application/rss+xml" title="Cloudflare Blog" href="https://blog.cloudflare.com/rss/" />
-    <meta name="msvalidate.01" content="CF295E1604697F9CAD18B5A232E871F6" />
-<meta class="swiftype" name="language" data-type="string" content="en" />
-<script src="https://blog.cloudflare.com/assets/js/index.js"></script>
-<script type="text/javascript" src="//cdn.bizible.com/scripts/bizible.js" async=""></script>
-<script>
-var trackRecruitingLink = function(role, url) {
-   ga('send', 'event', 'recruiting', 'jobscore-click', role, {
-     'transport': 'beacon',
-     'hitCallback': function(){document.location = url;}
-   });
-}
-</script> 
-<script type="text/javascript">
-	(function() {
-		var didInit = false;
-		function initMunchkin() {
-			if(didInit === false) {
-				didInit = true;
-				Munchkin.init('713-XSC-918');
-			}
-		}
-		var s = document.createElement('script');
-		s.type = 'text/javascript';
-		s.async = true;
-		s.src = '//munchkin.marketo.net/munchkin.js';
-		s.onreadystatechange = function() {
-			if (this.readyState == 'complete' || this.readyState == 'loaded') {
-				initMunchkin();
-			}
-		};
-		s.onload = initMunchkin;
-		document.getElementsByTagName('head')[0].appendChild(s);
-		})();
-</script>
-<script>
-var HTMLAttrToAdd = document.querySelector("html");
-HTMLAttrToAdd.setAttribute("lang", "en");
-</script>
-<style>
-    table {
-        background-color: transparent;
-    }
-    td {
-		padding: 5px 1em;
-    }
-    pre {
-        max-height: 500px;
-        overflow-y: scroll;
-    }
-</style>
-<link href="https://blog.cloudflare.com/assets/css/screen.css" rel="stylesheet">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.8.1/themes/prism.min.css" rel="stylesheet">
-
-    <style>
-        .st-default-search-input {
-            font-family: Helvetica, Arial, "Lucida Grande", sans-serif;
-            font-size: 14px;
-            line-height: 16px;
-            font-weight: 400;
-            -moz-transition: opacity 0.2s;
-            -o-transition: opacity 0.2s;
-            -webkit-transition: opacity 0.2s;
-            transition: opacity 0.2s;
-            display: inline-block;
-            width: 190px;
-            height: 16px;
-            padding: 7px 11px 7px 28px;
-            border: 1px solid rgba(0, 0, 0, 0.25);
-            color: #444;
-            -moz-box-sizing: content-box;
-            box-sizing: content-box;
-            -moz-border-radius: 5px;
-            -webkit-border-radius: 5px;
-            border-radius: 5px;
-            background: #fff 8px 8px no-repeat url("data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAYAAABy6%2BR8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAG11AABzoAAA%2FN0AAINkAABw6AAA7GgAADA%2BAAAQkOTsmeoAAAESSURBVHjajNCxS9VRGMbxz71E4OwgoXPQxVEpXCI47%2BZqGP0LCoJO7UVD3QZzb3SwcHB7F3Uw3Zpd%2FAPCcJKG7Dj4u%2FK7Pwp94HDg5Xyf5z1Pr9YKImKANTzFXxzjU2ae6qhXaxURr%2FAFl9hHDy%2FwEK8z89sYVEp5gh84wMvMvGiSJ%2FEV85jNzLMR1McqfmN5BEBmnmMJFSvtpH7jdJiZv7q7Z%2BZPfMdcF6rN%2FT%2F1m2LGBkd4HhFT3dcRMY2FpskxaLNpayciHrWAGeziD7b%2BVfkithuTk8bkGa4wgWFmbrSTZOYeBvjc%2BucQj%2FEe6xHx4Taq1nrnKaW8K6XUUsrHWuvNevdRRLzFGwzvDbXAB9cDAHvhedDruuxSAAAAAElFTkSuQmCC")
-        }
-
-        .st-ui-close-button {
-            -moz-transition: none;
-            -o-transition: none;
-            -webkit-transition: none;
-            transition: none
-        }
-    </style>
-</head>
-<body class="post-template tag-legal tag-jengo tag-patents">
-<div id="fb-root"></div>
-<header id="header" class="header">
-    <div class="wrapper">
-        <a href="https://www.cloudflare.com" class="logo logo-header">Cloudflare</a>
-        <nav id="main-menu" class="header-navigation navigation" role="navigation">
-            <ul class="menu menu-header">
-                <li><a href="https://blog.cloudflare.com/">Blog home</a></li>
-                <li><a href="https://www.cloudflare.com/overview" tabindex="1">What we do</a></li>
-                <li><a href="https://www.cloudflare.com/support" tabindex="9">Support</a></li>
-                <li><a href="https://www.cloudflare.com/community" tabindex="9">Community</a></li>
-                <li><a href="https://www.cloudflare.com/login" tabindex="10">Login</a></li>
-                <li><a href="https://www.cloudflare.com/sign-up" class="btn btn-success" tabindex="11">Sign up</a></li>
-            </ul>
-        </nav>
-    </div>
-</header>
-
-<div class="wrapper reverse-sidebar">
-    <section class="primary-content" role="main">
-
-        <article class="post tag-legal tag-jengo tag-patents">
-
-
-        <header class="post-header">
-            <h1 class="title">The Supreme Court Wanders into the Patent Troll Fight</h1>
-            <div class="meta">
-                <time class="meta-date" datetime="2017-11-20">20 Nov 2017</time>
-                by <a href="/author/edo-royker/">Edo Royker</a>.
-            </div>
-            <div class="social">
-                <div class="g-plusone" data-size="medium" data-href="https://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/"></div>
-                <script type="IN/Share" data-url="https://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/" data-counter="right"></script>
-                <div class="fb-like" data-href="https://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/" data-layout="button_count" data-action="like" data-show-faces="false" data-share="false"></div>
-                <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://blog.cloudflare.com/supreme-court-wanders-into-patent-troll-fight/" data-text="The Supreme Court Wanders into the Patent Troll Fight" data-via="cloudflare" data-related="cloudflare">Tweet</a>
-            </div>
-        </header>
-
-        <div class="post-content">
-            <p>Next Monday, the US Supreme Court will hear oral arguments in <em>Oil States Energy Services, LLC vs. Greene’s Energy Group, LLC</em>, which is a case to determine whether the Inter Partes Review (IPR) administrative process at the US Patent and Trademark Office (USPTO) used to determine the validity of patents is constitutional. </p>
-
-<p>The constitutionality of the IPR process is one of the biggest legal issues facing innovative technology companies, as the availability of this process has greatly reduced the anticipated costs, and thereby lessened the threat, of patent troll litigation. As we discuss in this blog post, it is ironic that the outcome of a case that is of such great importance to the technology community today may hinge on what courts in Britain were and were not doing more than 200 years ago.</p>
-
-<p><img src="/content/images/2017/11/Thomas_Rowlandson_-_The_Privy_Council_of_a_King_-_Google_Art_Project.jpg" alt="" title="" /><small>Thomas Rowlandson [Public domain], via <a href="https://commons.wikimedia.org/wiki/File%3AThomas_Rowlandson_-_The_Privy_Council_of_a_King_-_Google_Art_Project.jpg">Wikimedia Commons</a></small></p>
-
-<p>As we have discussed in prior <a href="https://blog.cloudflare.com/project-jengo-challenges/">blog posts</a>, the stakes are high: if the Supreme Court finds IPR unconstitutional, then the entire system of administrative review by the USPTO — including IPR and ex parte processes — will be shuttered.  This would be a mistake, as administrative recourse at the USPTO is one of the few ways to avoid the considerable costs and delays of federal court litigation, which can take years and run into the millions of dollars. Those heavy costs are often leveraged by patent trolls when they threaten litigation in the effort to procure easy and lucrative settlements from their targets. </p>
-
-<h3 id="cloudflareispursuingourfightagainstpatenttrollsallthewaytothestepsofthesupremecourt">Cloudflare is Pursuing Our Fight Against Patent Trolls All the Way to the Steps of the Supreme Court</h3>
-
-<p>Cloudflare joined Dell, Facebook, and a number of other companies, all practicing entities with large patent portfolios, in a <em>brief amici curiae</em> (or ‘friend of the court’ brief) in support of the IPR process, because it has a substantial positive impact on technological innovation in the United States. Amicus briefs allow parties who are interested in the outcome of a case, but are not parties to the immediate dispute before the court, to have input into the court’s deliberations.  </p>
-
-<p>As many of you are aware, we were sued by Blackbird Technologies, a notorious patent troll, earlier this year for patent infringement, and initiated <a href="https://blog.cloudflare.com/project-jengo/">Project Jengo</a> to crowd source prior art searches and invalidate Blackbird’s patents. One of our strategies for quickly and efficiently invalidating Blackbird’s patents is to take advantage of the IPR process at the USPTO, which can be completed in about half the time and at one tenth of the cost of a federal court case, and to initiate ex parte proceedings against Blackbird’s other patents that are overly broad and invalid. </p>
-
-<p>A full copy of the Amicus Brief we joined in the Oil States case is <a href="http://www.scotusblog.com/wp-content/uploads/2017/11/16-712-bsac-Dell.pdf">available here</a>, and a summary of the argument follows. </p>
-
-<h3 id="oilstatesmakesitscase">Oil States Makes its Case</h3>
-
-<p>Oil States is an oilfield services and drilling equipment manufacturing company. The USPTO invalidated one of its patents related to oil drilling technology in an IPR proceeding while Oil States had a lawsuit pending against one of its competitors claiming infringement of its patent. After it lost the IPR, Oil States lost an appeal in a lower federal court based on the findings of the IPR proceeding. The Supreme Court agreed to hear the case to determine whether once the USPTO issues a patent, an inventor has a constitutionally protected property right that — under <a href="http://www.heritage.org/constitution/#!/articles/3">Article III</a> of the U.S. Constitution (which outlines the powers of the judicial branch of the government), and the <a href="https://constitutioncenter.org/interactive-constitution/amendments/amendment-vii">7th Amendment</a> (which addresses the right to a jury trial in certain types of cases) — cannot be revoked without intervention by the court system. </p>
-
-<p><img src="/content/images/2017/11/2770193028_68edc662a9_b.jpg" alt="" title="" /><small><a href="https://www.flickr.com/photos/paul_lowry/2770193028">Image</a> by <a href="https://creativecommons.org/licenses/by/2.0/">Paul Lowry</a></small></p>
-
-<p>As the patent owner, Oil States argues that the IPR process violates the relevant provisions of the constitution by allowing an administrative body, the Patent Trial and Appeal Board (PTAB)--a non-judicial forum, to decide a matter which was historically handled by the judiciary. This argument rests upon the premise that there was a historical analogue to cancellation of patent claims available in the judiciary. Since cancellation of patent claims was historically available in the judiciary, the cancellation of patent claims today must be consistent with that history and done exclusively by courts. </p>
-
-<p>This argument is flawed on multiple counts, which are set forth in the “friend of the court” brief we joined.</p>
-
-<h4 id="firstflawanadministrativeprocessevenanoriginalistcanlove">First Flaw: An Administrative Process Even an Originalist Can Love</h4>
-
-<p>As the amicus brief we joined points out, patent revocation did not historically rest within the <em>exclusive</em> province of the common law and chancery courts, the historical equivalents in Britain to the judiciary in the United States. Rather, prior to the Founding of the United States, patent revocation rested entirely with the Crown of England’s Privy Council, a non-judicial body comprising of advisors to the king or queen of England. It wasn’t until later that the Privy Council granted the chancery court (the judiciary branch) concurrent authority to revoke patents. Because a non-judicial body had the authority to revoke patents when the US Constitution was framed, the general principles of separation of powers and the right to trial in the Constitution do not require that patentability challenges be decided solely by courts. </p>
-
-<h4 id="secondflawthejudicialrolewaslimited">Second Flaw: The Judicial Role was Limited</h4>
-
-<p>Not only did British courts share the power to address patent rights historically, the part shared by the the courts was significantly limited.  Historically, the common-law and chancery courts only received a partial delegation of the Privy Council’s authority to invalidate patents. Courts only had the authority to invalidate patents for issues related to things like inequitable conduct (e.g., making false statements in the original patent application). The limited authority delegated to the England Courts did not include the authority to seek claim <em>cancellation</em> based on elements intrinsic to the patent or patent application, like lack of novelty or obviousness as done under an IPR proceeding. Rather, such authority remained with the Privy Council, a non-court authority, which decided questions like whether the invention was really new. Thus, like the PTAB, the Privy Council was a non-judicial body charged with responsibility to assess patent validity based on criteria that included the novelty of the invention.</p>
-
-<p>We think these arguments are compelling and provide very strong reasons why the Supreme Court should resist the request that such matters be resolved exclusively in federal courts. We hope that’s the position they do take because the real world implications are significant. </p>
-
-<h3 id="dontmesswithagoodthing">Don’t Mess with a Good Thing</h3>
-
-<p>The IPR process is not only consistent with the US Constitution, but it also advances the Patent Clause’s objective of promoting the progress of science and useful arts. That is, the “quid pro quo of the patent system; the public must receive meaningful disclosure in exchange for being excluded from practicing the invention for a limited period of time” by patent rights. (<a href="http://caselaw.findlaw.com/us-federal-circuit/1330083.html">Enzo Biochem, Inc. v. Gen-probe Inc.</a>) Congress created the IPR process in the America Invents Act in 2011 to use administrative review to weed out poor-quality patents that did not satisfy this quid pro quo because they had not actually disclosed very much. Congress sought to provide quick and cost effective administrative procedures for challenging the validity of patent claims that did not disclose novel inventions, or that claimed to disclose substantially more innovation than they actually did,  to improve patent quality and restore confidence in the presumption of validity. In other words, Congress created a system to specifically permit the efficient challenge of the zealous assertion of vague and overly broad patents. </p>
-
-<p>As a recent study by the Congressional Research Service found, non-practicing entity (i.e., patent troll) patent litigation “activity cost defendants and licensees $29 billion in 2011, a 400 percent increase over $7 billion in 2005” and “the losses are mostly deadweight, with less than 25 percent flowing to innovation and at least that much going towards legal fees.” (<em>see</em> <a href="https://fas.org/sgp/crs/misc/R42668.pdf">Brian T. Yeh, Cong. Research sERV., R42668</a>) The IPR process enables innovative companies to navigate patent troll activity in an efficient manner and devote a greater proportion of their resources to research and development, rather than litigation or cost-of-litigation settlement fees for invalid patents. </p>
-
-<p><img src="/content/images/2017/11/Troll-slip.jpg" alt="" title="" /><small>By EFF-Graphics (<a href="http://creativecommons.org/licenses/by/3.0/us/deed.en">Own work</a>), via <a href="https://commons.wikimedia.org/wiki/File%3ATroll-slip.jpg">Wikimedia Commons</a></small></p>
-
-<p>Additionally, the IPR process reduces the total number and associated costs of patent disputes in a number of ways.</p>
-
-<ul>
-<li><p>Patent owners, especially patent trolls, are less likely to threaten litigation or file an infringement suit based on patent claims that they know or suspect to be invalid. In fact, patent owners who threaten or file suit merely to seek cost-of-litigation settlements have become far less prevalent because of the availability of the IPR process to reduce the cost of litigation.</p></li>
-<li><p>Patent owners are less likely to initiate litigation out of concerns that the IPR proceedings may culminate in PTAB’s cancellation of all patent claims asserted in the infringement suit.</p></li>
-<li><p>Where the PTAB does not cancel all asserted claims, statutory estoppel and the PTAB’s claim construction may serve to narrow the infringement issues to be resolved by the district court.</p></li>
-</ul>
-
-<p>Our hope is that the US Supreme Court justices take into full consideration the larger community of innovative companies that are helped by the IPR system in battling patent trolls, and do not limit their consideration to the implications on the parties to <em>Oil States</em> (neither of which is a non-practicing entity). As we have explained, not only does the IPR process enable innovative companies to focus their resources on technological innovation, instead of legal fees, but allowing the USPTO to administer IPR and ex parte proceedings is entirely consistent with the US Constitution.</p>
-
-<p>While we await a decision in <em>Oil States</em>, expect to see Cloudflare initiate IPR and ex parte proceedings against Blackbird Technologies patents in the coming months. </p>
-
-<p>We will make sure to keep you updated. </p>
-        </div>
-        <footer>
-            <small>
-                Tagged with <a href="/tag/legal/">Legal</a>, <a href="/tag/jengo/">Jengo</a>, <a href="/tag/patents/">Patents</a>
-            </small>
-        </footer>
-        <aside class="section learn-more">
-            <h5>Want to learn more about Cloudflare?</h5>
-            <p><a href="https://www.cloudflare.com" class="btn btn-success">Learn more</a></p>
-        </aside>
-
-        <aside class="section comments">
-            <h3>Comments</h3>
-
-        </aside>
-
-
-    <div id="disqus_thread"></div>
-    <script type="text/javascript">
-        var disqus_shortname = 'cloudflare';
-        (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-    </script>
-    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-    <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-
-</article>
-
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');
-</script>
-<script>(function(d, s, id) {
-      var js, fjs = d.getElementsByTagName(s)[0];
-      if (d.getElementById(id)) return;
-      js = d.createElement(s); js.id = id;
-      js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=596756540369391";
-      fjs.parentNode.insertBefore(js, fjs);
-    }(document, 'script', 'facebook-jssdk'));
-</script>
-<script src="//platform.linkedin.com/in.js" type="text/javascript">lang: en_US</script>
-<script type="text/javascript">
-  (function() {
-    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-    po.src = 'https://apis.google.com/js/platform.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-  })();
-</script>
-
-
-    </section>
-
-    <aside class="sidebar">
-    <div class="widget">
-      <input type="text" placeholder="Search the blog" class="st-default-search-input"></input>
-      <script type="text/javascript">
-          (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
-          (w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t);
-          e=d.getElementsByTagName(t)[0];s.async=0;s.src=u;e.parentNode.insertBefore(s,e);
-          })(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st');
-        _st('install','_KobMC_zsd_tDx_7NWiX','2.0.0');
-      </script>
-    </div>
-    <div class="widget">
-        <h4 class="widget-title">Cloudflare blog</h4>
-        <p style="margin-top: 20px">
-            <a href="https://www.cloudflare.com/enterprise-service-request" class="btn btn-success" tabindex="11" target="_blank">Contact our team</a>
-        </p>
-        <p>
-            <strong>US callers</strong><br/>
-            1 (888) 99-FLARE <br/>
-            <strong>UK callers</strong><br/>
-            +44 (0)20 3514 6970<br/>
-            <strong>International callers</strong><br/>
-            +1 (650) 319-8930 <BR/><BR/>
-            <a href="https://www.cloudflare.com/plans" target="_blank">Full feature list and plan types</a>
-        </p>
-        <p>Cloudflare provides performance and security for any website. More than 6 million websites use Cloudflare.</p>
-        <p>There is no hardware or software. Cloudflare works at the DNS level. It takes only 5 minutes to sign up. To learn more, please visit our website</p>
-    </div>
-    <div class="widget">
-        <h4 class="widget-title">Cloudflare features</h4>
-        <ul class="menu menu-sidebar">
-            <li><a href="https://www.cloudflare.com/">Overview</a></li>
-            <li><a href="https://www.cloudflare.com/cdn/">CDN</a></li>
-            <li><a href="https://www.cloudflare.com/website-optimization/">Optimizer</a></li>
-            <li><a href="https://www.cloudflare.com/security/">Security</a></li>
-            <li><a href="https://www.cloudflare.com/analytics/">Analytics</a></li>
-            <li><a href="https://www.cloudflare.com/apps">Apps</a></li>
-            <li><a href="https://www.cloudflare.com/network/">Network map</a></li>
-            <li><a href="https://www.cloudflarestatus.com">System status</a></li>
-        </ul>
-    </div>
-    <div id="mc_embed_signup" class="widget">
-        <form action="https://cloudflare.us5.list-manage.com/subscribe/post?u=d80d4d74266c0c044b0bcd7ca&amp;id=8dc0bf9dea" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
-            <input type="email" value="" name="EMAIL" class="width-full required email" id="mce-EMAIL" placeholder="Enter your email address"/>
-            <div id="mce-responses" class="clearfix">
-            <div class="response" id="mce-error-response" style="display:none"></div>
-            <div class="response" id="mce-success-response" style="display:none"></div>
-            </div>
-            <div class="clearfix">
-                <button type="submit" name="subscribe" id="mc-embedded-subscribe" class="btn btn-primary width-full">Sign up for email updates</button>
-            </div>
-        </form>
-    </div>
-</aside>
-</div>
-
-<footer id="footer" class="footer">
-    <div class="wrapper">
-        <nav class="navigation footer-nav">
-            <ul role="navigation">
-                <li id="cf_nav_menu-2" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">What We Do</h6>
-                    <div class="menu-what-we-do-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/plans">Plans</a></li>
-                            <li><a href="https://www.cloudflare.com/performance/">Performance</a></li>
-                            <li><a href="https://www.cloudflare.com/security/">Security</a></li>
-                            <li><a href="https://www.cloudflare.com/reliability/">Reliability</a></li>
-                            <li><a href="https://www.cloudflare.com/apps">Apps</a></li>
-                            <li><a href="https://www.cloudflare.com/network-map">Network</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-3" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Resources</h6>
-                    <div class="menu-support-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/support">Help Center</a></li>
-                            <li><a href="https://www.cloudflare.com/community">Community</a></li>
-                            <li><a href="https://www.cloudflare.com/video">Video Guides</a></li>
-                            <li><a href="https://www.cloudflarestatus.com">System Status</a></li>
-                            <li><a href="https://www.cloudflare.com/contact">Contact Us</a></li>
-
-                            <li class="active"><a href="/">Blog</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-4" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Not a Developer?</h6>
-                    <div class="menu-resources-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/case-studies">Case Studies</a></li>
-                            <li><a href="https://www.cloudflare.com/resources/">White Papers</a></li>
-                            <li><a href="https://www.cloudflare.com/internet-summit/">Internet Summit</a></li>
-                            <li><a href="https://www.cloudflare.com/hosting-partners">Partners</a></li>
-                            <li><a href="https://www.cloudflare.com/hosting-partners">Integrations</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-5" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">About Us</h6>
-                    <div class="menu-about-us-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="https://www.cloudflare.com/people">Our Team</a></li>
-                            <li><a href="https://www.cloudflare.com/join-our-team">Careers</a></li>
-                            <li><a href="https://www.cloudflare.com/press-center">Press</a></li>
-                            <li><a href="https://www.cloudflare.com/terms">Terms of Service</a></li>
-                            <li><a href="https://www.cloudflare.com/security-policy/">Privacy &amp; Security</a></li>
-                            <li><a href="https://www.cloudflare.com/abuse/">Trust &amp; Safety</a></li>
-                        </ul>
-                    </div>
-                </li>
-                <li id="cf_nav_menu-6" class="footer-column widget_cf_nav_menu">
-                    <h6 class="widget-title">Connect</h6>
-                    <div class="menu-connect-container">
-                        <ul class="menu menu-footer">
-                            <li><a href="http://twitter.com/cloudflare">Twitter</a></li>
-                            <li><a href="https://www.facebook.com/Cloudflare">Facebook</a></li>
-                            <li><a href="https://www.linkedin.com/company/cloudflare-inc-">LinkedIn</a></li>
-                            <li><a href="https://www.youtube.com/cloudflare-">YouTube</a></li>
-                            <li><a href="https://plus.google.com/+cloudflare/posts">Google+</a></li>
-                            <li><a href="/rss/">RSS</a></li>
-                        </ul>
-                    </div>
-                </li>
-            </ul>
-            <div class="credits">All content &copy; 2017 <a href="https://cloudflare.com">Cloudflare</a>. Proudly published with <a href="https://ghost.org">Ghost</a>.</div>
-        </nav>
-    </div>
-</footer>
-
-<script>
-    var links = document.links;
-
-    for (var i = 0, linksLength = links.length; i < linksLength; i++) {  
-       if (links[i].hostname != window.location.hostname) {
-           links[i].target = '_blank';
-       } 
-    } 
-</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.8.1/prism.min.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.fitvids.js?v=b6cf3f99a6"></script>
-<script type="text/javascript">
-    $(document).ready(function(){ $(".post-content").fitVids(); });
-</script>
-
-<script type="text/javascript">
-
-    var disqus_shortname = 'cloudflare';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-
-</body>
-</html>

h2mux/sample/jquery.fitvids.js

@@ -1,74 +0,0 @@
-/*global jQuery */
-/*jshint multistr:true browser:true */
-/*!
-* FitVids 1.0.3
-*
-* Copyright 2013, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com
-* Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
-* Released under the WTFPL license - http://sam.zoy.org/wtfpl/
-*
-* Date: Thu Sept 01 18:00:00 2011 -0500
-*/
-
-(function( $ ){
-
-  "use strict";
-
-  $.fn.fitVids = function( options ) {
-    var settings = {
-      customSelector: null
-    };
-
-    if(!document.getElementById('fit-vids-style')) {
-
-      var div = document.createElement('div'),
-          ref = document.getElementsByTagName('base')[0] || document.getElementsByTagName('script')[0],
-          cssStyles = '&shy;<style>.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}</style>';
-
-      div.className = 'fit-vids-style';
-      div.id = 'fit-vids-style';
-      div.style.display = 'none';
-      div.innerHTML = cssStyles;
-
-      ref.parentNode.insertBefore(div,ref);
-
-    }
-
-    if ( options ) {
-      $.extend( settings, options );
-    }
-
-    return this.each(function(){
-      var selectors = [
-        "iframe[src*='player.vimeo.com']",
-        "iframe[src*='youtube.com']",
-        "iframe[src*='youtube-nocookie.com']",
-        "iframe[src*='kickstarter.com'][src*='video.html']",
-        "object",
-        "embed"
-      ];
-
-      if (settings.customSelector) {
-        selectors.push(settings.customSelector);
-      }
-
-      var $allVideos = $(this).find(selectors.join(','));
-      $allVideos = $allVideos.not("object object"); // SwfObj conflict patch
-
-      $allVideos.each(function(){
-        var $this = $(this);
-        if (this.tagName.toLowerCase() === 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; }
-        var height = ( this.tagName.toLowerCase() === 'object' || ($this.attr('height') && !isNaN(parseInt($this.attr('height'), 10))) ) ? parseInt($this.attr('height'), 10) : $this.height(),
-            width = !isNaN(parseInt($this.attr('width'), 10)) ? parseInt($this.attr('width'), 10) : $this.width(),
-            aspectRatio = height / width;
-        if(!$this.attr('id')){
-          var videoID = 'fitvid' + Math.floor(Math.random()*999999);
-          $this.attr('id', videoID);
-        }
-        $this.wrap('<div class="fluid-width-video-wrapper"></div>').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+"%");
-        $this.removeAttr('height').removeAttr('width');
-      });
-    });
-  };
-// Works with either jQuery or Zepto
-})( window.jQuery || window.Zepto );

h2mux/shared_buffer.go

@@ -1,67 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"io"
-	"sync"
-)
-
-type SharedBuffer struct {
-	cond   *sync.Cond
-	buffer bytes.Buffer
-	eof    bool
-}
-
-func NewSharedBuffer() *SharedBuffer {
-	return &SharedBuffer{
-		cond: sync.NewCond(&sync.Mutex{}),
-	}
-}
-
-func (s *SharedBuffer) Read(p []byte) (n int, err error) {
-	totalRead := 0
-	s.cond.L.Lock()
-	for totalRead == 0 {
-		n, err = s.buffer.Read(p[totalRead:])
-		totalRead += n
-		if err == io.EOF {
-			if s.eof {
-				break
-			}
-			err = nil
-			if n > 0 {
-				break
-			}
-			s.cond.Wait()
-		}
-	}
-	s.cond.L.Unlock()
-	return totalRead, err
-}
-
-func (s *SharedBuffer) Write(p []byte) (n int, err error) {
-	s.cond.L.Lock()
-	defer s.cond.L.Unlock()
-	if s.eof {
-		return 0, io.EOF
-	}
-	n, err = s.buffer.Write(p)
-	s.cond.Signal()
-	return
-}
-
-func (s *SharedBuffer) Close() error {
-	s.cond.L.Lock()
-	defer s.cond.L.Unlock()
-	if !s.eof {
-		s.eof = true
-		s.cond.Signal()
-	}
-	return nil
-}
-
-func (s *SharedBuffer) Closed() bool {
-	s.cond.L.Lock()
-	defer s.cond.L.Unlock()
-	return s.eof
-}

h2mux/shared_buffer_test.go

@@ -1,129 +0,0 @@
-package h2mux
-
-import (
-	"bytes"
-	"io"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func AssertIOReturnIsGood(t *testing.T, expected int) func(int, error) {
-	return func(actual int, err error) {
-		if expected != actual {
-			t.Fatalf("Expected %d bytes, got %d", expected, actual)
-		}
-		if err != nil {
-			t.Fatalf("Unexpected error %s", err)
-		}
-	}
-}
-
-func TestSharedBuffer(t *testing.T) {
-	b := NewSharedBuffer()
-	testData := []byte("Hello world")
-	AssertIOReturnIsGood(t, len(testData))(b.Write(testData))
-	bytesRead := make([]byte, len(testData))
-	AssertIOReturnIsGood(t, len(testData))(b.Read(bytesRead))
-}
-
-func TestSharedBufferBlockingRead(t *testing.T) {
-	b := NewSharedBuffer()
-	testData1 := []byte("Hello")
-	testData2 := []byte(" world")
-	result := make(chan []byte)
-	go func() {
-		bytesRead := make([]byte, len(testData1)+len(testData2))
-		nRead, err := b.Read(bytesRead)
-		AssertIOReturnIsGood(t, len(testData1))(nRead, err)
-		result <- bytesRead[:nRead]
-		nRead, err = b.Read(bytesRead)
-		AssertIOReturnIsGood(t, len(testData2))(nRead, err)
-		result <- bytesRead[:nRead]
-	}()
-	time.Sleep(time.Millisecond * 250)
-	select {
-	case <-result:
-		t.Fatalf("read returned early")
-	default:
-	}
-	AssertIOReturnIsGood(t, len(testData1))(b.Write([]byte(testData1)))
-	select {
-	case r := <-result:
-		assert.Equal(t, testData1, r)
-	case <-time.After(time.Second):
-		t.Fatalf("read timed out")
-	}
-	AssertIOReturnIsGood(t, len(testData2))(b.Write([]byte(testData2)))
-	select {
-	case r := <-result:
-		assert.Equal(t, testData2, r)
-	case <-time.After(time.Second):
-		t.Fatalf("read timed out")
-	}
-}
-
-// This is quite slow under the race detector
-func TestSharedBufferConcurrentReadWrite(t *testing.T) {
-	b := NewSharedBuffer()
-	var expectedResult, actualResult bytes.Buffer
-	var wg sync.WaitGroup
-	wg.Add(2)
-	go func() {
-		block := make([]byte, 256)
-		for i := range block {
-			block[i] = byte(i)
-		}
-		for blockSize := 1; blockSize <= 256; blockSize++ {
-			for i := 0; i < 256; i++ {
-				expectedResult.Write(block[:blockSize])
-				n, err := b.Write(block[:blockSize])
-				if n != blockSize || err != nil {
-					t.Errorf("write error: %d %s", n, err)
-					return
-				}
-			}
-		}
-		wg.Done()
-	}()
-	go func() {
-		block := make([]byte, 256)
-		// Change block sizes in opposition to the write thread, to test blocking for new data.
-		for blockSize := 256; blockSize > 0; blockSize-- {
-			for i := 0; i < 256; i++ {
-				n, err := io.ReadFull(b, block[:blockSize])
-				if n != blockSize || err != nil {
-					t.Errorf("read error: %d %s", n, err)
-					return
-				}
-				actualResult.Write(block[:blockSize])
-			}
-		}
-		wg.Done()
-	}()
-	wg.Wait()
-	if bytes.Compare(expectedResult.Bytes(), actualResult.Bytes()) != 0 {
-		t.Fatal("Result diverged")
-	}
-}
-
-func TestSharedBufferClose(t *testing.T) {
-	b := NewSharedBuffer()
-	testData := []byte("Hello world")
-	AssertIOReturnIsGood(t, len(testData))(b.Write(testData))
-	err := b.Close()
-	if err != nil {
-		t.Fatalf("unexpected error from Close: %s", err)
-	}
-	bytesRead := make([]byte, len(testData))
-	AssertIOReturnIsGood(t, len(testData))(b.Read(bytesRead))
-	n, err := b.Read(bytesRead)
-	if n != 0 {
-		t.Fatalf("extra bytes received: %d", n)
-	}
-	if err != io.EOF {
-		t.Fatalf("expected EOF, got %s", err)
-	}
-}

h2mux/signal.go

@@ -1,34 +0,0 @@
-package h2mux
-
-// Signal describes an event that can be waited on for at least one signal.
-// Signalling the event while it is in the signalled state is a noop.
-// When the waiter wakes up, the signal is set to unsignalled.
-// It is a way for any number of writers to inform a reader (without blocking)
-// that an event has happened.
-type Signal struct {
-	c chan struct{}
-}
-
-// NewSignal creates a new Signal.
-func NewSignal() Signal {
-	return Signal{c: make(chan struct{}, 1)}
-}
-
-// Signal signals the event.
-func (s Signal) Signal() {
-	// This channel is buffered, so the nonblocking send will always succeed if the buffer is empty.
-	select {
-	case s.c <- struct{}{}:
-	default:
-	}
-}
-
-// Wait for the event to be signalled.
-func (s Signal) Wait() {
-	<-s.c
-}
-
-// WaitChannel returns a channel that is readable after Signal is called.
-func (s Signal) WaitChannel() <-chan struct{} {
-	return s.c
-}

h2mux/streamerrormap.go

@@ -1,47 +0,0 @@
-package h2mux
-
-import (
-	"sync"
-
-	"golang.org/x/net/http2"
-)
-
-// StreamErrorMap is used to track stream errors. This is a separate structure to ActiveStreamMap because
-// errors can be raised against non-existent or closed streams.
-type StreamErrorMap struct {
-	sync.RWMutex
-	// errors tracks per-stream errors
-	errors map[uint32]http2.ErrCode
-	// hasError is signaled whenever an error is raised.
-	hasError Signal
-}
-
-// NewStreamErrorMap creates a new StreamErrorMap.
-func NewStreamErrorMap() *StreamErrorMap {
-	return &StreamErrorMap{
-		errors:   make(map[uint32]http2.ErrCode),
-		hasError: NewSignal(),
-	}
-}
-
-// RaiseError raises a stream error.
-func (s *StreamErrorMap) RaiseError(streamID uint32, err http2.ErrCode) {
-	s.Lock()
-	s.errors[streamID] = err
-	s.Unlock()
-	s.hasError.Signal()
-}
-
-// GetSignalChan returns a channel that is signalled when an error is raised.
-func (s *StreamErrorMap) GetSignalChan() <-chan struct{} {
-	return s.hasError.WaitChannel()
-}
-
-// GetErrors retrieves all errors currently raised. This resets the currently-tracked errors.
-func (s *StreamErrorMap) GetErrors() map[uint32]http2.ErrCode {
-	s.Lock()
-	errors := s.errors
-	s.errors = make(map[uint32]http2.ErrCode)
-	s.Unlock()
-	return errors
-}

ingress/origin_udp_proxy.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"net/netip"
 )
 
 type UDPProxy interface {
@@ -30,3 +31,16 @@ func DialUDP(dstIP net.IP, dstPort uint16) (UDPProxy, error) {
 
 	return &udpProxy{udpConn}, nil
 }
+
+func DialUDPAddrPort(dest netip.AddrPort) (*net.UDPConn, error) {
+	addr := net.UDPAddrFromAddrPort(dest)
+
+	// We use nil as local addr to force runtime to find the best suitable local address IP given the destination
+	// address as context.
+	udpConn, err := net.DialUDP("udp", nil, addr)
+	if err != nil {
+		return nil, fmt.Errorf("unable to create UDP proxy to origin (%v:%v): %w", dest.Addr(), dest.Port(), err)
+	}
+
+	return udpConn, nil
+}

management/middleware_test.go

@@ -52,13 +52,11 @@ 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)

proxy/logger.go

@@ -16,11 +16,14 @@ const (
 	logFieldLBProbe       = "lbProbe"
 	logFieldRule          = "ingressRule"
 	logFieldOriginService = "originService"
-	logFieldFlowID        = "flowID"
 	logFieldConnIndex     = "connIndex"
 	logFieldDestAddr      = "destAddr"
 )
 
+var (
+	LogFieldFlowID = "flowID"
+)
+
 // newHTTPLogger creates a child zerolog.Logger from the provided with added context from the HTTP request, ingress
 // services, and connection index.
 func newHTTPLogger(logger *zerolog.Logger, connIndex uint8, req *http.Request, rule int, serviceName string) zerolog.Logger {
@@ -47,7 +50,7 @@ func newTCPLogger(logger *zerolog.Logger, req *connection.TCPRequest) zerolog.Lo
 		Int(management.EventTypeKey, int(management.TCP)).
 		Uint8(logFieldConnIndex, req.ConnIndex).
 		Str(logFieldOriginService, ingress.ServiceWarpRouting).
-		Str(logFieldFlowID, req.FlowID).
+		Str(LogFieldFlowID, req.FlowID).
 		Str(logFieldDestAddr, req.Dest).
 		Uint8(logFieldConnIndex, req.ConnIndex).
 		Logger()

quic/metrics.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/quic-go/quic-go/logging"
+	"github.com/rs/zerolog"
 )
 
 const (
@@ -18,6 +19,7 @@ var (
 	clientMetrics    = struct {
 		totalConnections  prometheus.Counter
 		closedConnections prometheus.Counter
+		maxUDPPayloadSize *prometheus.GaugeVec
 		sentFrames        *prometheus.CounterVec
 		sentBytes         *prometheus.CounterVec
 		receivedFrames    *prometheus.CounterVec
@@ -28,6 +30,9 @@ var (
 		minRTT            *prometheus.GaugeVec
 		latestRTT         *prometheus.GaugeVec
 		smoothedRTT       *prometheus.GaugeVec
+		mtu               *prometheus.GaugeVec
+		congestionWindow  *prometheus.GaugeVec
+		congestionState   *prometheus.GaugeVec
 	}{
 		totalConnections: prometheus.NewCounter(
 			prometheus.CounterOpts{
@@ -45,6 +50,15 @@ var (
 				Help:      "Number of connections that has been closed",
 			},
 		),
+		maxUDPPayloadSize: prometheus.NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: namespace,
+				Subsystem: "client",
+				Name:      "max_udp_payload",
+				Help:      "Maximum UDP payload size in bytes for a QUIC packet",
+			},
+			clientConnLabels,
+		),
 		sentFrames: prometheus.NewCounterVec(
 			prometheus.CounterOpts{
 				Namespace: namespace,
@@ -135,6 +149,33 @@ var (
 			},
 			clientConnLabels,
 		),
+		mtu: prometheus.NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: namespace,
+				Subsystem: "client",
+				Name:      "mtu",
+				Help:      "Current maximum transmission unit (MTU) of a connection",
+			},
+			clientConnLabels,
+		),
+		congestionWindow: prometheus.NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: namespace,
+				Subsystem: "client",
+				Name:      "congestion_window",
+				Help:      "Current congestion window size",
+			},
+			clientConnLabels,
+		),
+		congestionState: prometheus.NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: namespace,
+				Subsystem: "client",
+				Name:      "congestion_state",
+				Help:      "Current congestion control state. See https://pkg.go.dev/github.com/quic-go/quic-go@v0.45.0/logging#CongestionState for what each value maps to",
+			},
+			clientConnLabels,
+		),
 	}
 
 	registerClient = sync.Once{}
@@ -148,14 +189,16 @@ var (
 )
 
 type clientCollector struct {
-	index string
+	index  string
+	logger *zerolog.Logger
 }
 
-func newClientCollector(index uint8) *clientCollector {
+func newClientCollector(index string, logger *zerolog.Logger) *clientCollector {
 	registerClient.Do(func() {
 		prometheus.MustRegister(
 			clientMetrics.totalConnections,
 			clientMetrics.closedConnections,
+			clientMetrics.maxUDPPayloadSize,
 			clientMetrics.sentFrames,
 			clientMetrics.sentBytes,
 			clientMetrics.receivedFrames,
@@ -166,11 +209,16 @@ func newClientCollector(index uint8) *clientCollector {
 			clientMetrics.minRTT,
 			clientMetrics.latestRTT,
 			clientMetrics.smoothedRTT,
+			clientMetrics.mtu,
+			clientMetrics.congestionWindow,
+			clientMetrics.congestionState,
 			packetTooBigDropped,
 		)
 	})
+
 	return &clientCollector{
-		index: uint8ToString(index),
+		index:  index,
+		logger: logger,
 	}
 }
 
@@ -178,16 +226,21 @@ func (cc *clientCollector) startedConnection() {
 	clientMetrics.totalConnections.Inc()
 }
 
-func (cc *clientCollector) closedConnection(err error) {
+func (cc *clientCollector) closedConnection(error) {
 	clientMetrics.closedConnections.Inc()
 }
 
+func (cc *clientCollector) receivedTransportParameters(params *logging.TransportParameters) {
+	clientMetrics.maxUDPPayloadSize.WithLabelValues(cc.index).Set(float64(params.MaxUDPPayloadSize))
+	cc.logger.Debug().Msgf("Received transport parameters: MaxUDPPayloadSize=%d, MaxIdleTimeout=%v, MaxDatagramFrameSize=%d", params.MaxUDPPayloadSize, params.MaxIdleTimeout, params.MaxDatagramFrameSize)
+}
+
 func (cc *clientCollector) sentPackets(size logging.ByteCount, frames []logging.Frame) {
-	cc.collectPackets(size, frames, clientMetrics.sentFrames, clientMetrics.sentBytes)
+	cc.collectPackets(size, frames, clientMetrics.sentFrames, clientMetrics.sentBytes, sent)
 }
 
 func (cc *clientCollector) receivedPackets(size logging.ByteCount, frames []logging.Frame) {
-	cc.collectPackets(size, frames, clientMetrics.receivedFrames, clientMetrics.receivedBytes)
+	cc.collectPackets(size, frames, clientMetrics.receivedFrames, clientMetrics.receivedBytes, received)
 }
 
 func (cc *clientCollector) bufferedPackets(packetType logging.PacketType) {
@@ -212,8 +265,27 @@ func (cc *clientCollector) updatedRTT(rtt *logging.RTTStats) {
 	clientMetrics.smoothedRTT.WithLabelValues(cc.index).Set(durationToPromGauge(rtt.SmoothedRTT()))
 }
 
-func (cc *clientCollector) collectPackets(size logging.ByteCount, frames []logging.Frame, counter, bandwidth *prometheus.CounterVec) {
+func (cc *clientCollector) updateCongestionWindow(size logging.ByteCount) {
+	clientMetrics.congestionWindow.WithLabelValues(cc.index).Set(float64(size))
+}
+
+func (cc *clientCollector) updatedCongestionState(state logging.CongestionState) {
+	clientMetrics.congestionState.WithLabelValues(cc.index).Set(float64(state))
+}
+
+func (cc *clientCollector) updateMTU(mtu logging.ByteCount) {
+	clientMetrics.mtu.WithLabelValues(cc.index).Set(float64(mtu))
+	cc.logger.Debug().Msgf("QUIC MTU updated to %d", mtu)
+}
+
+func (cc *clientCollector) collectPackets(size logging.ByteCount, frames []logging.Frame, counter, bandwidth *prometheus.CounterVec, direction direction) {
 	for _, frame := range frames {
+		switch f := frame.(type) {
+		case logging.DataBlockedFrame:
+			cc.logger.Debug().Msgf("%s data_blocked frame", direction)
+		case logging.StreamDataBlockedFrame:
+			cc.logger.Debug().Int64("streamID", int64(f.StreamID)).Msgf("%s stream_data_blocked frame", direction)
+		}
 		counter.WithLabelValues(cc.index, frameName(frame)).Inc()
 	}
 	bandwidth.WithLabelValues(cc.index).Add(byteCountToPromCount(size))
@@ -227,3 +299,17 @@ func frameName(frame logging.Frame) string {
 		return strings.TrimSuffix(name, "Frame")
 	}
 }
+
+type direction uint8
+
+const (
+	sent direction = iota
+	received
+)
+
+func (d direction) String() string {
+	if d == sent {
+		return "sent"
+	}
+	return "received"
+}

quic/tracing.go

@@ -10,26 +10,20 @@ import (
 
 // QUICTracer is a wrapper to create new quicConnTracer
 type tracer struct {
+	index  string
 	logger *zerolog.Logger
-	config *tracerConfig
-}
-
-type tracerConfig struct {
-	index uint8
 }
 
 func NewClientTracer(logger *zerolog.Logger, index uint8) func(context.Context, logging.Perspective, logging.ConnectionID) *logging.ConnectionTracer {
 	t := &tracer{
+		index:  uint8ToString(index),
 		logger: logger,
-		config: &tracerConfig{
-			index: index,
-		},
 	}
 	return t.TracerForConnection
 }
 
 func (t *tracer) TracerForConnection(_ctx context.Context, _p logging.Perspective, _odcid logging.ConnectionID) *logging.ConnectionTracer {
-	return newConnTracer(newClientCollector(t.config.index))
+	return newConnTracer(newClientCollector(t.index, t.logger))
 }
 
 // connTracer collects connection level metrics
@@ -42,16 +36,19 @@ func newConnTracer(metricsCollector *clientCollector) *logging.ConnectionTracer
 		metricsCollector: metricsCollector,
 	}
 	return &logging.ConnectionTracer{
-		StartedConnection:         tracer.StartedConnection,
-		ClosedConnection:          tracer.ClosedConnection,
-		SentLongHeaderPacket:      tracer.SentLongHeaderPacket,
-		SentShortHeaderPacket:     tracer.SentShortHeaderPacket,
-		ReceivedLongHeaderPacket:  tracer.ReceivedLongHeaderPacket,
-		ReceivedShortHeaderPacket: tracer.ReceivedShortHeaderPacket,
-		BufferedPacket:            tracer.BufferedPacket,
-		DroppedPacket:             tracer.DroppedPacket,
-		UpdatedMetrics:            tracer.UpdatedMetrics,
-		LostPacket:                tracer.LostPacket,
+		StartedConnection:           tracer.StartedConnection,
+		ClosedConnection:            tracer.ClosedConnection,
+		ReceivedTransportParameters: tracer.ReceivedTransportParameters,
+		SentLongHeaderPacket:        tracer.SentLongHeaderPacket,
+		SentShortHeaderPacket:       tracer.SentShortHeaderPacket,
+		ReceivedLongHeaderPacket:    tracer.ReceivedLongHeaderPacket,
+		ReceivedShortHeaderPacket:   tracer.ReceivedShortHeaderPacket,
+		BufferedPacket:              tracer.BufferedPacket,
+		DroppedPacket:               tracer.DroppedPacket,
+		UpdatedMetrics:              tracer.UpdatedMetrics,
+		LostPacket:                  tracer.LostPacket,
+		UpdatedMTU:                  tracer.UpdatedMTU,
+		UpdatedCongestionState:      tracer.UpdatedCongestionState,
 	}
 }
 
@@ -63,6 +60,10 @@ func (ct *connTracer) ClosedConnection(err error) {
 	ct.metricsCollector.closedConnection(err)
 }
 
+func (ct *connTracer) ReceivedTransportParameters(params *logging.TransportParameters) {
+	ct.metricsCollector.receivedTransportParameters(params)
+}
+
 func (ct *connTracer) BufferedPacket(pt logging.PacketType, size logging.ByteCount) {
 	ct.metricsCollector.bufferedPackets(pt)
 }
@@ -77,6 +78,7 @@ func (ct *connTracer) LostPacket(level logging.EncryptionLevel, number logging.P
 
 func (ct *connTracer) UpdatedMetrics(rttStats *logging.RTTStats, cwnd, bytesInFlight logging.ByteCount, packetsInFlight int) {
 	ct.metricsCollector.updatedRTT(rttStats)
+	ct.metricsCollector.updateCongestionWindow(cwnd)
 }
 
 func (ct *connTracer) SentLongHeaderPacket(hdr *logging.ExtendedHeader, size logging.ByteCount, ecn logging.ECN, ack *logging.AckFrame, frames []logging.Frame) {
@@ -95,16 +97,10 @@ func (ct *connTracer) ReceivedShortHeaderPacket(hdr *logging.ShortHeader, size l
 	ct.metricsCollector.receivedPackets(size, frames)
 }
 
-type quicLogger struct {
-	logger       *zerolog.Logger
-	connectionID string
+func (ct *connTracer) UpdatedMTU(mtu logging.ByteCount, done bool) {
+	ct.metricsCollector.updateMTU(mtu)
 }
 
-func (qt *quicLogger) Write(p []byte) (n int, err error) {
-	qt.logger.Trace().Str("quicConnection", qt.connectionID).RawJSON("event", p).Msg("Quic event")
-	return len(p), nil
-}
-
-func (*quicLogger) Close() error {
-	return nil
+func (ct *connTracer) UpdatedCongestionState(state logging.CongestionState) {
+	ct.metricsCollector.updatedCongestionState(state)
 }

quic/v3/datagram.go

@@ -0,0 +1,374 @@
+package v3
+
+import (
+	"encoding/binary"
+	"net/netip"
+	"time"
+)
+
+type DatagramType byte
+
+const (
+	// UDP Registration
+	UDPSessionRegistrationType DatagramType = 0x0
+	// UDP Session Payload
+	UDPSessionPayloadType DatagramType = 0x1
+	// DatagramTypeICMP (supporting both ICMPv4 and ICMPv6)
+	ICMPType DatagramType = 0x2
+	// UDP Session Registration Response
+	UDPSessionRegistrationResponseType DatagramType = 0x3
+)
+
+const (
+	// Total number of bytes representing the [DatagramType]
+	datagramTypeLen = 1
+
+	// 1280 is the default datagram packet length used before MTU discovery: https://github.com/quic-go/quic-go/blob/v0.45.0/internal/protocol/params.go#L12
+	maxDatagramPayloadLen = 1280
+)
+
+func ParseDatagramType(data []byte) (DatagramType, error) {
+	if len(data) < datagramTypeLen {
+		return 0, ErrDatagramHeaderTooSmall
+	}
+	return DatagramType(data[0]), nil
+}
+
+// UDPSessionRegistrationDatagram handles a request to initialize a UDP session on the remote client.
+type UDPSessionRegistrationDatagram struct {
+	RequestID        RequestID
+	Dest             netip.AddrPort
+	Traced           bool
+	IdleDurationHint time.Duration
+	Payload          []byte
+}
+
+const (
+	sessionRegistrationFlagsIPMask      byte = 0b0000_0001
+	sessionRegistrationFlagsTracedMask  byte = 0b0000_0010
+	sessionRegistrationFlagsBundledMask byte = 0b0000_0100
+
+	sessionRegistrationIPv4DatagramHeaderLen = datagramTypeLen +
+		1 + // Flag length
+		2 + // Destination port length
+		2 + // Idle duration seconds length
+		datagramRequestIdLen + // Request ID length
+		4 // IPv4 address length
+
+	// The IPv4 and IPv6 address share space, so adding 12 to the header length gets the space taken by the IPv6 field.
+	sessionRegistrationIPv6DatagramHeaderLen = sessionRegistrationIPv4DatagramHeaderLen + 12
+)
+
+// The datagram structure for UDPSessionRegistrationDatagram is:
+//
+//   0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//  0|      Type     |     Flags     |       Destination Port        |
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//  4|     Idle Duration Seconds     |                               |
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               +
+//  8|                                                               |
+//   +                       Session Identifier                      +
+// 12|                           (16 Bytes)                          |
+//   +                                                               +
+// 16|                                                               |
+//   +                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// 20|                               |   Destination IPv4 Address    |
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- - - - - - - - - - - - - - - -+
+// 24| Destination IPv4 Address cont |                               |
+//   +- - - - - - - - - - - - - - - -                                +
+// 28|                   Destination IPv6 Address                    |
+//   +                  (extension of IPv4 region)                   +
+// 32|                                                               |
+//   +                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// 36|                               |                               |
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               +
+//   .                                                               .
+//   .                         Bundle Payload                        .
+//   .                                                               .
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+func (s *UDPSessionRegistrationDatagram) MarshalBinary() (data []byte, err error) {
+	ipv6 := s.Dest.Addr().Is6()
+	var flags byte
+	if s.Traced {
+		flags |= sessionRegistrationFlagsTracedMask
+	}
+	hasPayload := len(s.Payload) > 0
+	if hasPayload {
+		flags |= sessionRegistrationFlagsBundledMask
+	}
+	var maxPayloadLen int
+	if ipv6 {
+		maxPayloadLen = maxDatagramPayloadLen + sessionRegistrationIPv6DatagramHeaderLen
+		flags |= sessionRegistrationFlagsIPMask
+	} else {
+		maxPayloadLen = maxDatagramPayloadLen + sessionRegistrationIPv4DatagramHeaderLen
+	}
+	// Make sure that the payload being bundled can actually fit in the payload destination
+	if len(s.Payload) > maxPayloadLen {
+		return nil, wrapMarshalErr(ErrDatagramPayloadTooLarge)
+	}
+	// Allocate the buffer with the right size for the destination IP family
+	if ipv6 {
+		data = make([]byte, sessionRegistrationIPv6DatagramHeaderLen+len(s.Payload))
+	} else {
+		data = make([]byte, sessionRegistrationIPv4DatagramHeaderLen+len(s.Payload))
+	}
+	data[0] = byte(UDPSessionRegistrationType)
+	data[1] = byte(flags)
+	binary.BigEndian.PutUint16(data[2:4], s.Dest.Port())
+	binary.BigEndian.PutUint16(data[4:6], uint16(s.IdleDurationHint.Seconds()))
+	err = s.RequestID.MarshalBinaryTo(data[6:22])
+	if err != nil {
+		return nil, wrapMarshalErr(err)
+	}
+	var end int
+	if ipv6 {
+		copy(data[22:38], s.Dest.Addr().AsSlice())
+		end = 38
+	} else {
+		copy(data[22:26], s.Dest.Addr().AsSlice())
+		end = 26
+	}
+
+	if hasPayload {
+		copy(data[end:], s.Payload)
+	}
+
+	return data, nil
+}
+
+func (s *UDPSessionRegistrationDatagram) UnmarshalBinary(data []byte) error {
+	datagramType, err := ParseDatagramType(data)
+	if err != nil {
+		return err
+	}
+	if datagramType != UDPSessionRegistrationType {
+		return wrapUnmarshalErr(ErrInvalidDatagramType)
+	}
+
+	requestID, err := RequestIDFromSlice(data[6:22])
+	if err != nil {
+		return wrapUnmarshalErr(err)
+	}
+
+	traced := (data[1] & sessionRegistrationFlagsTracedMask) == sessionRegistrationFlagsTracedMask
+	bundled := (data[1] & sessionRegistrationFlagsBundledMask) == sessionRegistrationFlagsBundledMask
+	ipv6 := (data[1] & sessionRegistrationFlagsIPMask) == sessionRegistrationFlagsIPMask
+
+	port := binary.BigEndian.Uint16(data[2:4])
+	var datagramHeaderSize int
+	var dest netip.AddrPort
+	if ipv6 {
+		datagramHeaderSize = sessionRegistrationIPv6DatagramHeaderLen
+		dest = netip.AddrPortFrom(netip.AddrFrom16([16]byte(data[22:38])), port)
+	} else {
+		datagramHeaderSize = sessionRegistrationIPv4DatagramHeaderLen
+		dest = netip.AddrPortFrom(netip.AddrFrom4([4]byte(data[22:26])), port)
+	}
+
+	idle := time.Duration(binary.BigEndian.Uint16(data[4:6])) * time.Second
+
+	var payload []byte
+	if bundled && len(data) >= datagramHeaderSize && len(data[datagramHeaderSize:]) > 0 {
+		payload = data[datagramHeaderSize:]
+	}
+
+	*s = UDPSessionRegistrationDatagram{
+		RequestID:        requestID,
+		Dest:             dest,
+		Traced:           traced,
+		IdleDurationHint: idle,
+		Payload:          payload,
+	}
+	return nil
+}
+
+// UDPSessionPayloadDatagram provides the payload for a session to be send to either the origin or the client.
+type UDPSessionPayloadDatagram struct {
+	RequestID RequestID
+	Payload   []byte
+}
+
+const (
+	DatagramPayloadHeaderLen = datagramTypeLen + datagramRequestIdLen
+
+	// The maximum size that a proxied UDP payload can be in a [UDPSessionPayloadDatagram]
+	maxPayloadPlusHeaderLen = maxDatagramPayloadLen + DatagramPayloadHeaderLen
+)
+
+// The datagram structure for UDPSessionPayloadDatagram is:
+//
+//   0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//  0|      Type     |                                               |
+//   +-+-+-+-+-+-+-+-+                                               +
+//  4|                                                               |
+//   +                                                               +
+//  8|                      Session Identifier                       |
+//   +                           (16 Bytes)                          +
+// 12|                                                               |
+//   +                                               +-+-+-+-+-+-+-+-+
+// 16|                                               |               |
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+               +
+//   .                                                               .
+//   .                             Payload                           .
+//   .                                                               .
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+// MarshalPayloadHeaderTo provides a way to insert the Session Payload header into an already existing byte slice
+// without having to allocate and copy the payload into the destination.
+//
+// This method should be used in-place of MarshalBinary which will allocate in-place the required byte array to return.
+func MarshalPayloadHeaderTo(requestID RequestID, payload []byte) error {
+	if len(payload) < 17 {
+		return wrapMarshalErr(ErrDatagramPayloadHeaderTooSmall)
+	}
+	payload[0] = byte(UDPSessionPayloadType)
+	return requestID.MarshalBinaryTo(payload[1:17])
+}
+
+func (s *UDPSessionPayloadDatagram) UnmarshalBinary(data []byte) error {
+	datagramType, err := ParseDatagramType(data)
+	if err != nil {
+		return err
+	}
+	if datagramType != UDPSessionPayloadType {
+		return wrapUnmarshalErr(ErrInvalidDatagramType)
+	}
+
+	// Make sure that the slice provided is the right size to be parsed.
+	if len(data) < 17 || len(data) > maxPayloadPlusHeaderLen {
+		return wrapUnmarshalErr(ErrDatagramPayloadInvalidSize)
+	}
+
+	requestID, err := RequestIDFromSlice(data[1:17])
+	if err != nil {
+		return wrapUnmarshalErr(err)
+	}
+
+	*s = UDPSessionPayloadDatagram{
+		RequestID: requestID,
+		Payload:   data[17:],
+	}
+	return nil
+}
+
+// UDPSessionRegistrationResponseDatagram is used to either return a successful registration or error to the client
+// that requested the registration of a UDP session.
+type UDPSessionRegistrationResponseDatagram struct {
+	RequestID    RequestID
+	ResponseType SessionRegistrationResp
+	ErrorMsg     string
+}
+
+const (
+	datagramRespTypeLen   = 1
+	datagramRespErrMsgLen = 2
+
+	datagramSessionRegistrationResponseLen = datagramTypeLen + datagramRespTypeLen + datagramRequestIdLen + datagramRespErrMsgLen
+
+	// The maximum size that an error message can be in a [UDPSessionRegistrationResponseDatagram].
+	maxResponseErrorMessageLen = maxDatagramPayloadLen - datagramSessionRegistrationResponseLen
+)
+
+// SessionRegistrationResp represents all of the responses that a UDP session registration response
+// can return back to the client.
+type SessionRegistrationResp byte
+
+const (
+	// Session was received and is ready to proxy.
+	ResponseOk SessionRegistrationResp = 0x00
+	// Session registration was unable to reach the requested origin destination.
+	ResponseDestinationUnreachable SessionRegistrationResp = 0x01
+	// Session registration was unable to bind to a local UDP socket.
+	ResponseUnableToBindSocket SessionRegistrationResp = 0x02
+	// Session registration is already bound to another connection.
+	ResponseSessionAlreadyConnected SessionRegistrationResp = 0x03
+	// Session registration failed with an unexpected error but provided a message.
+	ResponseErrorWithMsg SessionRegistrationResp = 0xff
+)
+
+// The datagram structure for UDPSessionRegistrationResponseDatagram is:
+//
+//   0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//  0|      Type     |   Resp Type   |                               |
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               +
+//  4|                                                               |
+//   +                       Session Identifier                      +
+//  8|                           (16 Bytes)                          |
+//   +                                                               +
+// 12|                                                               |
+//   +                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+// 16|                               |          Error Length         |
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+//   .                                                               .
+//   .                                                               .
+//   .                                                               .
+//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+func (s *UDPSessionRegistrationResponseDatagram) MarshalBinary() (data []byte, err error) {
+	if len(s.ErrorMsg) > maxResponseErrorMessageLen {
+		return nil, wrapMarshalErr(ErrDatagramResponseMsgInvalidSize)
+	}
+	errMsgLen := uint16(len(s.ErrorMsg))
+
+	data = make([]byte, datagramSessionRegistrationResponseLen+errMsgLen)
+	data[0] = byte(UDPSessionRegistrationResponseType)
+	data[1] = byte(s.ResponseType)
+	err = s.RequestID.MarshalBinaryTo(data[2:18])
+	if err != nil {
+		return nil, wrapMarshalErr(err)
+	}
+
+	if errMsgLen > 0 {
+		binary.BigEndian.PutUint16(data[18:20], errMsgLen)
+		copy(data[20:], []byte(s.ErrorMsg))
+	}
+
+	return data, nil
+}
+
+func (s *UDPSessionRegistrationResponseDatagram) UnmarshalBinary(data []byte) error {
+	datagramType, err := ParseDatagramType(data)
+	if err != nil {
+		return wrapUnmarshalErr(err)
+	}
+	if datagramType != UDPSessionRegistrationResponseType {
+		return wrapUnmarshalErr(ErrInvalidDatagramType)
+	}
+
+	if len(data) < datagramSessionRegistrationResponseLen {
+		return wrapUnmarshalErr(ErrDatagramResponseInvalidSize)
+	}
+
+	respType := SessionRegistrationResp(data[1])
+
+	requestID, err := RequestIDFromSlice(data[2:18])
+	if err != nil {
+		return wrapUnmarshalErr(err)
+	}
+
+	errMsgLen := binary.BigEndian.Uint16(data[18:20])
+	if errMsgLen > maxResponseErrorMessageLen {
+		return wrapUnmarshalErr(ErrDatagramResponseMsgTooLargeMaximum)
+	}
+
+	if len(data[20:]) < int(errMsgLen) {
+		return wrapUnmarshalErr(ErrDatagramResponseMsgTooLargeDatagram)
+	}
+
+	var errMsg string
+	if errMsgLen > 0 {
+		errMsg = string(data[20:])
+	}
+
+	*s = UDPSessionRegistrationResponseDatagram{
+		RequestID:    requestID,
+		ResponseType: respType,
+		ErrorMsg:     errMsg,
+	}
+	return nil
+}

quic/v3/datagram_errors.go

@@ -0,0 +1,26 @@
+package v3
+
+import (
+	"errors"
+	"fmt"
+)
+
+var (
+	ErrInvalidDatagramType                 error = errors.New("invalid datagram type expected")
+	ErrDatagramHeaderTooSmall              error = fmt.Errorf("datagram should have at least %d byte", datagramTypeLen)
+	ErrDatagramPayloadTooLarge             error = errors.New("payload length is too large to be bundled in datagram")
+	ErrDatagramPayloadHeaderTooSmall       error = errors.New("payload length is too small to fit the datagram header")
+	ErrDatagramPayloadInvalidSize          error = errors.New("datagram provided is an invalid size")
+	ErrDatagramResponseMsgInvalidSize      error = errors.New("datagram response message is an invalid size")
+	ErrDatagramResponseInvalidSize         error = errors.New("datagram response is an invalid size")
+	ErrDatagramResponseMsgTooLargeMaximum  error = fmt.Errorf("datagram response error message length exceeds the length of the datagram maximum: %d", maxResponseErrorMessageLen)
+	ErrDatagramResponseMsgTooLargeDatagram error = fmt.Errorf("datagram response error message length exceeds the length of the provided datagram")
+)
+
+func wrapMarshalErr(err error) error {
+	return fmt.Errorf("datagram marshal error: %w", err)
+}
+
+func wrapUnmarshalErr(err error) error {
+	return fmt.Errorf("datagram unmarshal error: %w", err)
+}

quic/v3/datagram_test.go

@@ -0,0 +1,352 @@
+package v3_test
+
+import (
+	"encoding/binary"
+	"errors"
+	"net/netip"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	v3 "github.com/cloudflare/cloudflared/quic/v3"
+)
+
+func makePayload(size int) []byte {
+	payload := make([]byte, size)
+	for i := range len(payload) {
+		payload[i] = 0xfc
+	}
+	return payload
+}
+
+func TestSessionRegistration_MarshalUnmarshal(t *testing.T) {
+	payload := makePayload(1280)
+	tests := []*v3.UDPSessionRegistrationDatagram{
+		// Default (IPv4)
+		{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 5 * time.Second,
+			Payload:          nil,
+		},
+		// Request ID (max)
+		{
+			RequestID: mustRequestID([16]byte{
+				^uint8(0), ^uint8(0), ^uint8(0), ^uint8(0),
+				^uint8(0), ^uint8(0), ^uint8(0), ^uint8(0),
+				^uint8(0), ^uint8(0), ^uint8(0), ^uint8(0),
+				^uint8(0), ^uint8(0), ^uint8(0), ^uint8(0),
+			}),
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 5 * time.Second,
+			Payload:          nil,
+		},
+		// IPv6
+		{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("[fc00::0]:8080"),
+			Traced:           false,
+			IdleDurationHint: 5 * time.Second,
+			Payload:          nil,
+		},
+		// Traced
+		{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           true,
+			IdleDurationHint: 5 * time.Second,
+			Payload:          nil,
+		},
+		// IdleDurationHint (max)
+		{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 65535 * time.Second,
+			Payload:          nil,
+		},
+		// Payload
+		{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 5 * time.Second,
+			Payload:          []byte{0xff, 0xaa, 0xcc, 0x44},
+		},
+		// Payload (max: 1254) for IPv4
+		{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 5 * time.Second,
+			Payload:          payload,
+		},
+		// Payload (max: 1242) for IPv4
+		{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 5 * time.Second,
+			Payload:          payload[:1242],
+		},
+	}
+	for _, tt := range tests {
+		marshaled, err := tt.MarshalBinary()
+		if err != nil {
+			t.Error(err)
+		}
+		unmarshaled := v3.UDPSessionRegistrationDatagram{}
+		err = unmarshaled.UnmarshalBinary(marshaled)
+		if err != nil {
+			t.Error(err)
+		}
+		if !compareRegistrationDatagrams(t, tt, &unmarshaled) {
+			t.Errorf("not equal:\n%+v\n%+v", tt, &unmarshaled)
+		}
+	}
+}
+
+func TestSessionRegistration_MarshalBinary(t *testing.T) {
+	t.Run("idle hint too large", func(t *testing.T) {
+		// idle hint duration overflows back to 1
+		datagram := &v3.UDPSessionRegistrationDatagram{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 65537 * time.Second,
+			Payload:          nil,
+		}
+		expected := &v3.UDPSessionRegistrationDatagram{
+			RequestID:        testRequestID,
+			Dest:             netip.MustParseAddrPort("1.1.1.1:8080"),
+			Traced:           false,
+			IdleDurationHint: 1 * time.Second,
+			Payload:          nil,
+		}
+		marshaled, err := datagram.MarshalBinary()
+		if err != nil {
+			t.Error(err)
+		}
+		unmarshaled := v3.UDPSessionRegistrationDatagram{}
+		err = unmarshaled.UnmarshalBinary(marshaled)
+		if err != nil {
+			t.Error(err)
+		}
+		if !compareRegistrationDatagrams(t, expected, &unmarshaled) {
+			t.Errorf("not equal:\n%+v\n%+v", expected, &unmarshaled)
+		}
+	})
+}
+
+func TestTypeUnmarshalErrors(t *testing.T) {
+	t.Run("invalid length", func(t *testing.T) {
+		d1 := v3.UDPSessionRegistrationDatagram{}
+		err := d1.UnmarshalBinary([]byte{})
+		if !errors.Is(err, v3.ErrDatagramHeaderTooSmall) {
+			t.Errorf("expected invalid length to throw error")
+		}
+
+		d2 := v3.UDPSessionPayloadDatagram{}
+		err = d2.UnmarshalBinary([]byte{})
+		if !errors.Is(err, v3.ErrDatagramHeaderTooSmall) {
+			t.Errorf("expected invalid length to throw error")
+		}
+
+		d3 := v3.UDPSessionRegistrationResponseDatagram{}
+		err = d3.UnmarshalBinary([]byte{})
+		if !errors.Is(err, v3.ErrDatagramHeaderTooSmall) {
+			t.Errorf("expected invalid length to throw error")
+		}
+	})
+
+	t.Run("invalid types", func(t *testing.T) {
+		d1 := v3.UDPSessionRegistrationDatagram{}
+		err := d1.UnmarshalBinary([]byte{byte(v3.UDPSessionRegistrationResponseType)})
+		if !errors.Is(err, v3.ErrInvalidDatagramType) {
+			t.Errorf("expected invalid type to throw error")
+		}
+
+		d2 := v3.UDPSessionPayloadDatagram{}
+		err = d2.UnmarshalBinary([]byte{byte(v3.UDPSessionRegistrationType)})
+		if !errors.Is(err, v3.ErrInvalidDatagramType) {
+			t.Errorf("expected invalid type to throw error")
+		}
+
+		d3 := v3.UDPSessionRegistrationResponseDatagram{}
+		err = d3.UnmarshalBinary([]byte{byte(v3.UDPSessionPayloadType)})
+		if !errors.Is(err, v3.ErrInvalidDatagramType) {
+			t.Errorf("expected invalid type to throw error")
+		}
+	})
+}
+
+func TestSessionPayload(t *testing.T) {
+	t.Run("basic", func(t *testing.T) {
+		payload := makePayload(128)
+		err := v3.MarshalPayloadHeaderTo(testRequestID, payload[0:17])
+		if err != nil {
+			t.Error(err)
+		}
+		unmarshaled := v3.UDPSessionPayloadDatagram{}
+		err = unmarshaled.UnmarshalBinary(payload)
+		if err != nil {
+			t.Error(err)
+		}
+		require.Equal(t, testRequestID, unmarshaled.RequestID)
+		require.Equal(t, payload[17:], unmarshaled.Payload)
+	})
+
+	t.Run("empty", func(t *testing.T) {
+		payload := makePayload(17)
+		err := v3.MarshalPayloadHeaderTo(testRequestID, payload)
+		if err != nil {
+			t.Error(err)
+		}
+		unmarshaled := v3.UDPSessionPayloadDatagram{}
+		err = unmarshaled.UnmarshalBinary(payload)
+		if err != nil {
+			t.Error(err)
+		}
+		require.Equal(t, testRequestID, unmarshaled.RequestID)
+		require.Equal(t, payload[17:], unmarshaled.Payload)
+	})
+
+	t.Run("header size too small", func(t *testing.T) {
+		payload := makePayload(16)
+		err := v3.MarshalPayloadHeaderTo(testRequestID, payload)
+		if !errors.Is(err, v3.ErrDatagramPayloadHeaderTooSmall) {
+			t.Errorf("expected an error")
+		}
+	})
+
+	t.Run("payload size too small", func(t *testing.T) {
+		payload := makePayload(17)
+		err := v3.MarshalPayloadHeaderTo(testRequestID, payload)
+		if err != nil {
+			t.Error(err)
+		}
+		unmarshaled := v3.UDPSessionPayloadDatagram{}
+		err = unmarshaled.UnmarshalBinary(payload[:16])
+		if !errors.Is(err, v3.ErrDatagramPayloadInvalidSize) {
+			t.Errorf("expected an error: %s", err)
+		}
+	})
+
+	t.Run("payload size too large", func(t *testing.T) {
+		datagram := makePayload(17 + 1281) // 1280 is the largest payload size allowed
+		err := v3.MarshalPayloadHeaderTo(testRequestID, datagram)
+		if err != nil {
+			t.Error(err)
+		}
+		unmarshaled := v3.UDPSessionPayloadDatagram{}
+		err = unmarshaled.UnmarshalBinary(datagram[:])
+		if !errors.Is(err, v3.ErrDatagramPayloadInvalidSize) {
+			t.Errorf("expected an error: %s", err)
+		}
+	})
+}
+
+func TestSessionRegistrationResponse(t *testing.T) {
+	validRespTypes := []v3.SessionRegistrationResp{
+		v3.ResponseOk,
+		v3.ResponseDestinationUnreachable,
+		v3.ResponseUnableToBindSocket,
+		v3.ResponseErrorWithMsg,
+	}
+	t.Run("basic", func(t *testing.T) {
+		for _, responseType := range validRespTypes {
+			datagram := &v3.UDPSessionRegistrationResponseDatagram{
+				RequestID:    testRequestID,
+				ResponseType: responseType,
+				ErrorMsg:     "test",
+			}
+			marshaled, err := datagram.MarshalBinary()
+			if err != nil {
+				t.Error(err)
+			}
+			unmarshaled := &v3.UDPSessionRegistrationResponseDatagram{}
+			err = unmarshaled.UnmarshalBinary(marshaled)
+			if err != nil {
+				t.Error(err)
+			}
+			require.Equal(t, datagram, unmarshaled)
+		}
+	})
+
+	t.Run("unsupported resp type is valid", func(t *testing.T) {
+		datagram := &v3.UDPSessionRegistrationResponseDatagram{
+			RequestID:    testRequestID,
+			ResponseType: v3.SessionRegistrationResp(0xfc),
+			ErrorMsg:     "",
+		}
+		marshaled, err := datagram.MarshalBinary()
+		if err != nil {
+			t.Error(err)
+		}
+		unmarshaled := &v3.UDPSessionRegistrationResponseDatagram{}
+		err = unmarshaled.UnmarshalBinary(marshaled)
+		if err != nil {
+			t.Error(err)
+		}
+		require.Equal(t, datagram, unmarshaled)
+	})
+
+	t.Run("too small to unmarshal", func(t *testing.T) {
+		payload := makePayload(17)
+		payload[0] = byte(v3.UDPSessionRegistrationResponseType)
+		unmarshaled := &v3.UDPSessionRegistrationResponseDatagram{}
+		err := unmarshaled.UnmarshalBinary(payload)
+		if !errors.Is(err, v3.ErrDatagramResponseInvalidSize) {
+			t.Errorf("expected an error")
+		}
+	})
+
+	t.Run("error message too long", func(t *testing.T) {
+		message := ""
+		for i := 0; i < 1280; i++ {
+			message += "a"
+		}
+		datagram := &v3.UDPSessionRegistrationResponseDatagram{
+			RequestID:    testRequestID,
+			ResponseType: v3.SessionRegistrationResp(0xfc),
+			ErrorMsg:     message,
+		}
+		_, err := datagram.MarshalBinary()
+		if !errors.Is(err, v3.ErrDatagramResponseMsgInvalidSize) {
+			t.Errorf("expected an error")
+		}
+	})
+
+	t.Run("error message too large to unmarshal", func(t *testing.T) {
+		payload := makePayload(1280)
+		payload[0] = byte(v3.UDPSessionRegistrationResponseType)
+		binary.BigEndian.PutUint16(payload[18:20], 1280) // larger than the datagram size could be
+		unmarshaled := &v3.UDPSessionRegistrationResponseDatagram{}
+		err := unmarshaled.UnmarshalBinary(payload)
+		if !errors.Is(err, v3.ErrDatagramResponseMsgTooLargeMaximum) {
+			t.Errorf("expected an error: %v", err)
+		}
+	})
+
+	t.Run("error message larger than provided buffer", func(t *testing.T) {
+		payload := makePayload(1000)
+		payload[0] = byte(v3.UDPSessionRegistrationResponseType)
+		binary.BigEndian.PutUint16(payload[18:20], 1001) // larger than the datagram size provided
+		unmarshaled := &v3.UDPSessionRegistrationResponseDatagram{}
+		err := unmarshaled.UnmarshalBinary(payload)
+		if !errors.Is(err, v3.ErrDatagramResponseMsgTooLargeDatagram) {
+			t.Errorf("expected an error: %v", err)
+		}
+	})
+}
+
+func compareRegistrationDatagrams(t *testing.T, l *v3.UDPSessionRegistrationDatagram, r *v3.UDPSessionRegistrationDatagram) bool {
+	require.Equal(t, l.Payload, r.Payload)
+	return l.RequestID == r.RequestID &&
+		l.Dest == r.Dest &&
+		l.IdleDurationHint == r.IdleDurationHint &&
+		l.Traced == r.Traced
+}

quic/v3/manager.go

@@ -0,0 +1,87 @@
+package v3
+
+import (
+	"errors"
+	"net"
+	"net/netip"
+	"sync"
+
+	"github.com/rs/zerolog"
+
+	"github.com/cloudflare/cloudflared/ingress"
+)
+
+var (
+	ErrSessionNotFound         = errors.New("session not found")
+	ErrSessionBoundToOtherConn = errors.New("session is in use by another connection")
+)
+
+type SessionManager interface {
+	// RegisterSession will register a new session if it does not already exist for the request ID.
+	// During new session creation, the session will also bind the UDP socket for the origin.
+	// If the session exists for a different connection, it will return [ErrSessionBoundToOtherConn].
+	RegisterSession(request *UDPSessionRegistrationDatagram, conn DatagramWriter) (Session, error)
+	// GetSession returns an active session if available for the provided connection.
+	// If the session does not exist, it will return [ErrSessionNotFound]. If the session exists for a different
+	// connection, it will return [ErrSessionBoundToOtherConn].
+	GetSession(requestID RequestID) (Session, error)
+	// UnregisterSession will remove a session from the current session manager. It will attempt to close the session
+	// before removal.
+	UnregisterSession(requestID RequestID)
+}
+
+type DialUDP func(dest netip.AddrPort) (*net.UDPConn, error)
+
+type sessionManager struct {
+	sessions map[RequestID]Session
+	mutex    sync.RWMutex
+	log      *zerolog.Logger
+}
+
+func NewSessionManager(log *zerolog.Logger, originDialer DialUDP) SessionManager {
+	return &sessionManager{
+		sessions: make(map[RequestID]Session),
+		log:      log,
+	}
+}
+
+func (s *sessionManager) RegisterSession(request *UDPSessionRegistrationDatagram, conn DatagramWriter) (Session, error) {
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+	// Check to make sure session doesn't already exist for requestID
+	_, exists := s.sessions[request.RequestID]
+	if exists {
+		return nil, ErrSessionBoundToOtherConn
+	}
+	// Attempt to bind the UDP socket for the new session
+	origin, err := ingress.DialUDPAddrPort(request.Dest)
+	if err != nil {
+		return nil, err
+	}
+	// Create and insert the new session in the map
+	session := NewSession(request.RequestID, request.IdleDurationHint, origin, conn, s.log)
+	s.sessions[request.RequestID] = session
+	return session, nil
+}
+
+func (s *sessionManager) GetSession(requestID RequestID) (Session, error) {
+	s.mutex.RLock()
+	defer s.mutex.RUnlock()
+	session, exists := s.sessions[requestID]
+	if exists {
+		return session, nil
+	}
+	return nil, ErrSessionNotFound
+}
+
+func (s *sessionManager) UnregisterSession(requestID RequestID) {
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+	// Get the session and make sure to close it if it isn't already closed
+	session, exists := s.sessions[requestID]
+	if exists {
+		// We ignore any errors when attempting to close the session
+		_ = session.Close()
+	}
+	delete(s.sessions, requestID)
+}

quic/v3/manager_test.go

@@ -0,0 +1,74 @@
+package v3_test
+
+import (
+	"errors"
+	"net/netip"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/rs/zerolog"
+
+	"github.com/cloudflare/cloudflared/ingress"
+	v3 "github.com/cloudflare/cloudflared/quic/v3"
+)
+
+func TestRegisterSession(t *testing.T) {
+	log := zerolog.Nop()
+	manager := v3.NewSessionManager(&log, ingress.DialUDPAddrPort)
+
+	request := v3.UDPSessionRegistrationDatagram{
+		RequestID:        testRequestID,
+		Dest:             netip.MustParseAddrPort("127.0.0.1:5000"),
+		Traced:           false,
+		IdleDurationHint: 5 * time.Second,
+		Payload:          nil,
+	}
+	session, err := manager.RegisterSession(&request, &noopEyeball{})
+	if err != nil {
+		t.Fatalf("register session should've succeeded: %v", err)
+	}
+	if request.RequestID != session.ID() {
+		t.Fatalf("session id doesn't match: %v != %v", request.RequestID, session.ID())
+	}
+
+	// We shouldn't be able to register another session with the same request id
+	_, err = manager.RegisterSession(&request, &noopEyeball{})
+	if !errors.Is(err, v3.ErrSessionBoundToOtherConn) {
+		t.Fatalf("session should not be able to be registered again: %v", err)
+	}
+
+	// Get session
+	sessionGet, err := manager.GetSession(request.RequestID)
+	if err != nil {
+		t.Fatalf("get session failed: %v", err)
+	}
+	if session.ID() != sessionGet.ID() {
+		t.Fatalf("session's do not match: %v != %v", session.ID(), sessionGet.ID())
+	}
+
+	// Remove the session
+	manager.UnregisterSession(request.RequestID)
+
+	// Get session should fail
+	_, err = manager.GetSession(request.RequestID)
+	if !errors.Is(err, v3.ErrSessionNotFound) {
+		t.Fatalf("get session failed: %v", err)
+	}
+
+	// Closing the original session should return that the socket is already closed (by the session unregistration)
+	err = session.Close()
+	if err != nil && !strings.Contains(err.Error(), "use of closed network connection") {
+		t.Fatalf("session should've closed without issue: %v", err)
+	}
+}
+
+func TestGetSession_Empty(t *testing.T) {
+	log := zerolog.Nop()
+	manager := v3.NewSessionManager(&log, ingress.DialUDPAddrPort)
+
+	_, err := manager.GetSession(testRequestID)
+	if !errors.Is(err, v3.ErrSessionNotFound) {
+		t.Fatalf("get session find no session: %v", err)
+	}
+}

quic/v3/muxer.go

@@ -0,0 +1,227 @@
+package v3
+
+import (
+	"context"
+	"errors"
+
+	"github.com/rs/zerolog"
+)
+
+const (
+	// Allocating a 16 channel buffer here allows for the writer to be slightly faster than the reader.
+	// This has worked previously well for datagramv2, so we will start with this as well
+	demuxChanCapacity = 16
+)
+
+// DatagramConn is the bridge that multiplexes writes and reads of datagrams for UDP sessions and ICMP packets to
+// a connection.
+type DatagramConn interface {
+	DatagramWriter
+	// Serve provides a server interface to process and handle incoming QUIC datagrams and demux their datagram v3 payloads.
+	Serve(context.Context) error
+}
+
+// DatagramWriter provides the Muxer interface to create proper Datagrams when sending over a connection.
+type DatagramWriter interface {
+	SendUDPSessionDatagram(datagram []byte) error
+	SendUDPSessionResponse(id RequestID, resp SessionRegistrationResp) error
+	//SendICMPPacket(packet packet.IP) error
+}
+
+// QuicConnection provides an interface that matches [quic.Connection] for only the datagram operations.
+//
+// We currently rely on the mutex for the [quic.Connection.SendDatagram] and [quic.Connection.ReceiveDatagram] and
+// do not have any locking for them. If the implementation in quic-go were to ever change, we would need to make
+// sure that we lock properly on these operations.
+type QuicConnection interface {
+	Context() context.Context
+	SendDatagram(payload []byte) error
+	ReceiveDatagram(context.Context) ([]byte, error)
+}
+
+type datagramConn struct {
+	conn           QuicConnection
+	sessionManager SessionManager
+	logger         *zerolog.Logger
+
+	datagrams  chan []byte
+	readErrors chan error
+}
+
+func NewDatagramConn(conn QuicConnection, sessionManager SessionManager, logger *zerolog.Logger) DatagramConn {
+	log := logger.With().Uint8("datagramVersion", 3).Logger()
+	return &datagramConn{
+		conn:           conn,
+		sessionManager: sessionManager,
+		logger:         &log,
+		datagrams:      make(chan []byte, demuxChanCapacity),
+		readErrors:     make(chan error, 2),
+	}
+}
+
+func (c *datagramConn) SendUDPSessionDatagram(datagram []byte) error {
+	return c.conn.SendDatagram(datagram)
+}
+
+func (c *datagramConn) SendUDPSessionResponse(id RequestID, resp SessionRegistrationResp) error {
+	datagram := UDPSessionRegistrationResponseDatagram{
+		RequestID:    id,
+		ResponseType: resp,
+	}
+	data, err := datagram.MarshalBinary()
+	if err != nil {
+		return err
+	}
+	return c.conn.SendDatagram(data)
+}
+
+var errReadTimeout error = errors.New("receive datagram timeout")
+
+// pollDatagrams will read datagrams from the underlying connection until the provided context is done.
+func (c *datagramConn) pollDatagrams(ctx context.Context) {
+	for ctx.Err() == nil {
+		datagram, err := c.conn.ReceiveDatagram(ctx)
+		// If the read returns an error, we want to return the failure to the channel.
+		if err != nil {
+			c.readErrors <- err
+			return
+		}
+		c.datagrams <- datagram
+	}
+	if ctx.Err() != nil {
+		c.readErrors <- ctx.Err()
+	}
+}
+
+// Serve will begin the process of receiving datagrams from the [quic.Connection] and demuxing them to their destination.
+// The [DatagramConn] when serving, will be responsible for the sessions it accepts.
+func (c *datagramConn) Serve(ctx context.Context) error {
+	connCtx := c.conn.Context()
+	// We want to make sure that we cancel the reader context if the Serve method returns. This could also mean that the
+	// underlying connection is also closing, but that is handled outside of the context of the datagram muxer.
+	readCtx, cancel := context.WithCancel(connCtx)
+	defer cancel()
+	go c.pollDatagrams(readCtx)
+	for {
+		// We make sure to monitor the context of cloudflared and the underlying connection to return if any errors occur.
+		var datagram []byte
+		select {
+		// Monitor the context of cloudflared
+		case <-ctx.Done():
+			return ctx.Err()
+		// Monitor the context of the underlying connection
+		case <-connCtx.Done():
+			return connCtx.Err()
+		// Monitor for any hard errors from reading the connection
+		case err := <-c.readErrors:
+			return err
+		// Otherwise, wait and dequeue datagrams as they come in
+		case d := <-c.datagrams:
+			datagram = d
+		}
+
+		// Each incoming datagram will be processed in a new go routine to handle the demuxing and action associated.
+		go func() {
+			typ, err := ParseDatagramType(datagram)
+			if err != nil {
+				c.logger.Err(err).Msgf("unable to parse datagram type: %d", typ)
+				return
+			}
+			switch typ {
+			case UDPSessionRegistrationType:
+				reg := &UDPSessionRegistrationDatagram{}
+				err := reg.UnmarshalBinary(datagram)
+				if err != nil {
+					c.logger.Err(err).Msgf("unable to unmarshal session registration datagram")
+					return
+				}
+				// We bind the new session to the quic connection context instead of cloudflared context to allow for the
+				// quic connection to close and close only the sessions bound to it. Closing of cloudflared will also
+				// initiate the close of the quic connection, so we don't have to worry about the application context
+				// in the scope of a session.
+				c.handleSessionRegistrationDatagram(connCtx, reg)
+			case UDPSessionPayloadType:
+				payload := &UDPSessionPayloadDatagram{}
+				err := payload.UnmarshalBinary(datagram)
+				if err != nil {
+					c.logger.Err(err).Msgf("unable to unmarshal session payload datagram")
+					return
+				}
+				c.handleSessionPayloadDatagram(payload)
+			case UDPSessionRegistrationResponseType:
+				// cloudflared should never expect to receive UDP session responses as it will not initiate new
+				// sessions towards the edge.
+				c.logger.Error().Msgf("unexpected datagram type received: %d", UDPSessionRegistrationResponseType)
+				return
+			default:
+				c.logger.Error().Msgf("unknown datagram type received: %d", typ)
+			}
+		}()
+	}
+}
+
+// This method handles new registrations of a session and the serve loop for the session.
+func (c *datagramConn) handleSessionRegistrationDatagram(ctx context.Context, datagram *UDPSessionRegistrationDatagram) {
+	session, err := c.sessionManager.RegisterSession(datagram, c)
+	if err != nil {
+		c.logger.Err(err).Msgf("session registration failure")
+		c.handleSessionRegistrationFailure(datagram.RequestID, err)
+		return
+	}
+	// Make sure to eventually remove the session from the session manager when the session is closed
+	defer c.sessionManager.UnregisterSession(session.ID())
+
+	// Respond that we are able to process the new session
+	err = c.SendUDPSessionResponse(datagram.RequestID, ResponseOk)
+	if err != nil {
+		c.logger.Err(err).Msgf("session registration failure: unable to send session registration response")
+		return
+	}
+
+	// We bind the context of the session to the [quic.Connection] that initiated the session.
+	// [Session.Serve] is blocking and will continue this go routine till the end of the session lifetime.
+	err = session.Serve(ctx)
+	if err == nil {
+		// We typically don't expect a session to close without some error response. [SessionIdleErr] is the typical
+		// expected error response.
+		c.logger.Warn().Msg("session was closed without explicit close or timeout")
+		return
+	}
+	// SessionIdleErr and SessionCloseErr are valid and successful error responses to end a session.
+	if errors.Is(err, SessionIdleErr{}) || errors.Is(err, SessionCloseErr) {
+		c.logger.Debug().Msg(err.Error())
+		return
+	}
+
+	// All other errors should be reported as errors
+	c.logger.Err(err).Msgf("session was closed with an error")
+}
+
+func (c *datagramConn) handleSessionRegistrationFailure(requestID RequestID, regErr error) {
+	var errResp SessionRegistrationResp
+	switch regErr {
+	case ErrSessionBoundToOtherConn:
+		errResp = ResponseSessionAlreadyConnected
+	default:
+		errResp = ResponseUnableToBindSocket
+	}
+	err := c.SendUDPSessionResponse(requestID, errResp)
+	if err != nil {
+		c.logger.Err(err).Msgf("unable to send session registration error response (%d)", errResp)
+	}
+}
+
+// Handles incoming datagrams that need to be sent to a registered session.
+func (c *datagramConn) handleSessionPayloadDatagram(datagram *UDPSessionPayloadDatagram) {
+	s, err := c.sessionManager.GetSession(datagram.RequestID)
+	if err != nil {
+		c.logger.Err(err).Msgf("unable to find session")
+		return
+	}
+	// We ignore the bytes written to the socket because any partial write must return an error.
+	_, err = s.Write(datagram.Payload)
+	if err != nil {
+		c.logger.Err(err).Msgf("unable to write payload for unavailable session")
+		return
+	}
+}

quic/v3/muxer_test.go

@@ -0,0 +1,497 @@
+package v3_test
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"net"
+	"net/netip"
+	"slices"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/rs/zerolog"
+
+	"github.com/cloudflare/cloudflared/ingress"
+	v3 "github.com/cloudflare/cloudflared/quic/v3"
+)
+
+type noopEyeball struct{}
+
+func (noopEyeball) SendUDPSessionDatagram(datagram []byte) error {
+	return nil
+}
+
+func (noopEyeball) SendUDPSessionResponse(id v3.RequestID, resp v3.SessionRegistrationResp) error {
+	return nil
+}
+
+type mockEyeball struct {
+	// datagram sent via SendUDPSessionDatagram
+	recvData chan []byte
+	// responses sent via SendUDPSessionResponse
+	recvResp chan struct {
+		id   v3.RequestID
+		resp v3.SessionRegistrationResp
+	}
+}
+
+func newMockEyeball() mockEyeball {
+	return mockEyeball{
+		recvData: make(chan []byte, 1),
+		recvResp: make(chan struct {
+			id   v3.RequestID
+			resp v3.SessionRegistrationResp
+		}, 1),
+	}
+}
+
+func (m *mockEyeball) SendUDPSessionDatagram(datagram []byte) error {
+	b := make([]byte, len(datagram))
+	copy(b, datagram)
+	m.recvData <- b
+	return nil
+}
+
+func (m *mockEyeball) SendUDPSessionResponse(id v3.RequestID, resp v3.SessionRegistrationResp) error {
+	m.recvResp <- struct {
+		id   v3.RequestID
+		resp v3.SessionRegistrationResp
+	}{
+		id, resp,
+	}
+	return nil
+}
+
+func TestDatagramConn_New(t *testing.T) {
+	log := zerolog.Nop()
+	conn := v3.NewDatagramConn(newMockQuicConn(), v3.NewSessionManager(&log, ingress.DialUDPAddrPort), &log)
+	if conn == nil {
+		t.Fatal("expected valid connection")
+	}
+}
+
+func TestDatagramConn_SendUDPSessionDatagram(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	conn := v3.NewDatagramConn(quic, v3.NewSessionManager(&log, ingress.DialUDPAddrPort), &log)
+
+	payload := []byte{0xef, 0xef}
+	conn.SendUDPSessionDatagram(payload)
+	p := <-quic.recv
+	if !slices.Equal(p, payload) {
+		t.Fatal("datagram sent does not match datagram received on quic side")
+	}
+}
+
+func TestDatagramConn_SendUDPSessionResponse(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	conn := v3.NewDatagramConn(quic, v3.NewSessionManager(&log, ingress.DialUDPAddrPort), &log)
+
+	conn.SendUDPSessionResponse(testRequestID, v3.ResponseDestinationUnreachable)
+	resp := <-quic.recv
+	var response v3.UDPSessionRegistrationResponseDatagram
+	err := response.UnmarshalBinary(resp)
+	if err != nil {
+		t.Fatal(err)
+	}
+	expected := v3.UDPSessionRegistrationResponseDatagram{
+		RequestID:    testRequestID,
+		ResponseType: v3.ResponseDestinationUnreachable,
+	}
+	if response != expected {
+		t.Fatal("datagram response sent does not match expected datagram response received")
+	}
+}
+
+func TestDatagramConnServe_ApplicationClosed(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	conn := v3.NewDatagramConn(quic, v3.NewSessionManager(&log, ingress.DialUDPAddrPort), &log)
+
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+	defer cancel()
+	err := conn.Serve(ctx)
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Fatal(err)
+	}
+}
+
+func TestDatagramConnServe_ConnectionClosed(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+	defer cancel()
+	quic.ctx = ctx
+	conn := v3.NewDatagramConn(quic, v3.NewSessionManager(&log, ingress.DialUDPAddrPort), &log)
+
+	err := conn.Serve(context.Background())
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Fatal(err)
+	}
+}
+
+func TestDatagramConnServe_ReceiveDatagramError(t *testing.T) {
+	log := zerolog.Nop()
+	quic := &mockQuicConnReadError{err: net.ErrClosed}
+	conn := v3.NewDatagramConn(quic, v3.NewSessionManager(&log, ingress.DialUDPAddrPort), &log)
+
+	err := conn.Serve(context.Background())
+	if !errors.Is(err, net.ErrClosed) {
+		t.Fatal(err)
+	}
+}
+
+func TestDatagramConnServe_ErrorDatagramTypes(t *testing.T) {
+	for _, test := range []struct {
+		name     string
+		input    []byte
+		expected string
+	}{
+		{
+			"empty",
+			[]byte{},
+			"{\"level\":\"error\",\"datagramVersion\":3,\"error\":\"datagram should have at least 1 byte\",\"message\":\"unable to parse datagram type: 0\"}\n",
+		},
+		{
+			"unexpected",
+			[]byte{byte(v3.UDPSessionRegistrationResponseType)},
+			"{\"level\":\"error\",\"datagramVersion\":3,\"message\":\"unexpected datagram type received: 3\"}\n",
+		},
+		{
+			"unknown",
+			[]byte{99},
+			"{\"level\":\"error\",\"datagramVersion\":3,\"message\":\"unknown datagram type received: 99\"}\n",
+		},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			logOutput := new(LockedBuffer)
+			log := zerolog.New(logOutput)
+			quic := newMockQuicConn()
+			quic.send <- test.input
+			conn := v3.NewDatagramConn(quic, &mockSessionManager{}, &log)
+
+			ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+			defer cancel()
+			err := conn.Serve(ctx)
+			// we cancel the Serve method to check to see if the log output was written since the unsupported datagram
+			// is dropped with only a log message as a side-effect.
+			if !errors.Is(err, context.DeadlineExceeded) {
+				t.Fatal(err)
+			}
+
+			out := logOutput.String()
+			if out != test.expected {
+				t.Fatalf("incorrect log output expected: %s", out)
+			}
+		})
+	}
+}
+
+type LockedBuffer struct {
+	bytes.Buffer
+	l sync.Mutex
+}
+
+func (b *LockedBuffer) Write(p []byte) (n int, err error) {
+	b.l.Lock()
+	defer b.l.Unlock()
+	return b.Buffer.Write(p)
+}
+
+func (b *LockedBuffer) String() string {
+	b.l.Lock()
+	defer b.l.Unlock()
+	return b.Buffer.String()
+}
+
+func TestDatagramConnServe_RegisterSession_SessionManagerError(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	expectedErr := errors.New("unable to register session")
+	sessionManager := mockSessionManager{expectedRegErr: expectedErr}
+	conn := v3.NewDatagramConn(quic, &sessionManager, &log)
+
+	// Setup the muxer
+	ctx, cancel := context.WithCancelCause(context.Background())
+	defer cancel(errors.New("other error"))
+	done := make(chan error, 1)
+	go func() {
+		done <- conn.Serve(ctx)
+	}()
+
+	// Send new session registration
+	datagram := newRegisterSessionDatagram(testRequestID)
+	quic.send <- datagram
+
+	// Wait for session registration response with failure
+	datagram = <-quic.recv
+	var resp v3.UDPSessionRegistrationResponseDatagram
+	err := resp.UnmarshalBinary(datagram)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if resp.RequestID != testRequestID && resp.ResponseType != v3.ResponseUnableToBindSocket {
+		t.Fatalf("expected registration response failure")
+	}
+
+	// Cancel the muxer Serve context and make sure it closes with the expected error
+	cancel(expectedContextCanceled)
+	err = <-done
+	if !errors.Is(err, context.Canceled) {
+		t.Fatal(err)
+	}
+	if !errors.Is(context.Cause(ctx), expectedContextCanceled) {
+		t.Fatal(err)
+	}
+}
+
+func TestDatagramConnServe(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	session := newMockSession()
+	sessionManager := mockSessionManager{session: &session}
+	conn := v3.NewDatagramConn(quic, &sessionManager, &log)
+
+	// Setup the muxer
+	ctx, cancel := context.WithCancelCause(context.Background())
+	defer cancel(errors.New("other error"))
+	done := make(chan error, 1)
+	go func() {
+		done <- conn.Serve(ctx)
+	}()
+
+	// Send new session registration
+	datagram := newRegisterSessionDatagram(testRequestID)
+	quic.send <- datagram
+
+	// Wait for session registration response with success
+	datagram = <-quic.recv
+	var resp v3.UDPSessionRegistrationResponseDatagram
+	err := resp.UnmarshalBinary(datagram)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if resp.RequestID != testRequestID && resp.ResponseType != v3.ResponseOk {
+		t.Fatalf("expected registration response ok")
+	}
+
+	// We expect the session to be served
+	timer := time.NewTimer(15 * time.Second)
+	defer timer.Stop()
+	select {
+	case <-session.served:
+		break
+	case <-timer.C:
+		t.Fatalf("expected session serve to be called")
+	}
+
+	// Cancel the muxer Serve context and make sure it closes with the expected error
+	cancel(expectedContextCanceled)
+	err = <-done
+	if !errors.Is(err, context.Canceled) {
+		t.Fatal(err)
+	}
+	if !errors.Is(context.Cause(ctx), expectedContextCanceled) {
+		t.Fatal(err)
+	}
+}
+
+func TestDatagramConnServe_Payload_GetSessionError(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	sessionManager := mockSessionManager{session: nil, expectedGetErr: v3.ErrSessionNotFound}
+	conn := v3.NewDatagramConn(quic, &sessionManager, &log)
+
+	// Setup the muxer
+	ctx, cancel := context.WithCancelCause(context.Background())
+	defer cancel(errors.New("other error"))
+	done := make(chan error, 1)
+	go func() {
+		done <- conn.Serve(ctx)
+	}()
+
+	// Send new session registration
+	datagram := newSessionPayloadDatagram(testRequestID, []byte{0xef, 0xef})
+	quic.send <- datagram
+
+	// Cancel the muxer Serve context and make sure it closes with the expected error
+	cancel(expectedContextCanceled)
+	err := <-done
+	if !errors.Is(err, context.Canceled) {
+		t.Fatal(err)
+	}
+	if !errors.Is(context.Cause(ctx), expectedContextCanceled) {
+		t.Fatal(err)
+	}
+}
+
+func TestDatagramConnServe_Payload(t *testing.T) {
+	log := zerolog.Nop()
+	quic := newMockQuicConn()
+	session := newMockSession()
+	sessionManager := mockSessionManager{session: &session}
+	conn := v3.NewDatagramConn(quic, &sessionManager, &log)
+
+	// Setup the muxer
+	ctx, cancel := context.WithCancelCause(context.Background())
+	defer cancel(errors.New("other error"))
+	done := make(chan error, 1)
+	go func() {
+		done <- conn.Serve(ctx)
+	}()
+
+	// Send new session registration
+	expectedPayload := []byte{0xef, 0xef}
+	datagram := newSessionPayloadDatagram(testRequestID, expectedPayload)
+	quic.send <- datagram
+
+	// Session should receive the payload
+	payload := <-session.recv
+	if !slices.Equal(expectedPayload, payload) {
+		t.Fatalf("expected session receieve the payload sent via the muxer")
+	}
+
+	// Cancel the muxer Serve context and make sure it closes with the expected error
+	cancel(expectedContextCanceled)
+	err := <-done
+	if !errors.Is(err, context.Canceled) {
+		t.Fatal(err)
+	}
+	if !errors.Is(context.Cause(ctx), expectedContextCanceled) {
+		t.Fatal(err)
+	}
+}
+
+func newRegisterSessionDatagram(id v3.RequestID) []byte {
+	datagram := v3.UDPSessionRegistrationDatagram{
+		RequestID:        id,
+		Dest:             netip.MustParseAddrPort("127.0.0.1:8080"),
+		IdleDurationHint: 5 * time.Second,
+	}
+	payload, err := datagram.MarshalBinary()
+	if err != nil {
+		panic(err)
+	}
+	return payload
+}
+
+func newRegisterResponseSessionDatagram(id v3.RequestID, resp v3.SessionRegistrationResp) []byte {
+	datagram := v3.UDPSessionRegistrationResponseDatagram{
+		RequestID:    id,
+		ResponseType: resp,
+	}
+	payload, err := datagram.MarshalBinary()
+	if err != nil {
+		panic(err)
+	}
+	return payload
+}
+
+func newSessionPayloadDatagram(id v3.RequestID, payload []byte) []byte {
+	datagram := make([]byte, len(payload)+17)
+	err := v3.MarshalPayloadHeaderTo(id, datagram[:])
+	if err != nil {
+		panic(err)
+	}
+	copy(datagram[17:], payload)
+	return datagram
+}
+
+type mockQuicConn struct {
+	ctx  context.Context
+	send chan []byte
+	recv chan []byte
+}
+
+func newMockQuicConn() *mockQuicConn {
+	return &mockQuicConn{
+		ctx:  context.Background(),
+		send: make(chan []byte, 1),
+		recv: make(chan []byte, 1),
+	}
+}
+
+func (m *mockQuicConn) Context() context.Context {
+	return m.ctx
+}
+
+func (m *mockQuicConn) SendDatagram(payload []byte) error {
+	b := make([]byte, len(payload))
+	copy(b, payload)
+	m.recv <- b
+	return nil
+}
+
+func (m *mockQuicConn) ReceiveDatagram(_ context.Context) ([]byte, error) {
+	return <-m.send, nil
+}
+
+type mockQuicConnReadError struct {
+	err error
+}
+
+func (m *mockQuicConnReadError) Context() context.Context {
+	return context.Background()
+}
+
+func (m *mockQuicConnReadError) SendDatagram(payload []byte) error {
+	return nil
+}
+
+func (m *mockQuicConnReadError) ReceiveDatagram(_ context.Context) ([]byte, error) {
+	return nil, m.err
+}
+
+type mockSessionManager struct {
+	session v3.Session
+
+	expectedRegErr error
+	expectedGetErr error
+}
+
+func (m *mockSessionManager) RegisterSession(request *v3.UDPSessionRegistrationDatagram, conn v3.DatagramWriter) (v3.Session, error) {
+	return m.session, m.expectedRegErr
+}
+
+func (m *mockSessionManager) GetSession(requestID v3.RequestID) (v3.Session, error) {
+	return m.session, m.expectedGetErr
+}
+
+func (m *mockSessionManager) UnregisterSession(requestID v3.RequestID) {}
+
+type mockSession struct {
+	served chan struct{}
+	recv   chan []byte
+}
+
+func newMockSession() mockSession {
+	return mockSession{
+		served: make(chan struct{}),
+		recv:   make(chan []byte, 1),
+	}
+}
+
+func (m *mockSession) ID() v3.RequestID {
+	return testRequestID
+}
+
+func (m *mockSession) Serve(ctx context.Context) error {
+	close(m.served)
+	return v3.SessionCloseErr
+}
+
+func (m *mockSession) Write(payload []byte) (n int, err error) {
+	b := make([]byte, len(payload))
+	copy(b, payload)
+	m.recv <- b
+	return len(b), nil
+}
+
+func (m *mockSession) Close() error {
+	return nil
+}

quic/v3/request.go

@@ -0,0 +1,89 @@
+package v3
+
+import (
+	"encoding/binary"
+	"errors"
+	"fmt"
+)
+
+const (
+	datagramRequestIdLen = 16
+)
+
+var (
+	// ErrInvalidRequestIDLen is returned when the provided request id can not be parsed from the provided byte slice.
+	ErrInvalidRequestIDLen error = errors.New("invalid request id length provided")
+	// ErrInvalidPayloadDestLen is returned when the provided destination byte slice cannot fit the whole request id.
+	ErrInvalidPayloadDestLen error = errors.New("invalid payload size provided")
+)
+
+// RequestID is the request-id-v2 identifier, it is used to distinguish between specific flows or sessions proxied
+// from the edge to cloudflared.
+type RequestID uint128
+
+type uint128 struct {
+	hi uint64
+	lo uint64
+}
+
+// RequestIDFromSlice reads a request ID from a byte slice.
+func RequestIDFromSlice(data []byte) (RequestID, error) {
+	if len(data) != datagramRequestIdLen {
+		return RequestID{}, ErrInvalidRequestIDLen
+	}
+
+	return RequestID{
+		hi: binary.BigEndian.Uint64(data[:8]),
+		lo: binary.BigEndian.Uint64(data[8:]),
+	}, nil
+}
+
+func (id RequestID) String() string {
+	return fmt.Sprintf("%016x%016x", id.hi, id.lo)
+}
+
+// Compare returns an integer comparing two IPs.
+// The result will be 0 if id == id2, -1 if id < id2, and +1 if id > id2.
+// The definition of "less than" is the same as the [RequestID.Less] method.
+func (id RequestID) Compare(id2 RequestID) int {
+	hi1, hi2 := id.hi, id2.hi
+	if hi1 < hi2 {
+		return -1
+	}
+	if hi1 > hi2 {
+		return 1
+	}
+	lo1, lo2 := id.lo, id2.lo
+	if lo1 < lo2 {
+		return -1
+	}
+	if lo1 > lo2 {
+		return 1
+	}
+	return 0
+}
+
+// Less reports whether id sorts before id2.
+func (id RequestID) Less(id2 RequestID) bool { return id.Compare(id2) == -1 }
+
+// MarshalBinaryTo writes the id to the provided destination byte slice; the byte slice must be of at least size 16.
+func (id RequestID) MarshalBinaryTo(data []byte) error {
+	if len(data) < datagramRequestIdLen {
+		return ErrInvalidPayloadDestLen
+	}
+	binary.BigEndian.PutUint64(data[:8], id.hi)
+	binary.BigEndian.PutUint64(data[8:], id.lo)
+	return nil
+}
+
+func (id *RequestID) UnmarshalBinary(data []byte) error {
+	if len(data) != 16 {
+		return fmt.Errorf("invalid length slice provided to unmarshal: %d (expected 16)", len(data))
+	}
+
+	*id = RequestID{
+		binary.BigEndian.Uint64(data[:8]),
+		binary.BigEndian.Uint64(data[8:]),
+	}
+	return nil
+}