MYST-41 Session generation and exchange

cmd/mysterium_client/command_run/command.go

@@ -8,6 +8,8 @@ import (
 	dto_discovery "github.com/mysterium/node/service_discovery/dto"
 	"io"
 	"time"
+	"encoding/json"
+	vpn_session "github.com/mysterium/node/openvpn/session"
 )
 
 type CommandRun struct {
@@ -38,13 +40,13 @@ func (cmd *CommandRun) Run(options CommandOptions) (err error) {
 		return err
 	}
 
-	vpnConfigString, err := sender.Request(communication.GET_CONNECTION_CONFIG, "")
+	vpnSession, err := getVpnSession(sender, string(proposal.Id))
 	if err != nil {
 		return err
 	}
 
 	vpnConfig, err := openvpn.NewClientConfigFromString(
-		vpnConfigString,
+		vpnSession.Config,
 		options.DirectoryRuntime+"/client.ovpn",
 	)
 	if err != nil {
@@ -75,3 +77,14 @@ func (cmd *CommandRun) Kill() {
 	cmd.communicationClient.Stop()
 	cmd.vpnClient.Stop()
 }
+
+func getVpnSession(sender communication.Sender, proposalId string) (session vpn_session.VpnSession, err error) {
+	sessionJson, err := sender.Request(communication.SESSION_CREATE, proposalId)
+	if err != nil {
+		return
+	}
+
+	err = json.Unmarshal([]byte(sessionJson), &session)
+
+	return
+}

cmd/mysterium_server/command_run/command.go

@@ -12,6 +12,8 @@ import (
 	dto_discovery "github.com/mysterium/node/service_discovery/dto"
 	"io"
 	"time"
+	vpn_session "github.com/mysterium/node/openvpn/session"
+	"encoding/json"
 )
 
 type CommandRun struct {
@@ -46,9 +48,23 @@ func (cmd *CommandRun) Run(options CommandOptions) (err error) {
 	}
 
 	handleDialog := func(sender communication.Sender, receiver communication.Receiver) {
-		receiver.Respond(communication.GET_CONNECTION_CONFIG, func(request string) (response string) {
-			config, _ := buildVpnClientConfig(vpnServerIp, options.DirectoryConfig)
-			return config
+		receiver.Respond(communication.SESSION_CREATE, func(proposalId string) (response string) {
+			config, err := buildVpnClientConfig(vpnServerIp, options.DirectoryConfig)
+			if err != nil {
+				return "Failed to create VPN config."
+			}
+
+			vpnSession := vpn_session.NewVpnSession(config)
+			if err != nil {
+				return "Failed to create session."
+			}
+
+			session, err := json.Marshal(vpnSession)
+			if err != nil {
+				return "Failed to serialize VPN session."
+			}
+
+			return string(session)
 		})
 	}
 

communication/message_types.go

@@ -2,6 +2,6 @@ package communication
 
 const (
 	// Client is trying to establish new dialog with Node
-	DIALOG_CREATE         = RequestType("dialog-create")
-	GET_CONNECTION_CONFIG = RequestType("get-connection-config")
+	DIALOG_CREATE  = RequestType("dialog-create")
+	SESSION_CREATE = RequestType("session-create")
 )

glide.yaml

@@ -4,6 +4,8 @@ import:
   version: ^2.6.0
 - package: github.com/nats-io/go-nats
   version: ^1.3.0
+- package: github.com/satori/go.uuid
+  version: ~1.1.0
 testImport:
 - package: github.com/stretchr/testify
   subpackages:

openvpn/session/factory.go

@@ -0,0 +1,18 @@
+package session
+
+import (
+	node_session "github.com/mysterium/node/session"
+)
+
+var manager node_session.Manager
+
+func NewVpnSession(config string) (session VpnSession) {
+	id := manager.Create()
+
+	session = VpnSession{
+		Id:     id,
+		Config: config,
+	}
+
+	return
+}

openvpn/session/session.go

@@ -0,0 +1,8 @@
+package session
+
+import "github.com/mysterium/node/session"
+
+type VpnSession struct {
+	Id     session.SessionId `json:"id"`
+	Config string            `json:"config"`
+}

session/generate.go

@@ -0,0 +1,13 @@
+package session
+
+import (
+	"github.com/satori/go.uuid"
+)
+
+type SessionId string
+
+func GenerateSessionId() (sid SessionId) {
+	sid = SessionId(uuid.NewV4().String())
+
+	return
+}

session/generate_test.go

@@ -0,0 +1,12 @@
+package session
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSessionIdLength(t *testing.T) {
+	sid := GenerateSessionId()
+
+	assert.Len(t, sid, 36)
+}

session/manager.go

@@ -0,0 +1,13 @@
+package session
+
+type Manager struct {
+	Sessions []SessionId
+}
+
+func (manager *Manager) Create() (sid SessionId) {
+	sid = GenerateSessionId()
+
+	manager.Sessions = append(manager.Sessions, sid)
+
+	return sid
+}

session/manager_test.go

@@ -0,0 +1,17 @@
+package session
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestManagerHasSessionsStored(t *testing.T) {
+	manager := Manager{}
+	length := 10
+
+	for i := 0; i < length; i++ {
+		manager.Create()
+	}
+
+	assert.Len(t, manager.Sessions, length)
+}