From 87b830ff9abedf6567f5033cedd25f258afc4b43 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 9 Jan 2021 21:50:48 +0100 Subject: [PATCH] outpost: rename proxy to outpost --- {proxy => outpost}/.dockerignore | 0 {proxy => outpost}/.gitignore | 0 {proxy => outpost}/Dockerfile | 0 {proxy => outpost}/Makefile | 0 {proxy => outpost}/README.md | 0 {proxy => outpost}/azure-pipelines.yml | 0 {proxy => outpost}/cmd/server.go | 2 +- {proxy => outpost}/go.mod | 7 ++++--- {proxy => outpost}/go.sum | 9 +++++++++ {proxy => outpost}/main.go | 2 +- {proxy => outpost}/pkg/proxy/claims.go | 0 {proxy => outpost}/pkg/proxy/cookies.go | 0 {proxy => outpost}/pkg/proxy/oauth.go | 0 {proxy => outpost}/pkg/proxy/proxy.go | 0 {proxy => outpost}/pkg/proxy/templates.go | 0 {proxy => outpost}/pkg/server/api.go | 6 +++--- {proxy => outpost}/pkg/server/api_bundle.go | 6 +++--- {proxy => outpost}/pkg/server/api_uag.go | 0 {proxy => outpost}/pkg/server/api_ws.go | 2 +- {proxy => outpost}/pkg/server/api_ws_msg.go | 0 {proxy => outpost}/pkg/server/cert.go | 0 {proxy => outpost}/pkg/server/middleware.go | 0 {proxy => outpost}/pkg/server/server.go | 0 {proxy => outpost}/pkg/version.go | 0 24 files changed, 22 insertions(+), 12 deletions(-) rename {proxy => outpost}/.dockerignore (100%) rename {proxy => outpost}/.gitignore (100%) rename {proxy => outpost}/Dockerfile (100%) rename {proxy => outpost}/Makefile (100%) rename {proxy => outpost}/README.md (100%) rename {proxy => outpost}/azure-pipelines.yml (100%) rename {proxy => outpost}/cmd/server.go (95%) rename {proxy => outpost}/go.mod (87%) rename {proxy => outpost}/go.sum (99%) rename {proxy => outpost}/main.go (74%) rename {proxy => outpost}/pkg/proxy/claims.go (100%) rename {proxy => outpost}/pkg/proxy/cookies.go (100%) rename {proxy => outpost}/pkg/proxy/oauth.go (100%) rename {proxy => outpost}/pkg/proxy/proxy.go (100%) rename {proxy => outpost}/pkg/proxy/templates.go (100%) rename {proxy => outpost}/pkg/server/api.go (97%) rename {proxy => outpost}/pkg/server/api_bundle.go (96%) rename {proxy => outpost}/pkg/server/api_uag.go (100%) rename {proxy => outpost}/pkg/server/api_ws.go (98%) rename {proxy => outpost}/pkg/server/api_ws_msg.go (100%) rename {proxy => outpost}/pkg/server/cert.go (100%) rename {proxy => outpost}/pkg/server/middleware.go (100%) rename {proxy => outpost}/pkg/server/server.go (100%) rename {proxy => outpost}/pkg/version.go (100%) diff --git a/proxy/.dockerignore b/outpost/.dockerignore similarity index 100% rename from proxy/.dockerignore rename to outpost/.dockerignore diff --git a/proxy/.gitignore b/outpost/.gitignore similarity index 100% rename from proxy/.gitignore rename to outpost/.gitignore diff --git a/proxy/Dockerfile b/outpost/Dockerfile similarity index 100% rename from proxy/Dockerfile rename to outpost/Dockerfile diff --git a/proxy/Makefile b/outpost/Makefile similarity index 100% rename from proxy/Makefile rename to outpost/Makefile diff --git a/proxy/README.md b/outpost/README.md similarity index 100% rename from proxy/README.md rename to outpost/README.md diff --git a/proxy/azure-pipelines.yml b/outpost/azure-pipelines.yml similarity index 100% rename from proxy/azure-pipelines.yml rename to outpost/azure-pipelines.yml diff --git a/proxy/cmd/server.go b/outpost/cmd/server.go similarity index 95% rename from proxy/cmd/server.go rename to outpost/cmd/server.go index e251e9a8e..02c6d3140 100644 --- a/proxy/cmd/server.go +++ b/outpost/cmd/server.go @@ -8,7 +8,7 @@ import ( "os/signal" "time" - "github.com/BeryJu/authentik/proxy/pkg/server" + "github.com/BeryJu/authentik/outpost/pkg/server" ) const helpMessage = `authentik proxy diff --git a/proxy/go.mod b/outpost/go.mod similarity index 87% rename from proxy/go.mod rename to outpost/go.mod index 55e10d60f..2d8dd72c6 100644 --- a/proxy/go.mod +++ b/outpost/go.mod @@ -1,4 +1,4 @@ -module github.com/BeryJu/authentik/proxy +module github.com/BeryJu/authentik/outpost go 1.14 @@ -32,8 +32,9 @@ require ( golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect golang.org/x/mod v0.4.0 // indirect golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect - golang.org/x/sys v0.0.0-20201223074533-0d417f636930 // indirect - golang.org/x/tools v0.0.0-20201226215659-b1c90890d22a // indirect + golang.org/x/sys v0.0.0-20210108172913-0df2131ae363 // indirect + golang.org/x/text v0.3.5 // indirect + golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect ) diff --git a/proxy/go.sum b/outpost/go.sum similarity index 99% rename from proxy/go.sum rename to outpost/go.sum index eed06c792..4b13d2222 100644 --- a/proxy/go.sum +++ b/outpost/go.sum @@ -35,6 +35,9 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/BeryJu/authentik v0.0.0-20210108085217-fd6d99f4f999 h1:ymxzvnxKNUomJIRG1VP3I6ls5mWn8r1xWD82bHASEk0= +github.com/BeryJu/authentik/outpost v0.0.0-20210108085217-fd6d99f4f999 h1:XYHeaZx7fm4JNx77MHMO6ek/Gdp+sZa2jIJyjC294Gw= +github.com/BeryJu/authentik/proxy v0.0.0-20210108085217-fd6d99f4f999 h1:XYHeaZx7fm4JNx77MHMO6ek/Gdp+sZa2jIJyjC294Gw= github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb h1:ZVN4Iat3runWOFLaBCDVU5a9X/XikSRBosye++6gojw= github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb/go.mod h1:WsAABbY4HQBgd3mGuG4KMNTbHJCPvx9IVBHzysbknss= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= @@ -875,6 +878,8 @@ golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo= golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210108172913-0df2131ae363 h1:wHn06sgWHMO1VsQ8F+KzDJx/JzqfsNLnc+oEi07qD7s= +golang.org/x/sys v0.0.0-20210108172913-0df2131ae363/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -885,6 +890,8 @@ golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -946,6 +953,8 @@ golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f h1:33yHANSyO/TeglgY9rBhUpX golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201226215659-b1c90890d22a h1:pdfjQ7VswBeGam3EpuEJ4e8EAb7JgaubV570LO/SIQM= golang.org/x/tools v0.0.0-20201226215659-b1c90890d22a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e h1:Z2uDrs8MyXUWJbwGc4V+nGjV4Ygo+oubBbWSVQw21/I= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/proxy/main.go b/outpost/main.go similarity index 74% rename from proxy/main.go rename to outpost/main.go index 4a505f88e..4f77b281f 100644 --- a/proxy/main.go +++ b/outpost/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/BeryJu/authentik/proxy/cmd" + "github.com/BeryJu/authentik/outpost/cmd" log "github.com/sirupsen/logrus" ) diff --git a/proxy/pkg/proxy/claims.go b/outpost/pkg/proxy/claims.go similarity index 100% rename from proxy/pkg/proxy/claims.go rename to outpost/pkg/proxy/claims.go diff --git a/proxy/pkg/proxy/cookies.go b/outpost/pkg/proxy/cookies.go similarity index 100% rename from proxy/pkg/proxy/cookies.go rename to outpost/pkg/proxy/cookies.go diff --git a/proxy/pkg/proxy/oauth.go b/outpost/pkg/proxy/oauth.go similarity index 100% rename from proxy/pkg/proxy/oauth.go rename to outpost/pkg/proxy/oauth.go diff --git a/proxy/pkg/proxy/proxy.go b/outpost/pkg/proxy/proxy.go similarity index 100% rename from proxy/pkg/proxy/proxy.go rename to outpost/pkg/proxy/proxy.go diff --git a/proxy/pkg/proxy/templates.go b/outpost/pkg/proxy/templates.go similarity index 100% rename from proxy/pkg/proxy/templates.go rename to outpost/pkg/proxy/templates.go diff --git a/proxy/pkg/server/api.go b/outpost/pkg/server/api.go similarity index 97% rename from proxy/pkg/server/api.go rename to outpost/pkg/server/api.go index 164d46c9f..193c22ba8 100644 --- a/proxy/pkg/server/api.go +++ b/outpost/pkg/server/api.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/BeryJu/authentik/proxy/pkg" - "github.com/BeryJu/authentik/proxy/pkg/client" - "github.com/BeryJu/authentik/proxy/pkg/client/outposts" + "github.com/BeryJu/authentik/outpost/pkg" + "github.com/BeryJu/authentik/outpost/pkg/client" + "github.com/BeryJu/authentik/outpost/pkg/client/outposts" "github.com/getsentry/sentry-go" "github.com/go-openapi/runtime" "github.com/recws-org/recws" diff --git a/proxy/pkg/server/api_bundle.go b/outpost/pkg/server/api_bundle.go similarity index 96% rename from proxy/pkg/server/api_bundle.go rename to outpost/pkg/server/api_bundle.go index 331b6ea1a..531e11dbd 100644 --- a/proxy/pkg/server/api_bundle.go +++ b/outpost/pkg/server/api_bundle.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/BeryJu/authentik/proxy/pkg/client/crypto" - "github.com/BeryJu/authentik/proxy/pkg/models" - "github.com/BeryJu/authentik/proxy/pkg/proxy" + "github.com/BeryJu/authentik/outpost/pkg/client/crypto" + "github.com/BeryJu/authentik/outpost/pkg/models" + "github.com/BeryJu/authentik/outpost/pkg/proxy" "github.com/jinzhu/copier" "github.com/justinas/alice" "github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options" diff --git a/proxy/pkg/server/api_uag.go b/outpost/pkg/server/api_uag.go similarity index 100% rename from proxy/pkg/server/api_uag.go rename to outpost/pkg/server/api_uag.go diff --git a/proxy/pkg/server/api_ws.go b/outpost/pkg/server/api_ws.go similarity index 98% rename from proxy/pkg/server/api_ws.go rename to outpost/pkg/server/api_ws.go index d863b860e..3d845af01 100644 --- a/proxy/pkg/server/api_ws.go +++ b/outpost/pkg/server/api_ws.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/BeryJu/authentik/proxy/pkg" + "github.com/BeryJu/authentik/outpost/pkg" "github.com/go-openapi/strfmt" "github.com/gorilla/websocket" "github.com/recws-org/recws" diff --git a/proxy/pkg/server/api_ws_msg.go b/outpost/pkg/server/api_ws_msg.go similarity index 100% rename from proxy/pkg/server/api_ws_msg.go rename to outpost/pkg/server/api_ws_msg.go diff --git a/proxy/pkg/server/cert.go b/outpost/pkg/server/cert.go similarity index 100% rename from proxy/pkg/server/cert.go rename to outpost/pkg/server/cert.go diff --git a/proxy/pkg/server/middleware.go b/outpost/pkg/server/middleware.go similarity index 100% rename from proxy/pkg/server/middleware.go rename to outpost/pkg/server/middleware.go diff --git a/proxy/pkg/server/server.go b/outpost/pkg/server/server.go similarity index 100% rename from proxy/pkg/server/server.go rename to outpost/pkg/server/server.go diff --git a/proxy/pkg/version.go b/outpost/pkg/version.go similarity index 100% rename from proxy/pkg/version.go rename to outpost/pkg/version.go