refactor memorystorage, add goroutine for logratation)

in4it · Sep 9, 2024 · 81ce9d5 · 81ce9d5
1 parent bdff757
commit 81ce9d5
Show file tree

Hide file tree

Showing 18 changed files with 229 additions and 151 deletions.
diff --git a/pkg/auth/oidc/store/discovery_test.go b/pkg/auth/oidc/store/discovery_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/in4it/wireguard-server/pkg/auth/oidc"
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 )
 
 func TestGetDiscovery(t *testing.T) {
@@ -27,7 +27,7 @@ func TestGetDiscovery(t *testing.T) {
 	}))
 	defer ts.Close()
 
-	store, err := NewStore(&testingmocks.MockMemoryStorage{})
+	store, err := NewStore(&memorystorage.MockMemoryStorage{})
 	if err != nil {
 		t.Fatalf("new store error: %s", err)
 	}

diff --git a/pkg/auth/oidc/store/jwks_test.go b/pkg/auth/oidc/store/jwks_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/in4it/wireguard-server/pkg/auth/oidc"
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 )
 
 func TestGetJwks(t *testing.T) {
@@ -32,7 +32,7 @@ func TestGetJwks(t *testing.T) {
 	}))
 	defer ts.Close()
 
-	store, err := NewStore(&testingmocks.MockMemoryStorage{})
+	store, err := NewStore(&memorystorage.MockMemoryStorage{})
 	if err != nil {
 		t.Fatalf("new store error: %s", err)
 	}

diff --git a/pkg/auth/oidc/store/save_test.go b/pkg/auth/oidc/store/save_test.go
@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	"github.com/in4it/wireguard-server/pkg/auth/oidc"
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 )
 
 func TestSave(t *testing.T) {
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 	store, err := NewStore(storage)
 	if err != nil {
 		t.Fatalf("error: %s", err)

diff --git a/pkg/auth/provisioning/scim/users_test.go b/pkg/auth/provisioning/scim/users_test.go
@@ -11,15 +11,15 @@ import (
 	"path"
 	"testing"
 
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 	"github.com/in4it/wireguard-server/pkg/users"
 	"github.com/in4it/wireguard-server/pkg/wireguard"
 )
 
 const USERSTORE_MAX_USERS = 1000
 
 func TestUsersGetCount100EmptyResult(t *testing.T) {
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 
 	userStore, err := users.NewUserStore(storage, USERSTORE_MAX_USERS)
 	if err != nil {
@@ -48,7 +48,7 @@ func TestUsersGetCount100EmptyResult(t *testing.T) {
 }
 
 func TestUsersGetCount10(t *testing.T) {
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 	userStore, err := users.NewUserStore(storage, USERSTORE_MAX_USERS)
 	if err != nil {
 		t.Fatalf("cannot create new user store")
@@ -88,7 +88,7 @@ func TestUsersGetCount10(t *testing.T) {
 func TestUsersGetCount10Start5(t *testing.T) {
 	count := 10
 	start := 5
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 	userStore, err := users.NewUserStore(storage, USERSTORE_MAX_USERS)
 	if err != nil {
 		t.Fatalf("cannot create new user store")
@@ -138,12 +138,12 @@ func TestUsersGetCount10Start5(t *testing.T) {
 }
 
 func TestUsersGetNonExistentUser(t *testing.T) {
-	userStore, err := users.NewUserStore(&testingmocks.MockMemoryStorage{}, USERSTORE_MAX_USERS)
+	userStore, err := users.NewUserStore(&memorystorage.MockMemoryStorage{}, USERSTORE_MAX_USERS)
 	if err != nil {
 		t.Fatalf("cannot create new user stoer")
 	}
 
-	s := New(&testingmocks.MockMemoryStorage{}, userStore, "token")
+	s := New(&memorystorage.MockMemoryStorage{}, userStore, "token")
 	req := httptest.NewRequest("GET", "http://example.com/api/scim/v2/Users?filter=userName+eq+%22ward%40in4it.io%22&", nil)
 	w := httptest.NewRecorder()
 	s.getUsersHandler(w, req)
@@ -161,7 +161,7 @@ func TestUsersGetNonExistentUser(t *testing.T) {
 }
 
 func TestAddUser(t *testing.T) {
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 	userStore, err := users.NewUserStore(storage, USERSTORE_MAX_USERS)
 	if err != nil {
 		t.Fatalf("cannot create new user store: %s", err)
@@ -208,7 +208,7 @@ func TestAddUser(t *testing.T) {
 }
 
 func TestCreateUserConnectionDeleteUserFlow(t *testing.T) {
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 	userStore, err := users.NewUserStore(storage, USERSTORE_MAX_USERS)
 	if err != nil {
 		t.Fatalf("cannot create new user store: %s", err)
@@ -328,7 +328,7 @@ func TestCreateUserConnectionDeleteUserFlow(t *testing.T) {
 	}
 }
 func TestCreateUserConnectionSuspendUserFlow(t *testing.T) {
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 
 	userStore, err := users.NewUserStore(storage, USERSTORE_MAX_USERS)
 	if err != nil {

diff --git a/pkg/configmanager/start_darwin.go b/pkg/configmanager/start_darwin.go
@@ -26,4 +26,6 @@ func startStats(storage storage.Iface) {
 
 func startPacketLogger(storage storage.Iface, clientCache *wireguard.ClientCache, vpnConfig *wireguard.VPNConfig) {
 	go wireguard.RunPacketLogger(storage, clientCache, vpnConfig)
+	// run cleanup
+	go wireguard.PacketLoggerLogRotation(storage)
 }
diff --git a/pkg/configmanager/start_linux.go b/pkg/configmanager/start_linux.go
@@ -31,4 +31,6 @@ func startStats(storage storage.Iface) {
 func startPacketLogger(storage storage.Iface, clientCache *wireguard.ClientCache, vpnConfig *wireguard.VPNConfig) {
 	// run statistics go routine
 	go wireguard.RunPacketLogger(storage, clientCache, vpnConfig)
+	// run cleanup
+	go wireguard.PacketLoggerLogRotation(storage)
 }
diff --git a/pkg/license/gcp_test.go b/pkg/license/gcp_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 )
 
 func TestGuessInfrastructureGCP(t *testing.T) {
@@ -52,10 +52,10 @@ func TestGetMaxUsersGCPBYOL(t *testing.T) {
 	licenseURL = ts.URL
 	metadataIP = strings.Replace(ts.URL, "http://", "", -1)
 
-	mockStorage := &testingmocks.MockReadWriter{
-		Data: map[string][]byte{
-			"config/license.key": []byte("license-1234556-license"),
-		},
+	mockStorage := &memorystorage.MockMemoryStorage{}
+	err := mockStorage.WriteFile("config/license.key", []byte("license-1234556-license"))
+	if err != nil {
+		t.Fatalf("writefile error: %s", err)
 	}
 
 	for _, v := range []int{50} {

diff --git a/pkg/license/license_test.go b/pkg/license/license_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/in4it/wireguard-server/pkg/logging"
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 )
 
 func TestGetMaxUsersAzure(t *testing.T) {
@@ -39,7 +39,7 @@ func TestGetMaxUsersAWSMarketplace(t *testing.T) {
 		"t3.xlarge": 250,
 	}
 	for instanceType, v := range testCases {
-		if getMaxUsers(&testingmocks.MockReadWriter{}, "aws-marketplace", instanceType) != v {
+		if getMaxUsers(&memorystorage.MockMemoryStorage{}, "aws-marketplace", instanceType) != v {
 			t.Fatalf("Wrong output: %d vs %d", GetMaxUsersAWS(instanceType), v)
 		}
 	}
@@ -98,7 +98,7 @@ func TestGetMaxUsersAWSBYOL(t *testing.T) {
 	licenseURL = ts.URL
 	metadataIP = strings.Replace(ts.URL, "http://", "", -1)
 	for _, v := range testCases {
-		if v2 := GetMaxUsersAWSBYOL(http.Client{Timeout: 5 * time.Second}, &testingmocks.MockMemoryStorage{}); v2 != v {
+		if v2 := GetMaxUsersAWSBYOL(http.Client{Timeout: 5 * time.Second}, &memorystorage.MockMemoryStorage{}); v2 != v {
 			t.Fatalf("Wrong output: %d vs %d", v2, v)
 		}
 	}
@@ -111,7 +111,7 @@ func TestGetMaxUsersAWS(t *testing.T) {
 		"t3.xlarge": 3,
 	}
 	for instanceType, v := range testCases {
-		if getMaxUsers(&testingmocks.MockReadWriter{}, "aws", instanceType) != v {
+		if getMaxUsers(&memorystorage.MockMemoryStorage{}, "aws", instanceType) != v {
 			t.Fatalf("Wrong output: %d vs %d", GetMaxUsersAWS(instanceType), v)
 		}
 	}
@@ -212,7 +212,7 @@ func TestGuessInfrastructureAWS(t *testing.T) {
 		t.Fatalf("wrong infra returned: %s", infra)
 	}
 
-	if getMaxUsers(&testingmocks.MockReadWriter{}, infra, "t3.large") != 3 {
+	if getMaxUsers(&memorystorage.MockMemoryStorage{}, infra, "t3.large") != 3 {
 		t.Fatalf("wrong users returned")
 	}
 }
@@ -252,7 +252,7 @@ func TestGetAzureInstanceType(t *testing.T) {
 
 	usersPerVCPU := 25
 
-	users := getMaxUsers(&testingmocks.MockReadWriter{}, "azure", getAzureInstanceType(http.Client{Timeout: 5 * time.Second}))
+	users := getMaxUsers(&memorystorage.MockMemoryStorage{}, "azure", getAzureInstanceType(http.Client{Timeout: 5 * time.Second}))
 
 	if users != usersPerVCPU*2 {
 		t.Fatalf("Wrong user count returned")
@@ -302,7 +302,7 @@ func TestGuessInfrastructureDigitalOcean(t *testing.T) {
 		t.Fatalf("wrong infra returned: %s", infra)
 	}
 
-	if getMaxUsers(&testingmocks.MockReadWriter{}, infra, "t3.large") != 3 {
+	if getMaxUsers(&memorystorage.MockMemoryStorage{}, infra, "t3.large") != 3 {
 		t.Fatalf("wrong users returned")
 	}
 }
@@ -332,12 +332,11 @@ func TestGetMaxUsersDigitalOceanBYOL(t *testing.T) {
 	licenseURL = ts.URL
 	metadataIP = strings.Replace(ts.URL, "http://", "", -1)
 
-	mockStorage := &testingmocks.MockReadWriter{
-		Data: map[string][]byte{
-			"config/license.key": []byte("license-1234556-license"),
-		},
+	mockStorage := &memorystorage.MockMemoryStorage{}
+	err := mockStorage.WriteFile("config/license.key", []byte("license-1234556-license"))
+	if err != nil {
+		t.Fatalf("writefile error: %s", err)
 	}
-
 	for _, v := range []int{50} {
 		if v2 := GetMaxUsersDigitalOceanBYOL(http.Client{Timeout: 5 * time.Second}, mockStorage); v2 != v {
 			t.Fatalf("Wrong output: %d vs %d", v2, v)
@@ -387,27 +386,27 @@ func TestGetLicenseKey(t *testing.T) {
 	metadataIP = strings.Replace(ts.URL, "http://", "", -1)
 
 	logging.Loglevel = logging.LOG_DEBUG + logging.LOG_ERROR
-	key := GetLicenseKey(&testingmocks.MockMemoryStorage{}, "")
+	key := GetLicenseKey(&memorystorage.MockMemoryStorage{}, "")
 	if key == "" {
 		t.Fatalf("key is empty")
 	}
-	key = GetLicenseKey(&testingmocks.MockMemoryStorage{}, "aws")
+	key = GetLicenseKey(&memorystorage.MockMemoryStorage{}, "aws")
 	if key == "" {
 		t.Fatalf("aws key is empty")
 	}
-	key = GetLicenseKey(&testingmocks.MockMemoryStorage{}, "digitalocean")
+	key = GetLicenseKey(&memorystorage.MockMemoryStorage{}, "digitalocean")
 	if key == "" {
 		t.Fatalf("digitalocean key is empty")
 	}
-	key = GetLicenseKey(&testingmocks.MockMemoryStorage{}, "gcp")
+	key = GetLicenseKey(&memorystorage.MockMemoryStorage{}, "gcp")
 	if key == "" {
 		t.Fatalf("gcp key is empty")
 	}
 }
 func TestGetLicenseKeyNoCloudProvider(t *testing.T) {
 
 	logging.Loglevel = logging.LOG_DEBUG + logging.LOG_ERROR
-	key := GetLicenseKey(&testingmocks.MockMemoryStorage{}, "")
+	key := GetLicenseKey(&memorystorage.MockMemoryStorage{}, "")
 	if key == "" {
 		t.Fatalf("key is empty")
 	}

diff --git a/pkg/rest/auth_test.go b/pkg/rest/auth_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/in4it/wireguard-server/pkg/auth/saml"
 	"github.com/in4it/wireguard-server/pkg/logging"
 	"github.com/in4it/wireguard-server/pkg/rest/login"
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 	"github.com/in4it/wireguard-server/pkg/users"
 	"github.com/russellhaering/gosaml2/types"
 	dsigtypes "github.com/russellhaering/goxmldsig/types"
@@ -80,7 +80,7 @@ c7tL1QjbfAUHAQYwmHkWgPP+T2wAv0pOt36GgMCM`
 }
 
 func TestAuthHandler(t *testing.T) {
-	c, err := newContext(&testingmocks.MockMemoryStorage{}, SERVER_TYPE_VPN)
+	c, err := newContext(&memorystorage.MockMemoryStorage{}, SERVER_TYPE_VPN)
 	if err != nil {
 		t.Fatalf("Cannot create context: %s", err)
 	}
@@ -130,7 +130,7 @@ func TestAuthHandler(t *testing.T) {
 
 func TestNewSAMLConnection(t *testing.T) {
 	// generate new keypair
-	kp := saml.NewKeyPair(&testingmocks.MockMemoryStorage{}, "www.idp.inv")
+	kp := saml.NewKeyPair(&memorystorage.MockMemoryStorage{}, "www.idp.inv")
 	_, cert, err := kp.GetKeyPair()
 	if err != nil {
 		t.Fatalf("Can't generate new keypair: %s", err)
@@ -191,7 +191,7 @@ func TestNewSAMLConnection(t *testing.T) {
 	defer l.Close()
 
 	// first create a new user
-	c, err := newContext(&testingmocks.MockMemoryStorage{}, SERVER_TYPE_VPN)
+	c, err := newContext(&memorystorage.MockMemoryStorage{}, SERVER_TYPE_VPN)
 	if err != nil {
 		t.Fatalf("Cannot create context")
 	}
@@ -419,7 +419,7 @@ func TestNewSAMLConnection(t *testing.T) {
 
 }
 func TestAddModifyDeleteNewSAMLConnection(t *testing.T) {
-	c, err := newContext(&testingmocks.MockMemoryStorage{}, SERVER_TYPE_VPN)
+	c, err := newContext(&memorystorage.MockMemoryStorage{}, SERVER_TYPE_VPN)
 	if err != nil {
 		t.Fatalf("Cannot create context")
 	}
@@ -592,7 +592,7 @@ func TestAddModifyDeleteNewSAMLConnection(t *testing.T) {
 }
 
 func TestSAMLCallback(t *testing.T) {
-	c, err := newContext(&testingmocks.MockMemoryStorage{}, SERVER_TYPE_VPN)
+	c, err := newContext(&memorystorage.MockMemoryStorage{}, SERVER_TYPE_VPN)
 	if err != nil {
 		t.Fatalf("Cannot create context")
 	}
@@ -701,7 +701,7 @@ func TestOIDCFlow(t *testing.T) {
 	}
 
 	// first create a new user
-	c, err := newContext(&testingmocks.MockMemoryStorage{}, SERVER_TYPE_VPN)
+	c, err := newContext(&memorystorage.MockMemoryStorage{}, SERVER_TYPE_VPN)
 	if err != nil {
 		t.Fatalf("Cannot create context")
 	}

diff --git a/pkg/rest/rsa_test.go b/pkg/rest/rsa_test.go
@@ -6,11 +6,11 @@ import (
 	"encoding/pem"
 	"testing"
 
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 )
 
 func TestGetJWTKeys(t *testing.T) {
-	mockStorage := testingmocks.MockMemoryStorage{}
+	mockStorage := memorystorage.MockMemoryStorage{}
 	keys, err := getJWTKeys(&mockStorage)
 	if err != nil {
 		t.Fatalf("error: %s", err)

diff --git a/pkg/rest/stats_test.go b/pkg/rest/stats_test.go
@@ -8,13 +8,13 @@ import (
 	"testing"
 	"time"
 
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 	"github.com/in4it/wireguard-server/pkg/wireguard"
 )
 
 func TestUserStatsHandler(t *testing.T) {
 
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 
 	c, err := newContext(storage, SERVER_TYPE_VPN)
 	if err != nil {

diff --git a/pkg/rest/users_test.go b/pkg/rest/users_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	testingmocks "github.com/in4it/wireguard-server/pkg/testing/mocks"
+	memorystorage "github.com/in4it/wireguard-server/pkg/storage/memory"
 	"github.com/in4it/wireguard-server/pkg/users"
 	"github.com/in4it/wireguard-server/pkg/wireguard"
 )
@@ -50,7 +50,7 @@ func TestCreateUserConnectionDeleteUserFlow(t *testing.T) {
 	defer l.Close()
 
 	// first create a new user
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 
 	c, err := newContext(storage, SERVER_TYPE_VPN)
 	if err != nil {
@@ -161,7 +161,7 @@ func TestCreateUserConnectionDeleteUserFlow(t *testing.T) {
 
 func TestCreateUser(t *testing.T) {
 	// first create a new user
-	storage := &testingmocks.MockMemoryStorage{}
+	storage := &memorystorage.MockMemoryStorage{}
 
 	c, err := newContext(storage, SERVER_TYPE_VPN)
 	if err != nil {