Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added admin features #64

Merged
merged 11 commits into from
Dec 26, 2019
Merged

Added admin features #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1ceea74
Added admin features. Closes #58
antoniomika Dec 23, 2019
6d5c428
Updated readme to include new feature flags
antoniomika Dec 23, 2019
1a0f9ce
Update action to tag based on branch name also
antoniomika Dec 24, 2019
137265d
Changed how to handle listener closes
antoniomika Dec 24, 2019
c092022
Fixed graceful cleanup
antoniomika Dec 24, 2019
7d1db50
Fixed unixconn close
antoniomika Dec 24, 2019
28b9614
Fixed channel cleanup
antoniomika Dec 24, 2019
f26fde6
Test sending gzip data properly
antoniomika Dec 24, 2019
8466ab5
Base64 encode request/response for socket transfer
antoniomika Dec 24, 2019
5027801
Better handle console data
antoniomika Dec 25, 2019
839a731
Add console URL to connection output
antoniomika Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed channel cleanup
  • Loading branch information
@antoniomika
antoniomika committed Dec 24, 2019
commit 28b9614a16f793b56df9507cd3b8387df6951a4d
19 changes: 0 additions & 19 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,25 +332,6 @@ func main() {
func (s *SSHConnection) CleanUp(state *State) {
close(s.Close)
s.SSHConn.Close()
s.Listeners.Range(func(key, val interface{}) bool {
_, ok := key.(*net.UnixAddr)

if ok {
actualUnixListener, ok := val.(*net.UnixListener)

if ok {
actualUnixListener.Close()
} else {
actualUnixConn := val.(*net.UnixConn)
actualUnixConn.Close()
}
} else {
actualTCPListener := val.(*net.TCPListener)
actualTCPListener.Close()
}

return true
})
state.SSHConnections.Delete(s.SSHConn.RemoteAddr())
log.Println("Closed SSH connection for:", s.SSHConn.RemoteAddr(), "user:", s.SSHConn.User())
}
14 changes: 8 additions & 6 deletions requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,18 @@ func handleRemoteForward(newRequest *ssh.Request, sshConn *SSHConnection, state
state.Listeners.Store(chanListener.Addr(), chanListener)
sshConn.Listeners.Store(chanListener.Addr(), chanListener)

defer func() {
cleanupChanListener := func() {
chanListener.Close()
state.Listeners.Delete(chanListener.Addr())
sshConn.Listeners.Delete(chanListener.Addr())
os.Remove(tmpfile.Name())
}

defer cleanupChanListener()

go func() {
<-sshConn.Close
cleanupChanListener()
}()

connType := "tcp"
Expand Down Expand Up @@ -177,11 +184,6 @@ func handleRemoteForward(newRequest *ssh.Request, sshConn *SSHConnection, state

sendMessage(sshConn, requestMessages, false)

go func() {
<-sshConn.Close
chanListener.Close()
}()

for {
cl, err := chanListener.Accept()
if err != nil {
Expand Down