From 2fd85f21b9b1f6dd6569ca6617522a0bd82224a8 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Tue, 31 Oct 2023 13:28:26 -0300 Subject: [PATCH] some changes Signed-off-by: Marcos Lilljedahl --- docker-compose.yml | 2 ++ dockerfiles/dind/Dockerfile | 15 ++++++++++++--- dockerfiles/k8s/.bashrc | 1 + go.mod | 3 +++ go.sum | 15 ++++++++------- handlers/www/503.html | 15 ++++++++------- handlers/www/default/index.html | 14 +++++++------- handlers/www/default/landing.html | 17 ----------------- handlers/www/k8s/index.html | 20 ++++++++++---------- handlers/www/k8s/landing.html | 18 ------------------ handlers/www/ooc.html | 16 +++++++++------- router/router.go | 3 ++- 12 files changed, 62 insertions(+), 77 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f083cba..664d7f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: image: golang # go to the right place and starts the app command: /bin/sh -c 'ssh-keygen -N "" -t rsa -f /etc/ssh/ssh_host_rsa_key >/dev/null; cd /go/src/; if [ -e /runbin/pwd ]; then /runbin/pwd -save /pwd/sessions -name l2; else go run api.go -save /pwd/sessions -name l2; fi' + environment: + - APPARMOR_PROFILE=docker-dind volumes: # since this app creates networks and launches containers, we need to talk to docker daemon - /var/run/docker.sock:/var/run/docker.sock diff --git a/dockerfiles/dind/Dockerfile b/dockerfiles/dind/Dockerfile index fc18ad8..7a48f60 100644 --- a/dockerfiles/dind/Dockerfile +++ b/dockerfiles/dind/Dockerfile @@ -10,14 +10,23 @@ ENV PATH $PATH:$GOPATH ENV DOCKER_TLS_CERTDIR="" ENV DOCKER_CLI_EXPERIMENTAL=enabled -ENV COMPOSE_VERSION=2.16.0 - -# Add bash completion and set bash as default shell +# Install compose +ENV COMPOSE_VERSION=2.18.1 RUN mkdir -p /usr/lib/docker/cli-plugins \ && curl -LsS https://github.com/docker/compose/releases/download/v$COMPOSE_VERSION/docker-compose-linux-x86_64 -o /usr/lib/docker/cli-plugins/docker-compose \ && chmod +x /usr/lib/docker/cli-plugins/docker-compose + +# Install scout +ENV SCOUT_VERSION=1.0.9 +RUN wget -O /tmp/scout.tar.gz https://github.com/docker/scout-cli/releases/download/v1.0.9/docker-scout_1.0.9_linux_amd64.tar.gz \ + && tar -xvf /tmp/scout.tar.gz docker-scout -C /usr/local/bin \ + && chmod +x /usr/local/bin/docker-scout \ + && rm /tmp/scout.tar.gz + + + # Add bash completion and set bash as default shell RUN mkdir /etc/bash_completion.d \ && curl -sS https://raw.githubusercontent.com/docker/cli/master/contrib/completion/bash/docker -o /etc/bash_completion.d/docker \ diff --git a/dockerfiles/k8s/.bashrc b/dockerfiles/k8s/.bashrc index b793a44..619998c 100644 --- a/dockerfiles/k8s/.bashrc +++ b/dockerfiles/k8s/.bashrc @@ -1,2 +1,3 @@ export PS1="[\h \W]$ " cat /etc/motd +echo $BASHPID > /var/run/cwd diff --git a/go.mod b/go.mod index 2f3e3cb..d57cbaf 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.16 require ( cloud.google.com/go v0.58.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.4.5 // indirect github.com/PuerkitoBio/purell v1.1.0 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect @@ -36,6 +37,7 @@ require ( github.com/juju/ratelimit v1.0.1 // indirect github.com/mailru/easyjson v0.0.0-20171120080333-32fa128f234d // indirect github.com/miekg/dns v0.0.0-20171019064225-822ae18e7187 + github.com/morikuni/aec v1.0.0 // indirect github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/opencontainers/image-spec v1.0.0 // indirect @@ -58,6 +60,7 @@ require ( google.golang.org/genproto v0.0.0-20200611194920-44ba362f84c1 // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/inf.v0 v0.9.0 // indirect + gotest.tools v2.2.0+incompatible // indirect k8s.io/api v0.0.0-20171027084545-218912509d74 // indirect k8s.io/apimachinery v0.0.0-20171027084411-18a564baac72 k8s.io/client-go v5.0.1+incompatible diff --git a/go.sum b/go.sum index 39b604d..e6f4e39 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Microsoft/go-winio v0.4.5 h1:U2XsGR5dBg1yzwSEJoP2dE2/aAXpmad+CNG2hE9Pd5k= @@ -206,6 +208,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -273,8 +277,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -331,8 +333,6 @@ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -380,8 +380,8 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= @@ -390,12 +390,11 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/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 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -524,6 +523,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/handlers/www/503.html b/handlers/www/503.html index a50b982..843f965 100644 --- a/handlers/www/503.html +++ b/handlers/www/503.html @@ -5,13 +5,14 @@ + + @@ -19,4 +20,4 @@ An error has occurred. If you have some time, please report it. Thanks! - \ No newline at end of file + diff --git a/handlers/www/default/index.html b/handlers/www/default/index.html index 02cb74b..2669723 100644 --- a/handlers/www/default/index.html +++ b/handlers/www/default/index.html @@ -7,15 +7,15 @@ + + - diff --git a/handlers/www/default/landing.html b/handlers/www/default/landing.html index c6959d3..7aff657 100644 --- a/handlers/www/default/landing.html +++ b/handlers/www/default/landing.html @@ -16,8 +16,6 @@ - - @@ -66,15 +64,6 @@ - [[ if .SegmentId ]] - - [[ end ]] - @@ -90,15 +79,9 @@ method: 'GET', url: '/users/me' }).then(function(response) { - [[ if .SegmentId ]] - analytics.identify(response.data.provider_user_id, {"email": response.data.email}); - [[ end ]] $scope.user = response.data; $scope.loggedIn = true; }, function(response) { - [[ if .SegmentId ]] - analytics.identify(); - [[ end ]] console.log('ERROR', response); $scope.user = null; $scope.loggedIn = false; diff --git a/handlers/www/k8s/index.html b/handlers/www/k8s/index.html index 0fd64d5..21e6c0a 100644 --- a/handlers/www/k8s/index.html +++ b/handlers/www/k8s/index.html @@ -7,15 +7,15 @@ + + - @@ -142,10 +142,10 @@ - - - + + + - @@ -66,15 +64,6 @@ - [[ if .SegmentId ]] - - [[ end ]] - @@ -90,16 +79,9 @@ method: 'GET', url: '/users/me' }).then(function(response) { - [[ if .SegmentId ]] - analytics.identify(response.data.provider_user_id, {"email": response.data.email}); - [[ end ]] $scope.user = response.data; $scope.loggedIn = true; }, function(response) { - [[ if .SegmentId ]] - analytics.identify(); - [[ end ]] - console.log('ERROR', response); $scope.user = null; $scope.loggedIn = false; }); diff --git a/handlers/www/ooc.html b/handlers/www/ooc.html index 732cecc..61201d7 100644 --- a/handlers/www/ooc.html +++ b/handlers/www/ooc.html @@ -5,18 +5,20 @@ + + +
We are really sorry but we are out of capacity and cannot create your session at the moment. Please try again later.
- \ No newline at end of file + diff --git a/router/router.go b/router/router.go index 2211f75..d226719 100644 --- a/router/router.go +++ b/router/router.go @@ -320,6 +320,7 @@ func (r *proxyRouter) ListenDnsUdpAddress() string { return "" } + func (r *proxyRouter) ListenDnsTcpAddress() string { if r.tcpDnsServer != nil && r.tcpDnsServer.Listener != nil { return r.tcpDnsServer.Listener.Addr().String() @@ -459,7 +460,7 @@ func proxyConn(src, dst net.Conn) { } func NewRouter(director Director, keyPath string) *proxyRouter { - var sshConfig = &ssh.ServerConfig{ + sshConfig := &ssh.ServerConfig{ PublicKeyCallback: func(c ssh.ConnMetadata, pubKey ssh.PublicKey) (*ssh.Permissions, error) { return nil, nil },