Allow clients to force a handshake at a specific SAM version or between SAM versions

Fix Pass Lock By Value Vet Warning

.gitignore

@@ -22,3 +22,5 @@ _testmain.go
 *.exe
 itp-golang-github-eyedeekay-gosam.txt
 .pc
+deb/
+samsocks/samsocks

Makefile

@@ -1,9 +1,9 @@
 
 USER_GH=eyedeekay
-VERSION=0.32.22
+VERSION=0.32.30
 packagename=gosam
 
-echo:
+echo: fmt
 	@echo "type make version to do release $(VERSION)"
 
 version:
@@ -22,3 +22,6 @@ tar:
 link:
 	rm -f ../goSam
 	ln -sf . ../goSam
+
+fmt:
+	gofmt -w -s *.go */*.go

README.md

@@ -3,10 +3,10 @@ goSam
 
 A go library for using the [I2P](https://geti2p.net/en/) Simple Anonymous
 Messaging ([SAM version 3.0](https://geti2p.net/en/docs/api/samv3)) bridge. It
-has support for SAM version 3.1 signature types.
+has support for all streaming features SAM version 3.2.
 
-This is in an **early development stage**. I would love to hear about any
-issues or ideas for improvement.
+This is widely used and easy to use, but thusfar, mostly by me. It sees a lot of
+testing and no breaking changes to the API are expected.
 
 ## Installation
 ```
@@ -15,7 +15,7 @@ go get github.com/eyedeekay/goSam
 
 ## Using it for HTTP Transport
 
-I implemented `Client.Dial` like `net.Dial` so you can use go's library packages like http.
+`Client.Dial` implements `net.Dial` so you can use go's library packages like http.
 
 ```go
 package main
@@ -70,6 +70,52 @@ func checkErr(err error) {
 }
 ```
 
+## Using it as a SOCKS proxy
+
+`client` also implements a resolver compatible with
+[`getlantern/go-socks5`](https://github.com/getlantern/go-socks5),
+making it very easy to implement a SOCKS5 server.
+
+```go
+package main
+
+import (
+  "flag"
+
+	"github.com/eyedeekay/goSam"
+	"github.com/getlantern/go-socks5"
+	"log"
+)
+
+var (
+  samaddr = flag.String("sam", "127.0.0.1:7656", "SAM API address to use")
+  socksaddr = flag.String("socks", "127.0.0.1:7675", "SOCKS address to use")
+)
+
+func main() {
+	sam, err := goSam.NewClient(*samaddr)
+	if err != nil {
+		panic(err)
+	}
+	log.Println("Client Created")
+
+	// create a transport that uses SAM to dial TCP Connections
+	conf := &socks5.Config{
+		Dial:     sam.DialContext,
+		Resolver: sam,
+	}
+	server, err := socks5.New(conf)
+	if err != nil {
+		panic(err)
+	}
+
+	// Create SOCKS5 proxy on localhost port 8000
+	if err := server.ListenAndServe("tcp", *socksaddr); err != nil {
+		panic(err)
+	}
+}
+```
+
 ### .deb package
 
 A package for installing this on Debian is buildable, and a version for Ubuntu
@@ -85,7 +131,10 @@ to produce an unsigned deb for personal use only. For packagers,
 
 will produce a viable source package for use with Launchpad PPA's and other
 similar systems.
+
 ### TODO
 
-* Implement `STREAM ACCEPT` and `STREAM FORWARD`
+* Improve recovery on failed sockets
+* Implement `STREAM FORWARD`
 * Implement datagrams (Repliable and Anon)
+

accept.go

@@ -24,19 +24,19 @@ func (c *Client) Listen() (net.Listener, error) {
 // with Accept
 func (c *Client) ListenI2P(dest string) (net.Listener, error) {
 	var err error
-	var id int32
 	c.id = c.NewID()
-	c.destination, err = c.CreateStreamSession(id, dest)
+	c.destination, err = c.CreateStreamSession(c.id, dest)
+	d := c.destination
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println("Listening on destination:", c.Base32()+".b32.i2p")
 
-	fmt.Println("destination:", c.destination)
-
-	c, err = c.NewClient()
+	c, err = c.NewClient(c.id)
 	if err != nil {
 		return nil, err
 	}
+	c.destination = d
 
 	if c.debug {
 		c.SamConn = WrapConn(c.SamConn)

client.go

@@ -11,6 +11,8 @@ import (
 	"math/rand"
 	"net"
 	"strings"
+	//	"sync"
+	"time"
 )
 
 // A Client represents a single Connection to the SAM bridge
@@ -38,6 +40,7 @@ type Client struct {
 
 	dontPublishLease bool
 	encryptLease     bool
+	leaseSetEncType  string
 
 	reduceIdle         bool
 	reduceIdleTime     uint
@@ -50,8 +53,9 @@ type Client struct {
 
 	debug bool
 	//NEVER, EVER modify lastaddr or id yourself. They are used internally only.
-	lastaddr string
-	id       int32
+	id     int32
+	sammin int
+	sammax int
 }
 
 var SAMsigTypes = []string{
@@ -62,6 +66,12 @@ var SAMsigTypes = []string{
 	"SIGNATURE_TYPE=EdDSA_SHA512_Ed25519",
 }
 
+var ValidSAMCommands = []string{
+	"HELLO",
+	"SESSION",
+	"STREAM",
+}
+
 var (
 	i2pB64enc *base64.Encoding = base64.NewEncoding("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-~")
 	i2pB32enc *base32.Encoding = base32.NewEncoding("abcdefghijklmnopqrstuvwxyz234567")
@@ -79,7 +89,10 @@ func NewClient(addr string) (*Client, error) {
 
 // NewID generates a random number to use as an tunnel name
 func (c *Client) NewID() int32 {
-	return rand.Int31n(math.MaxInt32)
+	if c.id == 0 {
+		c.id = rand.Int31n(math.MaxInt32)
+	}
+	return c.id
 }
 
 // Destination returns the full destination of the local tunnel
@@ -89,13 +102,17 @@ func (c *Client) Destination() string {
 
 // Base32 returns the base32 of the local tunnel
 func (c *Client) Base32() string {
-	hash := sha256.New()
+	//	hash := sha256.New()
 	b64, err := i2pB64enc.DecodeString(c.Base64())
 	if err != nil {
 		return ""
 	}
-	hash.Write([]byte(b64))
-	return strings.ToLower(strings.Replace(i2pB32enc.EncodeToString(hash.Sum(nil)), "=", "", -1))
+	//hash.Write([]byte(b64))
+	var s []byte
+	for _, e := range sha256.Sum256(b64) {
+		s = append(s, e)
+	}
+	return strings.ToLower(strings.Replace(i2pB32enc.EncodeToString(s), "=", "", -1))
 }
 
 func (c *Client) base64() []byte {
@@ -119,11 +136,11 @@ func NewClientFromOptions(opts ...func(*Client) error) (*Client, error) {
 	c.port = "7656"
 	c.inLength = 3
 	c.inVariance = 0
-	c.inQuantity = 1
+	c.inQuantity = 3
 	c.inBackups = 1
 	c.outLength = 3
 	c.outVariance = 0
-	c.outQuantity = 1
+	c.outQuantity = 3
 	c.outBackups = 1
 	c.dontPublishLease = true
 	c.encryptLease = false
@@ -132,17 +149,22 @@ func NewClientFromOptions(opts ...func(*Client) error) (*Client, error) {
 	c.reduceIdleQuantity = 1
 	c.closeIdle = true
 	c.closeIdleTime = 600000
-	c.debug = true
+	c.debug = false
 	c.sigType = SAMsigTypes[4]
 	c.id = 0
-	c.lastaddr = "invalid"
 	c.destination = ""
+	c.leaseSetEncType = "4,0"
+	c.fromport = ""
+	c.toport = ""
+	c.sammin = 0
+	c.sammax = 1
 	for _, o := range opts {
 		if err := o(&c); err != nil {
 			return nil, err
 		}
 	}
-	conn, err := net.Dial("tcp", c.samaddr())
+	c.id = c.NewID()
+	conn, err := net.DialTimeout("tcp", c.samaddr(), 15*time.Minute)
 	if err != nil {
 		return nil, err
 	}
@@ -169,13 +191,13 @@ func (c *Client) samaddr() string {
 
 // send the initial handshake command and check that the reply is ok
 func (c *Client) hello() error {
-	r, err := c.sendCmd("HELLO VERSION MIN=3.0 MAX=3.2\n")
+	r, err := c.sendCmd("HELLO VERSION MIN=3.%d MAX=3.%d\n", c.sammin, c.sammax)
 	if err != nil {
 		return err
 	}
 
 	if r.Topic != "HELLO" {
-		return fmt.Errorf("Unknown Reply: %+v\n", r)
+		return fmt.Errorf("Client Hello Unknown Reply: %+v\n", r)
 	}
 
 	if r.Pairs["RESULT"] != "OK" {
@@ -205,8 +227,10 @@ func (c *Client) Close() error {
 	return c.SamConn.Close()
 }
 
-// NewClient generates an exact copy of the client with the same options
-func (c *Client) NewClient() (*Client, error) {
+// NewClient generates an exact copy of the client with the same options, but
+// re-does all the handshaky business so that Dial can pick up right where it
+// left off, should the need arise.
+func (c *Client) NewClient(id int32) (*Client, error) {
 	return NewClientFromOptions(
 		SetHost(c.host),
 		SetPort(c.port),
@@ -227,7 +251,6 @@ func (c *Client) NewClient() (*Client, error) {
 		SetCloseIdle(c.closeIdle),
 		SetCloseIdleTime(c.closeIdleTime),
 		SetCompression(c.compression),
-		setlastaddr(c.lastaddr),
-		setid(c.id),
+		setid(id),
 	)
 }

client_test.go

@@ -4,6 +4,20 @@ package goSam
 
 import "testing"
 
+import (
+	"fmt"
+	"time"
+	//"log"
+	"net/http"
+
+	"github.com/eyedeekay/sam3/helper"
+	"github.com/eyedeekay/sam3/i2pkeys"
+)
+
+func HelloServer(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "Hello, %s!", r.URL.Path[1:])
+}
+
 var client *Client
 
 func setup(t *testing.T) {
@@ -16,6 +30,65 @@ func setup(t *testing.T) {
 	}
 }
 
+func TestCompositeClient(t *testing.T) {
+	listener, err := sam.I2PListener("testservice", "127.0.0.1:7656", "testkeys")
+	if err != nil {
+		t.Fatalf("Listener() Error: %q\n", err)
+	}
+	http.HandleFunc("/", HelloServer)
+	go http.Serve(listener, nil)
+
+	listener2, err := sam.I2PListener("testservice2", "127.0.0.1:7656", "testkeys2")
+	if err != nil {
+		t.Fatalf("Listener() Error: %q\n", err)
+	}
+	//	http.HandleFunc("/", HelloServer)
+	go http.Serve(listener2, nil)
+
+	listener3, err := sam.I2PListener("testservice3", "127.0.0.1:7656", "testkeys3")
+	if err != nil {
+		t.Fatalf("Listener() Error: %q\n", err)
+	}
+	//	http.HandleFunc("/", HelloServer)
+	go http.Serve(listener3, nil)
+
+	client, err = NewClientFromOptions(SetDebug(true))
+	if err != nil {
+		t.Fatalf("NewDefaultClient() Error: %q\n", err)
+	}
+	tr := &http.Transport{
+		Dial: client.Dial,
+	}
+	client := &http.Client{Transport: tr}
+	time.Sleep(time.Second * 30)
+	go func() {
+		resp, err := client.Get("http://" + listener.Addr().(i2pkeys.I2PAddr).Base32())
+		if err != nil {
+			t.Fatalf("Get Error: %q\n", err)
+		}
+		defer resp.Body.Close()
+		t.Log("Get returned ", resp)
+	}()
+	go func() {
+		resp, err := client.Get("http://" + listener2.Addr().(i2pkeys.I2PAddr).Base32())
+		if err != nil {
+			t.Fatalf("Get Error: %q\n", err)
+		}
+		defer resp.Body.Close()
+		t.Log("Get returned ", resp)
+	}()
+	go func() {
+		resp, err := client.Get("http://" + listener3.Addr().(i2pkeys.I2PAddr).Base32())
+		if err != nil {
+			t.Fatalf("Get Error: %q\n", err)
+		}
+		defer resp.Body.Close()
+		t.Log("Get returned ", resp)
+	}()
+
+	time.Sleep(time.Second * 15)
+}
+
 func teardown(t *testing.T) {
 	if err := client.Close(); err != nil {
 		t.Fatalf("client.Close() Error: %q\n", err)
@@ -27,3 +100,12 @@ func TestClientHello(t *testing.T) {
 	t.Log(client.Base32())
 	teardown(t)
 }
+
+func TestNewDestination(t *testing.T) {
+	setup(t)
+	t.Log(client.Base32())
+	if _, err := client.NewDestination(SAMsigTypes[3]); err != nil {
+		t.Error(err)
+	}
+	teardown(t)
+}

debian/changelog

@@ -1,3 +1,54 @@
+golang-github-eyedeekay-gosam (0.32.30) UNRELEASED; urgency=medium
+
+  * Improve the defaults
+  * Handle errors more correctly
+  * Gracefully handle hangups by creating a new session
+  * Set empty destinations to TRANSIENT when dialing
+
+ -- idk <hankhill19580@gmail.com>  Sun, 03 Nov 2020 16:12:04 -0500
+
+golang-github-eyedeekay-gosam (0.32.29) UNRELEASED; urgency=medium
+
+  * Maintenance updates
+
+ -- idk <hankhill19580@gmail.com>  Mon, 23 Nov 2020 20:40:40 -0500
+
+golang-github-eyedeekay-gosam (0.32.28) UNRELEASED; urgency=medium
+
+  * Maintenance updates
+
+ -- idk <hankhill19580@gmail.com>  Thu, 12 Sept 2020 22:44:27 -0500
+
+golang-github-eyedeekay-gosam (0.32.27) UNRELEASED; urgency=medium
+
+  * Add a Resolve function to fulfill SOCKS5 proxy requirements
+
+ -- idk <hankhill19580@gmail.com>  Sun, 13 Sept 2020 04:48:27 -0500
+
+golang-github-eyedeekay-gosam (0.32.26) UNRELEASED; urgency=medium
+
+  * Fix mistaken-identity issue with listeners
+
+ -- idk <hankhill19580@gmail.com>  Thu, 03 Sept 2020 08:17:40 -0500
+
+golang-github-eyedeekay-gosam (0.32.25) UNRELEASED; urgency=medium
+
+  * Support dual-keys by default in all future versions
+
+ -- idk <hankhill19580@gmail.com>  Thu, 03 Sept 2020 04:25:04 -0500
+
+golang-github-eyedeekay-gosam (0.32.24) UNRELEASED; urgency=medium
+
+  * Improve the mutex thingy
+
+ -- idk <hankhill19580@gmail.com>  Tue, 25 Aug 2020 04:52:11 -0500
+  
+golang-github-eyedeekay-gosam (0.32.23) UNRELEASED; urgency=medium
+
+  * Protect Dial with a mutex to fix a lookup bug
+
+ -- idk <hankhill19580@gmail.com>  Tue, 25 Aug 2020 10:29:26 -0500
+
 golang-github-eyedeekay-gosam (0.3.2.1) bionic; urgency=medium
 
   * Get rid of the debug directory, just move it into the source

debian/files

@@ -1 +0,0 @@
-golang-github-eyedeekay-gosam_0.3.2.1_source.buildinfo devel optional

dial.go

@@ -2,7 +2,7 @@ package goSam
 
 import (
 	"context"
-	"fmt"
+	"log"
 	"net"
 	"strings"
 )
@@ -12,10 +12,11 @@ func (c *Client) DialContext(ctx context.Context, network, addr string) (net.Con
 	errCh := make(chan error, 1)
 	connCh := make(chan net.Conn, 1)
 	go func() {
-		if conn, err := c.Dial(network, addr); err != nil {
+		if conn, err := c.DialContextFree(network, addr); err != nil {
 			errCh <- err
 		} else if ctx.Err() != nil {
-			conn.Close()
+			log.Println(ctx)
+			errCh <- ctx.Err()
 		} else {
 			connCh <- conn
 		}
@@ -30,41 +31,49 @@ func (c *Client) DialContext(ctx context.Context, network, addr string) (net.Con
 	}
 }
 
-func (c Client) dialCheck(addr string) (int32, bool) {
-	if c.lastaddr == "invalid" {
-		fmt.Println("Preparing to dial new address.")
-		return c.NewID(), true
-	} else if c.lastaddr != addr {
-		fmt.Println("Preparing to dial next new address.")
-		return c.NewID(), true
-	}
-	return c.id, false
+func (c *Client) Dial(network, addr string) (net.Conn, error) {
+	return c.DialContext(context.TODO(), network, addr)
 }
 
 // Dial implements the net.Dial function and can be used for http.Transport
-func (c *Client) Dial(network, addr string) (net.Conn, error) {
+func (c *Client) DialContextFree(network, addr string) (net.Conn, error) {
 	portIdx := strings.Index(addr, ":")
 	if portIdx >= 0 {
 		addr = addr[:portIdx]
 	}
 	addr, err := c.Lookup(addr)
 	if err != nil {
+		log.Printf("LOOKUP DIALER ERROR %s %s", addr, err)
 		return nil, err
 	}
 
-	var test bool
-	if c.id, test = c.dialCheck(addr); test == true {
-		c.destination, err = c.CreateStreamSession(c.id, c.destination)
+	c.destination, err = c.CreateStreamSession(c.id, c.destination)
+	if err != nil {
+		c.Close()
+		d, err := c.NewClient(c.id + 1) /**/
 		if err != nil {
 			return nil, err
 		}
-		c.lastaddr = addr
+		d.destination, err = d.CreateStreamSession(d.id, c.destination)
+		if err != nil {
+			return nil, err
+		}
+		d, err = d.NewClient(d.id)
+		if err != nil {
+			return nil, err
+		}
+		//	  d.lastaddr = addr
+		err = d.StreamConnect(d.id, addr)
+		if err != nil {
+			return nil, err
+		}
+		c = d
+		return d.SamConn, nil
 	}
-	c, err = c.NewClient()
+	c, err = c.NewClient(c.id)
 	if err != nil {
 		return nil, err
 	}
-
 	err = c.StreamConnect(c.id, addr)
 	if err != nil {
 		return nil, err

go.mod

@@ -1,6 +1,12 @@
 module github.com/eyedeekay/goSam
 
-require github.com/eyedeekay/sam3 v0.32.2
+require (
+	github.com/eyedeekay/sam3 v0.32.32
+	github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5
+	github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 // indirect
+	github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd // indirect
+	github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 // indirect
+)
 
 //replace github.com/eyedeekay/gosam v0.1.1-0.20190814195658-27e786578944 => github.com/eyedeekay/goSam ./
 

go.sum

@@ -1,3 +1,35 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab h1:EfTRHxGSbiaEyxNzvKRBWVIDw3mD8xXGxj4gvwFzY7Q=
 github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab/go.mod h1:h7mvUAMgZ/rtRDUOkvKTK+8LnDMeUhJSoa5EPdB51fc=
 github.com/eyedeekay/sam3 v0.32.2 h1:xODDY5nBVg0oK7KaYk7ofkXFoHPsmI1umhSv1TZlS7s=
 github.com/eyedeekay/sam3 v0.32.2/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM=
+github.com/eyedeekay/sam3 v0.32.31 h1:0fdDAupEQZSETHcyVQAsnFgpYArGJzU+lC2qN6f0GDk=
+github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350 h1:8R4zcaWsgANiZ4MKKBPUf9Isct2M1IFVUVZdAMqPCmU=
+github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU=
+github.com/eyedeekay/sam3 v0.32.32 h1:9Ea1Ere5O8Clx8zYxKnvhrWy7R96Q4FvxlPskYf8VW0=
+github.com/eyedeekay/sam3 v0.32.32/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
+github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw=
+github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5 h1:RBKofGGMt2k6eGBwX8mky9qunjL+KnAp9JdzXjiRkRw=
+github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5/go.mod h1:kGHRXch95rnGLHjER/GhhFiHvfnqNz7KqWD9kGfATHY=
+github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 h1:8MYJU90rB1bsavemKSAuDKBjtAKo5xq95bEPOnzV7CE=
+github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9/go.mod h1:ZyIjgH/1wTCl+B+7yH1DqrWp6MPJqESmwmEQ89ZfhvA=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
+github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd h1:mn98vs69Kqw56iKhR82mjk16Q1q5aDFFW0E89/QbXkQ=
+github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd/go.mod h1:wKdY0ikOgzrWSeB9UyBVKPRhjXQ+vTb+BPeJuypUuNE=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
+github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 h1:QthAQCekS1YOeYWSvoHI6ZatlG4B+GBDLxV/2ZkBsTA=
+github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=

i2pkeys.go

@@ -0,0 +1,35 @@
+package goSam
+
+import (
+	"errors"
+
+	"github.com/eyedeekay/sam3/i2pkeys"
+)
+
+// NewDestination generates a new I2P destination, creating the underlying
+// public/private keys in the process. The public key can be used to send messages
+// to the destination, while the private key can be used to reply to messages
+func (c *Client) NewDestination(sigType ...string) (i2pkeys.I2PKeys, error) {
+	var (
+		sigtmp string
+		keys   i2pkeys.I2PKeys
+	)
+	if len(sigType) > 0 {
+		sigtmp = sigType[0]
+	}
+	r, err := c.sendCmd(
+		"DEST GENERATE %s\n",
+		sigtmp,
+	)
+	if err != nil {
+		return keys, err
+	}
+	var pub, priv string
+	if priv = r.Pairs["PRIV"]; priv == "" {
+		return keys, errors.New("failed to generate private destination key")
+	}
+	if pub = r.Pairs["PUB"]; pub == "" {
+		return keys, errors.New("failed to generate public destination key")
+	}
+	return i2pkeys.NewKeys(i2pkeys.I2PAddr(pub), priv), nil
+}

naming.go

@@ -1,7 +1,10 @@
 package goSam
 
 import (
+	"context"
 	"fmt"
+	"io"
+	"net"
 	"os"
 )
 
@@ -14,7 +17,7 @@ func (c *Client) Lookup(name string) (string, error) {
 
 	// TODO: move check into sendCmd()
 	if r.Topic != "NAMING" || r.Type != "REPLY" {
-		return "", fmt.Errorf("Unknown Reply: %+v\n", r)
+		return "", fmt.Errorf("Naming Unknown Reply: %+v\n", r)
 	}
 
 	result := r.Pairs["RESULT"]
@@ -32,3 +35,41 @@ func (c *Client) Lookup(name string) (string, error) {
 
 	return r.Pairs["VALUE"], nil
 }
+
+func (c *Client) forward(client, conn net.Conn) {
+	defer client.Close()
+	defer conn.Close()
+	go func() {
+		//		defer client.Close()
+		//		defer conn.Close()
+		io.Copy(client, conn)
+	}()
+	go func() {
+		//		defer client.Close()
+		//		defer conn.Close()
+		io.Copy(conn, client)
+	}()
+}
+
+func (c *Client) Resolve(ctx context.Context, name string) (context.Context, net.IP, error) {
+	//	if c.lastaddr == "invalid" || c.lastaddr != name {
+	client, err := c.DialContext(ctx, "", name)
+	if err != nil {
+		return ctx, nil, err
+	}
+	ln, err := net.Listen("tcp", "127.0.0.1:")
+	if err != nil {
+		return ctx, nil, err
+	}
+	go func() {
+		for {
+			conn, err := ln.Accept()
+			if err != nil {
+				fmt.Println(err.Error())
+			}
+			go c.forward(client, conn)
+		}
+	}()
+	//	}
+	return ctx, nil, nil
+}

naming_test.go

@@ -22,12 +22,12 @@ func TestClientLookupInvalid(t *testing.T) {
 	if !ok {
 		t.Fatalf("client.Lookup() should return a ReplyError")
 	}
-	if repErr.Result != ResultInvalidKey {
-		t.Errorf("client.Lookup() should throw an ResultKeyNotFound error.\nGot:%+v\n", repErr)
+	if repErr.Result != ResultKeyNotFound {
+		t.Errorf("client.Lookup() should throw an ResultKeyNotFound error.\nGot:%+v%s%s\n", repErr, "!=", ResultKeyNotFound)
 	}
 }
 
-func ExampleClient_Lookup() {
+func TestClientLookupValid(t *testing.T) {
 	client, err := NewDefaultClient()
 	if err != nil {
 		fmt.Printf("NewDefaultClient() should not throw an error.\n%s\n", err)
@@ -40,11 +40,17 @@ func ExampleClient_Lookup() {
 		return
 	}
 
+	if addr == `GKapJ8koUcBj~jmQzHsTYxDg2tpfWj0xjQTzd8BhfC9c3OS5fwPBNajgF-eOD6eCjFTqTlorlh7Hnd8kXj1qblUGXT-tDoR9~YV8dmXl51cJn9MVTRrEqRWSJVXbUUz9t5Po6Xa247Vr0sJn27R4KoKP8QVj1GuH6dB3b6wTPbOamC3dkO18vkQkfZWUdRMDXk0d8AdjB0E0864nOT~J9Fpnd2pQE5uoFT6P0DqtQR2jsFvf9ME61aqLvKPPWpkgdn4z6Zkm-NJOcDz2Nv8Si7hli94E9SghMYRsdjU-knObKvxiagn84FIwcOpepxuG~kFXdD5NfsH0v6Uri3usE3XWD7Pw6P8qVYF39jUIq4OiNMwPnNYzy2N4mDMQdsdHO3LUVh~DEppOy9AAmEoHDjjJxt2BFBbGxfdpZCpENkwvmZeYUyNCCzASqTOOlNzdpne8cuesn3NDXIpNnqEE6Oe5Qm5YOJykrX~Vx~cFFT3QzDGkIjjxlFBsjUJyYkFjBQAEAAcAAA==` {
+		t.Log("Success")
+	} else {
+		t.Errorf("Address of zzz.i2p != \nGKapJ8koUcBj~jmQzHsTYxDg2tpfWj0xjQTzd8BhfC9c3OS5fwPBNajgF-eOD6eCjFTqTlorlh7Hnd8kXj1qblUGXT-tDoR9~YV8dmXl51cJn9MVTRrEqRWSJVXbUUz9t5Po6Xa247Vr0sJn27R4KoKP8QVj1GuH6dB3b6wTPbOamC3dkO18vkQkfZWUdRMDXk0d8AdjB0E0864nOT~J9Fpnd2pQE5uoFT6P0DqtQR2jsFvf9ME61aqLvKPPWpkgdn4z6Zkm-NJOcDz2Nv8Si7hli94E9SghMYRsdjU-knObKvxiagn84FIwcOpepxuG~kFXdD5NfsH0v6Uri3usE3XWD7Pw6P8qVYF39jUIq4OiNMwPnNYzy2N4mDMQdsdHO3LUVh~DEppOy9AAmEoHDjjJxt2BFBbGxfdpZCpENkwvmZeYUyNCCzASqTOOlNzdpne8cuesn3NDXIpNnqEE6Oe5Qm5YOJykrX~Vx~cFFT3QzDGkIjjxlFBsjUJyYkFjBQAEAAcAAA==\n, check to see if it changed, %s", addr)
+	}
+
 	fmt.Println("Address of zzz.i2p:")
 	// Addresses change all the time
 	fmt.Println(addr)
 
 	// Output:
 	//Address of zzz.i2p:
-	//GKapJ8koUcBj~jmQzHsTYxDg2tpfWj0xjQTzd8BhfC9c3OS5fwPBNajgF-eOD6eCjFTqTlorlh7Hnd8kXj1qblUGXT-tDoR9~YV8dmXl51cJn9MVTRrEqRWSJVXbUUz9t5Po6Xa247Vr0sJn27R4KoKP8QVj1GuH6dB3b6wTPbOamC3dkO18vkQkfZWUdRMDXk0d8AdjB0E0864nOT~J9Fpnd2pQE5uoFT6P0DqtQR2jsFvf9ME61aqLvKPPWpkgdn4z6Zkm-NJOcDz2Nv8Si7hli94E9SghMYRsdjU-knObKvxiagn84FIwcOpepxuG~kFXdD5NfsH0v6Uri3usE3uSzpWS0EHmrlfoLr5uGGd9ZHwwCIcgfOATaPRMUEQxiK9q48PS0V3EXXO4-YLT0vIfk4xO~XqZpn8~PW1kFe2mQMHd7oO89yCk-3yizRG3UyFtI7-mO~eCI6-m1spYoigStgoupnC3G85gJkqEjMm49gUjbhfWKWI-6NwTj0ZnAAAA
+	//
 }

options.go

@@ -62,6 +62,32 @@ func SetHost(s string) func(*Client) error {
 	}
 }
 
+func SetSAMMinVersion(i int) func(*Client) error {
+	return func(c *Client) error {
+		if i < 0 {
+			return fmt.Errorf("SAM version must be greater than or equal to 0")
+		}
+		if i > 3 {
+			return fmt.Errorf("SAM version must be less than or equal to 3")
+		}
+		c.sammin = i
+		return nil
+	}
+}
+
+func SetSAMMaxVersion(i int) func(*Client) error {
+	return func(c *Client) error {
+		if i < 0 {
+			return fmt.Errorf("SAM version must be greater than or equal to 0")
+		}
+		if i > 3 {
+			return fmt.Errorf("SAM version must be less than or equal to 3")
+		}
+		c.sammin = i
+		return nil
+	}
+}
+
 //SetLocalDestination sets the local destination of the tunnel from a private
 //key
 func SetLocalDestination(s string) func(*Client) error {
@@ -71,13 +97,6 @@ func SetLocalDestination(s string) func(*Client) error {
 	}
 }
 
-func setlastaddr(s string) func(*Client) error {
-	return func(c *Client) error {
-		c.lastaddr = s
-		return nil
-	}
-}
-
 func setid(s int32) func(*Client) error {
 	return func(c *Client) error {
 		c.id = s
@@ -275,6 +294,15 @@ func SetEncrypt(b bool) func(*Client) error {
 	}
 }
 
+//SetLeaseSetEncType tells the router to use an encrypted leaseset of a specific type.
+//defaults to 4,0
+func SetLeaseSetEncType(b string) func(*Client) error {
+	return func(c *Client) error {
+		c.leaseSetEncType = b
+		return nil
+	}
+}
+
 //SetReduceIdle sets the created tunnels to be reduced during extended idle time to avoid excessive resource usage
 func SetReduceIdle(b bool) func(*Client) error {
 	return func(c *Client) error {
@@ -360,6 +388,12 @@ func SetSignatureType(s string) func(*Client) error {
 
 //return the from port as a string.
 func (c *Client) from() string {
+	if c.fromport == "FROM_PORT=0" {
+		return ""
+	}
+	if c.fromport == "0" {
+		return ""
+	}
 	if c.fromport == "" {
 		return ""
 	}
@@ -368,6 +402,12 @@ func (c *Client) from() string {
 
 //return the to port as a string.
 func (c *Client) to() string {
+	if c.fromport == "TO_PORT=0" {
+		return ""
+	}
+	if c.fromport == "0" {
+		return ""
+	}
 	if c.toport == "" {
 		return ""
 	}
@@ -426,6 +466,13 @@ func (c *Client) encryptlease() string {
 	return " i2cp.encryptLeaseSet=false "
 }
 
+func (c *Client) leasesetenctype() string {
+	if c.encryptLease {
+		return fmt.Sprintf(" i2cp.leaseSetEncType=%s ", c.leaseSetEncType)
+	}
+	return " i2cp.leaseSetEncType=4,0 "
+}
+
 func (c *Client) dontpublishlease() string {
 	if c.dontPublishLease {
 		return " i2cp.dontPublishLeaseSet=true "
@@ -478,6 +525,7 @@ func (c *Client) allOptions() string {
 		c.outbackups() +
 		c.dontpublishlease() +
 		c.encryptlease() +
+		c.leasesetenctype() +
 		c.reduceonidle() +
 		c.reduceidletime() +
 		c.reduceidlecount() +
@@ -498,6 +546,7 @@ func (c *Client) Print() string {
 		c.outbackups() +
 		c.dontpublishlease() +
 		c.encryptlease() +
+		c.leasesetenctype() +
 		c.reduceonidle() +
 		c.reduceidletime() +
 		c.reduceidlecount() +

replyParser.go

@@ -32,6 +32,8 @@ func (r ReplyError) Error() string {
 type Reply struct {
 	Topic string
 	Type  string
+	From  string
+	To    string
 
 	Pairs map[string]string
 }
@@ -42,6 +44,25 @@ func parseReply(line string) (*Reply, error) {
 	if len(parts) < 3 {
 		return nil, fmt.Errorf("Malformed Reply.\n%s\n", line)
 	}
+	preParseReply := func() []string {
+		val := ""
+		quote := false
+		for _, v := range parts {
+			if strings.Contains(v, "=\"") {
+				quote = true
+			}
+			if strings.Contains(v, "\"\n") || strings.Contains(v, "\" ") {
+				quote = false
+			}
+			if quote {
+				val += v + "_"
+			} else {
+				val += v + " "
+			}
+		}
+		return strings.Split(strings.TrimSuffix(strings.TrimSpace(val), "_"), " ")
+	}
+	parts = preParseReply()
 
 	r := &Reply{
 		Topic: parts[0],
@@ -50,14 +71,23 @@ func parseReply(line string) (*Reply, error) {
 	}
 
 	for _, v := range parts[2:] {
-		kvPair := strings.SplitN(v, "=", 2)
-		if kvPair != nil {
-			if len(kvPair) != 2 {
-				return nil, fmt.Errorf("Malformed key-value-pair.\n%s\n", kvPair)
+		if strings.Contains(v, "FROM_PORT") {
+			if v != "FROM_PORT=0" {
+				r.From = v
 			}
+		} else if strings.Contains(v, "TO_PORT") {
+			if v != "TO_PORT=0" {
+				r.To = v
+			}
+		} else {
+			kvPair := strings.SplitN(v, "=", 2)
+			if kvPair != nil {
+				if len(kvPair) != 2 {
+					return nil, fmt.Errorf("Malformed key-value-pair len != 2.\n%s\n", kvPair)
+				}
+			}
+			r.Pairs[kvPair[0]] = kvPair[len(kvPair)-1]
 		}
-
-		r.Pairs[kvPair[0]] = kvPair[len(kvPair)-1]
 	}
 
 	return r, nil

samsocks/main.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"flag"
+
+	"github.com/eyedeekay/goSam"
+	"github.com/getlantern/go-socks5"
+	"log"
+)
+
+var (
+	samaddr   = flag.String("sam", "127.0.0.1:7656", "SAM API address to use")
+	socksaddr = flag.String("socks", "127.0.0.1:7675", "SOCKS address to use")
+)
+
+func main() {
+	sam, err := goSam.NewClient(*samaddr)
+	if err != nil {
+		panic(err)
+	}
+	log.Println("Client Created")
+
+	// create a transport that uses SAM to dial TCP Connections
+	conf := &socks5.Config{
+		Dial:     sam.DialContext,
+		Resolver: sam,
+	}
+	server, err := socks5.New(conf)
+	if err != nil {
+		panic(err)
+	}
+
+	// Create SOCKS5 proxy on localhost port 8000
+	if err := server.ListenAndServe("tcp", *socksaddr); err != nil {
+		panic(err)
+	}
+}

sessions.go

@@ -19,11 +19,11 @@ func (c *Client) CreateStreamSession(id int32, dest string) (string, error) {
 	}
 	c.id = id
 	r, err := c.sendCmd(
-		"SESSION CREATE STYLE=STREAM ID=%d %s %s DESTINATION=%s %s %s\n",
+		"SESSION CREATE STYLE=STREAM ID=%d DESTINATION=%s %s %s %s %s \n",
 		c.id,
+		dest,
 		c.from(),
 		c.to(),
-		dest,
 		c.sigtype(),
 		c.allOptions(),
 	)
@@ -33,7 +33,7 @@ func (c *Client) CreateStreamSession(id int32, dest string) (string, error) {
 
 	// TODO: move check into sendCmd()
 	if r.Topic != "SESSION" || r.Type != "STATUS" {
-		return "", fmt.Errorf("Unknown Reply: %+v\n", r)
+		return "", fmt.Errorf("Session Unknown Reply: %+v\n", r)
 	}
 
 	result := r.Pairs["RESULT"]

stream.go

@@ -6,14 +6,17 @@ import (
 
 // StreamConnect asks SAM for a TCP-Like connection to dest, has to be called on a new Client
 func (c *Client) StreamConnect(id int32, dest string) error {
-	r, err := c.sendCmd("STREAM CONNECT ID=%d %s %s DESTINATION=%s\n", id, c.from(), c.to(), dest)
+	if dest == "" {
+		return nil
+	}
+	r, err := c.sendCmd("STREAM CONNECT ID=%d DESTINATION=%s %s %s\n", id, dest, c.from(), c.to())
 	if err != nil {
 		return err
 	}
 
 	// TODO: move check into sendCmd()
 	if r.Topic != "STREAM" || r.Type != "STATUS" {
-		return fmt.Errorf("Unknown Reply: %+v\n", r)
+		return fmt.Errorf("Stream Connect Unknown Reply: %+v\n", r)
 	}
 
 	result := r.Pairs["RESULT"]
@@ -33,7 +36,7 @@ func (c *Client) StreamAccept(id int32) (*Reply, error) {
 
 	// TODO: move check into sendCmd()
 	if r.Topic != "STREAM" || r.Type != "STATUS" {
-		return nil, fmt.Errorf("Unknown Reply: %+v\n", r)
+		return nil, fmt.Errorf("Stream Accept Unknown Reply: %+v\n", r)
 	}
 
 	result := r.Pairs["RESULT"]