Sarah Jamie Lewis
5 years ago
20 changed files with 380 additions and 170 deletions
-
23application/acceptallcontactmanager.go
-
124application/application.go
-
11application/contactmanagerinterface.go
-
31application/examples/echobot/main.go
-
25application/ricochetonion.go
-
1channels/channel.go
-
14channels/contactrequestchannel.go
-
20channels/hiddenserviceauthchannel.go
-
2connection/autoconnectionhandler.go
-
12connection/channelmanager.go
-
58connection/connection.go
-
7connection/inboundconnectionhandler.go
-
11connection/outboundconnectionhandler.go
-
2examples/echobot/main.go
-
68ricochet.go
-
92ricochet_test.go
-
7utils/crypto.go
-
17utils/error.go
-
12utils/networking.go
-
13utils/networkresolver.go
@ -0,0 +1,23 @@ |
|||
package application |
|||
|
|||
import ( |
|||
"crypto/rsa" |
|||
) |
|||
|
|||
// AcceptAllContactManager implements the contact manager interface an presumes
|
|||
// all connections are allowed.
|
|||
type AcceptAllContactManager struct { |
|||
} |
|||
|
|||
// LookupContact returns that a contact is known and allowed to communicate for all cases.
|
|||
func (aacm *AcceptAllContactManager) LookupContact(hostname string, publicKey rsa.PublicKey) (allowed, known bool) { |
|||
return true, true |
|||
} |
|||
|
|||
func (aacm *AcceptAllContactManager) GetContactDetails() (string, string) { |
|||
return "", "" |
|||
} |
|||
|
|||
func (aacm *AcceptAllContactManager) ContactRequest(name string, message string) string { |
|||
return "Accepted" |
|||
} |
|||
@ -1,36 +1,134 @@ |
|||
package application |
|||
|
|||
import ( |
|||
"errors" |
|||
"crypto/rsa" |
|||
"github.com/s-rah/go-ricochet" |
|||
"github.com/s-rah/go-ricochet/channels" |
|||
"github.com/s-rah/go-ricochet/connection" |
|||
"log" |
|||
"net" |
|||
"time" |
|||
) |
|||
|
|||
// RicochetApplication bundles many useful constructs that are
|
|||
// likely standard in a ricochet application
|
|||
type RicochetApplication struct { |
|||
connection *connection.Connection |
|||
contactManager ContactManagerInterface |
|||
privateKey *rsa.PrivateKey |
|||
chatMessageHandler func(*RicochetApplicationInstance, uint32, time.Time, string) |
|||
chatMessageAckHandler func(*RicochetApplicationInstance, uint32) |
|||
} |
|||
|
|||
// NewRicochetApplication ...
|
|||
func NewRicochetApplication(connection *connection.Connection) *RicochetApplication { |
|||
ra := new(RicochetApplication) |
|||
ra.connection = connection |
|||
return ra |
|||
type RicochetApplicationInstance struct { |
|||
connection.AutoConnectionHandler |
|||
connection *connection.Connection |
|||
RemoteHostname string |
|||
ChatMessageHandler func(*RicochetApplicationInstance, uint32, time.Time, string) |
|||
ChatMessageAckHandler func(*RicochetApplicationInstance, uint32) |
|||
} |
|||
|
|||
// SendMessage ...
|
|||
func (ra *RicochetApplication) SendChatMessage(message string) error { |
|||
return ra.connection.Do(func() error { |
|||
channel := ra.connection.Channel("im.ricochet.chat", channels.Outbound) |
|||
func (rai *RicochetApplicationInstance) GetContactDetails() (string, string) { |
|||
return "EchoBot", "I LIVE 😈😈!!!!" |
|||
} |
|||
|
|||
func (rai *RicochetApplicationInstance) ContactRequest(name string, message string) string { |
|||
return "Accepted" |
|||
} |
|||
|
|||
func (rai *RicochetApplicationInstance) ContactRequestRejected() { |
|||
} |
|||
func (rai *RicochetApplicationInstance) ContactRequestAccepted() { |
|||
} |
|||
func (rai *RicochetApplicationInstance) ContactRequestError() { |
|||
} |
|||
|
|||
func (rai *RicochetApplicationInstance) SendChatMessage(message string) { |
|||
|
|||
// Technically this errors afte the second time but we can ignore it.
|
|||
rai.connection.RequestOpenChannel("im.ricochet.chat", rai) |
|||
|
|||
rai.connection.Do(func() error { |
|||
channel := rai.connection.Channel("im.ricochet.chat", channels.Outbound) |
|||
if channel != nil { |
|||
chatchannel, ok := (*channel.Handler).(*channels.ChatChannel) |
|||
if ok { |
|||
chatchannel.SendMessage(message) |
|||
} |
|||
} else { |
|||
return errors.New("") |
|||
} |
|||
return nil |
|||
}) |
|||
} |
|||
|
|||
func (rai *RicochetApplicationInstance) ChatMessage(messageID uint32, when time.Time, message string) bool { |
|||
go rai.ChatMessageHandler(rai, messageID, when, message) |
|||
return true |
|||
} |
|||
|
|||
func (rai *RicochetApplicationInstance) ChatMessageAck(messageID uint32) { |
|||
rai.ChatMessageAckHandler(rai, messageID) |
|||
} |
|||
|
|||
func (ra *RicochetApplication) Init(pk *rsa.PrivateKey, cm ContactManagerInterface) { |
|||
ra.privateKey = pk |
|||
ra.contactManager = cm |
|||
ra.chatMessageHandler = func(*RicochetApplicationInstance, uint32, time.Time, string) {} |
|||
ra.chatMessageAckHandler = func(*RicochetApplicationInstance, uint32) {} |
|||
} |
|||
|
|||
func (ra *RicochetApplication) OnChatMessage(call func(*RicochetApplicationInstance, uint32, time.Time, string)) { |
|||
ra.chatMessageHandler = call |
|||
} |
|||
|
|||
func (ra *RicochetApplication) OnChatMessageAck(call func(*RicochetApplicationInstance, uint32)) { |
|||
ra.chatMessageAckHandler = call |
|||
} |
|||
|
|||
func (ra *RicochetApplication) handleConnection(conn net.Conn) { |
|||
rc, err := goricochet.NegotiateVersionInbound(conn) |
|||
if err != nil { |
|||
log.Printf("There was an error") |
|||
conn.Close() |
|||
return |
|||
} |
|||
|
|||
ich := connection.HandleInboundConnection(rc) |
|||
|
|||
err = ich.ProcessAuthAsServer(ra.privateKey, ra.contactManager.LookupContact) |
|||
if err != nil { |
|||
log.Printf("There was an error") |
|||
conn.Close() |
|||
return |
|||
} |
|||
|
|||
rai := new(RicochetApplicationInstance) |
|||
rai.Init(ra.privateKey, "") |
|||
rai.RemoteHostname = rc.RemoteHostname |
|||
rai.connection = rc |
|||
rai.ChatMessageHandler = ra.chatMessageHandler |
|||
rai.ChatMessageAckHandler = ra.chatMessageAckHandler |
|||
|
|||
rai.RegisterChannelHandler("im.ricochet.contact.request", func() channels.Handler { |
|||
contact := new(channels.ContactRequestChannel) |
|||
contact.Handler = rai |
|||
return contact |
|||
}) |
|||
rai.RegisterChannelHandler("im.ricochet.chat", func() channels.Handler { |
|||
chat := new(channels.ChatChannel) |
|||
chat.Handler = rai |
|||
return chat |
|||
}) |
|||
rc.Process(rai) |
|||
} |
|||
|
|||
func (ra *RicochetApplication) Run(l net.Listener) { |
|||
if ra.privateKey == nil || ra.contactManager == nil { |
|||
return |
|||
} |
|||
|
|||
for { |
|||
conn, err := l.Accept() |
|||
if err == nil { |
|||
go ra.handleConnection(conn) |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
package application |
|||
|
|||
import ( |
|||
"crypto/rsa" |
|||
) |
|||
|
|||
// ContactManagerInterface provides a mechanism for autonous applications
|
|||
// to make decisions on what connections to accept or reject.
|
|||
type ContactManagerInterface interface { |
|||
LookupContact(hostname string, publicKey rsa.PublicKey) (allowed, known bool) |
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
package main |
|||
|
|||
import ( |
|||
"github.com/s-rah/go-ricochet/application" |
|||
"github.com/s-rah/go-ricochet/utils" |
|||
"log" |
|||
"time" |
|||
) |
|||
|
|||
func main() { |
|||
echobot := new(application.RicochetApplication) |
|||
pk, err := utils.LoadPrivateKeyFromFile("./testing/private_key") |
|||
|
|||
if err != nil { |
|||
log.Fatalf("error reading private key file: %v", err) |
|||
} |
|||
|
|||
l, err := application.SetupOnion("127.0.0.1:9051", "", pk, 9878) |
|||
|
|||
if err != nil { |
|||
log.Fatalf("error setting up onion service: %v", err) |
|||
} |
|||
|
|||
echobot.Init(pk, new(application.AcceptAllContactManager)) |
|||
echobot.OnChatMessage(func(rai *application.RicochetApplicationInstance, id uint32, timestamp time.Time, message string) { |
|||
log.Printf("message from %v - %v", rai.RemoteHostname, message) |
|||
rai.SendChatMessage(message) |
|||
}) |
|||
log.Printf("echobot listening on %s", l.Addr().String()) |
|||
echobot.Run(l) |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package application |
|||
|
|||
import ( |
|||
"crypto/rsa" |
|||
"github.com/yawning/bulb" |
|||
"net" |
|||
) |
|||
|
|||
func SetupOnion(proxyServer string, authentication string, pk *rsa.PrivateKey, onionport uint16) (net.Listener, error) { |
|||
c, err := bulb.Dial("tcp4", proxyServer) |
|||
if err != nil { |
|||
return nil, err |
|||
} |
|||
|
|||
if err := c.Authenticate(authentication); err != nil { |
|||
return nil, err |
|||
} |
|||
|
|||
cfg := &bulb.NewOnionConfig{ |
|||
DiscardPK: true, |
|||
PrivateKey: pk, |
|||
} |
|||
|
|||
return c.NewListener(cfg, onionport) |
|||
} |
|||
@ -1,70 +1,68 @@ |
|||
package goricochet |
|||
|
|||
import ( |
|||
"testing" |
|||
"github.com/s-rah/go-ricochet/utils" |
|||
"net" |
|||
"time" |
|||
"github.com/s-rah/go-ricochet/utils" |
|||
"net" |
|||
"testing" |
|||
"time" |
|||
) |
|||
|
|||
|
|||
func SimpleServer() { |
|||
ln,_ := net.Listen("tcp", "127.0.0.1:11000") |
|||
conn,_ := ln.Accept() |
|||
b := make([]byte, 4) |
|||
n,err := conn.Read(b) |
|||
if n == 4 && err == nil { |
|||
conn.Write([]byte{0x01}) |
|||
} |
|||
conn.Close() |
|||
ln, _ := net.Listen("tcp", "127.0.0.1:11000") |
|||
conn, _ := ln.Accept() |
|||
b := make([]byte, 4) |
|||
n, err := conn.Read(b) |
|||
if n == 4 && err == nil { |
|||
conn.Write([]byte{0x01}) |
|||
} |
|||
conn.Close() |
|||
} |
|||
|
|||
func BadVersionNegotiation() { |
|||
ln,_ := net.Listen("tcp", "127.0.0.1:11001") |
|||
conn,_ := ln.Accept() |
|||
// We are already testing negotiation bytes, we don't care, just send a termination.
|
|||
conn.Write([]byte{0x00}) |
|||
conn.Close() |
|||
ln, _ := net.Listen("tcp", "127.0.0.1:11001") |
|||
conn, _ := ln.Accept() |
|||
// We are already testing negotiation bytes, we don't care, just send a termination.
|
|||
conn.Write([]byte{0x00}) |
|||
conn.Close() |
|||
} |
|||
|
|||
func NotRicochetServer() { |
|||
ln,_ := net.Listen("tcp", "127.0.0.1:11002") |
|||
conn,_ := ln.Accept() |
|||
conn.Close() |
|||
ln, _ := net.Listen("tcp", "127.0.0.1:11002") |
|||
conn, _ := ln.Accept() |
|||
conn.Close() |
|||
} |
|||
|
|||
func TestRicochet(t *testing.T) { |
|||
go SimpleServer() |
|||
// Wait for Server to Initialize
|
|||
time.Sleep(time.Second) |
|||
go SimpleServer() |
|||
// Wait for Server to Initialize
|
|||
time.Sleep(time.Second) |
|||
|
|||
rc,err := Open("127.0.0.1:11000|abcdefghijklmno.onion") |
|||
if err == nil { |
|||
if rc.IsInbound { |
|||
t.Errorf("RicochetConnection declares itself as an Inbound connection after an Outbound attempt...that shouldn't happen") |
|||
} |
|||
return |
|||
} |
|||
t.Errorf("RicochetProtocol: Open Failed: %v", err) |
|||
rc, err := Open("127.0.0.1:11000|abcdefghijklmno.onion") |
|||
if err == nil { |
|||
if rc.IsInbound { |
|||
t.Errorf("RicochetConnection declares itself as an Inbound connection after an Outbound attempt...that shouldn't happen") |
|||
} |
|||
return |
|||
} |
|||
t.Errorf("RicochetProtocol: Open Failed: %v", err) |
|||
} |
|||
|
|||
func TestBadVersionNegotiation(t*testing.T) { |
|||
go BadVersionNegotiation() |
|||
time.Sleep(time.Second) |
|||
func TestBadVersionNegotiation(t *testing.T) { |
|||
go BadVersionNegotiation() |
|||
time.Sleep(time.Second) |
|||
|
|||
_,err := Open("127.0.0.1:11001|abcdefghijklmno.onion") |
|||
if err != utils.VersionNegotiationFailed { |
|||
t.Errorf("RicochetProtocol: Server Had No Correct Version - Should Have Failed: err = %v", err) |
|||
} |
|||
_, err := Open("127.0.0.1:11001|abcdefghijklmno.onion") |
|||
if err != utils.VersionNegotiationFailed { |
|||
t.Errorf("RicochetProtocol: Server Had No Correct Version - Should Have Failed: err = %v", err) |
|||
} |
|||
} |
|||
|
|||
func TestNotARicochetServer(t *testing.T) { |
|||
go NotRicochetServer() |
|||
time.Sleep(time.Second) |
|||
|
|||
func TestNotARicochetServer(t*testing.T) { |
|||
go NotRicochetServer() |
|||
time.Sleep(time.Second) |
|||
|
|||
_,err := Open("127.0.0.1:11002|abcdefghijklmno.onion") |
|||
if err != utils.VersionNegotiationError { |
|||
t.Errorf("RicochetProtocol: Server Had No Correct Version - Should Have Failed: err = %v", err) |
|||
} |
|||
_, err := Open("127.0.0.1:11002|abcdefghijklmno.onion") |
|||
if err != utils.VersionNegotiationError { |
|||
t.Errorf("RicochetProtocol: Server Had No Correct Version - Should Have Failed: err = %v", err) |
|||
} |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue