Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable real forwarding for wireguard service #596

Merged
merged 3 commits into from Dec 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions services/wireguard/service/service.go
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/mysteriumnetwork/node/core/location"
"github.com/mysteriumnetwork/node/identity"
"github.com/mysteriumnetwork/node/money"
"github.com/mysteriumnetwork/node/nat"
dto_discovery "github.com/mysteriumnetwork/node/service_discovery/dto"
wg "github.com/mysteriumnetwork/node/services/wireguard"
"github.com/mysteriumnetwork/node/services/wireguard/endpoint"
Expand All @@ -39,6 +40,7 @@ func NewManager(locationResolver location.Resolver, ipResolver ip.Resolver, conn
locationResolver: locationResolver,
ipResolver: ipResolver,
connectionEndpoint: connectionEndpoint,
natService: nat.NewService(),
}
}

Expand All @@ -48,13 +50,30 @@ type Manager struct {
ipResolver ip.Resolver
connectionEndpoint wg.ConnectionEndpoint
wg sync.WaitGroup
natService nat.NATService
}

// Start starts service - does not block
func (manager *Manager) Start(providerID identity.Identity) (dto_discovery.ServiceProposal, session.ConfigProvider, error) {
if err := manager.connectionEndpoint.Start(nil); err != nil {
return dto_discovery.ServiceProposal{}, nil, err
}
config, err := manager.connectionEndpoint.Config()
if err != nil {
return dto_discovery.ServiceProposal{}, nil, err
}

outboundIP, err := manager.ipResolver.GetOutboundIP()
if err != nil {
return dto_discovery.ServiceProposal{}, nil, err
}
manager.natService.Add(nat.RuleForwarding{
SourceAddress: config.Subnet.String(),
TargetIP: outboundIP,
})
if err := manager.natService.Start(); err != nil {
return dto_discovery.ServiceProposal{}, nil, err
}

sessionConfigProvider := func() (session.ServiceConfiguration, error) {
privateKey, err := endpoint.GeneratePrivateKey()
Expand Down Expand Up @@ -116,6 +135,7 @@ func (manager *Manager) Wait() error {
// Stop stops service.
func (manager *Manager) Stop() error {
manager.wg.Done()
manager.natService.Stop()
if err := manager.connectionEndpoint.Stop(); err != nil {
return err
}
Expand Down
28 changes: 23 additions & 5 deletions services/wireguard/service/service_test.go
Expand Up @@ -23,9 +23,12 @@ import (
"testing"
"time"

"github.com/mysteriumnetwork/node/core/ip"
"github.com/mysteriumnetwork/node/core/location"
"github.com/mysteriumnetwork/node/core/service"
"github.com/mysteriumnetwork/node/identity"
"github.com/mysteriumnetwork/node/money"
"github.com/mysteriumnetwork/node/nat"
dto_discovery "github.com/mysteriumnetwork/node/service_discovery/dto"
wg "github.com/mysteriumnetwork/node/services/wireguard"
"github.com/stretchr/testify/assert"
Expand All @@ -48,7 +51,7 @@ var ipresolverStub = &fakeIPResolver{
var connectionEndpointStub = &fakeConnectionEndpoint{}

func Test_Manager_Start(t *testing.T) {
manager := NewManager(locationResolverStub, ipresolverStub, connectionEndpointStub)
manager := newManagerStub(locationResolverStub, ipresolverStub)
proposal, sessionConfigProvider, err := manager.Start(providerID)
assert.NoError(t, err)
assert.Exactly(
Expand Down Expand Up @@ -79,7 +82,7 @@ func Test_Manager_Start_IPResolverErrs(t *testing.T) {
publicIPRes: "127.0.0.1",
publicErr: fakeErr,
}
manager := NewManager(locationResolverStub, ipResStub, connectionEndpointStub)
manager := newManagerStub(locationResolverStub, ipResStub)
_, _, err := manager.Start(providerID)
assert.Equal(t, fakeErr, err)
}
Expand All @@ -90,14 +93,14 @@ func Test_Manager_Start_LocResolverErrs(t *testing.T) {
res: "LT",
err: fakeErr,
}
manager := NewManager(locResStub, ipresolverStub, connectionEndpointStub)
manager := newManagerStub(locResStub, ipresolverStub)

_, _, err := manager.Start(providerID)
assert.Equal(t, fakeErr, err)
}

func Test_Manager_Wait(t *testing.T) {
manager := NewManager(locationResolverStub, ipresolverStub, connectionEndpointStub)
manager := newManagerStub(locationResolverStub, ipresolverStub)

manager.Start(providerID)
go func() {
Expand All @@ -108,7 +111,7 @@ func Test_Manager_Wait(t *testing.T) {
}

func Test_Manager_Stop(t *testing.T) {
manager := NewManager(locationResolverStub, ipresolverStub, connectionEndpointStub)
manager := newManagerStub(locationResolverStub, ipresolverStub)
manager.Start(providerID)

err := manager.Stop()
Expand Down Expand Up @@ -154,3 +157,18 @@ func (fce *fakeConnectionEndpoint) Stop() error { ret
func (fce *fakeConnectionEndpoint) Start(_ *wg.ServiceConfig) error { return nil }
func (fce *fakeConnectionEndpoint) Config() (wg.ServiceConfig, error) { return wg.ServiceConfig{}, nil }
func (fce *fakeConnectionEndpoint) AddPeer(_ string, _ *net.UDPAddr) error { return nil }

func newManagerStub(locationResolver location.Resolver, ipResolver ip.Resolver) *Manager {
return &Manager{
locationResolver: locationResolver,
ipResolver: ipResolver,
connectionEndpoint: connectionEndpointStub,
natService: &serviceFake{},
}
}

type serviceFake struct{}

func (service *serviceFake) Add(rule nat.RuleForwarding) {}
func (service *serviceFake) Start() error { return nil }
func (service *serviceFake) Stop() {}