@ -1,15 +1,23 @@
package obfssh package obfssh
import ( import (
"bufio"
"context"
"errors"
"fmt"
"fmt"
socks "github.com/fangdingjun/socks-go"
"golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/terminal"
"net"
"net"
"net/http"
"os"
"os"
"os/signal"
"os/signal"
"strings"
"sync"
"syscall"
"syscall"
"time"
"time"
"github.com/fangdingjun/go-log"
socks "github.com/fangdingjun/socks-go"
"golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/terminal"
) )
// Client is ssh client connection
// Client is ssh client connection
@ -18,43 +26,30 @@ type Client struct {
sshConn ssh . Conn
sshConn ssh . Conn
client * ssh . Client
client * ssh . Client
listeners [ ] net . Listener
listeners [ ] net . Listener
ch chan struct { }
err error
err error
ctx context . Context
cancel context . CancelFunc
} }
// NewClient create a new ssh Client
// NewClient create a new ssh Client
//
//
// addr is server address
// addr is server address
//
//
// method is obfs encrypt method, value is rc4, aes or none or ""
//
// key is obfs encrypt key
//
// conf is the client configure
// conf is the client configure
//
//
// if set method to none or "", means disable the obfs,
// when the obfs is disabled, the client can connect to standard ssh server, like OpenSSH server
//
//
func NewClient ( c net . Conn , config * ssh . ClientConfig , addr string , conf * Conf ) ( * Client , error ) { func NewClient ( c net . Conn , config * ssh . ClientConfig , addr string , conf * Conf ) ( * Client , error ) {
Log ( DEBUG , "create obfs conn with method %s" , conf . ObfsMethod )
//obfsConn := &TimedOutConn{c, conf.Timeout}
obfsConn , err := NewObfsConn ( & TimedOutConn { c , conf . Timeout } , conf . ObfsMethod , conf . ObfsKey , false )
sshConn , newch , reqs , err := ssh . NewClientConn ( c , addr , config )
if err != nil {
return nil , err
}
sshConn , newch , reqs , err := ssh . NewClientConn ( obfsConn , addr , config )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
if conf . DisableObfsAfterHandshake {
obfsConn . DisableObfs ( )
}
sshClient := ssh . NewClient ( sshConn , newch , reqs )
sshClient := ssh . NewClient ( sshConn , newch , reqs )
client := & Client {
client := & Client {
conn : c , sshConn : sshConn , client : sshClient ,
conn : c , sshConn : sshConn , client : sshClient ,
ch : make ( chan struct { } ) ,
}
}
client . ctx , client . cancel = context . WithCancel ( context . Background ( ) )
go client . keepAlive ( conf . KeepAliveInterval , conf . KeepAliveMax )
go client . keepAlive ( conf . KeepAliveInterval , conf . KeepAliveMax )
return client , nil
return client , nil
} }
@ -66,50 +61,75 @@ func (cc *Client) Client() *ssh.Client {
// Run wait ssh connection to finish
// Run wait ssh connection to finish
func ( cc * Client ) Run ( ) error { func ( cc * Client ) Run ( ) error {
defer cc . Close ( )
defer cc . cancel ( )
select {
select {
case <- time . After ( 1 * time . Second ) :
case <- time . After ( 1 * time . Second ) :
}
}
// wait port forward to finish
// wait port forward to finish
if cc . listeners != nil {
if cc . listeners != nil {
Log ( DEBUG , "wait all channel to be done" )
log . Debugf ( "wait all channel to be done" )
go cc . registerSignal ( )
go cc . registerSignal ( )
go func ( ) {
go func ( ) {
cc . err = cc . sshConn . Wait ( )
cc . err = cc . sshConn . Wait ( )
Log ( DEBUG , "connection hang up" )
log . Debugf ( "connection hang up" )
close ( cc . ch )
cc . cancel ( )
//close(cc.ch)
} ( )
} ( )
<- cc . ctx . Done ( )
// wait exit signal
select {
case <- cc . ch :
Log ( INFO , "got signal, exit" )
}
}
}
Log ( DEBUG , "Done" )
cc . Close ( )
return cc . err
return cc . err
} }
func ( cc * Client ) closeListener ( ) {
if len ( cc . listeners ) == 0 {
return
}
// close remote listener may block, because of connection issue
// so only 1 second to wait
ctx , cancel := context . WithTimeout ( context . Background ( ) , 1 * time . Second )
defer cancel ( )
wg := & sync . WaitGroup { }
for _ , l := range cc . listeners {
go func ( l net . Listener ) {
log . Debugf ( "begin to close listener %s" , l . Addr ( ) . String ( ) )
l . Close ( )
log . Debugf ( "close listener %s done" , l . Addr ( ) . String ( ) )
wg . Done ( )
} ( l )
wg . Add ( 1 )
}
go func ( ) {
wg . Wait ( )
cancel ( )
} ( )
<- ctx . Done ( )
}
// Close close the ssh connection
// Close close the ssh connection
// and free all the port forward resources
// and free all the port forward resources
func ( cc * Client ) Close ( ) { func ( cc * Client ) Close ( ) {
for _ , l := range cc . listeners {
cc . closeListener ( )
Log ( INFO , "close the listener %s" , l . Addr ( ) )
l . Close ( )
log . Debugf ( "close ssh connection" )
}
//Log(DEBUG, "close ssh connection")
cc . sshConn . Close ( )
cc . sshConn . Close ( )
cc . conn . Close ( )
cc . conn . Close ( )
log . Debugf ( "close ssh connection done" )
} }
// RunCmd run a single command on server
// RunCmd run a single command on server
func ( cc * Client ) RunCmd ( cmd string ) ( [ ] byte , error ) { func ( cc * Client ) RunCmd ( cmd string ) ( [ ] byte , error ) {
Log ( INFO , "run command %s" , cmd )
log . Debugf ( "run command %s" , cmd )
session , err := cc . client . NewSession ( )
session , err := cc . client . NewSession ( )
if err != nil {
if err != nil {
Log ( DEBUG , "command exited with error: %s" , err . Error ( ) )
log . Debugf ( "command exited with error: %s" , err . Error ( ) )
} else {
} else {
Log ( DEBUG , "command exited with no error" )
log . Debugf ( "command exited with no error" )
}
}
if err != nil {
if err != nil {
@ -122,7 +142,7 @@ func (cc *Client) RunCmd(cmd string) ([]byte, error) {
// Shell start a login shell on server
// Shell start a login shell on server
func ( cc * Client ) Shell ( ) error { func ( cc * Client ) Shell ( ) error {
Log ( DEBUG , "request new session" )
log . Debugf ( "request new session" )
session , err := cc . client . NewSession ( )
session , err := cc . client . NewSession ( )
if err != nil {
if err != nil {
return err
return err
@ -138,34 +158,34 @@ func (cc *Client) Shell() error {
}
}
// this make CTRL+C works
// this make CTRL+C works
Log ( DEBUG , "turn terminal mode to raw" )
log . Debugf ( "turn terminal mode to raw" )
oldState , _ := terminal . MakeRaw ( 0 )
oldState , _ := terminal . MakeRaw ( 0 )
defer func ( ) {
log . Debugf ( "restore terminal mode" )
terminal . Restore ( 0 , oldState )
} ( )
w , h , _ := terminal . GetSize ( 0 )
w , h , _ := terminal . GetSize ( 0 )
Log ( DEBUG , "request pty" )
log . Debugf ( "request pty" )
if err := session . RequestPty ( "xterm" , h , w , modes ) ; err != nil {
if err := session . RequestPty ( "xterm" , h , w , modes ) ; err != nil {
Log ( ERROR , "request pty error: %s" , err . Error ( ) )
log . Errorf ( "request pty error: %s" , err . Error ( ) )
Log ( DEBUG , "restore terminal mode" )
terminal . Restore ( 0 , oldState )
return err
return err
}
}
Log ( DEBUG , "request shell" )
log . Debugf ( "request shell" )
if err := session . Shell ( ) ; err != nil {
if err := session . Shell ( ) ; err != nil {
Log ( ERROR , "start shell error: %s" , err . Error ( ) )
log . Errorf ( "start shell error: %s" , err . Error ( ) )
Log ( DEBUG , "restore terminal mode" )
terminal . Restore ( 0 , oldState )
return err
return err
}
}
session . Wait ( )
session . Wait ( )
Log ( DEBUG , "session closed" )
log . Debugf ( "session closed" )
terminal . Restore ( 0 , oldState )
Log ( DEBUG , "restore terminal mode" )
return nil
return nil
} }
// AddLocalForward add a local to remote port forward
// AddLocalForward add a local to remote port forward
func ( cc * Client ) AddLocalForward ( local , remote string ) error { func ( cc * Client ) AddLocalForward ( local , remote string ) error {
Log ( DEBUG , "add local forward %s -> %s" , local , remote )
log . Debugf ( "add local forward %s -> %s" , local , remote )
l , err := net . Listen ( "tcp" , local )
l , err := net . Listen ( "tcp" , local )
if err != nil {
if err != nil {
return err
return err
@ -176,10 +196,10 @@ func (cc *Client) AddLocalForward(local, remote string) error {
for {
for {
c , err := l . Accept ( )
c , err := l . Accept ( )
if err != nil {
if err != nil {
Log ( DEBUG , "local listen %s closed" , l . Addr ( ) )
log . Debugf ( "local listen %s closed" , l . Addr ( ) )
return
return
}
}
Log ( DEBUG , "connection accepted from %s" , c . RemoteAddr ( ) )
log . Debugf ( "connection accepted from %s" , c . RemoteAddr ( ) )
go cc . handleLocalForward ( c , remote )
go cc . handleLocalForward ( c , remote )
}
}
} ( l )
} ( l )
@ -189,7 +209,7 @@ func (cc *Client) AddLocalForward(local, remote string) error {
// AddRemoteForward add a remote to local port forward
// AddRemoteForward add a remote to local port forward
func ( cc * Client ) AddRemoteForward ( local , remote string ) error { func ( cc * Client ) AddRemoteForward ( local , remote string ) error {
Log ( DEBUG , "add remote forward %s -> %s" , remote , local )
log . Debugf ( "add remote forward %s -> %s" , remote , local )
l , err := cc . client . Listen ( "tcp" , remote )
l , err := cc . client . Listen ( "tcp" , remote )
if err != nil {
if err != nil {
return err
return err
@ -201,10 +221,10 @@ func (cc *Client) AddRemoteForward(local, remote string) error {
for {
for {
c , err := l . Accept ( )
c , err := l . Accept ( )
if err != nil {
if err != nil {
Log ( DEBUG , "remote listener %s closed" , l . Addr ( ) )
log . Debugf ( "remote listener %s closed" , l . Addr ( ) )
return
return
}
}
Log ( DEBUG , "accept remote forward connection from %s" , c . RemoteAddr ( ) )
log . Debugf ( "accept remote forward connection from %s" , c . RemoteAddr ( ) )
go cc . handleRemoteForward ( c , local )
go cc . handleRemoteForward ( c , local )
}
}
} ( l )
} ( l )
@ -213,7 +233,7 @@ func (cc *Client) AddRemoteForward(local, remote string) error {
// AddDynamicForward add a dynamic port forward
// AddDynamicForward add a dynamic port forward
func ( cc * Client ) AddDynamicForward ( local string ) error { func ( cc * Client ) AddDynamicForward ( local string ) error {
Log ( DEBUG , "add dynamic forward %s" , local )
log . Debugf ( "add dynamic forward %s" , local )
l , err := net . Listen ( "tcp" , local )
l , err := net . Listen ( "tcp" , local )
if err != nil {
if err != nil {
return err
return err
@ -224,10 +244,10 @@ func (cc *Client) AddDynamicForward(local string) error {
for {
for {
c , err := l . Accept ( )
c , err := l . Accept ( )
if err != nil {
if err != nil {
Log ( DEBUG , "local listener %s closed" , l . Addr ( ) )
log . Debugf ( "local listener %s closed" , l . Addr ( ) )
return
return
}
}
Log ( DEBUG , "accept connection from %s" , c . RemoteAddr ( ) )
log . Debugf ( "accept connection from %s" , c . RemoteAddr ( ) )
go cc . handleDynamicForward ( c )
go cc . handleDynamicForward ( c )
}
}
} ( l )
} ( l )
@ -237,22 +257,22 @@ func (cc *Client) AddDynamicForward(local string) error {
func ( cc * Client ) handleLocalForward ( conn net . Conn , remote string ) { func ( cc * Client ) handleLocalForward ( conn net . Conn , remote string ) {
rconn , err := cc . client . Dial ( "tcp" , remote )
rconn , err := cc . client . Dial ( "tcp" , remote )
if err != nil {
if err != nil {
Log ( ERROR , "connect to %s failed: %s" , remote , err . Error ( ) )
log . Errorf ( "connect to %s failed: %s" , remote , err . Error ( ) )
conn . Close ( )
conn . Close ( )
return
return
}
}
Log ( DEBUG , "remote connect to %s success" , remote )
log . Debugf ( "remote connect to %s success" , remote )
PipeAndClose ( rconn , conn )
PipeAndClose ( rconn , conn )
} }
func ( cc * Client ) handleRemoteForward ( conn net . Conn , local string ) { func ( cc * Client ) handleRemoteForward ( conn net . Conn , local string ) {
lconn , err := net . Dial ( "tcp" , local )
lconn , err := dialer . Dial ( "tcp" , local )
if err != nil {
if err != nil {
Log ( ERROR , "connect to %s failed: %s" , local , err . Error ( ) )
log . Errorf ( "connect to %s failed: %s" , local , err . Error ( ) )
conn . Close ( )
conn . Close ( )
return
return
}
}
Log ( DEBUG , "connect to %s success" , local )
log . Debugf ( "connect to %s success" , local )
PipeAndClose ( conn , lconn )
PipeAndClose ( conn , lconn )
} }
@ -262,19 +282,19 @@ func (cc *Client) handleDynamicForward(conn net.Conn) {
if addr . String ( ) != conn . LocalAddr ( ) . String ( ) {
if addr . String ( ) != conn . LocalAddr ( ) . String ( ) {
// transparent proxy
// transparent proxy
// iptables redirect the packet to this port
// iptables redirect the packet to this port
Log ( DEBUG , "transparent %s -> %s" , conn . RemoteAddr ( ) , addr )
log . Debugf ( "transparent %s -> %s" , conn . RemoteAddr ( ) , addr )
cc . handleTransparentProxy ( conn , addr )
cc . handleTransparentProxy ( conn , addr )
return
return
}
}
} else {
} else {
// SO_ORIGNAL_DST failed
// SO_ORIGNAL_DST failed
// just ignore it
// just ignore it
Log ( DEBUG , "get original destination on %s failed: %s, ignore" ,
log . Debugf ( "get original destination on %s failed: %s, ignore" ,
conn . LocalAddr ( ) , err )
conn . LocalAddr ( ) , err )
}
}
// socks5 to this port
// socks5 to this port
Log ( DEBUG , "socks %s" , conn . RemoteAddr ( ) )
log . Debugf ( "socks %s" , conn . RemoteAddr ( ) )
s := socks . Conn { Conn : conn , Dial : cc . client . Dial }
s := socks . Conn { Conn : conn , Dial : cc . client . Dial }
s . Serve ( )
s . Serve ( )
} }
@ -282,33 +302,54 @@ func (cc *Client) handleDynamicForward(conn net.Conn) {
func ( cc * Client ) handleTransparentProxy ( c net . Conn , addr net . Addr ) { func ( cc * Client ) handleTransparentProxy ( c net . Conn , addr net . Addr ) {
c2 , err := cc . client . Dial ( "tcp" , addr . String ( ) )
c2 , err := cc . client . Dial ( "tcp" , addr . String ( ) )
if err != nil {
if err != nil {
Log ( ERROR , "%s" , err )
log . Errorf ( "%s" , err )
c . Close ( )
c . Close ( )
return
return
}
}
PipeAndClose ( c2 , c )
PipeAndClose ( c2 , c )
} }
func doKeepAlive ( conn ssh . Conn , timeout time . Duration ) error {
ctx , cancel := context . WithTimeout ( context . Background ( ) , timeout )
defer cancel ( )
ch := make ( chan error , 1 )
go func ( ) {
_ , _ , err := conn . SendRequest ( "keepalive@openssh.org" , true , nil )
ch <- err
} ( )
select {
case <- ctx . Done ( ) :
return errors . New ( "keepalive timeout" )
case err := <- ch :
if err != nil {
return err
}
return nil
}
}
func ( cc * Client ) keepAlive ( interval time . Duration , maxCount int ) { func ( cc * Client ) keepAlive ( interval time . Duration , maxCount int ) {
count := 0
count := 0
c := time . NewTicker ( interval )
c := time . NewTicker ( interval )
defer c . Stop ( )
for {
for {
select {
select {
case <- cc . ctx . Done ( ) :
return
case <- c . C :
case <- c . C :
_ , _ , err := cc . sshConn . SendRequest ( "keepalive@openssh.org" , true , nil )
if err := doKeepAlive ( cc . sshConn , 3 * time . Second ) ; err != nil {
if err != nil {
Log ( DEBUG , "keep alive error: %s" , err . Error ( ) )
count ++
count ++
} else {
} else {
count = 0
count = 0
}
}
if count >= maxCount {
if count >= maxCount {
cc . err = fmt . Errorf ( "keep alive detects connection hang up" )
cc . err = fmt . Errorf ( "keep alive detects connection hang up" )
Log ( ERROR , "keep alive hit max count, exit" )
log . Errorf ( "keep alive hit max count, exit" )
//cc.sshConn.Close()
cc . cancel ( )
//cc.conn.Close()
// send exit signal
close ( cc . ch )
return
return
}
}
}
}
@ -321,7 +362,96 @@ func (cc *Client) registerSignal() {
select {
select {
case s1 := <- c :
case s1 := <- c :
cc . err = fmt . Errorf ( "signal %v" , s1 )
cc . err = fmt . Errorf ( "signal %v" , s1 )
Log ( ERROR , "signal %d received, exit" , s1 )
log . Errorf ( "signal %d received, exit" , s1 )
close ( cc . ch )
//close(cc.ch)
cc . cancel ( )
}
}
// AddDynamicHTTPForward add a http dynamic forward through
// secure channel
func ( cc * Client ) AddDynamicHTTPForward ( addr string ) error {
log . Debugf ( "add dynamic http listen: %s" , addr )
l , err := net . Listen ( "tcp" , addr )
if err != nil {
log . Errorf ( "listen on %s failed, %s" , addr , err )
return err
}
cc . listeners = append ( cc . listeners , l )
go func ( l net . Listener ) {
// defer l.Close()
for {
c , err := l . Accept ( )
if err != nil {
log . Errorf ( "accept error %s" , err )
break
}
go cc . handleHTTPIncoming ( c )
}
} ( l )
return nil
}
func ( cc * Client ) handleHTTPIncoming ( c net . Conn ) {
//defer c.Close()
r := bufio . NewReader ( c )
req , err := http . ReadRequest ( r )
if err != nil {
log . Errorf ( "read http request error %s" , err )
c . Close ( )
return
}
if req . Method == "CONNECT" {
cc . handleConnect ( req , c )
return
}
cc . handleHTTPReq ( req , c )
}
func ( cc * Client ) handleConnect ( req * http . Request , c net . Conn ) {
log . Debugf ( "connect to %s" , req . RequestURI )
c1 , err := cc . client . Dial ( "tcp" , req . RequestURI )
if err != nil {
fmt . Fprintf ( c , "HTTP/1.0 503 connection failed\r\n\r\n" )
log . Errorf ( "dial error %s" , err )
c . Close ( )
return
}
//defer c1.Close()
fmt . Fprintf ( c , "HTTP/1.0 200 connection established\r\n\r\n" )
PipeAndClose ( c , c1 )
}
func ( cc * Client ) handleHTTPReq ( req * http . Request , c net . Conn ) {
host := req . Host
if ! strings . Contains ( host , ":" ) {
host = fmt . Sprintf ( "%s:80" , host )
}
log . Debugf ( "request to %s" , host )
c1 , err := cc . client . Dial ( "tcp" , host )
if err != nil {
fmt . Fprintf ( c , "HTTP/1.1 503 connection failed\r\nConnection: close\r\n\r\n" )
log . Errorf ( "connection failed %s" , err )
c . Close ( )
return
}
//defer c1.Close()
if err = req . Write ( c1 ) ; err != nil {
fmt . Fprintf ( c , "HTTP/1.1 503 write to server error\r\nConnection: close\r\n\r\n" )
log . Errorf ( "write request to server error %s" , err )
c . Close ( )
c1 . Close ( )
return
}
}
PipeAndClose ( c , c1 )
} }
dingjun
dingjun
nlimpid
fangdingjun