dan
/
go-ricochet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding Hidden Service Resolution 

New option to use either hidden service address or localhost
address for who to connect to.
This commit is contained in:
Sarah Jamie Lewis 2015-10-15 23:03:36 -07:00
parent 1d50af7c5f
commit 42f64e94df
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ricochet.go
View File

@ -15,10 +15,12 @@ import (
"github.com/s-rah/go-ricochet/chat" "github.com/s-rah/go-ricochet/chat"
"github.com/s-rah/go-ricochet/contact" "github.com/s-rah/go-ricochet/contact"
"github.com/s-rah/go-ricochet/control" "github.com/s-rah/go-ricochet/control"
"h12.me/socks"
"io/ioutil" "io/ioutil"
"log" "log"
"net" "net"
"os" "os"
"strings"
) )
// Ricochet is a protocol to conducting anonymous IM. // Ricochet is a protocol to conducting anonymous IM.
@ -115,25 +117,34 @@ func (r *Ricochet) constructProtocol(data []byte, channel int) []byte {
// both ricochet formated hostnames e.g. qn6uo4cmsrfv4kzq.onion. If this // both ricochet formated hostnames e.g. qn6uo4cmsrfv4kzq.onion. If this
// function finished successfully then the connection can be assumed to // function finished successfully then the connection can be assumed to
// be open and authenticated. // be open and authenticated.
// To specify a local port using the format "127.0.0.1:[port]|ricochet-id" for
// to
func (r *Ricochet) Connect(from string, to string) error { func (r *Ricochet) Connect(from string, to string) error {
// TODO: In the future we will want the ability to connect if strings.HasPrefix(to, "127.0.0.1") {
// through Tor to a hidden service address. This works if toAddr := strings.Split(to, "|")
// you uncomment this, but is slower for testing purposes tcpAddr, err := net.ResolveTCPAddr("tcp", toAddr[0])
// dialSocksProxy := socks.DialSocksProxy(socks.SOCKS5, "127.0.0.1:9050") if err != nil {
//return dialSocksProxy("", "qn6uo4cmsrfv4kzq.onion:9878") r.logger.Fatal("Cannot Resolve TCP Address ", err)
return errors.New("Cannot Resolve Local TCP Address")
// TODO: For now hardcoding port numbers, these change }
// on startup so need to be reset every time. r.conn, err = net.DialTCP("tcp", nil, tcpAddr)
tcpAddr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:43978") if err != nil {
if err != nil { r.logger.Fatal("Cannot Dial TCP Address ", err)
r.logger.Fatal("Cannot Resolve TCP Address ", err) return errors.New("Cannot Dial Local TCP Address")
return err }
} r.logger.Print("Connected to " + to + " as " + toAddr[1])
r.conn, err = net.DialTCP("tcp", nil, tcpAddr) to = toAddr[1]
if err != nil { } else {
r.logger.Fatal("Cannot Dial TCP Address ", err) dialSocksProxy := socks.DialSocksProxy(socks.SOCKS5, "127.0.0.1:9050")
return err r.logger.Print("Connecting to ", to+".onion:9878")
conn, err := dialSocksProxy("", to+".onion:9878")
if err != nil {
r.logger.Fatal("Cannot Dial Remove Address ", err)
return errors.New("Cannot Dial Remote Ricochet Address")
}
r.conn = conn
r.logger.Print("Connected to ", to+".onion:9878")
} }
r.negotiateVersion() r.negotiateVersion()
@ -143,7 +154,7 @@ func (r *Ricochet) Connect(from string, to string) error {
ChannelIdentifier: proto.Int32(1), ChannelIdentifier: proto.Int32(1),
ChannelType: proto.String("im.ricochet.auth.hidden-service"), ChannelType: proto.String("im.ricochet.auth.hidden-service"),
} }
err = proto.SetExtension(oc, Protocol_Data_AuthHiddenService.E_ClientCookie, []byte("0000000000000000")) err := proto.SetExtension(oc, Protocol_Data_AuthHiddenService.E_ClientCookie, []byte("0000000000000000"))
pc := &Protocol_Data_Control.Packet{ pc := &Protocol_Data_Control.Packet{
OpenChannel: oc, OpenChannel: oc,
} }