bb40c420c7
* Update generateSigner key size to 2048 (#62)
Fixes #58
* Add syntax highlighting to readme (#67)
* small api updates (#69)
These updates make it easier to implement and pass custom Session and
Context implementations
No compatibilty breaking, all tests pass
* Move channelHandlers to avoid data race (#59)
* Update tests to work with go 1.10+ (#73)
Fixes #72
* Update shutdown to use a WaitGroup rather than sleeping (#74)
* Fix race condition in TestServerClose (#75)
In test server close, 3 things need to happen in order:
- Client session start
- Server.Close
- Client session exit (With io.EOF)
This fix ensures the client won't do anything until after the call to
close which ensure's we'll get io.EOF rather than a different error.
* Update circleci config to test multiple go versions
* Update CircleCI config to test 1.9 and the latest
The x/crypto/ssh library dropped support go < 1.9 as that's the first
version to have the math/bits library.
83c378c48d
* Wait for connections to finish when shutting down
PR #74 introduced a WaitGroup for listeners, but it doesn't wait for
open connections before closing the server. This patch waits until all
conns are closed before returning from Shutdown.
* Support port forwarding of literal IPv6 addresses (#85)
* Support port forwarding of literal IPv6 addresses
To disambiguate between colons as host:port separators and as IPv6 address separators, literal IPv6 addresses use square brackets around the address (https://en.wikipedia.org/wiki/IPv6_address#Literal_IPv6_addresses_in_network_resource_identifiers). So host ::1, port 22 is written as [::1]:22, and therefore a simple concatenation of host, colon, and port doesn't work. Fortunately net.JoinHostPort already implements this functionality, so with a bit of type gymnastics we can generate dest in an IPv6-safe way.
* Support port forwarding of literal IPv6 addresses
To disambiguate between colons as host:port separators and as IPv6 address separators, literal IPv6 addresses use square brackets around the address (https://en.wikipedia.org/wiki/IPv6_address#Literal_IPv6_addresses_in_network_resource_identifiers). So host ::1, port 22 is written as [::1]:22, and therefore a simple concatenation of host, colon, and port doesn't work. Fortunately net.JoinHostPort already implements this functionality, so with a bit of type gymnastics we can generate dest in an IPv6-safe way.
* Reverse port forwarding callback added
84 lines
1.9 KiB
Go
84 lines
1.9 KiB
Go
package ssh
|
|
|
|
import (
|
|
"bytes"
|
|
"io/ioutil"
|
|
"net"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
gossh "golang.org/x/crypto/ssh"
|
|
)
|
|
|
|
var sampleServerResponse = []byte("Hello world")
|
|
|
|
func sampleSocketServer() net.Listener {
|
|
l := newLocalListener()
|
|
|
|
go func() {
|
|
conn, err := l.Accept()
|
|
if err != nil {
|
|
return
|
|
}
|
|
conn.Write(sampleServerResponse)
|
|
conn.Close()
|
|
}()
|
|
|
|
return l
|
|
}
|
|
|
|
func newTestSessionWithForwarding(t *testing.T, forwardingEnabled bool) (net.Listener, *gossh.Client, func()) {
|
|
l := sampleSocketServer()
|
|
|
|
_, client, cleanup := newTestSession(t, &Server{
|
|
Handler: func(s Session) {},
|
|
LocalPortForwardingCallback: func(ctx Context, destinationHost string, destinationPort uint32) bool {
|
|
addr := net.JoinHostPort(destinationHost, strconv.FormatInt(int64(destinationPort), 10))
|
|
if addr != l.Addr().String() {
|
|
panic("unexpected destinationHost: " + addr)
|
|
}
|
|
return forwardingEnabled
|
|
},
|
|
}, nil)
|
|
|
|
return l, client, func() {
|
|
cleanup()
|
|
l.Close()
|
|
}
|
|
}
|
|
|
|
func TestLocalPortForwardingWorks(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
l, client, cleanup := newTestSessionWithForwarding(t, true)
|
|
defer cleanup()
|
|
|
|
conn, err := client.Dial("tcp", l.Addr().String())
|
|
if err != nil {
|
|
t.Fatalf("Error connecting to %v: %v", l.Addr().String(), err)
|
|
}
|
|
result, err := ioutil.ReadAll(conn)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !bytes.Equal(result, sampleServerResponse) {
|
|
t.Fatalf("result = %#v; want %#v", result, sampleServerResponse)
|
|
}
|
|
}
|
|
|
|
func TestLocalPortForwardingRespectsCallback(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
l, client, cleanup := newTestSessionWithForwarding(t, false)
|
|
defer cleanup()
|
|
|
|
_, err := client.Dial("tcp", l.Addr().String())
|
|
if err == nil {
|
|
t.Fatalf("Expected error connecting to %v but it succeeded", l.Addr().String())
|
|
}
|
|
if !strings.Contains(err.Error(), "port forwarding is disabled") {
|
|
t.Fatalf("Expected permission error but got %#v", err)
|
|
}
|
|
}
|