Archives
/
tty-proxy
mirror of https://github.com/elisescu/tty-proxy/
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix embeded

Browse Source
pull/11/head
pyama 1 year ago
parent af76850e80
commit e3bd37e114
4 changed files with 41 additions and 344 deletions
Show Stats Download Patch File Download Diff File

10
go.mod
Unescape Escape View File

@ -1,11 +1,11 @@
module github.com/elisescu/tty-proxy
go 1.14
go 1.19
require (
github.com/gorilla/mux v1.8.0
github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce
github.com/sirupsen/logrus v1.2.0
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect
github.com/hashicorp/yamux v0.1.1
github.com/sirupsen/logrus v1.9.0
)
require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect

29
go.sum
Unescape Escape View File

@ -1,22 +1,19 @@
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/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce h1:7UnVY3T/ZnHUrfviiAgIUjg2PXxsQfs5bphsG8F7Keo=
github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
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/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es=
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

313
gobindata.go
View File

File diff suppressed because one or more lines are too long

33
server.go
Unescape Escape View File

@ -10,6 +10,7 @@ import (
"time"
"crypto/rand"
_ "embed"
"encoding/base64"
"encoding/json"
@ -187,20 +188,32 @@ func getSession(s *server, sessionID string) (wrapper *sessionWrapper) {
return
}
func (s *server) serveContent(w http.ResponseWriter, r *http.Request, name string) {
file, err := Asset(name)
var (
//go:embed static/404.css
_404Css string
//go:embed static/404.html
_404Html string
//go:embed static/bootstrap.min.css
bootstrapMinCss string
//go:embed static/invalid-session.html
invalidSessionHtml string
)
if err != nil {
w.WriteHeader(http.StatusNotFound)
return
func (s *server) serveContent(w http.ResponseWriter, r *http.Request, name string) {
assets := map[string]string{
"404.css": _404Css,
"404.html": _404Html,
"bootstrap.min.css": bootstrapMinCss,
"invalid-session.html": invalidSessionHtml,
}
file := assets[name]
ctype := mime.TypeByExtension(filepath.Ext(name))
if ctype == "" {
ctype = http.DetectContentType(file)
ctype = http.DetectContentType([]byte(file))
}
w.Header().Set("Content-Type", ctype)
w.Write(file)
w.Write([]byte(file))
}
func (s *server) handleFrontConnections() error {
@ -220,7 +233,7 @@ func (s *server) handleFrontConnections() error {
backConn, err := wrapper.ySession.Open()
defer backConn.Close()
if err != nil {
log.Warnf("Cannot serve session %s for %s, back request error: ", sessionID, r.RemoteAddr, err.Error())
log.Warnf("Cannot serve session %s for %s, back request error: %s", sessionID, r.RemoteAddr, err.Error())
s.serveContent(w, r, "invalid-session.html")
return
}
@ -272,7 +285,7 @@ func (s *server) handleBackConnections() (err error) {
err = performHandshake(conn, s.config.publicURL, sessionID)
if err != nil {
log.Warn("Cannot perform handshake on the back connection: %s", err.Error())
log.Warnf("Cannot perform handshake on the back connection: %s", err.Error())
conn.Close()
continue
@ -281,7 +294,7 @@ func (s *server) handleBackConnections() (err error) {
ymuxServerSession, err := yamux.Client(conn, nil)
if err != nil {
log.Warn("Cannot create back tunnel: %s", err.Error())
log.Warnf("Cannot create back tunnel: %s", err.Error())
conn.Close()
continue
}

Write Preview
Loading…
Cancel
Save