From 3597ebff28ec4b9caf1e2f0951710ef2bb9f1d42 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 28 Apr 2020 00:26:00 -0600 Subject: [PATCH] minor refactor --- .gitignore | 8 +- .ignore | 1 + README.md | 48 ++--- .../main.go => cmd/telebit/telebit.go | 2 +- main.go => cmd/telebitd/telebitd.go | 6 +- d | 4 - debug.sh | 5 + go-rvpn-server.yaml | 36 ++-- go.mod | 12 ++ go.sum | 166 ++++++++++++++++++ html/admin/js/app.js | 6 +- rvpn-docker/{readme.md => README.md} | 16 +- rvpn/client/ws_handler.go | 4 +- rvpn/envelope/envelope.go | 2 +- rvpn/server/api_interface.go | 6 +- rvpn/server/connection.go | 2 +- rvpn/server/listener_generic.go | 6 +- rvpn/server/manager.go | 14 +- rvpn/server/status.go | 2 +- 19 files changed, 267 insertions(+), 79 deletions(-) create mode 100644 .ignore rename go-rvpn-client/main.go => cmd/telebit/telebit.go (99%) rename main.go => cmd/telebitd/telebitd.go (95%) delete mode 100755 d create mode 100755 debug.sh create mode 100644 go.mod create mode 100644 go.sum rename rvpn-docker/{readme.md => README.md} (84%) diff --git a/.gitignore b/.gitignore index 6b45014..c3e45fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ -/go-rvpn-server +*.exe +/telebitd +/cmd/telebitd/telebitd +/telebit +/cmd/telebit/telebit /m /debug - - diff --git a/.ignore b/.ignore new file mode 100644 index 0000000..22d0d82 --- /dev/null +++ b/.ignore @@ -0,0 +1 @@ +vendor diff --git a/README.md b/README.md index dfd5f9e..ac49d24 100644 --- a/README.md +++ b/README.md @@ -2,39 +2,46 @@ ## branch: load-balancing -- code now passes traffic using just daplie tools -- this will require serve-https and node-tunnel-client to work -- the system supports round-robin load balancing - +- code now passes traffic using just Root tools +- this will require serve-https and node-tunnel-client to work +- the system supports round-robin load balancing ### Build RVPN ```bash -go-rvpn-server $ go get -go-rvpn-server $ go build +go build -mod vendor ./cmd/telebit/ +go build -mod vendor ./cmd/telebitd/ ``` + ### Setup Some Entries -```bash -127.0.0.1 tunnel.example.com rvpn.daplie.invalid hfc2.daplie.me hfc.daplie.me +`/etc/hosts`: + +```txt +127.0.0.1 tunnel.example.com rvpn.rootprojects.invalid hfc2.rootprojects.org hfc.rootprojects.org ``` ### Start Up Webserver + ```bash tmp $ cd /tmp -tmp $ vi index.html --- Place some index content -tmp $ serve-https -p 8080 -d /tmp --servername hfc.daplie.me --agree-tos --email henry.f.camacho@gmail.com +tmp $ vim index.html --- Place some index content +tmp $ serve-https -p 8080 -d /tmp --servername hfc.rootprojects.org --agree-tos --email henry.f.camacho@gmail.com ``` ### Start Tunnel Client + ```bash -node-tunnel-client $ bin/stunnel.js --locals http://hfc.daplie.me:8080,http://test1.hfc.daplie.me:8080 --stunneld wss://localhost.daplie.me:8443 --secret abc123 +node-tunnel-client $ bin/stunnel.js --locals http://hfc.rootprojects.org:8080,http://test1.hfc.rootprojects.org:8080 --stunneld wss://localhost.rootprojects.org:8443 --secret abc123 ``` ### Execute RVPN ```bash -go-rvpn-server $ ./go-rvpn-server +./telebitd +``` + +```txt INFO: packer: 2017/03/02 19:16:52.652109 run.go:47: startup -=-=-=-=-=-=-=-=-=-= INFO: genericlistener: 2017/03/02 19:16:52.652777 manager.go:77: ConnectionTable starting @@ -49,19 +56,20 @@ INFO: genericlistener: 2017/03/02 19:16:52.652869 conn_tracking.go:25: Tracking ### Browse via tunnel -https://hfc.daplie.me:8443 +https://hfc.rootprojects.org:8443 ### Test Load Balancing In a new terminal ```bash -node-tunnel-client $ bin/stunnel.js --locals http://hfc.daplie.me:8080,http://test1.hfc.daplie.me:8080 --stunneld wss://localhost.daplie.me:8443 --secret abc123 +node-tunnel-client $ bin/stunnel.js --locals http://hfc.rootprojects.org:8080,http://test1.hfc.rootprojects.org:8080 --stunneld wss://localhost.rootprojects.org:8443 --secret abc123 ``` ### Check Results -- you should see traffic going to both node-clients hitting the single webserver on the back end. -- Browse: https://rvpn.daplie.invalid:8443/api/com.daplie.rvpn/servers + +- you should see traffic going to both node-clients hitting the single webserver on the back end. +- Browse: https://rvpn.rootprojects.invalid:8443/api/org.rootprojects.rvpn/servers ```javascript { @@ -77,7 +85,7 @@ node-tunnel-client $ bin/stunnel.js --locals http://hfc.daplie.me:8080,http://te "server_name": "0xc42014a0c0", "server_id": 1, "domains": [{ - "domain_name": "hfc.daplie.me", + "domain_name": "hfc.rootprojects.org", "server_id": 1, "bytes_in": 4055, "bytes_out": 8119, @@ -85,7 +93,7 @@ node-tunnel-client $ bin/stunnel.js --locals http://hfc.daplie.me:8080,http://te "responses": 12, "source_addr": "127.0.0.1:55875" }, { - "domain_name": "test1.hfc.daplie.me", + "domain_name": "test1.hfc.rootprojects.org", "server_id": 1, "bytes_in": 0, "bytes_out": 0, @@ -104,7 +112,7 @@ node-tunnel-client $ bin/stunnel.js --locals http://hfc.daplie.me:8080,http://te "server_name": "0xc4200ea3c0", "server_id": 2, "domains": [{ - "domain_name": "hfc.daplie.me", + "domain_name": "hfc.rootprojects.org", "server_id": 2, "bytes_in": 1098, "bytes_out": 62, @@ -112,7 +120,7 @@ node-tunnel-client $ bin/stunnel.js --locals http://hfc.daplie.me:8080,http://te "responses": 2, "source_addr": "127.0.0.1:56318" }, { - "domain_name": "test1.hfc.daplie.me", + "domain_name": "test1.hfc.rootprojects.org", "server_id": 2, "bytes_in": 0, "bytes_out": 0, diff --git a/go-rvpn-client/main.go b/cmd/telebit/telebit.go similarity index 99% rename from go-rvpn-client/main.go rename to cmd/telebit/telebit.go index 9ab43bc..f026fc2 100644 --- a/go-rvpn-client/main.go +++ b/cmd/telebit/telebit.go @@ -11,7 +11,7 @@ import ( flag "github.com/spf13/pflag" "github.com/spf13/viper" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/client" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/client" ) var httpRegexp = regexp.MustCompile(`(?i)^http`) diff --git a/main.go b/cmd/telebitd/telebitd.go similarity index 95% rename from main.go rename to cmd/telebitd/telebitd.go index 0e00f0f..9f87051 100644 --- a/main.go +++ b/cmd/telebitd/telebitd.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/viper" lumberjack "gopkg.in/natefinch/lumberjack.v2" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/server" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/server" ) var ( @@ -33,8 +33,8 @@ var ( argDeadTime int connectionTable *server.Table secretKey = "abc123" - wssHostName = "localhost.daplie.me" - adminHostName = "rvpn.daplie.invalid" + wssHostName = "localhost.rootprojects.org" + adminHostName = "rvpn.rootprojects.invalid" idle int dwell int cancelcheck int diff --git a/d b/d deleted file mode 100755 index dd7956a..0000000 --- a/d +++ /dev/null @@ -1,4 +0,0 @@ -godebug build -instrument git.daplie.com/Daplie/go-rvpn-server/rvpn/connection,\ -git.daplie.com/Daplie/go-rvpn-server/rvpn/connection \ --o debug main.go - diff --git a/debug.sh b/debug.sh new file mode 100755 index 0000000..dc77c4a --- /dev/null +++ b/debug.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +godebug build -instrument \ + git.coolaj86.com/coolaj86/go-telebitd/rvpn/connection,git.coolaj86.com/coolaj86/go-telebitd/rvpn/connection \ + -o debug . diff --git a/go-rvpn-server.yaml b/go-rvpn-server.yaml index 772fd67..5c062b9 100644 --- a/go-rvpn-server.yaml +++ b/go-rvpn-server.yaml @@ -1,20 +1,18 @@ rvpn: - serverName: rvpn1 - wssdomain: localhost.daplie.me - admindomain: rvpn.daplie.invalid - genericlistener: 8443 - deadtime: - dwell: 120 - idle: 60 - cancelcheck: 10 - domains: - test.daplie.me: - secret: abc123 - test2.daplie.me: - secret: abc123 - test3.daplie.me: - secret: abc123 - loadbalancing: - defaultmethod: round-robin - - + serverName: rvpn1 + wssdomain: localhost.rootprojects.org + admindomain: rvpn.rootprojects.invalid + genericlistener: 8443 + deadtime: + dwell: 120 + idle: 60 + cancelcheck: 10 + domains: + test.rootprojects.org: + secret: abc123 + test2.rootprojects.org: + secret: abc123 + test3.rootprojects.org: + secret: abc123 + loadbalancing: + defaultmethod: round-robin diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..62ccd32 --- /dev/null +++ b/go.mod @@ -0,0 +1,12 @@ +module git.coolaj86.com/coolaj86/go-telebitd + +go 1.14 + +require ( + github.com/dgrijalva/jwt-go v3.2.0+incompatible + github.com/gorilla/mux v1.7.4 + github.com/gorilla/websocket v1.4.2 + github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.6.3 + gopkg.in/natefinch/lumberjack.v2 v2.0.0 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..da35738 --- /dev/null +++ b/go.sum @@ -0,0 +1,166 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +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/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs= +github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/html/admin/js/app.js b/html/admin/js/app.js index 3f31357..6c3a7a4 100644 --- a/html/admin/js/app.js +++ b/html/admin/js/app.js @@ -74,7 +74,7 @@ app.controller('statusController', function ($scope, $http) { console.log("statusController"); $scope.status_search = ""; - var api = '/api/com.daplie.tunnel/status' + var api = '/api/org.rootprojects.tunnel/status' $scope.updateView = function() { $http.get(api).then(function(response) { @@ -96,7 +96,7 @@ app.controller('serverController', function ($scope, $http) { $scope.servers_trigger_details = []; $scope.filtered - var api = '/api/com.daplie.tunnel/servers' + var api = '/api/org.rootprojects.tunnel/servers' $scope.updateView = function() { $http.get(api).then(function(response) { @@ -129,4 +129,4 @@ app.controller('serverController', function ($scope, $http) { $scope.updateView() }); - \ No newline at end of file + diff --git a/rvpn-docker/readme.md b/rvpn-docker/README.md similarity index 84% rename from rvpn-docker/readme.md rename to rvpn-docker/README.md index 11b4f7e..c5fa66b 100644 --- a/rvpn-docker/readme.md +++ b/rvpn-docker/README.md @@ -13,8 +13,8 @@ Docker version 17.03.0-ce, build 60ccb22 - checkout code into gopath ```bash -cd $GOPATH/src/git.daplie.com/Daplie -git clone git@git.daplie.com:Daplie/go-rvpn-server.git +cd $GOPATH/src/git.coolaj86.com/coolaj86 +git clone git@git.coolaj86.com:coolaj86/go-telebitd.git cd go-rvpn-server go get @@ -75,14 +75,14 @@ rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.268045 one_conn.go:17: Acce rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.268062 one_conn.go:27: close rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.268066 listener_generic.go:421: Serve error: EOF rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.268707 listener_generic.go:366: HandleFunc / -rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.268727 listener_generic.go:369: websocket opening 172.18.0.1:38148 localhost.daplie.me:8443 +rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.268727 listener_generic.go:369: websocket opening 172.18.0.1:38148 localhost.rootprojects.org:8443 rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269264 listener_generic.go:397: before connection table rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269321 connection_table.go:79: register fired -rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269523 connection_table.go:90: adding domain hfc.daplie.me to connection 172.18.0.1:38148 -rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269602 connection_table.go:90: adding domain test1.hfc.daplie.me to connection 172.18.0.1:38148 -rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269821 listener_generic.go:410: connection registration accepted &{0xc42012af00 172.18.0.1:38148 0xc420120ea0 [hfc.daplie.me test1.hfc.daplie.me] 0xc4200f49c0} -rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.270168 connection.go:200: Reader Start &{0xc420104990 0xc420077560 map[hfc.daplie.me:0xc4201ee7a0 test1.hfc.daplie.me:0xc4201ee7c0] 0xc42012af00 0xc420120f00 172.18.0.1:38148 0 0 {63624247982 269492963 0x8392a0} {0 0 } [hfc.daplie.me test1.hfc.daplie.me] 0xc4200f49c0 true} -rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.270281 connection.go:242: Writer Start &{0xc420104990 0xc420077560 map[hfc.daplie.me:0xc4201ee7a0 test1.hfc.daplie.me:0xc4201ee7c0] 0xc42012af00 0xc420120f00 172.18.0.1:38148 0 0 {63624247982 269492963 0x8392a0} {0 0 } [hfc.daplie.me test1.hfc.daplie.me] 0xc4200f49c0 true} +rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269523 connection_table.go:90: adding domain hfc.rootprojects.org to connection 172.18.0.1:38148 +rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269602 connection_table.go:90: adding domain test1.hfc.rootprojects.org to connection 172.18.0.1:38148 +rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.269821 listener_generic.go:410: connection registration accepted &{0xc42012af00 172.18.0.1:38148 0xc420120ea0 [hfc.rootprojects.org test1.hfc.rootprojects.org] 0xc4200f49c0} +rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.270168 connection.go:200: Reader Start &{0xc420104990 0xc420077560 map[hfc.rootprojects.org:0xc4201ee7a0 test1.hfc.rootprojects.org:0xc4201ee7c0] 0xc42012af00 0xc420120f00 172.18.0.1:38148 0 0 {63624247982 269492963 0x8392a0} {0 0 } [hfc.rootprojects.org test1.hfc.rootprojects.org] 0xc4200f49c0 true} +rvpn_1 | INFO: genericlistener: 2017/03/04 18:13:02.270281 connection.go:242: Writer Start &{0xc420104990 0xc420077560 map[hfc.rootprojects.org:0xc4201ee7a0 test1.hfc.rootprojects.org:0xc4201ee7c0] 0xc42012af00 0xc420120f00 172.18.0.1:38148 0 0 {63624247982 269492963 0x8392a0} {0 0 } [hfc.rootprojects.org test1.hfc.rootprojects.org] 0xc4200f49c0 true} ``` diff --git a/rvpn/client/ws_handler.go b/rvpn/client/ws_handler.go index 7501d88..5adf9ee 100644 --- a/rvpn/client/ws_handler.go +++ b/rvpn/client/ws_handler.go @@ -12,8 +12,8 @@ import ( "github.com/gorilla/websocket" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/packer" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/sni" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/packer" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/sni" ) var hostRegexp = regexp.MustCompile(`(?im)(?:^|[\r\n])Host: *([^\r\n]+)[\r\n]`) diff --git a/rvpn/envelope/envelope.go b/rvpn/envelope/envelope.go index 38476c1..0eff8f7 100644 --- a/rvpn/envelope/envelope.go +++ b/rvpn/envelope/envelope.go @@ -7,7 +7,7 @@ import ( "time" ) -//Envelope -- Standard daplie response structure +//Envelope -- Standard response structure type Envelope struct { TransactionType string `json:"type"` Schema string `json:"schema"` diff --git a/rvpn/server/api_interface.go b/rvpn/server/api_interface.go index 108d1c7..fdab4e8 100644 --- a/rvpn/server/api_interface.go +++ b/rvpn/server/api_interface.go @@ -9,11 +9,11 @@ import ( "github.com/gorilla/mux" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/envelope" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/envelope" ) const ( - endPointPrefix = "/api/com.daplie.tunnel/" + endPointPrefix = "/api/org.rootprojects.tunnel/" ) var connectionTable *Table @@ -40,7 +40,7 @@ func handleAdminClient(ctx context.Context, oneConn *oneConnListener) { switch url := r.URL.Path; url { case "/": // check to see if we are using the administrative Host - if strings.Contains(r.Host, "rvpn.daplie.invalid") { + if strings.Contains(r.Host, "rvpn.rootprojects.invalid") { http.Redirect(w, r, "/admin", 301) serverStatus.AdminStats.IncResponses() diff --git a/rvpn/server/connection.go b/rvpn/server/connection.go index 7048870..778edb4 100755 --- a/rvpn/server/connection.go +++ b/rvpn/server/connection.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/websocket" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/packer" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/packer" ) // Connection track websocket and faciliates in and out data diff --git a/rvpn/server/listener_generic.go b/rvpn/server/listener_generic.go index 0f68e52..ea44cca 100644 --- a/rvpn/server/listener_generic.go +++ b/rvpn/server/listener_generic.go @@ -17,8 +17,8 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/packer" - "git.daplie.com/Daplie/go-rvpn-server/rvpn/sni" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/packer" + "git.coolaj86.com/coolaj86/go-telebitd/rvpn/sni" ) type contextKey string @@ -255,7 +255,7 @@ func handleStream(ctx context.Context, wConn *WedgeConn) { //do we have a invalid domain indicating Admin? //if yes, prep the oneConn and send it to the handler - } else if strings.Contains(r.Host, "rvpn.daplie.invalid") { + } else if strings.Contains(r.Host, "rvpn.rootprojects.invalid") { loginfo.Println("admin") oneConn := &oneConnListener{wConn} handleAdminClient(ctx, oneConn) diff --git a/rvpn/server/manager.go b/rvpn/server/manager.go index f3033f9..bf9d853 100644 --- a/rvpn/server/manager.go +++ b/rvpn/server/manager.go @@ -43,8 +43,8 @@ func NewListenerRegistration(port int) (p *ListenerRegistration) { return } -//servers - -type servers struct { +// Servers - +type Servers struct { listeners map[*net.Listener]int ctx context.Context connnectionTable *Table @@ -52,7 +52,7 @@ type servers struct { secretKey string certbundle tls.Certificate register chan *ListenerRegistration - servers *servers + servers *Servers wssHostName string adminHostName string cancelCheck int @@ -60,9 +60,9 @@ type servers struct { serverStatus *Status } -//NewGenerListeners -- -func NewGenerListeners(ctx context.Context, secretKey string, certbundle tls.Certificate, serverStatus *Status) (p *servers) { - p = new(servers) +// NewGenerListeners creates tcp (and https and wss?) listeners +func NewGenerListeners(ctx context.Context, secretKey string, certbundle tls.Certificate, serverStatus *Status) (p *Servers) { + p = &Servers{} p.listeners = make(map[*net.Listener]int) p.ctx = ctx p.connnectionTable = serverStatus.ConnectionTable @@ -81,7 +81,7 @@ func NewGenerListeners(ctx context.Context, secretKey string, certbundle tls.Cer //Run -- Execute // - execute the GenericLister // - pass initial port, we'll announce that -func (gl *servers) Run(ctx context.Context, initialPort int) { +func (gl *Servers) Run(ctx context.Context, initialPort int) { loginfo.Println("ConnectionTable starting") config := &tls.Config{Certificates: []tls.Certificate{gl.certbundle}} diff --git a/rvpn/server/status.go b/rvpn/server/status.go index 6a7275e..fbd0fde 100644 --- a/rvpn/server/status.go +++ b/rvpn/server/status.go @@ -15,7 +15,7 @@ type Status struct { DeadTime *StatusDeadTime ConnectionTracking *Tracking ConnectionTable *Table - servers *servers + servers *Servers LoadbalanceDefaultMethod string AdminStats *TrafficStats AdminReqTyoe *AdminReqType