curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Unwind Most Changes 

Paring down to what should be necessary, but likely won't build in this state
This commit is contained in:
kjake 2025-01-20 17:10:15 -05:00
parent 3da39ea5bb
commit 4e9b54e610
167 changed files with 420 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -6,12 +6,12 @@ ENV GO111MODULE=on \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
TARGET_GOOS=${TARGET_GOOS} \ TARGET_GOOS=${TARGET_GOOS} \
TARGET_GOARCH=${TARGET_GOARCH} \ TARGET_GOARCH=${TARGET_GOARCH} \
# the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual
# which changes how cloudflared binds the metrics server # which changes how cloudflared binds the metrics server
CONTAINER_BUILD=1 CONTAINER_BUILD=1
WORKDIR /go/src/github.com/kjake/cloudflared/ WORKDIR /go/src/github.com/cloudflare/cloudflared/
# copy our sources into the builder image # copy our sources into the builder image
COPY . . COPY . .
@ -24,10 +24,10 @@ RUN PATH="/tmp/go/bin:$PATH" make cloudflared
# use a distroless base image with glibc # use a distroless base image with glibc
FROM gcr.io/distroless/base-debian11:nonroot FROM gcr.io/distroless/base-debian11:nonroot
LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"
# copy our compiled binary # copy our compiled binary
COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
# run as non-privileged user # run as non-privileged user
USER nonroot USER nonroot

8
Dockerfile.amd64
View File

@ -2,11 +2,11 @@
FROM golang:1.22.5 as builder FROM golang:1.22.5 as builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
# the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual
# which changes how cloudflared binds the metrics server # which changes how cloudflared binds the metrics server
CONTAINER_BUILD=1 CONTAINER_BUILD=1
WORKDIR /go/src/github.com/kjake/cloudflared/ WORKDIR /go/src/github.com/cloudflare/cloudflared/
# copy our sources into the builder image # copy our sources into the builder image
COPY . . COPY . .
@ -19,10 +19,10 @@ RUN GOOS=linux GOARCH=amd64 PATH="/tmp/go/bin:$PATH" make cloudflared
# use a distroless base image with glibc # use a distroless base image with glibc
FROM gcr.io/distroless/base-debian11:nonroot FROM gcr.io/distroless/base-debian11:nonroot
LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"
# copy our compiled binary # copy our compiled binary
COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
# run as non-privileged user # run as non-privileged user
USER nonroot USER nonroot

8
Dockerfile.arm64
View File

@ -2,11 +2,11 @@
FROM golang:1.22.5 as builder FROM golang:1.22.5 as builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
# the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual
# which changes how cloudflared binds the metrics server # which changes how cloudflared binds the metrics server
CONTAINER_BUILD=1 CONTAINER_BUILD=1
WORKDIR /go/src/github.com/kjake/cloudflared/ WORKDIR /go/src/github.com/cloudflare/cloudflared/
# copy our sources into the builder image # copy our sources into the builder image
COPY . . COPY . .
@ -19,10 +19,10 @@ RUN GOOS=linux GOARCH=arm64 PATH="/tmp/go/bin:$PATH" make cloudflared
# use a distroless base image with glibc # use a distroless base image with glibc
FROM gcr.io/distroless/base-debian11:nonroot-arm64 FROM gcr.io/distroless/base-debian11:nonroot-arm64
LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"
# copy our compiled binary # copy our compiled binary
COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
# run as non-privileged user # run as non-privileged user
USER nonroot USER nonroot

12
Makefile
View File

@ -27,11 +27,11 @@ endif
DATE := $(shell date -u '+%Y-%m-%d-%H%M UTC') DATE := $(shell date -u '+%Y-%m-%d-%H%M UTC')
VERSION_FLAGS := -X "main.Version=$(VERSION)" -X "main.BuildTime=$(DATE)" VERSION_FLAGS := -X "main.Version=$(VERSION)" -X "main.BuildTime=$(DATE)"
ifdef PACKAGE_MANAGER ifdef PACKAGE_MANAGER
VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/kjake/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=$(PACKAGE_MANAGER)" VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=$(PACKAGE_MANAGER)"
endif endif
ifdef CONTAINER_BUILD ifdef CONTAINER_BUILD
VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/kjake/cloudflared/metrics.Runtime=virtual" VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/cloudflare/cloudflared/metrics.Runtime=virtual"
endif endif
LINK_FLAGS := LINK_FLAGS :=
@ -51,7 +51,7 @@ ifeq ($(debug), 1)
GO_BUILD_TAGS += -gcflags="all=-N -l" GO_BUILD_TAGS += -gcflags="all=-N -l"
endif endif
IMPORT_PATH := github.com/kjake/cloudflared IMPORT_PATH := github.com/cloudflare/cloudflared
PACKAGE_DIR := $(CURDIR)/packaging PACKAGE_DIR := $(CURDIR)/packaging
PREFIX := /usr PREFIX := /usr
INSTALL_BINDIR := $(PREFIX)/bin/ INSTALL_BINDIR := $(PREFIX)/bin/
@ -208,7 +208,7 @@ define build_package
--description 'Cloudflare Tunnel daemon' \ --description 'Cloudflare Tunnel daemon' \
--vendor 'Cloudflare' \ --vendor 'Cloudflare' \
--license 'Apache License Version 2.0' \ --license 'Apache License Version 2.0' \
--url 'https://github.com/kjake/cloudflared' \ --url 'https://github.com/cloudflare/cloudflared' \
-m 'Cloudflare <support@cloudflare.com>' \ -m 'Cloudflare <support@cloudflare.com>' \
-a $(PACKAGE_ARCH) -v $(VERSION) -n $(DEB_PACKAGE_NAME) $(RPM_DIGEST) $(NIGHTLY_FLAGS) --after-install postinst.sh --after-remove postrm.sh \ -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) cloudflared=$(INSTALL_BINDIR) cloudflared.1=$(INSTALL_MANDIR)
@ -251,11 +251,11 @@ capnp:
.PHONY: vet .PHONY: vet
vet: vet:
go vet -mod=vendor github.com/kjake/cloudflared/... go vet -mod=vendor github.com/cloudflare/cloudflared/...
.PHONY: fmt .PHONY: fmt
fmt: fmt:
@goimports -l -w -local github.com/kjake/cloudflared $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto) @goimports -l -w -local github.com/cloudflare/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) @go fmt $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto)
.PHONY: fmt-check .PHONY: fmt-check

2
carrier/carrier.go
View File

@ -16,7 +16,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/token" "github.com/cloudflare/cloudflared/token"
) )
const ( const (

6
carrier/websocket.go
View File

@ -9,9 +9,9 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/stream" "github.com/cloudflare/cloudflared/stream"
"github.com/kjake/cloudflared/token" "github.com/cloudflare/cloudflared/token"
cfwebsocket "github.com/kjake/cloudflared/websocket" cfwebsocket "github.com/cloudflare/cloudflared/websocket"
) )
// Websocket is used to carry data via WS binary frames over the tunnel from client to the origin // Websocket is used to carry data via WS binary frames over the tunnel from client to the origin

6
carrier/websocket_test.go
View File

@ -15,9 +15,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
"github.com/kjake/cloudflared/hello" "github.com/cloudflare/cloudflared/hello"
"github.com/kjake/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/tlsconfig"
cfwebsocket "github.com/kjake/cloudflared/websocket" cfwebsocket "github.com/cloudflare/cloudflared/websocket"
) )
func websocketClientTLSConfig(t *testing.T) *tls.Config { func websocketClientTLSConfig(t *testing.T) *tls.Config {

10
cmd/cloudflared/access/carrier.go
View File

@ -11,11 +11,11 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/carrier" "github.com/cloudflare/cloudflared/carrier"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
"github.com/kjake/cloudflared/stream" "github.com/cloudflare/cloudflared/stream"
"github.com/kjake/cloudflared/validation" "github.com/cloudflare/cloudflared/validation"
) )
const ( const (

12
cmd/cloudflared/access/cmd.go
View File

@ -17,12 +17,12 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/net/idna" "golang.org/x/net/idna"
"github.com/kjake/cloudflared/carrier" "github.com/cloudflare/cloudflared/carrier"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
"github.com/kjake/cloudflared/sshgen" "github.com/cloudflare/cloudflared/sshgen"
"github.com/kjake/cloudflared/token" "github.com/cloudflare/cloudflared/token"
"github.com/kjake/cloudflared/validation" "github.com/cloudflare/cloudflared/validation"
) )
const ( const (

4
cmd/cloudflared/app_forward_service.go
View File

@ -3,8 +3,8 @@ package main
import ( import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/cmd/cloudflared/access" "github.com/cloudflare/cloudflared/cmd/cloudflared/access"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
) )
// ForwardServiceType is used to identify what kind of overwatch service this is // ForwardServiceType is used to identify what kind of overwatch service this is

4
cmd/cloudflared/app_resolver_service.go
View File

@ -3,8 +3,8 @@ package main
import ( import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/tunneldns" "github.com/cloudflare/cloudflared/tunneldns"
) )
const ( const (

4
cmd/cloudflared/app_service.go
View File

@ -3,8 +3,8 @@ package main
import ( import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/overwatch" "github.com/cloudflare/cloudflared/overwatch"
) )
// AppService is the main service that runs when no command lines flags are passed to cloudflared // AppService is the main service that runs when no command lines flags are passed to cloudflared

4
cmd/cloudflared/cliutil/handler.go
View File

@ -4,8 +4,8 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/urfave/cli/v2/altsrc" "github.com/urfave/cli/v2/altsrc"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
func Action(actionFunc cli.ActionFunc) cli.ActionFunc { func Action(actionFunc cli.ActionFunc) cli.ActionFunc {

2
cmd/cloudflared/cliutil/logger.go
View File

@ -4,7 +4,7 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/urfave/cli/v2/altsrc" "github.com/urfave/cli/v2/altsrc"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
var ( var (

4
cmd/cloudflared/common_service.go
View File

@ -4,8 +4,8 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/cmd/cloudflared/tunnel" "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel"
) )
func buildArgsForToken(c *cli.Context, log *zerolog.Logger) ([]string, error) { func buildArgsForToken(c *cli.Context, log *zerolog.Logger) ([]string, error) {

2
cmd/cloudflared/generic_service.go
View File

@ -8,7 +8,7 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
) )
func runApp(app *cli.App, graceShutdownC chan struct{}) { func runApp(app *cli.App, graceShutdownC chan struct{}) {

8
cmd/cloudflared/linux_service.go
View File

@ -9,10 +9,10 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/cmd/cloudflared/tunnel" "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
func runApp(app *cli.App, graceShutdownC chan struct{}) { func runApp(app *cli.App, graceShutdownC chan struct{}) {

4
cmd/cloudflared/macos_service.go
View File

@ -9,8 +9,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
const ( const (

26
cmd/cloudflared/main.go
View File

@ -13,19 +13,19 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"go.uber.org/automaxprocs/maxprocs" "go.uber.org/automaxprocs/maxprocs"
"github.com/kjake/cloudflared/cmd/cloudflared/access" "github.com/cloudflare/cloudflared/cmd/cloudflared/access"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/cmd/cloudflared/proxydns" "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns"
"github.com/kjake/cloudflared/cmd/cloudflared/tail" "github.com/cloudflare/cloudflared/cmd/cloudflared/tail"
"github.com/kjake/cloudflared/cmd/cloudflared/tunnel" "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel"
"github.com/kjake/cloudflared/cmd/cloudflared/updater" "github.com/cloudflare/cloudflared/cmd/cloudflared/updater"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
"github.com/kjake/cloudflared/metrics" "github.com/cloudflare/cloudflared/metrics"
"github.com/kjake/cloudflared/overwatch" "github.com/cloudflare/cloudflared/overwatch"
"github.com/kjake/cloudflared/token" "github.com/cloudflare/cloudflared/token"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
"github.com/kjake/cloudflared/watcher" "github.com/cloudflare/cloudflared/watcher"
) )
const ( const (

8
cmd/cloudflared/proxydns/cmd.go
View File

@ -9,10 +9,10 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
"github.com/kjake/cloudflared/metrics" "github.com/cloudflare/cloudflared/metrics"
"github.com/kjake/cloudflared/tunneldns" "github.com/cloudflare/cloudflared/tunneldns"
) )
func Command(hidden bool) *cli.Command { func Command(hidden bool) *cli.Command {

2
cmd/cloudflared/service_template.go
View File

@ -12,7 +12,7 @@ import (
homedir "github.com/mitchellh/go-homedir" homedir "github.com/mitchellh/go-homedir"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
) )
type ServiceTemplate struct { type ServiceTemplate struct {

8
cmd/cloudflared/tail/cmd.go
View File

@ -17,10 +17,10 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"nhooyr.io/websocket" "nhooyr.io/websocket"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/credentials" "github.com/cloudflare/cloudflared/credentials"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
) )
var ( var (

40
cmd/cloudflared/tunnel/cmd.go
View File

@ -22,26 +22,26 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/urfave/cli/v2/altsrc" "github.com/urfave/cli/v2/altsrc"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/cmd/cloudflared/proxydns" "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns"
"github.com/kjake/cloudflared/cmd/cloudflared/updater" "github.com/cloudflare/cloudflared/cmd/cloudflared/updater"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
"github.com/kjake/cloudflared/credentials" "github.com/cloudflare/cloudflared/credentials"
"github.com/kjake/cloudflared/diagnostic" "github.com/cloudflare/cloudflared/diagnostic"
"github.com/kjake/cloudflared/edgediscovery" "github.com/cloudflare/cloudflared/edgediscovery"
"github.com/kjake/cloudflared/ingress" "github.com/cloudflare/cloudflared/ingress"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
"github.com/kjake/cloudflared/metrics" "github.com/cloudflare/cloudflared/metrics"
"github.com/kjake/cloudflared/orchestration" "github.com/cloudflare/cloudflared/orchestration"
"github.com/kjake/cloudflared/signal" "github.com/cloudflare/cloudflared/signal"
"github.com/kjake/cloudflared/supervisor" "github.com/cloudflare/cloudflared/supervisor"
"github.com/kjake/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/tlsconfig"
"github.com/kjake/cloudflared/tunneldns" "github.com/cloudflare/cloudflared/tunneldns"
"github.com/kjake/cloudflared/tunnelstate" "github.com/cloudflare/cloudflared/tunnelstate"
"github.com/kjake/cloudflared/validation" "github.com/cloudflare/cloudflared/validation"
) )
const ( const (

2
cmd/cloudflared/tunnel/config_test.go
View File

@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/kjake/cloudflared/features" "github.com/cloudflare/cloudflared/features"
) )
func TestDedup(t *testing.T) { func TestDedup(t *testing.T) {

22
cmd/cloudflared/tunnel/configuration.go
View File

@ -17,17 +17,17 @@ import (
"github.com/urfave/cli/v2/altsrc" "github.com/urfave/cli/v2/altsrc"
"golang.org/x/term" "golang.org/x/term"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
"github.com/kjake/cloudflared/edgediscovery" "github.com/cloudflare/cloudflared/edgediscovery"
"github.com/kjake/cloudflared/edgediscovery/allregions" "github.com/cloudflare/cloudflared/edgediscovery/allregions"
"github.com/kjake/cloudflared/features" "github.com/cloudflare/cloudflared/features"
"github.com/kjake/cloudflared/ingress" "github.com/cloudflare/cloudflared/ingress"
"github.com/kjake/cloudflared/orchestration" "github.com/cloudflare/cloudflared/orchestration"
"github.com/kjake/cloudflared/supervisor" "github.com/cloudflare/cloudflared/supervisor"
"github.com/kjake/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/tlsconfig"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
) )
const ( const (

4
cmd/cloudflared/tunnel/credential_finder.go
View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/credentials" "github.com/cloudflare/cloudflared/credentials"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/rs/zerolog" "github.com/rs/zerolog"

2
cmd/cloudflared/tunnel/info.go
View File

@ -5,7 +5,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
) )
type Info struct { type Info struct {

6
cmd/cloudflared/tunnel/ingress_subcommands.go
View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"net/url" "net/url"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/ingress" "github.com/cloudflare/cloudflared/ingress"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"

10
cmd/cloudflared/tunnel/login.go
View File

@ -11,11 +11,11 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/credentials" "github.com/cloudflare/cloudflared/credentials"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
"github.com/kjake/cloudflared/token" "github.com/cloudflare/cloudflared/token"
) )
const ( const (

2
cmd/cloudflared/tunnel/quick_tunnel.go
View File

@ -11,7 +11,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
) )
const httpTimeout = 15 * time.Second const httpTimeout = 15 * time.Second

2
cmd/cloudflared/tunnel/server.go
View File

@ -3,7 +3,7 @@ package tunnel
import ( import (
"fmt" "fmt"
"github.com/kjake/cloudflared/tunneldns" "github.com/cloudflare/cloudflared/tunneldns"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog" "github.com/rs/zerolog"

8
cmd/cloudflared/tunnel/subcommand_context.go
View File

@ -13,10 +13,10 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
"github.com/kjake/cloudflared/credentials" "github.com/cloudflare/cloudflared/credentials"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
type errInvalidJSONCredential struct { type errInvalidJSONCredential struct {

2
cmd/cloudflared/tunnel/subcommand_context_teamnet.go
View File

@ -6,7 +6,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
) )
const noClientMsg = "error while creating backend client" const noClientMsg = "error while creating backend client"

6
cmd/cloudflared/tunnel/subcommand_context_test.go
View File

@ -14,9 +14,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
"github.com/kjake/cloudflared/credentials" "github.com/cloudflare/cloudflared/credentials"
) )
type mockFileSystem struct { type mockFileSystem struct {

2
cmd/cloudflared/tunnel/subcommand_context_vnets.go
View File

@ -4,7 +4,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
) )
func (sc *subcommandContext) addVirtualNetwork(newVnet cfapi.NewVirtualNetwork) (cfapi.VirtualNetwork, error) { func (sc *subcommandContext) addVirtualNetwork(newVnet cfapi.NewVirtualNetwork) (cfapi.VirtualNetwork, error) {

14
cmd/cloudflared/tunnel/subcommands.go
View File

@ -23,13 +23,13 @@ import (
"golang.org/x/net/idna" "golang.org/x/net/idna"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/cmd/cloudflared/updater" "github.com/cloudflare/cloudflared/cmd/cloudflared/updater"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
"github.com/kjake/cloudflared/diagnostic" "github.com/cloudflare/cloudflared/diagnostic"
"github.com/kjake/cloudflared/metrics" "github.com/cloudflare/cloudflared/metrics"
) )
const ( const (

4
cmd/cloudflared/tunnel/subcommands_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
) )
func Test_fmtConnections(t *testing.T) { func Test_fmtConnections(t *testing.T) {

2
cmd/cloudflared/tunnel/tag.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"regexp" "regexp"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
) )
// Restrict key names to characters allowed in an HTTP header name. // Restrict key names to characters allowed in an HTTP header name.

2
cmd/cloudflared/tunnel/tag_test.go
View File

@ -3,7 +3,7 @@ package tunnel
import ( import (
"testing" "testing"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

6
cmd/cloudflared/tunnel/teamnet_subcommands.go
View File

@ -10,9 +10,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/cmd/cloudflared/updater" "github.com/cloudflare/cloudflared/cmd/cloudflared/updater"
) )
var ( var (

6
cmd/cloudflared/tunnel/vnets_subcommands.go
View File

@ -9,9 +9,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/cmd/cloudflared/updater" "github.com/cloudflare/cloudflared/cmd/cloudflared/updater"
) )
var ( var (

6
cmd/cloudflared/updater/update.go
View File

@ -14,9 +14,9 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/term" "golang.org/x/term"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
const ( const (

2
cmd/cloudflared/updater/update_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
) )
func init() { func init() {

2
cmd/cloudflared/updater/workers_update.go
View File

@ -18,7 +18,7 @@ import (
"github.com/getsentry/sentry-go" "github.com/getsentry/sentry-go"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
) )
const ( const (

4
cmd/cloudflared/windows_service.go
View File

@ -19,8 +19,8 @@ import (
"golang.org/x/sys/windows/svc/eventlog" "golang.org/x/sys/windows/svc/eventlog"
"golang.org/x/sys/windows/svc/mgr" "golang.org/x/sys/windows/svc/mgr"
"github.com/kjake/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
const ( const (

2
config/configuration.go
View File

@ -17,7 +17,7 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
"github.com/kjake/cloudflared/validation" "github.com/cloudflare/cloudflared/validation"
) )
var ( var (

2
config/manager.go
View File

@ -8,7 +8,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
"github.com/kjake/cloudflared/watcher" "github.com/cloudflare/cloudflared/watcher"
) )
// Notifier sends out config updates // Notifier sends out config updates

2
config/manager_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/kjake/cloudflared/watcher" "github.com/cloudflare/cloudflared/watcher"
) )
type mockNotifier struct { type mockNotifier struct {

2
config/model.go
View File

@ -6,7 +6,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/kjake/cloudflared/tunneldns" "github.com/cloudflare/cloudflared/tunneldns"
) )
// Forwarder represents a client side listener to forward traffic to the edge // Forwarder represents a client side listener to forward traffic to the edge

6
connection/connection.go
View File

@ -15,9 +15,9 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
"github.com/kjake/cloudflared/websocket" "github.com/cloudflare/cloudflared/websocket"
) )
const ( const (

10
connection/connection_test.go
View File

@ -10,10 +10,10 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/stream" "github.com/cloudflare/cloudflared/stream"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
"github.com/kjake/cloudflared/websocket" "github.com/cloudflare/cloudflared/websocket"
) )
const ( const (
@ -120,7 +120,7 @@ func (ep *echoPipe) Write(p []byte) (int, error) {
} }
// A mock origin that echos data by streaming like a tcpOverWSConnection // A mock origin that echos data by streaming like a tcpOverWSConnection
// https://github.com/kjake/cloudflared/blob/master/ingress/origin_connection.go // https://github.com/cloudflare/cloudflared/blob/master/ingress/origin_connection.go
func wsEchoEndpoint(w ResponseWriter, r *http.Request) error { func wsEchoEndpoint(w ResponseWriter, r *http.Request) error {
resp := &http.Response{ resp := &http.Response{
StatusCode: http.StatusSwitchingProtocols, StatusCode: http.StatusSwitchingProtocols,

6
connection/control.go
View File

@ -8,9 +8,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
"github.com/kjake/cloudflared/tunnelrpc" "github.com/cloudflare/cloudflared/tunnelrpc"
tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
) )
// registerClient derives a named tunnel rpc client that can then be used to register and unregister connections. // registerClient derives a named tunnel rpc client that can then be used to register and unregister connections.

4
connection/errors.go
View File

@ -1,8 +1,8 @@
package connection package connection
import ( import (
"github.com/kjake/cloudflared/edgediscovery" "github.com/cloudflare/cloudflared/edgediscovery"
tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
) )
const ( const (

4
connection/http2.go
View File

@ -16,8 +16,8 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"golang.org/x/net/http2" "golang.org/x/net/http2"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
) )
// note: these constants are exported so we can reuse them in the edge-side code // note: these constants are exported so we can reuse them in the edge-side code

4
connection/http2_test.go
View File

@ -20,8 +20,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/net/http2" "golang.org/x/net/http2"
"github.com/kjake/cloudflared/tunnelrpc" "github.com/cloudflare/cloudflared/tunnelrpc"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
) )
var ( var (

2
connection/observer.go
View File

@ -7,7 +7,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
) )
const ( const (

2
connection/protocol.go
View File

@ -8,7 +8,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/edgediscovery" "github.com/cloudflare/cloudflared/edgediscovery"
) )
const ( const (

2
connection/protocol_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/kjake/cloudflared/edgediscovery" "github.com/cloudflare/cloudflared/edgediscovery"
) )
const ( const (

10
connection/quic_connection.go
View File

@ -17,11 +17,11 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
cfdquic "github.com/kjake/cloudflared/quic" cfdquic "github.com/cloudflare/cloudflared/quic"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic"
) )
const ( const (

14
connection/quic_connection_test.go
View File

@ -28,13 +28,13 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/net/nettest" "golang.org/x/net/nettest"
"github.com/kjake/cloudflared/datagramsession" "github.com/cloudflare/cloudflared/datagramsession"
"github.com/kjake/cloudflared/ingress" "github.com/cloudflare/cloudflared/ingress"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
cfdquic "github.com/kjake/cloudflared/quic" cfdquic "github.com/cloudflare/cloudflared/quic"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic"
) )
var ( var (

18
connection/quic_datagram_v2.go
View File

@ -13,15 +13,15 @@ import (
"go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/kjake/cloudflared/datagramsession" "github.com/cloudflare/cloudflared/datagramsession"
"github.com/kjake/cloudflared/ingress" "github.com/cloudflare/cloudflared/ingress"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
cfdquic "github.com/kjake/cloudflared/quic" cfdquic "github.com/cloudflare/cloudflared/quic"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic"
) )
const ( const (

8
connection/quic_datagram_v3.go
View File

@ -10,10 +10,10 @@ import (
"github.com/quic-go/quic-go" "github.com/quic-go/quic-go"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/ingress" "github.com/cloudflare/cloudflared/ingress"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
cfdquic "github.com/kjake/cloudflared/quic/v3" cfdquic "github.com/cloudflare/cloudflared/quic/v3"
"github.com/kjake/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/tunnelrpc/pogs"
) )
type datagramV3Connection struct { type datagramV3Connection struct {

2
credentials/credentials.go
View File

@ -4,7 +4,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cfapi"
) )
const ( const (

2
credentials/origin_cert.go
View File

@ -10,7 +10,7 @@ import (
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
) )
const ( const (

4
datagramsession/manager.go
View File

@ -10,8 +10,8 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
const ( const (

2
datagramsession/manager_test.go
View File

@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
var ( var (

2
datagramsession/session.go
View File

@ -11,7 +11,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
const ( const (

2
datagramsession/session_test.go
View File

@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
// TestCloseSession makes sure a session will stop after context is done // TestCloseSession makes sure a session will stop after context is done

4
dev.Dockerfile
View File

@ -1,10 +1,10 @@
FROM golang:1.22.5 as builder FROM golang:1.22.5 as builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 CGO_ENABLED=0
WORKDIR /go/src/github.com/kjake/cloudflared/ WORKDIR /go/src/github.com/cloudflare/cloudflared/
RUN apt-get update RUN apt-get update
COPY . . COPY . .
RUN .teamcity/install-cloudflare-go.sh RUN .teamcity/install-cloudflare-go.sh
# compile cloudflared # compile cloudflared
RUN PATH="/tmp/go/bin:$PATH" make cloudflared RUN PATH="/tmp/go/bin:$PATH" make cloudflared
RUN cp /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/

2
diagnostic/client.go
View File

@ -9,7 +9,7 @@ import (
"net/url" "net/url"
"strconv" "strconv"
"github.com/kjake/cloudflared/logger" "github.com/cloudflare/cloudflared/logger"
) )
type httpClient struct { type httpClient struct {

2
diagnostic/diagnostic.go
View File

@ -15,7 +15,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
network "github.com/kjake/cloudflared/diagnostic/network" network "github.com/cloudflare/cloudflared/diagnostic/network"
) )
const ( const (

6
diagnostic/diagnostic_utils_test.go
View File

@ -14,9 +14,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/kjake/cloudflared/diagnostic" "github.com/cloudflare/cloudflared/diagnostic"
"github.com/kjake/cloudflared/metrics" "github.com/cloudflare/cloudflared/metrics"
"github.com/kjake/cloudflared/tunnelstate" "github.com/cloudflare/cloudflared/tunnelstate"
) )
func helperCreateServer(t *testing.T, listeners *gracenet.Net, tunnelID uuid.UUID, connectorID uuid.UUID) func() { func helperCreateServer(t *testing.T, listeners *gracenet.Net, tunnelID uuid.UUID, connectorID uuid.UUID) func() {

2
diagnostic/handlers.go
View File

@ -11,7 +11,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/tunnelstate" "github.com/cloudflare/cloudflared/tunnelstate"
) )
type Handler struct { type Handler struct {

6
diagnostic/handlers_test.go
View File

@ -15,9 +15,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/kjake/cloudflared/connection" "github.com/cloudflare/cloudflared/connection"
"github.com/kjake/cloudflared/diagnostic" "github.com/cloudflare/cloudflared/diagnostic"
"github.com/kjake/cloudflared/tunnelstate" "github.com/cloudflare/cloudflared/tunnelstate"
) )
type SystemCollectorMock struct { type SystemCollectorMock struct {

2
diagnostic/network/collector_unix_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
diagnostic "github.com/kjake/cloudflared/diagnostic/network" diagnostic "github.com/cloudflare/cloudflared/diagnostic/network"
) )
func TestDecode(t *testing.T) { func TestDecode(t *testing.T) {

2
diagnostic/network/collector_windows_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
diagnostic "github.com/kjake/cloudflared/diagnostic/network" diagnostic "github.com/cloudflare/cloudflared/diagnostic/network"
) )
func TestDecode(t *testing.T) { func TestDecode(t *testing.T) {

2
diagnostic/system_collector_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/kjake/cloudflared/diagnostic" "github.com/cloudflare/cloudflared/diagnostic"
) )
func TestParseMemoryInformationFromKV(t *testing.T) { func TestParseMemoryInformationFromKV(t *testing.T) {

2
edgediscovery/allregions/discovery.go
View File

@ -10,7 +10,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
) )
const ( const (

4
edgediscovery/edgediscovery.go
View File

@ -5,8 +5,8 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/edgediscovery/allregions" "github.com/cloudflare/cloudflared/edgediscovery/allregions"
"github.com/kjake/cloudflared/management" "github.com/cloudflare/cloudflared/management"
) )
const ( const (

2
edgediscovery/edgediscovery_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/kjake/cloudflared/edgediscovery/allregions" "github.com/cloudflare/cloudflared/edgediscovery/allregions"
) )
var ( var (

2
fips/fips.go.linux-amd64
View File

@ -4,7 +4,7 @@ package main
import ( import (
_ "crypto/tls/fipsonly" _ "crypto/tls/fipsonly"
"github.com/kjake/cloudflared/cmd/cloudflared/tunnel" "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel"
) )
func init () { func init () {

2
fmt-check.sh
View File

@ -2,7 +2,7 @@
set -e -o pipefail set -e -o pipefail
OUTPUT=$(goimports -l -d -local github.com/kjake/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc)) OUTPUT=$(goimports -l -d -local github.com/cloudflare/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc))
if [ -n "$OUTPUT" ] ; then if [ -n "$OUTPUT" ] ; then
PAGER=$(which colordiff || echo cat) PAGER=$(which colordiff || echo cat)

7
go.mod
View File

@ -1,4 +1,4 @@
module github.com/kjake/cloudflared module github.com/cloudflare/cloudflared
go 1.22 go 1.22
@ -55,10 +55,10 @@ require (
github.com/coredns/caddy v1.1.1 // indirect github.com/coredns/caddy v1.1.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 // indirect github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 // indirect
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect
@ -70,7 +70,6 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/klauspost/compress v1.15.11 // indirect github.com/klauspost/compress v1.15.11 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

12
go.sum
View File

@ -19,21 +19,20 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0=
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 h1:wWke/RUCl7VRjQhwPlR/v0glZXNYzBHdNUzf/Am2Nmg= github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 h1:wWke/RUCl7VRjQhwPlR/v0glZXNYzBHdNUzf/Am2Nmg=
github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9/go.mod h1:uPmAp6Sws4L7+Q/OokbWDAK1ibXYhB3PXFP1kol5hPg= github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9/go.mod h1:uPmAp6Sws4L7+Q/OokbWDAK1ibXYhB3PXFP1kol5hPg=
github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434 h1:mOp33BLbcbJ8fvTAmZacbBiOASfxN+MLcLxymZCIrGE= github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434 h1:mOp33BLbcbJ8fvTAmZacbBiOASfxN+MLcLxymZCIrGE=
github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434/go.mod h1:KigFdumBXUPSwzLDbeuzyt0elrL7+CP7TKuhrhT4bcU= github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434/go.mod h1:KigFdumBXUPSwzLDbeuzyt0elrL7+CP7TKuhrhT4bcU=
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk=
github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
@ -123,9 +122,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=

2
hello/hello.go
View File

@ -15,7 +15,7 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/tlsconfig"
) )
const ( const (

6
ingress/config.go
View File

@ -6,9 +6,9 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/ipaccess"
"github.com/kjake/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/tlsconfig"
) )
var ( var (

4
ingress/config_test.go
View File

@ -10,8 +10,8 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/ipaccess"
) )
// Ensure that the nullable config from `config` package and the // Ensure that the nullable config from `config` package and the

2
ingress/constants_test.go
View File

@ -1,6 +1,6 @@
package ingress package ingress
import "github.com/kjake/cloudflared/logger" import "github.com/cloudflare/cloudflared/logger"
var ( var (
TestLogger = logger.Create(nil) TestLogger = logger.Create(nil)

4
ingress/icmp_darwin.go
View File

@ -20,8 +20,8 @@ import (
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"
"golang.org/x/net/icmp" "golang.org/x/net/icmp"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
) )
type icmpProxy struct { type icmpProxy struct {

2
ingress/icmp_darwin_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
func TestSingleEchoIDTracker(t *testing.T) { func TestSingleEchoIDTracker(t *testing.T) {

2
ingress/icmp_generic.go
View File

@ -11,7 +11,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s %s", runtime.GOOS, runtime.GOARCH) var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s %s", runtime.GOOS, runtime.GOARCH)

4
ingress/icmp_linux.go
View File

@ -21,8 +21,8 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
) )
const ( const (

2
ingress/icmp_linux_test.go
View File

@ -5,7 +5,7 @@ package ingress
import ( import (
"testing" "testing"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
func getFunnel(t *testing.T, proxy *icmpProxy, tuple flow3Tuple) (packet.Funnel, bool) { func getFunnel(t *testing.T, proxy *icmpProxy, tuple flow3Tuple) (packet.Funnel, bool) {

2
ingress/icmp_posix.go
View File

@ -13,7 +13,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"golang.org/x/net/icmp" "golang.org/x/net/icmp"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
// Opens a non-privileged ICMP socket on Linux and Darwin // Opens a non-privileged ICMP socket on Linux and Darwin

2
ingress/icmp_posix_test.go
View File

@ -15,7 +15,7 @@ import (
"golang.org/x/net/icmp" "golang.org/x/net/icmp"
"golang.org/x/net/ipv4" "golang.org/x/net/ipv4"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
) )
func TestFunnelIdleTimeout(t *testing.T) { func TestFunnelIdleTimeout(t *testing.T) {

4
ingress/icmp_windows.go
View File

@ -25,8 +25,8 @@ import (
"golang.org/x/net/ipv4" "golang.org/x/net/ipv4"
"golang.org/x/net/ipv6" "golang.org/x/net/ipv6"
"github.com/kjake/cloudflared/packet" "github.com/cloudflare/cloudflared/packet"
"github.com/kjake/cloudflared/tracing" "github.com/cloudflare/cloudflared/tracing"
) )
const ( const (

6
ingress/ingress.go
View File

@ -13,9 +13,9 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/net/idna" "golang.org/x/net/idna"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/ingress/middleware" "github.com/cloudflare/cloudflared/ingress/middleware"
"github.com/kjake/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/ipaccess"
) )
var ( var (

6
ingress/ingress_test.go
View File

@ -14,9 +14,9 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
"github.com/kjake/cloudflared/config" "github.com/cloudflare/cloudflared/config"
"github.com/kjake/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/ipaccess"
"github.com/kjake/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/tlsconfig"
) )
func TestParseUnixSocket(t *testing.T) { func TestParseUnixSocket(t *testing.T) {

8
ingress/origin_connection.go
View File

@ -8,10 +8,10 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/kjake/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/ipaccess"
"github.com/kjake/cloudflared/socks" "github.com/cloudflare/cloudflared/socks"
"github.com/kjake/cloudflared/stream" "github.com/cloudflare/cloudflared/stream"
"github.com/kjake/cloudflared/websocket" "github.com/cloudflare/cloudflared/websocket"
) )
// OriginConnection is a way to stream to a service running on the user's origin. // OriginConnection is a way to stream to a service running on the user's origin.

6
ingress/origin_connection_test.go
View File

@ -19,9 +19,9 @@ import (
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/kjake/cloudflared/socks" "github.com/cloudflare/cloudflared/socks"
"github.com/kjake/cloudflared/stream" "github.com/cloudflare/cloudflared/stream"
"github.com/kjake/cloudflared/websocket" "github.com/cloudflare/cloudflared/websocket"
) )
const ( const (

Some files were not shown because too many files have changed in this diff Show More