sour-is/sshfwd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add base context

Browse Source
This commit is contained in:
xuu 2021-08-26 23:29:20 +00:00
parent 43b052daab
commit 5d111f0885
No known key found for this signature in database
GPG Key ID: 1601E16A9C4D8A22
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.go
View File

@ -110,6 +110,7 @@ func (srv *server) newSession(ctx context.Context) func(ssh.Session) {
if u, ok := srv.GetUserByName(s.User()); ok { if u, ok := srv.GetUserByName(s.User()); ok {
host := fmt.Sprintf("%v:%v", u.bindHost, u.bindPort) host := fmt.Sprintf("%v:%v", u.bindHost, u.bindPort)
director := func(req *http.Request) { director := func(req *http.Request) {
req = req.WithContext(s.Context())
if h := req.Header.Get("X-Forwarded-Host"); h == "" { if h := req.Header.Get("X-Forwarded-Host"); h == "" {
req.Header.Set("X-Forwarded-Host", req.Host) req.Header.Set("X-Forwarded-Host", req.Host)
} }
@ -127,9 +128,16 @@ func (srv *server) newSession(ctx context.Context) func(ssh.Session) {
fmt.Fprintf(s, "Created HTTP listener at: %v%v\n", u.name, srv.domainSuffix) fmt.Fprintf(s, "Created HTTP listener at: %v%v\n", u.name, srv.domainSuffix)
} }
<-ctx.Done() select {
case <-ctx.Done():
log.Println("server shutting down")
case <-s.Context().Done():
log.Println("user", s.User(), "disconnected")
}
srv.ports.Delete(s.User()) if u, ok := srv.GetUserByName(s.User()); ok {
srv.ports.Delete(u.bindPort)
}
if _, err := fmt.Fprintf(s, "Goodbye! %s\n", s.User()); err != nil { if _, err := fmt.Fprintf(s, "Goodbye! %s\n", s.User()); err != nil {
return return
} }
@ -298,6 +306,7 @@ func (srv *server) serveHTTP(ctx context.Context) func(net.Listener) error {
ReadTimeout: 2500 * time.Millisecond, ReadTimeout: 2500 * time.Millisecond,
WriteTimeout: 5 * time.Second, WriteTimeout: 5 * time.Second,
Handler: http.DefaultServeMux, Handler: http.DefaultServeMux,
BaseContext: func(net.Listener) context.Context { return ctx },
} }
go func(ctx context.Context) { go func(ctx context.Context) {