From 32a5ba9418564d9dc2ad0fb88149a36ce6314f80 Mon Sep 17 00:00:00 2001 From: kjake Date: Mon, 20 Jan 2025 13:36:21 -0500 Subject: [PATCH] More complete freebsd change --- .teamcity/mac/build.sh | 4 +- Dockerfile | 8 ++-- Dockerfile.amd64 | 8 ++-- Dockerfile.arm64 | 8 ++-- Makefile | 12 +++--- carrier/carrier.go | 2 +- carrier/websocket.go | 6 +-- carrier/websocket_test.go | 6 +-- cmd/cloudflared/access/carrier.go | 10 ++--- cmd/cloudflared/access/cmd.go | 12 +++--- cmd/cloudflared/app_forward_service.go | 4 +- cmd/cloudflared/app_resolver_service.go | 4 +- cmd/cloudflared/app_service.go | 4 +- cmd/cloudflared/cliutil/handler.go | 4 +- cmd/cloudflared/cliutil/logger.go | 2 +- cmd/cloudflared/common_service.go | 4 +- cmd/cloudflared/linux_service.go | 8 ++-- cmd/cloudflared/macos_service.go | 4 +- cmd/cloudflared/main.go | 26 ++++++------ cmd/cloudflared/proxydns/cmd.go | 8 ++-- cmd/cloudflared/service_template.go | 2 +- cmd/cloudflared/tail/cmd.go | 8 ++-- cmd/cloudflared/tunnel/cmd.go | 40 +++++++++---------- cmd/cloudflared/tunnel/config_test.go | 2 +- cmd/cloudflared/tunnel/configuration.go | 22 +++++----- cmd/cloudflared/tunnel/credential_finder.go | 4 +- cmd/cloudflared/tunnel/info.go | 2 +- cmd/cloudflared/tunnel/ingress_subcommands.go | 6 +-- cmd/cloudflared/tunnel/login.go | 10 ++--- cmd/cloudflared/tunnel/quick_tunnel.go | 2 +- cmd/cloudflared/tunnel/server.go | 2 +- cmd/cloudflared/tunnel/subcommand_context.go | 8 ++-- .../tunnel/subcommand_context_teamnet.go | 2 +- .../tunnel/subcommand_context_test.go | 6 +-- .../tunnel/subcommand_context_vnets.go | 2 +- cmd/cloudflared/tunnel/subcommands.go | 14 +++---- cmd/cloudflared/tunnel/subcommands_test.go | 4 +- cmd/cloudflared/tunnel/tag.go | 2 +- cmd/cloudflared/tunnel/tag_test.go | 2 +- cmd/cloudflared/tunnel/teamnet_subcommands.go | 6 +-- cmd/cloudflared/tunnel/vnets_subcommands.go | 6 +-- cmd/cloudflared/updater/update.go | 6 +-- cmd/cloudflared/updater/update_test.go | 2 +- cmd/cloudflared/updater/workers_update.go | 2 +- cmd/cloudflared/windows_service.go | 4 +- config/configuration.go | 2 +- config/manager.go | 2 +- config/manager_test.go | 2 +- config/model.go | 2 +- connection/connection.go | 6 +-- connection/connection_test.go | 10 ++--- connection/control.go | 6 +-- connection/errors.go | 4 +- connection/http2.go | 4 +- connection/http2_test.go | 4 +- connection/observer.go | 2 +- connection/protocol.go | 2 +- connection/protocol_test.go | 2 +- connection/quic_connection.go | 10 ++--- connection/quic_connection_test.go | 14 +++---- connection/quic_datagram_v2.go | 18 ++++----- connection/quic_datagram_v3.go | 8 ++-- credentials/credentials.go | 2 +- credentials/origin_cert.go | 2 +- datagramsession/manager.go | 4 +- datagramsession/manager_test.go | 2 +- datagramsession/session.go | 2 +- datagramsession/session_test.go | 2 +- dev.Dockerfile | 4 +- diagnostic/client.go | 2 +- diagnostic/diagnostic_utils_test.go | 6 +-- diagnostic/handlers.go | 2 +- diagnostic/handlers_test.go | 6 +-- diagnostic/network/collector_unix.go | 2 +- diagnostic/network/collector_unix_test.go | 2 +- diagnostic/network/collector_windows_test.go | 2 +- diagnostic/system_collector_test.go | 2 +- edgediscovery/allregions/discovery.go | 2 +- edgediscovery/edgediscovery.go | 4 +- edgediscovery/edgediscovery_test.go | 2 +- fips/fips.go.linux-amd64 | 2 +- fmt-check.sh | 2 +- go.mod | 2 +- hello/hello.go | 2 +- ingress/config.go | 6 +-- ingress/config_test.go | 4 +- ingress/constants_test.go | 2 +- ingress/icmp_darwin.go | 4 +- ingress/icmp_darwin_test.go | 2 +- ingress/icmp_generic.go | 2 +- ingress/icmp_linux.go | 4 +- ingress/icmp_linux_test.go | 2 +- ingress/icmp_posix.go | 5 +-- ingress/icmp_posix_test.go | 4 +- ingress/icmp_windows.go | 4 +- ingress/ingress.go | 6 +-- ingress/ingress_test.go | 6 +-- ingress/origin_connection.go | 8 ++-- ingress/origin_connection_test.go | 6 +-- ingress/origin_icmp_proxy.go | 4 +- ingress/origin_icmp_proxy_test.go | 6 +-- ingress/origin_proxy_test.go | 4 +- ingress/origin_service.go | 10 ++--- ingress/packet_router.go | 6 +-- ingress/packet_router_test.go | 4 +- ingress/rule.go | 2 +- ingress/rule_test.go | 2 +- logger/create.go | 2 +- management/events_test.go | 2 +- management/service_test.go | 2 +- metrics/metrics.go | 2 +- metrics/metrics_test.go | 2 +- metrics/readiness.go | 2 +- metrics/readiness_test.go | 6 +-- orchestration/config.go | 4 +- orchestration/config_test.go | 4 +- orchestration/orchestrator.go | 10 ++--- orchestration/orchestrator_test.go | 12 +++--- proxy/logger.go | 6 +-- proxy/metrics.go | 2 +- proxy/proxy.go | 14 +++---- proxy/proxy_posix_test.go | 2 +- proxy/proxy_test.go | 16 ++++---- quic/datagram.go | 2 +- quic/datagram_test.go | 4 +- quic/datagramv2.go | 4 +- quic/v3/datagram_test.go | 2 +- quic/v3/icmp.go | 6 +-- quic/v3/icmp_test.go | 4 +- quic/v3/manager_test.go | 4 +- quic/v3/muxer.go | 4 +- quic/v3/muxer_test.go | 6 +-- quic/v3/request_test.go | 2 +- quic/v3/session_test.go | 2 +- socks/request_handler.go | 2 +- socks/request_handler_test.go | 2 +- sshgen/sshgen.go | 4 +- sshgen/sshgen_test.go | 4 +- stream/stream.go | 2 +- supervisor/conn_aware_logger.go | 4 +- supervisor/metrics.go | 2 +- supervisor/pqtunnels.go | 2 +- supervisor/supervisor.go | 16 ++++---- supervisor/tunnel.go | 26 ++++++------ supervisor/tunnel_test.go | 6 +-- token/path.go | 2 +- token/token.go | 4 +- tunnelrpc/pogs/cloudflared_server.go | 2 +- tunnelrpc/pogs/configuration_manager.go | 4 +- tunnelrpc/pogs/quic_metadata_protocol.go | 2 +- tunnelrpc/pogs/registration_server.go | 4 +- tunnelrpc/pogs/registration_server_test.go | 2 +- tunnelrpc/pogs/session_manager.go | 4 +- tunnelrpc/proto/quic_metadata_protocol.capnp | 2 +- tunnelrpc/proto/tunnelrpc.capnp | 2 +- tunnelrpc/quic/cloudflared_client.go | 6 +-- tunnelrpc/quic/cloudflared_server.go | 4 +- tunnelrpc/quic/request_client_stream.go | 2 +- tunnelrpc/quic/request_server_stream.go | 2 +- tunnelrpc/quic/request_server_stream_test.go | 2 +- tunnelrpc/quic/session_client.go | 6 +-- tunnelrpc/quic/session_server.go | 4 +- tunnelrpc/registration_client.go | 4 +- tunnelrpc/registration_server.go | 2 +- tunnelstate/conntracker.go | 2 +- 165 files changed, 414 insertions(+), 415 deletions(-) diff --git a/.teamcity/mac/build.sh b/.teamcity/mac/build.sh index ff50a252..a1b3456f 100755 --- a/.teamcity/mac/build.sh +++ b/.teamcity/mac/build.sh @@ -33,8 +33,8 @@ 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 +cp -r . ../src/github.com/kjake/cloudflared +cd ../src/github.com/kjake/cloudflared # Imports certificates to the Apple KeyChain import_certificate() { diff --git a/Dockerfile b/Dockerfile index 66674c2a..ab36e50b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,12 @@ ENV GO111MODULE=on \ CGO_ENABLED=0 \ TARGET_GOOS=${TARGET_GOOS} \ TARGET_GOARCH=${TARGET_GOARCH} \ - # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual + # the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual # which changes how cloudflared binds the metrics server CONTAINER_BUILD=1 -WORKDIR /go/src/github.com/cloudflare/cloudflared/ +WORKDIR /go/src/github.com/kjake/cloudflared/ # copy our sources into the builder image COPY . . @@ -24,10 +24,10 @@ RUN PATH="/tmp/go/bin:$PATH" make cloudflared # use a distroless base image with glibc FROM gcr.io/distroless/base-debian11:nonroot -LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared" +LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" # copy our compiled binary -COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ +COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ # run as non-privileged user USER nonroot diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index c375d801..13e67b7b 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -2,11 +2,11 @@ FROM golang:1.22.5 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ - # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual + # the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual # which changes how cloudflared binds the metrics server CONTAINER_BUILD=1 -WORKDIR /go/src/github.com/cloudflare/cloudflared/ +WORKDIR /go/src/github.com/kjake/cloudflared/ # copy our sources into the builder image COPY . . @@ -19,10 +19,10 @@ RUN GOOS=linux GOARCH=amd64 PATH="/tmp/go/bin:$PATH" make cloudflared # use a distroless base image with glibc FROM gcr.io/distroless/base-debian11:nonroot -LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared" +LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" # copy our compiled binary -COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ +COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ # run as non-privileged user USER nonroot diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index b617d7ae..9470b792 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -2,11 +2,11 @@ FROM golang:1.22.5 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ - # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual + # the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual # which changes how cloudflared binds the metrics server CONTAINER_BUILD=1 -WORKDIR /go/src/github.com/cloudflare/cloudflared/ +WORKDIR /go/src/github.com/kjake/cloudflared/ # copy our sources into the builder image COPY . . @@ -19,10 +19,10 @@ RUN GOOS=linux GOARCH=arm64 PATH="/tmp/go/bin:$PATH" make cloudflared # use a distroless base image with glibc FROM gcr.io/distroless/base-debian11:nonroot-arm64 -LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared" +LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" # copy our compiled binary -COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ +COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ # run as non-privileged user USER nonroot diff --git a/Makefile b/Makefile index 2e0e82e8..2a488145 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,11 @@ endif DATE := $(shell date -u '+%Y-%m-%d-%H%M UTC') VERSION_FLAGS := -X "main.Version=$(VERSION)" -X "main.BuildTime=$(DATE)" ifdef PACKAGE_MANAGER - VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=$(PACKAGE_MANAGER)" + VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/kjake/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=$(PACKAGE_MANAGER)" endif ifdef CONTAINER_BUILD - VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/cloudflare/cloudflared/metrics.Runtime=virtual" + VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/kjake/cloudflared/metrics.Runtime=virtual" endif LINK_FLAGS := @@ -51,7 +51,7 @@ ifeq ($(debug), 1) GO_BUILD_TAGS += -gcflags="all=-N -l" endif -IMPORT_PATH := github.com/cloudflare/cloudflared +IMPORT_PATH := github.com/kjake/cloudflared PACKAGE_DIR := $(CURDIR)/packaging PREFIX := /usr INSTALL_BINDIR := $(PREFIX)/bin/ @@ -208,7 +208,7 @@ define build_package --description 'Cloudflare Tunnel daemon' \ --vendor 'Cloudflare' \ --license 'Apache License Version 2.0' \ - --url 'https://github.com/cloudflare/cloudflared' \ + --url 'https://github.com/kjake/cloudflared' \ -m 'Cloudflare ' \ -a $(PACKAGE_ARCH) -v $(VERSION) -n $(DEB_PACKAGE_NAME) $(RPM_DIGEST) $(NIGHTLY_FLAGS) --after-install postinst.sh --after-remove postrm.sh \ cloudflared=$(INSTALL_BINDIR) cloudflared.1=$(INSTALL_MANDIR) @@ -251,11 +251,11 @@ capnp: .PHONY: vet vet: - go vet -mod=vendor github.com/cloudflare/cloudflared/... + go vet -mod=vendor github.com/kjake/cloudflared/... .PHONY: fmt fmt: - @goimports -l -w -local github.com/cloudflare/cloudflared $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto) + @goimports -l -w -local github.com/kjake/cloudflared $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto) @go fmt $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto) .PHONY: fmt-check diff --git a/carrier/carrier.go b/carrier/carrier.go index b44e1324..2bfb13af 100644 --- a/carrier/carrier.go +++ b/carrier/carrier.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/token" + "github.com/kjake/cloudflared/token" ) const ( diff --git a/carrier/websocket.go b/carrier/websocket.go index 31075210..3517ae45 100644 --- a/carrier/websocket.go +++ b/carrier/websocket.go @@ -9,9 +9,9 @@ import ( "github.com/gorilla/websocket" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/stream" - "github.com/cloudflare/cloudflared/token" - cfwebsocket "github.com/cloudflare/cloudflared/websocket" + "github.com/kjake/cloudflared/stream" + "github.com/kjake/cloudflared/token" + cfwebsocket "github.com/kjake/cloudflared/websocket" ) // Websocket is used to carry data via WS binary frames over the tunnel from client to the origin diff --git a/carrier/websocket_test.go b/carrier/websocket_test.go index a0a32bb8..590e941c 100644 --- a/carrier/websocket_test.go +++ b/carrier/websocket_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/websocket" - "github.com/cloudflare/cloudflared/hello" - "github.com/cloudflare/cloudflared/tlsconfig" - cfwebsocket "github.com/cloudflare/cloudflared/websocket" + "github.com/kjake/cloudflared/hello" + "github.com/kjake/cloudflared/tlsconfig" + cfwebsocket "github.com/kjake/cloudflared/websocket" ) func websocketClientTLSConfig(t *testing.T) *tls.Config { diff --git a/cmd/cloudflared/access/carrier.go b/cmd/cloudflared/access/carrier.go index 12cc8ac7..d1b0c944 100644 --- a/cmd/cloudflared/access/carrier.go +++ b/cmd/cloudflared/access/carrier.go @@ -11,11 +11,11 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/carrier" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/stream" - "github.com/cloudflare/cloudflared/validation" + "github.com/kjake/cloudflared/carrier" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/stream" + "github.com/kjake/cloudflared/validation" ) const ( diff --git a/cmd/cloudflared/access/cmd.go b/cmd/cloudflared/access/cmd.go index d1490ef7..a9479385 100644 --- a/cmd/cloudflared/access/cmd.go +++ b/cmd/cloudflared/access/cmd.go @@ -17,12 +17,12 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/net/idna" - "github.com/cloudflare/cloudflared/carrier" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/sshgen" - "github.com/cloudflare/cloudflared/token" - "github.com/cloudflare/cloudflared/validation" + "github.com/kjake/cloudflared/carrier" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/sshgen" + "github.com/kjake/cloudflared/token" + "github.com/kjake/cloudflared/validation" ) const ( diff --git a/cmd/cloudflared/app_forward_service.go b/cmd/cloudflared/app_forward_service.go index 1c015430..dade2a5f 100644 --- a/cmd/cloudflared/app_forward_service.go +++ b/cmd/cloudflared/app_forward_service.go @@ -3,8 +3,8 @@ package main import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/cmd/cloudflared/access" - "github.com/cloudflare/cloudflared/config" + "github.com/kjake/cloudflared/cmd/cloudflared/access" + "github.com/kjake/cloudflared/config" ) // ForwardServiceType is used to identify what kind of overwatch service this is diff --git a/cmd/cloudflared/app_resolver_service.go b/cmd/cloudflared/app_resolver_service.go index e680e307..4b64cab7 100644 --- a/cmd/cloudflared/app_resolver_service.go +++ b/cmd/cloudflared/app_resolver_service.go @@ -3,8 +3,8 @@ package main import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/tunneldns" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/tunneldns" ) const ( diff --git a/cmd/cloudflared/app_service.go b/cmd/cloudflared/app_service.go index 7eb0d542..c5d48bf6 100644 --- a/cmd/cloudflared/app_service.go +++ b/cmd/cloudflared/app_service.go @@ -3,8 +3,8 @@ package main import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/overwatch" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/overwatch" ) // AppService is the main service that runs when no command lines flags are passed to cloudflared diff --git a/cmd/cloudflared/cliutil/handler.go b/cmd/cloudflared/cliutil/handler.go index 47c8af87..5baf79a4 100644 --- a/cmd/cloudflared/cliutil/handler.go +++ b/cmd/cloudflared/cliutil/handler.go @@ -4,8 +4,8 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/logger" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/logger" ) func Action(actionFunc cli.ActionFunc) cli.ActionFunc { diff --git a/cmd/cloudflared/cliutil/logger.go b/cmd/cloudflared/cliutil/logger.go index 01435213..c70275f0 100644 --- a/cmd/cloudflared/cliutil/logger.go +++ b/cmd/cloudflared/cliutil/logger.go @@ -4,7 +4,7 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "github.com/cloudflare/cloudflared/logger" + "github.com/kjake/cloudflared/logger" ) var ( diff --git a/cmd/cloudflared/common_service.go b/cmd/cloudflared/common_service.go index db7338c0..09042ab6 100644 --- a/cmd/cloudflared/common_service.go +++ b/cmd/cloudflared/common_service.go @@ -4,8 +4,8 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" ) func buildArgsForToken(c *cli.Context, log *zerolog.Logger) ([]string, error) { diff --git a/cmd/cloudflared/linux_service.go b/cmd/cloudflared/linux_service.go index 4e68af17..5d0a2599 100644 --- a/cmd/cloudflared/linux_service.go +++ b/cmd/cloudflared/linux_service.go @@ -9,10 +9,10 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/logger" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/logger" ) func runApp(app *cli.App, graceShutdownC chan struct{}) { diff --git a/cmd/cloudflared/macos_service.go b/cmd/cloudflared/macos_service.go index 48d066e0..d031550f 100644 --- a/cmd/cloudflared/macos_service.go +++ b/cmd/cloudflared/macos_service.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/logger" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/logger" ) const ( diff --git a/cmd/cloudflared/main.go b/cmd/cloudflared/main.go index b0b93cf8..e69b78a3 100644 --- a/cmd/cloudflared/main.go +++ b/cmd/cloudflared/main.go @@ -13,19 +13,19 @@ import ( "github.com/urfave/cli/v2" "go.uber.org/automaxprocs/maxprocs" - "github.com/cloudflare/cloudflared/cmd/cloudflared/access" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns" - "github.com/cloudflare/cloudflared/cmd/cloudflared/tail" - "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" - "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/metrics" - "github.com/cloudflare/cloudflared/overwatch" - "github.com/cloudflare/cloudflared/token" - "github.com/cloudflare/cloudflared/tracing" - "github.com/cloudflare/cloudflared/watcher" + "github.com/kjake/cloudflared/cmd/cloudflared/access" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/proxydns" + "github.com/kjake/cloudflared/cmd/cloudflared/tail" + "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" + "github.com/kjake/cloudflared/cmd/cloudflared/updater" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/metrics" + "github.com/kjake/cloudflared/overwatch" + "github.com/kjake/cloudflared/token" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/watcher" ) const ( diff --git a/cmd/cloudflared/proxydns/cmd.go b/cmd/cloudflared/proxydns/cmd.go index 950da293..6df06788 100644 --- a/cmd/cloudflared/proxydns/cmd.go +++ b/cmd/cloudflared/proxydns/cmd.go @@ -9,10 +9,10 @@ import ( "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/metrics" - "github.com/cloudflare/cloudflared/tunneldns" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/metrics" + "github.com/kjake/cloudflared/tunneldns" ) func Command(hidden bool) *cli.Command { diff --git a/cmd/cloudflared/service_template.go b/cmd/cloudflared/service_template.go index c2f0d3cf..c58e1364 100644 --- a/cmd/cloudflared/service_template.go +++ b/cmd/cloudflared/service_template.go @@ -12,7 +12,7 @@ import ( homedir "github.com/mitchellh/go-homedir" - "github.com/cloudflare/cloudflared/config" + "github.com/kjake/cloudflared/config" ) type ServiceTemplate struct { diff --git a/cmd/cloudflared/tail/cmd.go b/cmd/cloudflared/tail/cmd.go index 7d444024..d976487b 100644 --- a/cmd/cloudflared/tail/cmd.go +++ b/cmd/cloudflared/tail/cmd.go @@ -17,10 +17,10 @@ import ( "github.com/urfave/cli/v2" "nhooyr.io/websocket" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/credentials" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/management" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/credentials" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/management" ) var ( diff --git a/cmd/cloudflared/tunnel/cmd.go b/cmd/cloudflared/tunnel/cmd.go index c8d565f2..a3b83413 100644 --- a/cmd/cloudflared/tunnel/cmd.go +++ b/cmd/cloudflared/tunnel/cmd.go @@ -22,26 +22,26 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "github.com/cloudflare/cloudflared/cfapi" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns" - "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/credentials" - "github.com/cloudflare/cloudflared/diagnostic" - "github.com/cloudflare/cloudflared/edgediscovery" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/management" - "github.com/cloudflare/cloudflared/metrics" - "github.com/cloudflare/cloudflared/orchestration" - "github.com/cloudflare/cloudflared/signal" - "github.com/cloudflare/cloudflared/supervisor" - "github.com/cloudflare/cloudflared/tlsconfig" - "github.com/cloudflare/cloudflared/tunneldns" - "github.com/cloudflare/cloudflared/tunnelstate" - "github.com/cloudflare/cloudflared/validation" + "github.com/kjake/cloudflared/cfapi" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/proxydns" + "github.com/kjake/cloudflared/cmd/cloudflared/updater" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/credentials" + "github.com/kjake/cloudflared/diagnostic" + "github.com/kjake/cloudflared/edgediscovery" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/management" + "github.com/kjake/cloudflared/metrics" + "github.com/kjake/cloudflared/orchestration" + "github.com/kjake/cloudflared/signal" + "github.com/kjake/cloudflared/supervisor" + "github.com/kjake/cloudflared/tlsconfig" + "github.com/kjake/cloudflared/tunneldns" + "github.com/kjake/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/validation" ) const ( diff --git a/cmd/cloudflared/tunnel/config_test.go b/cmd/cloudflared/tunnel/config_test.go index 0ca6c436..92d8f10b 100644 --- a/cmd/cloudflared/tunnel/config_test.go +++ b/cmd/cloudflared/tunnel/config_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/features" + "github.com/kjake/cloudflared/features" ) func TestDedup(t *testing.T) { diff --git a/cmd/cloudflared/tunnel/configuration.go b/cmd/cloudflared/tunnel/configuration.go index c5983273..6392192b 100644 --- a/cmd/cloudflared/tunnel/configuration.go +++ b/cmd/cloudflared/tunnel/configuration.go @@ -17,17 +17,17 @@ import ( "github.com/urfave/cli/v2/altsrc" "golang.org/x/term" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/edgediscovery" - "github.com/cloudflare/cloudflared/edgediscovery/allregions" - "github.com/cloudflare/cloudflared/features" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/orchestration" - "github.com/cloudflare/cloudflared/supervisor" - "github.com/cloudflare/cloudflared/tlsconfig" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/edgediscovery" + "github.com/kjake/cloudflared/edgediscovery/allregions" + "github.com/kjake/cloudflared/features" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/orchestration" + "github.com/kjake/cloudflared/supervisor" + "github.com/kjake/cloudflared/tlsconfig" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/cmd/cloudflared/tunnel/credential_finder.go b/cmd/cloudflared/tunnel/credential_finder.go index 92e05495..2a1eaa2e 100644 --- a/cmd/cloudflared/tunnel/credential_finder.go +++ b/cmd/cloudflared/tunnel/credential_finder.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/credentials" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/credentials" "github.com/google/uuid" "github.com/rs/zerolog" diff --git a/cmd/cloudflared/tunnel/info.go b/cmd/cloudflared/tunnel/info.go index 7c20556a..e400abb0 100644 --- a/cmd/cloudflared/tunnel/info.go +++ b/cmd/cloudflared/tunnel/info.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" - "github.com/cloudflare/cloudflared/cfapi" + "github.com/kjake/cloudflared/cfapi" ) type Info struct { diff --git a/cmd/cloudflared/tunnel/ingress_subcommands.go b/cmd/cloudflared/tunnel/ingress_subcommands.go index 82ef7561..f07db514 100644 --- a/cmd/cloudflared/tunnel/ingress_subcommands.go +++ b/cmd/cloudflared/tunnel/ingress_subcommands.go @@ -5,9 +5,9 @@ import ( "fmt" "net/url" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ingress" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/ingress" "github.com/pkg/errors" "github.com/urfave/cli/v2" diff --git a/cmd/cloudflared/tunnel/login.go b/cmd/cloudflared/tunnel/login.go index 632e622a..0fed1024 100644 --- a/cmd/cloudflared/tunnel/login.go +++ b/cmd/cloudflared/tunnel/login.go @@ -11,11 +11,11 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/credentials" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/token" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/credentials" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/token" ) const ( diff --git a/cmd/cloudflared/tunnel/quick_tunnel.go b/cmd/cloudflared/tunnel/quick_tunnel.go index ee438450..ccbcef87 100644 --- a/cmd/cloudflared/tunnel/quick_tunnel.go +++ b/cmd/cloudflared/tunnel/quick_tunnel.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/cloudflare/cloudflared/connection" + "github.com/kjake/cloudflared/connection" ) const httpTimeout = 15 * time.Second diff --git a/cmd/cloudflared/tunnel/server.go b/cmd/cloudflared/tunnel/server.go index 63ffad49..7206103a 100644 --- a/cmd/cloudflared/tunnel/server.go +++ b/cmd/cloudflared/tunnel/server.go @@ -3,7 +3,7 @@ package tunnel import ( "fmt" - "github.com/cloudflare/cloudflared/tunneldns" + "github.com/kjake/cloudflared/tunneldns" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/cmd/cloudflared/tunnel/subcommand_context.go b/cmd/cloudflared/tunnel/subcommand_context.go index 83332b51..e22d30ab 100644 --- a/cmd/cloudflared/tunnel/subcommand_context.go +++ b/cmd/cloudflared/tunnel/subcommand_context.go @@ -13,10 +13,10 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cfapi" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/credentials" - "github.com/cloudflare/cloudflared/logger" + "github.com/kjake/cloudflared/cfapi" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/credentials" + "github.com/kjake/cloudflared/logger" ) type errInvalidJSONCredential struct { diff --git a/cmd/cloudflared/tunnel/subcommand_context_teamnet.go b/cmd/cloudflared/tunnel/subcommand_context_teamnet.go index 55faa82a..ff52d3ca 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_teamnet.go +++ b/cmd/cloudflared/tunnel/subcommand_context_teamnet.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/cloudflare/cloudflared/cfapi" + "github.com/kjake/cloudflared/cfapi" ) const noClientMsg = "error while creating backend client" diff --git a/cmd/cloudflared/tunnel/subcommand_context_test.go b/cmd/cloudflared/tunnel/subcommand_context_test.go index ca2a42b2..23a22759 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_test.go +++ b/cmd/cloudflared/tunnel/subcommand_context_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cfapi" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/credentials" + "github.com/kjake/cloudflared/cfapi" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/credentials" ) type mockFileSystem struct { diff --git a/cmd/cloudflared/tunnel/subcommand_context_vnets.go b/cmd/cloudflared/tunnel/subcommand_context_vnets.go index c6e9adca..fb8bbf87 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_vnets.go +++ b/cmd/cloudflared/tunnel/subcommand_context_vnets.go @@ -4,7 +4,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/cloudflare/cloudflared/cfapi" + "github.com/kjake/cloudflared/cfapi" ) func (sc *subcommandContext) addVirtualNetwork(newVnet cfapi.NewVirtualNetwork) (cfapi.VirtualNetwork, error) { diff --git a/cmd/cloudflared/tunnel/subcommands.go b/cmd/cloudflared/tunnel/subcommands.go index ee26e2ae..6be2529b 100644 --- a/cmd/cloudflared/tunnel/subcommands.go +++ b/cmd/cloudflared/tunnel/subcommands.go @@ -23,13 +23,13 @@ import ( "golang.org/x/net/idna" yaml "gopkg.in/yaml.v3" - "github.com/cloudflare/cloudflared/cfapi" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/diagnostic" - "github.com/cloudflare/cloudflared/metrics" + "github.com/kjake/cloudflared/cfapi" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/updater" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/diagnostic" + "github.com/kjake/cloudflared/metrics" ) const ( diff --git a/cmd/cloudflared/tunnel/subcommands_test.go b/cmd/cloudflared/tunnel/subcommands_test.go index 2016fe6d..9141b3ec 100644 --- a/cmd/cloudflared/tunnel/subcommands_test.go +++ b/cmd/cloudflared/tunnel/subcommands_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/cfapi" - "github.com/cloudflare/cloudflared/connection" + "github.com/kjake/cloudflared/cfapi" + "github.com/kjake/cloudflared/connection" ) func Test_fmtConnections(t *testing.T) { diff --git a/cmd/cloudflared/tunnel/tag.go b/cmd/cloudflared/tunnel/tag.go index badca9d7..6ef49670 100644 --- a/cmd/cloudflared/tunnel/tag.go +++ b/cmd/cloudflared/tunnel/tag.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // Restrict key names to characters allowed in an HTTP header name. diff --git a/cmd/cloudflared/tunnel/tag_test.go b/cmd/cloudflared/tunnel/tag_test.go index 0419d4df..5af0d7b4 100644 --- a/cmd/cloudflared/tunnel/tag_test.go +++ b/cmd/cloudflared/tunnel/tag_test.go @@ -3,7 +3,7 @@ package tunnel import ( "testing" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/stretchr/testify/assert" ) diff --git a/cmd/cloudflared/tunnel/teamnet_subcommands.go b/cmd/cloudflared/tunnel/teamnet_subcommands.go index b46f52e1..4c134bd0 100644 --- a/cmd/cloudflared/tunnel/teamnet_subcommands.go +++ b/cmd/cloudflared/tunnel/teamnet_subcommands.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cfapi" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" + "github.com/kjake/cloudflared/cfapi" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/updater" ) var ( diff --git a/cmd/cloudflared/tunnel/vnets_subcommands.go b/cmd/cloudflared/tunnel/vnets_subcommands.go index 57c350c9..16a85099 100644 --- a/cmd/cloudflared/tunnel/vnets_subcommands.go +++ b/cmd/cloudflared/tunnel/vnets_subcommands.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cfapi" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" + "github.com/kjake/cloudflared/cfapi" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/updater" ) var ( diff --git a/cmd/cloudflared/updater/update.go b/cmd/cloudflared/updater/update.go index 1d3cbc2e..9c21bae1 100644 --- a/cmd/cloudflared/updater/update.go +++ b/cmd/cloudflared/updater/update.go @@ -14,9 +14,9 @@ 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" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/logger" ) const ( diff --git a/cmd/cloudflared/updater/update_test.go b/cmd/cloudflared/updater/update_test.go index 3159f7ab..dc7f2375 100644 --- a/cmd/cloudflared/updater/update_test.go +++ b/cmd/cloudflared/updater/update_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" ) func init() { diff --git a/cmd/cloudflared/updater/workers_update.go b/cmd/cloudflared/updater/workers_update.go index b7a86ff1..6fdecb07 100644 --- a/cmd/cloudflared/updater/workers_update.go +++ b/cmd/cloudflared/updater/workers_update.go @@ -18,7 +18,7 @@ import ( "github.com/getsentry/sentry-go" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" ) const ( diff --git a/cmd/cloudflared/windows_service.go b/cmd/cloudflared/windows_service.go index 0858439d..d1873db7 100644 --- a/cmd/cloudflared/windows_service.go +++ b/cmd/cloudflared/windows_service.go @@ -19,8 +19,8 @@ import ( "golang.org/x/sys/windows/svc/eventlog" "golang.org/x/sys/windows/svc/mgr" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/logger" + "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/kjake/cloudflared/logger" ) const ( diff --git a/config/configuration.go b/config/configuration.go index 05122d76..8ab09c0f 100644 --- a/config/configuration.go +++ b/config/configuration.go @@ -17,7 +17,7 @@ import ( "github.com/urfave/cli/v2" yaml "gopkg.in/yaml.v3" - "github.com/cloudflare/cloudflared/validation" + "github.com/kjake/cloudflared/validation" ) var ( diff --git a/config/manager.go b/config/manager.go index e5002c30..b7f7eca6 100644 --- a/config/manager.go +++ b/config/manager.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" yaml "gopkg.in/yaml.v3" - "github.com/cloudflare/cloudflared/watcher" + "github.com/kjake/cloudflared/watcher" ) // Notifier sends out config updates diff --git a/config/manager_test.go b/config/manager_test.go index 1de80985..a81df0c2 100644 --- a/config/manager_test.go +++ b/config/manager_test.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/cloudflare/cloudflared/watcher" + "github.com/kjake/cloudflared/watcher" ) type mockNotifier struct { diff --git a/config/model.go b/config/model.go index f90fd1ec..eff05a36 100644 --- a/config/model.go +++ b/config/model.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/cloudflare/cloudflared/tunneldns" + "github.com/kjake/cloudflared/tunneldns" ) // Forwarder represents a client side listener to forward traffic to the edge diff --git a/connection/connection.go b/connection/connection.go index b7376e38..9f94e5fa 100644 --- a/connection/connection.go +++ b/connection/connection.go @@ -15,9 +15,9 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/cloudflare/cloudflared/tracing" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - "github.com/cloudflare/cloudflared/websocket" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/websocket" ) const ( diff --git a/connection/connection_test.go b/connection/connection_test.go index ffd483d2..f6fbc630 100644 --- a/connection/connection_test.go +++ b/connection/connection_test.go @@ -10,10 +10,10 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/stream" - "github.com/cloudflare/cloudflared/tracing" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - "github.com/cloudflare/cloudflared/websocket" + "github.com/kjake/cloudflared/stream" + "github.com/kjake/cloudflared/tracing" + tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/websocket" ) const ( @@ -120,7 +120,7 @@ func (ep *echoPipe) Write(p []byte) (int, error) { } // A mock origin that echos data by streaming like a tcpOverWSConnection -// https://github.com/cloudflare/cloudflared/blob/master/ingress/origin_connection.go +// https://github.com/kjake/cloudflared/blob/master/ingress/origin_connection.go func wsEchoEndpoint(w ResponseWriter, r *http.Request) error { resp := &http.Response{ StatusCode: http.StatusSwitchingProtocols, diff --git a/connection/control.go b/connection/control.go index 2e5f1e35..96d8215d 100644 --- a/connection/control.go +++ b/connection/control.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" - "github.com/cloudflare/cloudflared/management" - "github.com/cloudflare/cloudflared/tunnelrpc" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/management" + "github.com/kjake/cloudflared/tunnelrpc" + tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // registerClient derives a named tunnel rpc client that can then be used to register and unregister connections. diff --git a/connection/errors.go b/connection/errors.go index 1bb34d6d..a894634e 100644 --- a/connection/errors.go +++ b/connection/errors.go @@ -1,8 +1,8 @@ package connection import ( - "github.com/cloudflare/cloudflared/edgediscovery" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/edgediscovery" + tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/connection/http2.go b/connection/http2.go index aee9d9da..ce4dc822 100644 --- a/connection/http2.go +++ b/connection/http2.go @@ -16,8 +16,8 @@ import ( "github.com/rs/zerolog" "golang.org/x/net/http2" - "github.com/cloudflare/cloudflared/tracing" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tracing" + tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // note: these constants are exported so we can reuse them in the edge-side code diff --git a/connection/http2_test.go b/connection/http2_test.go index 92665688..7ee3e628 100644 --- a/connection/http2_test.go +++ b/connection/http2_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/http2" - "github.com/cloudflare/cloudflared/tunnelrpc" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) var ( diff --git a/connection/observer.go b/connection/observer.go index 817e6d2e..74f685c0 100644 --- a/connection/observer.go +++ b/connection/observer.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/management" + "github.com/kjake/cloudflared/management" ) const ( diff --git a/connection/protocol.go b/connection/protocol.go index 417c8b72..9ef07ba4 100644 --- a/connection/protocol.go +++ b/connection/protocol.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/edgediscovery" + "github.com/kjake/cloudflared/edgediscovery" ) const ( diff --git a/connection/protocol_test.go b/connection/protocol_test.go index 12d238c5..960c4b97 100644 --- a/connection/protocol_test.go +++ b/connection/protocol_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cloudflare/cloudflared/edgediscovery" + "github.com/kjake/cloudflared/edgediscovery" ) const ( diff --git a/connection/quic_connection.go b/connection/quic_connection.go index 7a20e15a..76e55d1a 100644 --- a/connection/quic_connection.go +++ b/connection/quic_connection.go @@ -17,11 +17,11 @@ import ( "github.com/rs/zerolog" "golang.org/x/sync/errgroup" - 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" + cfdquic "github.com/kjake/cloudflared/quic" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/tunnelrpc/pogs" + tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" + rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" ) const ( diff --git a/connection/quic_connection_test.go b/connection/quic_connection_test.go index 1c22605b..1f5fbd50 100644 --- a/connection/quic_connection_test.go +++ b/connection/quic_connection_test.go @@ -28,13 +28,13 @@ import ( "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" - rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic" + "github.com/kjake/cloudflared/datagramsession" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/packet" + cfdquic "github.com/kjake/cloudflared/quic" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/tunnelrpc/pogs" + rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" ) var ( diff --git a/connection/quic_datagram_v2.go b/connection/quic_datagram_v2.go index c6b8bc03..427d8f51 100644 --- a/connection/quic_datagram_v2.go +++ b/connection/quic_datagram_v2.go @@ -13,15 +13,15 @@ import ( "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" + "github.com/kjake/cloudflared/datagramsession" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/management" + "github.com/kjake/cloudflared/packet" + cfdquic "github.com/kjake/cloudflared/quic" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/tunnelrpc/pogs" + tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" + rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" ) const ( diff --git a/connection/quic_datagram_v3.go b/connection/quic_datagram_v3.go index 1b42600e..803ff6f8 100644 --- a/connection/quic_datagram_v3.go +++ b/connection/quic_datagram_v3.go @@ -10,10 +10,10 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/management" - cfdquic "github.com/cloudflare/cloudflared/quic/v3" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/management" + cfdquic "github.com/kjake/cloudflared/quic/v3" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) type datagramV3Connection struct { diff --git a/credentials/credentials.go b/credentials/credentials.go index 8d1d8908..4384afd8 100644 --- a/credentials/credentials.go +++ b/credentials/credentials.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/cfapi" + "github.com/kjake/cloudflared/cfapi" ) const ( diff --git a/credentials/origin_cert.go b/credentials/origin_cert.go index 73a59fa3..6f07cefa 100644 --- a/credentials/origin_cert.go +++ b/credentials/origin_cert.go @@ -10,7 +10,7 @@ import ( "github.com/mitchellh/go-homedir" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/config" + "github.com/kjake/cloudflared/config" ) const ( diff --git a/datagramsession/manager.go b/datagramsession/manager.go index f315a0d3..d9123cf9 100644 --- a/datagramsession/manager.go +++ b/datagramsession/manager.go @@ -10,8 +10,8 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/management" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/management" + "github.com/kjake/cloudflared/packet" ) const ( diff --git a/datagramsession/manager_test.go b/datagramsession/manager_test.go index 496ee16d..75b2faf3 100644 --- a/datagramsession/manager_test.go +++ b/datagramsession/manager_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) var ( diff --git a/datagramsession/session.go b/datagramsession/session.go index bb1369f9..ada0850b 100644 --- a/datagramsession/session.go +++ b/datagramsession/session.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) const ( diff --git a/datagramsession/session_test.go b/datagramsession/session_test.go index 997624b7..a9518505 100644 --- a/datagramsession/session_test.go +++ b/datagramsession/session_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) // TestCloseSession makes sure a session will stop after context is done diff --git a/dev.Dockerfile b/dev.Dockerfile index 8986040a..cbbaa65c 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,10 +1,10 @@ FROM golang:1.22.5 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 -WORKDIR /go/src/github.com/cloudflare/cloudflared/ +WORKDIR /go/src/github.com/kjake/cloudflared/ RUN apt-get update COPY . . RUN .teamcity/install-cloudflare-go.sh # compile cloudflared RUN PATH="/tmp/go/bin:$PATH" make cloudflared -RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ +RUN cp /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ diff --git a/diagnostic/client.go b/diagnostic/client.go index 6e4dc2d3..8a9ae3b5 100644 --- a/diagnostic/client.go +++ b/diagnostic/client.go @@ -9,7 +9,7 @@ import ( "net/url" "strconv" - "github.com/cloudflare/cloudflared/logger" + "github.com/kjake/cloudflared/logger" ) type httpClient struct { diff --git a/diagnostic/diagnostic_utils_test.go b/diagnostic/diagnostic_utils_test.go index f0f5a6a3..52b19ead 100644 --- a/diagnostic/diagnostic_utils_test.go +++ b/diagnostic/diagnostic_utils_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/diagnostic" - "github.com/cloudflare/cloudflared/metrics" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/diagnostic" + "github.com/kjake/cloudflared/metrics" + "github.com/kjake/cloudflared/tunnelstate" ) func helperCreateServer(t *testing.T, listeners *gracenet.Net, tunnelID uuid.UUID, connectorID uuid.UUID) func() { diff --git a/diagnostic/handlers.go b/diagnostic/handlers.go index e4d85db4..f111cbfe 100644 --- a/diagnostic/handlers.go +++ b/diagnostic/handlers.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/tunnelstate" ) type Handler struct { diff --git a/diagnostic/handlers_test.go b/diagnostic/handlers_test.go index 2849241c..34aea9ff 100644 --- a/diagnostic/handlers_test.go +++ b/diagnostic/handlers_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/diagnostic" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/diagnostic" + "github.com/kjake/cloudflared/tunnelstate" ) type SystemCollectorMock struct { diff --git a/diagnostic/network/collector_unix.go b/diagnostic/network/collector_unix.go index a2630adf..94bfaa15 100644 --- a/diagnostic/network/collector_unix.go +++ b/diagnostic/network/collector_unix.go @@ -1,4 +1,4 @@ -//go:build darwin || linux || unix +//go:build darwin || linux || freebsd package diagnostic diff --git a/diagnostic/network/collector_unix_test.go b/diagnostic/network/collector_unix_test.go index 2772a3d6..b1b0a0c4 100644 --- a/diagnostic/network/collector_unix_test.go +++ b/diagnostic/network/collector_unix_test.go @@ -1,4 +1,4 @@ -//go:build darwin || linux || unix +//go:build darwin || linux || freebsd package diagnostic_test diff --git a/diagnostic/network/collector_windows_test.go b/diagnostic/network/collector_windows_test.go index 3338a8bc..1e3f5a85 100644 --- a/diagnostic/network/collector_windows_test.go +++ b/diagnostic/network/collector_windows_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - diagnostic "github.com/cloudflare/cloudflared/diagnostic/network" + diagnostic "github.com/kjake/cloudflared/diagnostic/network" ) func TestDecode(t *testing.T) { diff --git a/diagnostic/system_collector_test.go b/diagnostic/system_collector_test.go index c9338740..a568ae9e 100644 --- a/diagnostic/system_collector_test.go +++ b/diagnostic/system_collector_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/diagnostic" + "github.com/kjake/cloudflared/diagnostic" ) func TestParseMemoryInformationFromKV(t *testing.T) { diff --git a/edgediscovery/allregions/discovery.go b/edgediscovery/allregions/discovery.go index cab06611..f9acc394 100644 --- a/edgediscovery/allregions/discovery.go +++ b/edgediscovery/allregions/discovery.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/management" + "github.com/kjake/cloudflared/management" ) const ( diff --git a/edgediscovery/edgediscovery.go b/edgediscovery/edgediscovery.go index 59091bc7..0ce9538e 100644 --- a/edgediscovery/edgediscovery.go +++ b/edgediscovery/edgediscovery.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/edgediscovery/allregions" - "github.com/cloudflare/cloudflared/management" + "github.com/kjake/cloudflared/edgediscovery/allregions" + "github.com/kjake/cloudflared/management" ) const ( diff --git a/edgediscovery/edgediscovery_test.go b/edgediscovery/edgediscovery_test.go index 55288ce5..5e5d2352 100644 --- a/edgediscovery/edgediscovery_test.go +++ b/edgediscovery/edgediscovery_test.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/cloudflare/cloudflared/edgediscovery/allregions" + "github.com/kjake/cloudflared/edgediscovery/allregions" ) var ( diff --git a/fips/fips.go.linux-amd64 b/fips/fips.go.linux-amd64 index 5075f298..ed9d9ad3 100644 --- a/fips/fips.go.linux-amd64 +++ b/fips/fips.go.linux-amd64 @@ -4,7 +4,7 @@ package main import ( _ "crypto/tls/fipsonly" - "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" + "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" ) func init () { diff --git a/fmt-check.sh b/fmt-check.sh index 31fc7abc..b112eb80 100755 --- a/fmt-check.sh +++ b/fmt-check.sh @@ -2,7 +2,7 @@ set -e -o pipefail -OUTPUT=$(goimports -l -d -local github.com/cloudflare/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc)) +OUTPUT=$(goimports -l -d -local github.com/kjake/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc)) if [ -n "$OUTPUT" ] ; then PAGER=$(which colordiff || echo cat) diff --git a/go.mod b/go.mod index e3b60fee..b288cdc6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cloudflare/cloudflared +module github.com/kjake/cloudflared go 1.22 diff --git a/hello/hello.go b/hello/hello.go index f8dc1e71..127da31b 100644 --- a/hello/hello.go +++ b/hello/hello.go @@ -15,7 +15,7 @@ import ( "github.com/gorilla/websocket" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/tlsconfig" + "github.com/kjake/cloudflared/tlsconfig" ) const ( diff --git a/ingress/config.go b/ingress/config.go index 670a9db1..dfe60057 100644 --- a/ingress/config.go +++ b/ingress/config.go @@ -6,9 +6,9 @@ import ( "github.com/urfave/cli/v2" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ipaccess" - "github.com/cloudflare/cloudflared/tlsconfig" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/ipaccess" + "github.com/kjake/cloudflared/tlsconfig" ) var ( diff --git a/ingress/config_test.go b/ingress/config_test.go index 249cf2d5..926a92e4 100644 --- a/ingress/config_test.go +++ b/ingress/config_test.go @@ -10,8 +10,8 @@ import ( "github.com/urfave/cli/v2" yaml "gopkg.in/yaml.v3" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ipaccess" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/ipaccess" ) // Ensure that the nullable config from `config` package and the diff --git a/ingress/constants_test.go b/ingress/constants_test.go index e2f62f0e..fe2b8d81 100644 --- a/ingress/constants_test.go +++ b/ingress/constants_test.go @@ -1,6 +1,6 @@ package ingress -import "github.com/cloudflare/cloudflared/logger" +import "github.com/kjake/cloudflared/logger" var ( TestLogger = logger.Create(nil) diff --git a/ingress/icmp_darwin.go b/ingress/icmp_darwin.go index 31972ac5..5543ccd3 100644 --- a/ingress/icmp_darwin.go +++ b/ingress/icmp_darwin.go @@ -20,8 +20,8 @@ import ( "go.opentelemetry.io/otel/attribute" "golang.org/x/net/icmp" - "github.com/cloudflare/cloudflared/packet" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + "github.com/kjake/cloudflared/tracing" ) type icmpProxy struct { diff --git a/ingress/icmp_darwin_test.go b/ingress/icmp_darwin_test.go index 6cfacb9d..7a6600a9 100644 --- a/ingress/icmp_darwin_test.go +++ b/ingress/icmp_darwin_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) func TestSingleEchoIDTracker(t *testing.T) { diff --git a/ingress/icmp_generic.go b/ingress/icmp_generic.go index 4964244a..ac4061f0 100644 --- a/ingress/icmp_generic.go +++ b/ingress/icmp_generic.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s %s", runtime.GOOS, runtime.GOARCH) diff --git a/ingress/icmp_linux.go b/ingress/icmp_linux.go index 0b263a8f..51d1014b 100644 --- a/ingress/icmp_linux.go +++ b/ingress/icmp_linux.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog" "go.opentelemetry.io/otel/attribute" - "github.com/cloudflare/cloudflared/packet" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + "github.com/kjake/cloudflared/tracing" ) const ( diff --git a/ingress/icmp_linux_test.go b/ingress/icmp_linux_test.go index 597b5557..f9b83f6d 100644 --- a/ingress/icmp_linux_test.go +++ b/ingress/icmp_linux_test.go @@ -5,7 +5,7 @@ package ingress import ( "testing" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) func getFunnel(t *testing.T, proxy *icmpProxy, tuple flow3Tuple) (packet.Funnel, bool) { diff --git a/ingress/icmp_posix.go b/ingress/icmp_posix.go index a5353917..97c10b7a 100644 --- a/ingress/icmp_posix.go +++ b/ingress/icmp_posix.go @@ -1,5 +1,4 @@ -//go:build darwin || linux - +//go:build darwin || linux || freebsd package ingress // This file extracts logic shared by Linux and Darwin implementation if ICMPProxy. @@ -14,7 +13,7 @@ import ( "github.com/rs/zerolog" "golang.org/x/net/icmp" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) // Opens a non-privileged ICMP socket on Linux and Darwin diff --git a/ingress/icmp_posix_test.go b/ingress/icmp_posix_test.go index 6231e1b9..608ea027 100644 --- a/ingress/icmp_posix_test.go +++ b/ingress/icmp_posix_test.go @@ -1,4 +1,4 @@ -//go:build darwin || linux +//go:build darwin || linux || freebsd package ingress @@ -15,7 +15,7 @@ import ( "golang.org/x/net/icmp" "golang.org/x/net/ipv4" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) func TestFunnelIdleTimeout(t *testing.T) { diff --git a/ingress/icmp_windows.go b/ingress/icmp_windows.go index 23c3eb50..06f8b272 100644 --- a/ingress/icmp_windows.go +++ b/ingress/icmp_windows.go @@ -25,8 +25,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/cloudflare/cloudflared/packet" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + "github.com/kjake/cloudflared/tracing" ) const ( diff --git a/ingress/ingress.go b/ingress/ingress.go index 60ee87ac..20b9c65f 100644 --- a/ingress/ingress.go +++ b/ingress/ingress.go @@ -13,9 +13,9 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/net/idna" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ingress/middleware" - "github.com/cloudflare/cloudflared/ipaccess" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/ingress/middleware" + "github.com/kjake/cloudflared/ipaccess" ) var ( diff --git a/ingress/ingress_test.go b/ingress/ingress_test.go index 109cb353..7d5d8157 100644 --- a/ingress/ingress_test.go +++ b/ingress/ingress_test.go @@ -14,9 +14,9 @@ import ( "github.com/urfave/cli/v2" yaml "gopkg.in/yaml.v3" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ipaccess" - "github.com/cloudflare/cloudflared/tlsconfig" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/ipaccess" + "github.com/kjake/cloudflared/tlsconfig" ) func TestParseUnixSocket(t *testing.T) { diff --git a/ingress/origin_connection.go b/ingress/origin_connection.go index f7e08004..e0713f27 100644 --- a/ingress/origin_connection.go +++ b/ingress/origin_connection.go @@ -8,10 +8,10 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/ipaccess" - "github.com/cloudflare/cloudflared/socks" - "github.com/cloudflare/cloudflared/stream" - "github.com/cloudflare/cloudflared/websocket" + "github.com/kjake/cloudflared/ipaccess" + "github.com/kjake/cloudflared/socks" + "github.com/kjake/cloudflared/stream" + "github.com/kjake/cloudflared/websocket" ) // OriginConnection is a way to stream to a service running on the user's origin. diff --git a/ingress/origin_connection_test.go b/ingress/origin_connection_test.go index 40611de7..fb937e38 100644 --- a/ingress/origin_connection_test.go +++ b/ingress/origin_connection_test.go @@ -19,9 +19,9 @@ import ( "golang.org/x/net/proxy" "golang.org/x/sync/errgroup" - "github.com/cloudflare/cloudflared/socks" - "github.com/cloudflare/cloudflared/stream" - "github.com/cloudflare/cloudflared/websocket" + "github.com/kjake/cloudflared/socks" + "github.com/kjake/cloudflared/stream" + "github.com/kjake/cloudflared/websocket" ) const ( diff --git a/ingress/origin_icmp_proxy.go b/ingress/origin_icmp_proxy.go index 981b8667..1284f883 100644 --- a/ingress/origin_icmp_proxy.go +++ b/ingress/origin_icmp_proxy.go @@ -13,8 +13,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/cloudflare/cloudflared/packet" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + "github.com/kjake/cloudflared/tracing" ) const ( diff --git a/ingress/origin_icmp_proxy_test.go b/ingress/origin_icmp_proxy_test.go index b85013be..65852a7c 100644 --- a/ingress/origin_icmp_proxy_test.go +++ b/ingress/origin_icmp_proxy_test.go @@ -19,9 +19,9 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/cloudflare/cloudflared/packet" - quicpogs "github.com/cloudflare/cloudflared/quic" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + quicpogs "github.com/kjake/cloudflared/quic" + "github.com/kjake/cloudflared/tracing" ) var ( diff --git a/ingress/origin_proxy_test.go b/ingress/origin_proxy_test.go index 7a6170a2..39c21409 100644 --- a/ingress/origin_proxy_test.go +++ b/ingress/origin_proxy_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/carrier" - "github.com/cloudflare/cloudflared/websocket" + "github.com/kjake/cloudflared/carrier" + "github.com/kjake/cloudflared/websocket" ) func TestRawTCPServiceEstablishConnection(t *testing.T) { diff --git a/ingress/origin_service.go b/ingress/origin_service.go index e13204c5..37a5f553 100644 --- a/ingress/origin_service.go +++ b/ingress/origin_service.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/hello" - "github.com/cloudflare/cloudflared/ipaccess" - "github.com/cloudflare/cloudflared/management" - "github.com/cloudflare/cloudflared/socks" - "github.com/cloudflare/cloudflared/tlsconfig" + "github.com/kjake/cloudflared/hello" + "github.com/kjake/cloudflared/ipaccess" + "github.com/kjake/cloudflared/management" + "github.com/kjake/cloudflared/socks" + "github.com/kjake/cloudflared/tlsconfig" ) const ( diff --git a/ingress/packet_router.go b/ingress/packet_router.go index c1224843..c2e85784 100644 --- a/ingress/packet_router.go +++ b/ingress/packet_router.go @@ -8,9 +8,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/cloudflare/cloudflared/packet" - quicpogs "github.com/cloudflare/cloudflared/quic" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + quicpogs "github.com/kjake/cloudflared/quic" + "github.com/kjake/cloudflared/tracing" ) // Upstream of raw packets diff --git a/ingress/packet_router_test.go b/ingress/packet_router_test.go index 77ab5e89..edfbc8eb 100644 --- a/ingress/packet_router_test.go +++ b/ingress/packet_router_test.go @@ -14,8 +14,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/cloudflare/cloudflared/packet" - quicpogs "github.com/cloudflare/cloudflared/quic" + "github.com/kjake/cloudflared/packet" + quicpogs "github.com/kjake/cloudflared/quic" ) var ( diff --git a/ingress/rule.go b/ingress/rule.go index 43c7ad5e..f871805b 100644 --- a/ingress/rule.go +++ b/ingress/rule.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/cloudflare/cloudflared/ingress/middleware" + "github.com/kjake/cloudflared/ingress/middleware" ) // Rule routes traffic from a hostname/path on the public internet to the diff --git a/ingress/rule_test.go b/ingress/rule_test.go index a3d12e01..4dfa4217 100644 --- a/ingress/rule_test.go +++ b/ingress/rule_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/config" + "github.com/kjake/cloudflared/config" ) func Test_rule_matches(t *testing.T) { diff --git a/logger/create.go b/logger/create.go index 4a298ad4..f5c1c8e6 100644 --- a/logger/create.go +++ b/logger/create.go @@ -16,7 +16,7 @@ import ( "golang.org/x/term" "gopkg.in/natefinch/lumberjack.v2" - "github.com/cloudflare/cloudflared/management" + "github.com/kjake/cloudflared/management" ) const ( diff --git a/management/events_test.go b/management/events_test.go index 1d40e29b..138b4c01 100644 --- a/management/events_test.go +++ b/management/events_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "nhooyr.io/websocket" - "github.com/cloudflare/cloudflared/internal/test" + "github.com/kjake/cloudflared/internal/test" ) var ( diff --git a/management/service_test.go b/management/service_test.go index f283b5f7..76d9e0fd 100644 --- a/management/service_test.go +++ b/management/service_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "nhooyr.io/websocket" - "github.com/cloudflare/cloudflared/internal/test" + "github.com/kjake/cloudflared/internal/test" ) var ( diff --git a/metrics/metrics.go b/metrics/metrics.go index 2a4fe993..63777d02 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -16,7 +16,7 @@ import ( "github.com/rs/zerolog" "golang.org/x/net/trace" - "github.com/cloudflare/cloudflared/diagnostic" + "github.com/kjake/cloudflared/diagnostic" ) const ( diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go index 849076d7..a8967ad8 100644 --- a/metrics/metrics_test.go +++ b/metrics/metrics_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/metrics" + "github.com/kjake/cloudflared/metrics" ) func TestMetricsListenerCreation(t *testing.T) { diff --git a/metrics/readiness.go b/metrics/readiness.go index 0e5124f1..b8529a29 100644 --- a/metrics/readiness.go +++ b/metrics/readiness.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/tunnelstate" ) // ReadyServer serves HTTP 200 if the tunnel can serve traffic. Intended for k8s readiness checks. diff --git a/metrics/readiness_test.go b/metrics/readiness_test.go index 240f171e..a373f5f6 100644 --- a/metrics/readiness_test.go +++ b/metrics/readiness_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/metrics" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/metrics" + "github.com/kjake/cloudflared/tunnelstate" ) func mockRequest(t *testing.T, readyServer *metrics.ReadyServer) (int, uint) { diff --git a/orchestration/config.go b/orchestration/config.go index 04c7a0ab..ccca9b47 100644 --- a/orchestration/config.go +++ b/orchestration/config.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ingress" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/ingress" ) type newRemoteConfig struct { diff --git a/orchestration/config_test.go b/orchestration/config_test.go index affac27a..76efe44f 100644 --- a/orchestration/config_test.go +++ b/orchestration/config_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ingress" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/ingress" ) // TestNewLocalConfig_MarshalJSON tests that we are able to converte a compiled and validated config back diff --git a/orchestration/orchestrator.go b/orchestration/orchestrator.go index 9af18865..4d69d1a4 100644 --- a/orchestration/orchestrator.go +++ b/orchestration/orchestrator.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/proxy" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/proxy" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // Orchestrator manages configurations, so they can be updatable during runtime diff --git a/orchestration/orchestrator_test.go b/orchestration/orchestrator_test.go index eb2c6f72..db609267 100644 --- a/orchestration/orchestrator_test.go +++ b/orchestration/orchestrator_test.go @@ -18,12 +18,12 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/management" - "github.com/cloudflare/cloudflared/tracing" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/management" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) var ( diff --git a/proxy/logger.go b/proxy/logger.go index fa202964..70e0b867 100644 --- a/proxy/logger.go +++ b/proxy/logger.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/management" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/management" ) const ( diff --git a/proxy/metrics.go b/proxy/metrics.go index 54e09ad2..81bf09b2 100644 --- a/proxy/metrics.go +++ b/proxy/metrics.go @@ -3,7 +3,7 @@ package proxy import ( "github.com/prometheus/client_golang/prometheus" - "github.com/cloudflare/cloudflared/connection" + "github.com/kjake/cloudflared/connection" ) // Metrics uses connection.MetricsNamespace(aka cloudflared) as namespace and connection.TunnelSubsystem diff --git a/proxy/proxy.go b/proxy/proxy.go index dd999f87..ce38f05e 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -13,13 +13,13 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/cloudflare/cloudflared/carrier" - "github.com/cloudflare/cloudflared/cfio" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/stream" - "github.com/cloudflare/cloudflared/tracing" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/carrier" + "github.com/kjake/cloudflared/cfio" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/stream" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/proxy/proxy_posix_test.go b/proxy/proxy_posix_test.go index df927fd3..ba29e618 100644 --- a/proxy/proxy_posix_test.go +++ b/proxy/proxy_posix_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/config" + "github.com/kjake/cloudflared/config" ) func TestUnixSocketOrigin(t *testing.T) { diff --git a/proxy/proxy_test.go b/proxy/proxy_test.go index c1c60fc4..8457cba6 100644 --- a/proxy/proxy_test.go +++ b/proxy/proxy_test.go @@ -23,14 +23,14 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "github.com/cloudflare/cloudflared/cfio" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/hello" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/tracing" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/cfio" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/hello" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/logger" + "github.com/kjake/cloudflared/tracing" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) var ( diff --git a/quic/datagram.go b/quic/datagram.go index cb5fde77..56c6e3da 100644 --- a/quic/datagram.go +++ b/quic/datagram.go @@ -9,7 +9,7 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/packet" ) const ( diff --git a/quic/datagram_test.go b/quic/datagram_test.go index 3dfbc2fb..0a85e585 100644 --- a/quic/datagram_test.go +++ b/quic/datagram_test.go @@ -24,8 +24,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/sync/errgroup" - "github.com/cloudflare/cloudflared/packet" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + "github.com/kjake/cloudflared/tracing" ) var ( diff --git a/quic/datagramv2.go b/quic/datagramv2.go index 27dfe10e..1d7a14e7 100644 --- a/quic/datagramv2.go +++ b/quic/datagramv2.go @@ -8,8 +8,8 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/packet" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/packet" + "github.com/kjake/cloudflared/tracing" ) type DatagramV2Type byte diff --git a/quic/v3/datagram_test.go b/quic/v3/datagram_test.go index 834c4ae4..ce55f0c3 100644 --- a/quic/v3/datagram_test.go +++ b/quic/v3/datagram_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - v3 "github.com/cloudflare/cloudflared/quic/v3" + v3 "github.com/kjake/cloudflared/quic/v3" ) func makePayload(size int) []byte { diff --git a/quic/v3/icmp.go b/quic/v3/icmp.go index e9e3cc01..d6153f25 100644 --- a/quic/v3/icmp.go +++ b/quic/v3/icmp.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" "go.opentelemetry.io/otel/trace" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/packet" - "github.com/cloudflare/cloudflared/tracing" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/packet" + "github.com/kjake/cloudflared/tracing" ) // packetResponder is an implementation of the [ingress.ICMPResponder] which provides the ICMP Flow manager the diff --git a/quic/v3/icmp_test.go b/quic/v3/icmp_test.go index 3189a571..706c5c36 100644 --- a/quic/v3/icmp_test.go +++ b/quic/v3/icmp_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/packet" ) type noopICMPRouter struct{} diff --git a/quic/v3/manager_test.go b/quic/v3/manager_test.go index 71defadd..45245e63 100644 --- a/quic/v3/manager_test.go +++ b/quic/v3/manager_test.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/ingress" - v3 "github.com/cloudflare/cloudflared/quic/v3" + "github.com/kjake/cloudflared/ingress" + v3 "github.com/kjake/cloudflared/quic/v3" ) func TestRegisterSession(t *testing.T) { diff --git a/quic/v3/muxer.go b/quic/v3/muxer.go index 29673a3b..6c8d4da9 100644 --- a/quic/v3/muxer.go +++ b/quic/v3/muxer.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/packet" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/packet" ) const ( diff --git a/quic/v3/muxer_test.go b/quic/v3/muxer_test.go index 90c167a6..ef7f912d 100644 --- a/quic/v3/muxer_test.go +++ b/quic/v3/muxer_test.go @@ -20,9 +20,9 @@ import ( "golang.org/x/net/icmp" "golang.org/x/net/ipv4" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/packet" - v3 "github.com/cloudflare/cloudflared/quic/v3" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/packet" + v3 "github.com/kjake/cloudflared/quic/v3" ) type noopEyeball struct { diff --git a/quic/v3/request_test.go b/quic/v3/request_test.go index 3c7915c7..372d7603 100644 --- a/quic/v3/request_test.go +++ b/quic/v3/request_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - v3 "github.com/cloudflare/cloudflared/quic/v3" + v3 "github.com/kjake/cloudflared/quic/v3" ) var ( diff --git a/quic/v3/session_test.go b/quic/v3/session_test.go index b739ca2d..d0caf27f 100644 --- a/quic/v3/session_test.go +++ b/quic/v3/session_test.go @@ -13,7 +13,7 @@ import ( "github.com/fortytw2/leaktest" "github.com/rs/zerolog" - v3 "github.com/cloudflare/cloudflared/quic/v3" + v3 "github.com/kjake/cloudflared/quic/v3" ) var ( diff --git a/socks/request_handler.go b/socks/request_handler.go index 179c955c..05ba635a 100644 --- a/socks/request_handler.go +++ b/socks/request_handler.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/ipaccess" + "github.com/kjake/cloudflared/ipaccess" ) // RequestHandler is the functions needed to handle a SOCKS5 command diff --git a/socks/request_handler_test.go b/socks/request_handler_test.go index 401b2017..c11584af 100644 --- a/socks/request_handler_test.go +++ b/socks/request_handler_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cloudflare/cloudflared/ipaccess" + "github.com/kjake/cloudflared/ipaccess" ) func TestUnsupportedBind(t *testing.T) { diff --git a/sshgen/sshgen.go b/sshgen/sshgen.go index aef3097a..416793d9 100644 --- a/sshgen/sshgen.go +++ b/sshgen/sshgen.go @@ -21,8 +21,8 @@ import ( "github.com/pkg/errors" gossh "golang.org/x/crypto/ssh" - "github.com/cloudflare/cloudflared/config" - cfpath "github.com/cloudflare/cloudflared/token" + "github.com/kjake/cloudflared/config" + cfpath "github.com/kjake/cloudflared/token" ) const ( diff --git a/sshgen/sshgen_test.go b/sshgen/sshgen_test.go index 429f24f3..0581cc15 100644 --- a/sshgen/sshgen_test.go +++ b/sshgen/sshgen_test.go @@ -20,8 +20,8 @@ import ( "github.com/go-jose/go-jose/v4/jwt" "github.com/stretchr/testify/assert" - "github.com/cloudflare/cloudflared/config" - cfpath "github.com/cloudflare/cloudflared/token" + "github.com/kjake/cloudflared/config" + cfpath "github.com/kjake/cloudflared/token" ) const ( diff --git a/stream/stream.go b/stream/stream.go index c9491ec6..95bfc803 100644 --- a/stream/stream.go +++ b/stream/stream.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/cfio" + "github.com/kjake/cloudflared/cfio" ) type Stream interface { diff --git a/supervisor/conn_aware_logger.go b/supervisor/conn_aware_logger.go index 1311f20b..fed978b3 100644 --- a/supervisor/conn_aware_logger.go +++ b/supervisor/conn_aware_logger.go @@ -3,8 +3,8 @@ package supervisor import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/tunnelstate" ) type ConnAwareLogger struct { diff --git a/supervisor/metrics.go b/supervisor/metrics.go index e6d50cdd..98cb74b9 100644 --- a/supervisor/metrics.go +++ b/supervisor/metrics.go @@ -3,7 +3,7 @@ package supervisor import ( "github.com/prometheus/client_golang/prometheus" - "github.com/cloudflare/cloudflared/connection" + "github.com/kjake/cloudflared/connection" ) // Metrics uses connection.MetricsNamespace(aka cloudflared) as namespace and connection.TunnelSubsystem diff --git a/supervisor/pqtunnels.go b/supervisor/pqtunnels.go index 70a3fd69..b4def29e 100644 --- a/supervisor/pqtunnels.go +++ b/supervisor/pqtunnels.go @@ -4,7 +4,7 @@ import ( "crypto/tls" "fmt" - "github.com/cloudflare/cloudflared/features" + "github.com/kjake/cloudflared/features" ) // When experimental post-quantum tunnels are enabled, and we're hitting an diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go index 8736963c..ba66030a 100644 --- a/supervisor/supervisor.go +++ b/supervisor/supervisor.go @@ -11,14 +11,14 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/edgediscovery" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/orchestration" - v3 "github.com/cloudflare/cloudflared/quic/v3" - "github.com/cloudflare/cloudflared/retry" - "github.com/cloudflare/cloudflared/signal" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/edgediscovery" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/orchestration" + v3 "github.com/kjake/cloudflared/quic/v3" + "github.com/kjake/cloudflared/retry" + "github.com/kjake/cloudflared/signal" + "github.com/kjake/cloudflared/tunnelstate" ) const ( diff --git a/supervisor/tunnel.go b/supervisor/tunnel.go index 43349c19..4e3f9217 100644 --- a/supervisor/tunnel.go +++ b/supervisor/tunnel.go @@ -16,19 +16,19 @@ import ( "github.com/rs/zerolog" "golang.org/x/sync/errgroup" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/edgediscovery" - "github.com/cloudflare/cloudflared/edgediscovery/allregions" - "github.com/cloudflare/cloudflared/features" - "github.com/cloudflare/cloudflared/ingress" - "github.com/cloudflare/cloudflared/management" - "github.com/cloudflare/cloudflared/orchestration" - quicpogs "github.com/cloudflare/cloudflared/quic" - v3 "github.com/cloudflare/cloudflared/quic/v3" - "github.com/cloudflare/cloudflared/retry" - "github.com/cloudflare/cloudflared/signal" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/edgediscovery" + "github.com/kjake/cloudflared/edgediscovery/allregions" + "github.com/kjake/cloudflared/features" + "github.com/kjake/cloudflared/ingress" + "github.com/kjake/cloudflared/management" + "github.com/kjake/cloudflared/orchestration" + quicpogs "github.com/kjake/cloudflared/quic" + v3 "github.com/kjake/cloudflared/quic/v3" + "github.com/kjake/cloudflared/retry" + "github.com/kjake/cloudflared/signal" + "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelstate" ) const ( diff --git a/supervisor/tunnel_test.go b/supervisor/tunnel_test.go index b0b6cef5..adc6db2b 100644 --- a/supervisor/tunnel_test.go +++ b/supervisor/tunnel_test.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/edgediscovery" - "github.com/cloudflare/cloudflared/retry" + "github.com/kjake/cloudflared/connection" + "github.com/kjake/cloudflared/edgediscovery" + "github.com/kjake/cloudflared/retry" ) type dynamicMockFetcher struct { diff --git a/token/path.go b/token/path.go index 332117c3..565b809e 100644 --- a/token/path.go +++ b/token/path.go @@ -9,7 +9,7 @@ import ( homedir "github.com/mitchellh/go-homedir" - "github.com/cloudflare/cloudflared/config" + "github.com/kjake/cloudflared/config" ) // GenerateSSHCertFilePathFromURL will return a file path for creating short lived certificates diff --git a/token/token.go b/token/token.go index d561dc38..b4b8120b 100644 --- a/token/token.go +++ b/token/token.go @@ -16,8 +16,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/retry" + "github.com/kjake/cloudflared/config" + "github.com/kjake/cloudflared/retry" ) const ( diff --git a/tunnelrpc/pogs/cloudflared_server.go b/tunnelrpc/pogs/cloudflared_server.go index cfc66f03..b7a85bf2 100644 --- a/tunnelrpc/pogs/cloudflared_server.go +++ b/tunnelrpc/pogs/cloudflared_server.go @@ -4,7 +4,7 @@ import ( capnp "zombiezen.com/go/capnproto2" "zombiezen.com/go/capnproto2/rpc" - "github.com/cloudflare/cloudflared/tunnelrpc/proto" + "github.com/kjake/cloudflared/tunnelrpc/proto" ) type CloudflaredServer interface { diff --git a/tunnelrpc/pogs/configuration_manager.go b/tunnelrpc/pogs/configuration_manager.go index 4daae802..04bb5d31 100644 --- a/tunnelrpc/pogs/configuration_manager.go +++ b/tunnelrpc/pogs/configuration_manager.go @@ -8,8 +8,8 @@ import ( "zombiezen.com/go/capnproto2/rpc" "zombiezen.com/go/capnproto2/server" - "github.com/cloudflare/cloudflared/tunnelrpc/metrics" - "github.com/cloudflare/cloudflared/tunnelrpc/proto" + "github.com/kjake/cloudflared/tunnelrpc/metrics" + "github.com/kjake/cloudflared/tunnelrpc/proto" ) type ConfigurationManager interface { diff --git a/tunnelrpc/pogs/quic_metadata_protocol.go b/tunnelrpc/pogs/quic_metadata_protocol.go index cfbfe845..15a9f26c 100644 --- a/tunnelrpc/pogs/quic_metadata_protocol.go +++ b/tunnelrpc/pogs/quic_metadata_protocol.go @@ -6,7 +6,7 @@ import ( capnp "zombiezen.com/go/capnproto2" "zombiezen.com/go/capnproto2/pogs" - "github.com/cloudflare/cloudflared/tunnelrpc/proto" + "github.com/kjake/cloudflared/tunnelrpc/proto" ) // ConnectionType indicates the type of underlying connection proxied within the QUIC stream. diff --git a/tunnelrpc/pogs/registration_server.go b/tunnelrpc/pogs/registration_server.go index 9908c113..0f4f7a38 100644 --- a/tunnelrpc/pogs/registration_server.go +++ b/tunnelrpc/pogs/registration_server.go @@ -12,8 +12,8 @@ import ( "zombiezen.com/go/capnproto2/rpc" "zombiezen.com/go/capnproto2/server" - "github.com/cloudflare/cloudflared/tunnelrpc/metrics" - "github.com/cloudflare/cloudflared/tunnelrpc/proto" + "github.com/kjake/cloudflared/tunnelrpc/metrics" + "github.com/kjake/cloudflared/tunnelrpc/proto" ) type RegistrationServer interface { diff --git a/tunnelrpc/pogs/registration_server_test.go b/tunnelrpc/pogs/registration_server_test.go index 70dfba48..b8d6c208 100644 --- a/tunnelrpc/pogs/registration_server_test.go +++ b/tunnelrpc/pogs/registration_server_test.go @@ -13,7 +13,7 @@ import ( capnp "zombiezen.com/go/capnproto2" "zombiezen.com/go/capnproto2/rpc" - "github.com/cloudflare/cloudflared/tunnelrpc/proto" + "github.com/kjake/cloudflared/tunnelrpc/proto" ) const testAccountTag = "abc123" diff --git a/tunnelrpc/pogs/session_manager.go b/tunnelrpc/pogs/session_manager.go index b5552983..e3a5f30d 100644 --- a/tunnelrpc/pogs/session_manager.go +++ b/tunnelrpc/pogs/session_manager.go @@ -11,8 +11,8 @@ import ( "zombiezen.com/go/capnproto2/rpc" "zombiezen.com/go/capnproto2/server" - "github.com/cloudflare/cloudflared/tunnelrpc/metrics" - "github.com/cloudflare/cloudflared/tunnelrpc/proto" + "github.com/kjake/cloudflared/tunnelrpc/metrics" + "github.com/kjake/cloudflared/tunnelrpc/proto" ) type SessionManager interface { diff --git a/tunnelrpc/proto/quic_metadata_protocol.capnp b/tunnelrpc/proto/quic_metadata_protocol.capnp index 290a034a..f195891c 100644 --- a/tunnelrpc/proto/quic_metadata_protocol.capnp +++ b/tunnelrpc/proto/quic_metadata_protocol.capnp @@ -2,7 +2,7 @@ using Go = import "go.capnp"; @0xb29021ef7421cc32; $Go.package("proto"); -$Go.import("github.com/cloudflare/cloudflared/tunnelrpc"); +$Go.import("github.com/kjake/cloudflared/tunnelrpc"); struct ConnectRequest @0xc47116a1045e4061 { diff --git a/tunnelrpc/proto/tunnelrpc.capnp b/tunnelrpc/proto/tunnelrpc.capnp index 08c3b9e0..d3f71cce 100644 --- a/tunnelrpc/proto/tunnelrpc.capnp +++ b/tunnelrpc/proto/tunnelrpc.capnp @@ -1,7 +1,7 @@ using Go = import "go.capnp"; @0xdb8274f9144abc7e; $Go.package("proto"); -$Go.import("github.com/cloudflare/cloudflared/tunnelrpc"); +$Go.import("github.com/kjake/cloudflared/tunnelrpc"); # === DEPRECATED Legacy Tunnel Authentication and Registration methods/servers === # diff --git a/tunnelrpc/quic/cloudflared_client.go b/tunnelrpc/quic/cloudflared_client.go index 85a96b5f..5aca8511 100644 --- a/tunnelrpc/quic/cloudflared_client.go +++ b/tunnelrpc/quic/cloudflared_client.go @@ -11,9 +11,9 @@ import ( "github.com/google/uuid" - "github.com/cloudflare/cloudflared/tunnelrpc" - "github.com/cloudflare/cloudflared/tunnelrpc/metrics" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc" + "github.com/kjake/cloudflared/tunnelrpc/metrics" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // CloudflaredClient calls capnp rpc methods of SessionManager and ConfigurationManager. diff --git a/tunnelrpc/quic/cloudflared_server.go b/tunnelrpc/quic/cloudflared_server.go index 2bba6f1c..70019d32 100644 --- a/tunnelrpc/quic/cloudflared_server.go +++ b/tunnelrpc/quic/cloudflared_server.go @@ -6,8 +6,8 @@ import ( "io" "time" - "github.com/cloudflare/cloudflared/tunnelrpc" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // HandleRequestFunc wraps the proxied request from the upstream and also provides methods on the stream to diff --git a/tunnelrpc/quic/request_client_stream.go b/tunnelrpc/quic/request_client_stream.go index 54d1482e..ebbddfdd 100644 --- a/tunnelrpc/quic/request_client_stream.go +++ b/tunnelrpc/quic/request_client_stream.go @@ -6,7 +6,7 @@ import ( capnp "zombiezen.com/go/capnproto2" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // RequestClientStream is a stream to provide requests to the server. This operation is typically driven by the edge service. diff --git a/tunnelrpc/quic/request_server_stream.go b/tunnelrpc/quic/request_server_stream.go index c0aee434..90002fe8 100644 --- a/tunnelrpc/quic/request_server_stream.go +++ b/tunnelrpc/quic/request_server_stream.go @@ -5,7 +5,7 @@ import ( capnp "zombiezen.com/go/capnproto2" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // RequestServerStream is a stream to serve requests diff --git a/tunnelrpc/quic/request_server_stream_test.go b/tunnelrpc/quic/request_server_stream_test.go index 0be17049..c7340b6b 100644 --- a/tunnelrpc/quic/request_server_stream_test.go +++ b/tunnelrpc/quic/request_server_stream_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/tunnelrpc/quic/session_client.go b/tunnelrpc/quic/session_client.go index 75e36906..ef91e3df 100644 --- a/tunnelrpc/quic/session_client.go +++ b/tunnelrpc/quic/session_client.go @@ -10,9 +10,9 @@ import ( "github.com/google/uuid" "zombiezen.com/go/capnproto2/rpc" - "github.com/cloudflare/cloudflared/tunnelrpc" - "github.com/cloudflare/cloudflared/tunnelrpc/metrics" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc" + "github.com/kjake/cloudflared/tunnelrpc/metrics" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // SessionClient calls capnp rpc methods of SessionManager. diff --git a/tunnelrpc/quic/session_server.go b/tunnelrpc/quic/session_server.go index 82daa306..cfe72fe7 100644 --- a/tunnelrpc/quic/session_server.go +++ b/tunnelrpc/quic/session_server.go @@ -6,8 +6,8 @@ import ( "io" "time" - "github.com/cloudflare/cloudflared/tunnelrpc" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // SessionManagerServer handles streams with the SessionManager RPCs. diff --git a/tunnelrpc/registration_client.go b/tunnelrpc/registration_client.go index 7d945f58..1a9c5d3c 100644 --- a/tunnelrpc/registration_client.go +++ b/tunnelrpc/registration_client.go @@ -9,8 +9,8 @@ import ( "github.com/google/uuid" "zombiezen.com/go/capnproto2/rpc" - "github.com/cloudflare/cloudflared/tunnelrpc/metrics" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc/metrics" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) type RegistrationClient interface { diff --git a/tunnelrpc/registration_server.go b/tunnelrpc/registration_server.go index a40e3fb3..297ace3e 100644 --- a/tunnelrpc/registration_server.go +++ b/tunnelrpc/registration_server.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/kjake/cloudflared/tunnelrpc/pogs" ) // RegistrationServer provides a handler interface for a client to provide methods to handle the different types of diff --git a/tunnelstate/conntracker.go b/tunnelstate/conntracker.go index d0119f10..e8bdc363 100644 --- a/tunnelstate/conntracker.go +++ b/tunnelstate/conntracker.go @@ -6,7 +6,7 @@ import ( "github.com/rs/zerolog" - "github.com/cloudflare/cloudflared/connection" + "github.com/kjake/cloudflared/connection" ) type ConnTracker struct {