repository name mbvpn-linux

Author: parfenovvs

Makefile

@@ -1,7 +1,7 @@
 -include .env
 
 BINARY_NAME=mbvpn
-GO_PKG=github.com/Malwarebytes/mbvpn
+GO_PKG=github.com/Malwarebytes/mbvpn-linux
 GOFLAGS ?=
 
 # Version information

README.md

@@ -1,8 +1,8 @@
 # Malwarebytes VPN for Linux
 
-[![Version](https://img.shields.io/github/v/release/Malwarebytes/mbvpn?style=flat-square)](https://github.com/Malwarebytes/mbvpn/releases)
-[![Go Report Card](https://goreportcard.com/badge/github.com/Malwarebytes/mbvpn)](https://goreportcard.com/report/github.com/Malwarebytes/mbvpn)
-[![License](https://img.shields.io/github/license/Malwarebytes/mbvpn?style=flat-square)](LICENSE.md)
+[![Version](https://img.shields.io/github/v/release/Malwarebytes/mbvpn-linux?style=flat-square)](https://github.com/Malwarebytes/mbvpn-linux/releases)
+[![Go Report Card](https://goreportcard.com/badge/github.com/Malwarebytes/mbvpn-linux)](https://goreportcard.com/report/github.com/Malwarebytes/mbvpn-linux)
+[![License](https://img.shields.io/github/license/Malwarebytes/mbvpn-linux?style=flat-square)](LICENSE.md)
 
 ## IMPORTANT
 
@@ -31,14 +31,14 @@ WireGuard tools are required for MBVPN to function properly. Install them using
 Install MBVPN directly using Go's package manager:
 
 ```bash
-go install github.com/Malwarebytes/mbvpn@latest
+go install github.com/Malwarebytes/mbvpn-linux@latest
 ```
 
 > **Note**: Ensure that your `$GOPATH/bin` (typically `~/go/bin`) is in your `$PATH` to run the `mbvpn` command.
 
 ### Alternative: Download from Releases
 
-1. Download the latest release for your architecture from the [Releases](https://github.com/Malwarebytes/mbvpn/releases) page
+1. Download the latest release for your architecture from the [Releases](https://github.com/Malwarebytes/mbvpn-linux/releases) page
 2. Extract the binary and place it in a directory in your `$PATH` (e.g., `/usr/local/bin`)
 
 ## Build Configuration

cmd/cities.go

@@ -1,13 +1,12 @@
 /*
 Copyright © 2025 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
 import (
-	"github.com/Malwarebytes/mbvpn/pkg/errors"
-	"github.com/Malwarebytes/mbvpn/pkg/session"
-	"github.com/Malwarebytes/mbvpn/pkg/vpn"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/errors"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/session"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/vpn"
 	"github.com/spf13/cobra"
 )
 
@@ -29,4 +28,4 @@ Provides more specific geographic options than countries. Requires an active ses
 	}
 
 	return cmd
-}
+}

cmd/connect.go

@@ -4,17 +4,17 @@ Copyright © 2025 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/Malwarebytes/mbvpn/pkg/errors"
-	"github.com/Malwarebytes/mbvpn/pkg/session"
-	"github.com/Malwarebytes/mbvpn/pkg/vpn"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/errors"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/session"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/vpn"
 	"github.com/spf13/cobra"
 )
 
 func NewConnectCommand(sm session.SessionManager, vpn vpn.Vpn) *cobra.Command {
 	return &cobra.Command{
-		Use:   "connect",
+		Use:     "connect",
 		Aliases: []string{"c"},
-		Short: "Connect to a VPN server",
+		Short:   "Connect to a VPN server",
 		Long: `Establishes a VPN connection to the specified server using WireGuard.
 Requires an active session (login first) and a valid server identifier.
 
@@ -47,4 +47,4 @@ Use 'mbvpn countries' or 'mbvpn cities' to browse servers by location.`,
 			}
 		},
 	}
-}
+}

cmd/countries.go

@@ -1,13 +1,12 @@
 /*
 Copyright © 2025 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
 import (
-	"github.com/Malwarebytes/mbvpn/pkg/errors"
-	"github.com/Malwarebytes/mbvpn/pkg/session"
-	"github.com/Malwarebytes/mbvpn/pkg/vpn"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/errors"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/session"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/vpn"
 	"github.com/spf13/cobra"
 )
 
@@ -29,4 +28,4 @@ Useful for selecting servers by geographic location. Requires an active session.
 	}
 
 	return cmd
-}
+}

cmd/disconnect.go

@@ -4,24 +4,24 @@ Copyright © 2025 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/Malwarebytes/mbvpn/pkg/vpn"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/vpn"
 	"github.com/spf13/cobra"
 )
 
 func NewDisconnectCommand(vpn vpn.Vpn) *cobra.Command {
 	return &cobra.Command{
-		Use:   "disconnect",
+		Use:     "disconnect",
 		Aliases: []string{"d"},
-		Short: "Stops the VPN connection.",
-		Long: `Stops the VPN connection.`,
+		Short:   "Stops the VPN connection.",
+		Long:    `Stops the VPN connection.`,
 		Run: func(cmd *cobra.Command, args []string) {
 			server := ""
 			if len(args) > 0 {
 				server = args[0]
 			}
-			
+
 			err := vpn.Disconnect(server)
 			HandleError(err)
 		},
 	}
-}
+}

cmd/login.go

@@ -4,7 +4,7 @@ Copyright © 2025 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/Malwarebytes/mbvpn/pkg/session"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/session"
 	"github.com/spf13/cobra"
 )
 
@@ -16,15 +16,15 @@ func NewLoginCommand(sm session.SessionManager) *cobra.Command {
    The command claims available seat of your Malwarebytes license.`,
 		Run: func(cmd *cobra.Command, args []string) {
 			var err error
-			
+
 			key, _ := cmd.Flags().GetString("licenseKey")
 			if key == "" {
 				code, _ := cmd.Flags().GetString("mbCode")
 				err = sm.LoginWithCode(code)
 			} else {
 				err = sm.LoginWithKey(key)
 			}
-			
+
 			// Handle any errors that might have occurred
 			HandleError(err)
 		},
@@ -35,4 +35,4 @@ func NewLoginCommand(sm session.SessionManager) *cobra.Command {
 	cmd.MarkFlagsOneRequired("licenseKey", "mbCode")
 
 	return cmd
-}
+}

cmd/logout.go

@@ -4,18 +4,18 @@ Copyright © 2025 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/Malwarebytes/mbvpn/pkg/session"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/session"
 	"github.com/spf13/cobra"
 )
 
 func NewLogoutCommand(sm session.SessionManager) *cobra.Command {
-  return &cobra.Command{
-    Use:   "logout",
-    Short: "Logout this device.",
-    Long:  `Deactivates this device seat and cleans local configuration.`,
-    Run: func(cmd *cobra.Command, args []string) {
-      err := sm.Logout()
-      HandleError(err)
-    },
-  }
-}
+	return &cobra.Command{
+		Use:   "logout",
+		Short: "Logout this device.",
+		Long:  `Deactivates this device seat and cleans local configuration.`,
+		Run: func(cmd *cobra.Command, args []string) {
+			err := sm.Logout()
+			HandleError(err)
+		},
+	}
+}

cmd/root.go

@@ -7,14 +7,14 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Malwarebytes/mbvpn/pkg/config"
-	"github.com/Malwarebytes/mbvpn/pkg/errors"
-	"github.com/Malwarebytes/mbvpn/pkg/remote"
-	"github.com/Malwarebytes/mbvpn/pkg/servers"
-	"github.com/Malwarebytes/mbvpn/pkg/session"
-	"github.com/Malwarebytes/mbvpn/pkg/vpn"
-	"github.com/spf13/cobra"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/config"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/errors"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/remote"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/servers"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/session"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/vpn"
 	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
 // ErrorHandler is the central error handler for all commands
@@ -45,7 +45,7 @@ your privacy settings from the terminal. Requires a valid Malwarebytes license.`
 			log.SetLevel(log.InfoLevel)
 			config.DebugFlag = false
 		}
-		
+
 		// Initialize error handler with current debug setting
 		ErrorHandler = errors.NewHandler()
 	},
@@ -84,13 +84,13 @@ func HandleError(err error) {
 	if err == nil {
 		return
 	}
-	
+
 	if ErrorHandler == nil {
 		// Fallback if handler isn't initialized
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)
 	}
-	
+
 	if ErrorHandler.Handle(err) {
 		os.Exit(1)
 	}

cmd/root_test.go

@@ -3,26 +3,26 @@ package cmd
 import (
 	"testing"
 
-	"github.com/Malwarebytes/mbvpn/pkg/errors"
+	"github.com/Malwarebytes/mbvpn-linux/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
 func TestRootCommandStructure(t *testing.T) {
 	if rootCmd.Use != "mbvpn" {
 		t.Errorf("Expected Use to be 'mbvpn', got '%s'", rootCmd.Use)
 	}
-	
+
 	if rootCmd.Short != "Malwarebytes VPN command-line client" {
 		t.Errorf("Expected Short to be 'Malwarebytes VPN command-line client', got '%s'", rootCmd.Short)
 	}
-	
+
 	expectedLong := `MBVPN is a command-line VPN client for Malwarebytes VPN service.
 Manage your VPN connections, browse available servers, and control
 your privacy settings from the terminal. Requires a valid Malwarebytes license.`
 	if rootCmd.Long != expectedLong {
 		t.Errorf("Expected Long to be '%s', got '%s'", expectedLong, rootCmd.Long)
 	}
-	
+
 	if rootCmd.PersistentPreRun == nil {
 		t.Error("Expected PersistentPreRun function to be defined")
 	}
@@ -38,7 +38,7 @@ func TestRootCommandFlags(t *testing.T) {
 			t.Errorf("Expected debug flag usage to be 'Run command in debug mode.', got '%s'", debugFlag.Usage)
 		}
 	}
-	
+
 	// Test trace flag
 	traceFlag := rootCmd.PersistentFlags().Lookup("trace")
 	if traceFlag == nil {
@@ -52,7 +52,7 @@ func TestRootCommandFlags(t *testing.T) {
 
 func TestRootCommandSubcommands(t *testing.T) {
 	expectedCommands := []string{"login", "logout", "servers", "countries", "cities", "connect", "disconnect", "status", "version"}
-	
+
 	for _, expectedCmd := range expectedCommands {
 		found := false
 		for _, cmd := range rootCmd.Commands() {
@@ -70,15 +70,15 @@ func TestRootCommandSubcommands(t *testing.T) {
 func TestPersistentPreRunInitializesErrorHandler(t *testing.T) {
 	// Create a simple test command with the same PersistentPreRun
 	testCmd := &cobra.Command{
-		Use: "test",
+		Use:              "test",
 		PersistentPreRun: rootCmd.PersistentPreRun,
 	}
 	testCmd.PersistentFlags().Bool("debug", false, "Run command in debug mode.")
 	testCmd.PersistentFlags().Bool("trace", false, "Run command in trace mode.")
-	
+
 	// Execute PersistentPreRun
 	testCmd.PersistentPreRun(testCmd, []string{})
-	
+
 	// Verify ErrorHandler is initialized
 	if ErrorHandler == nil {
 		t.Error("Expected ErrorHandler to be initialized")
@@ -88,7 +88,7 @@ func TestPersistentPreRunInitializesErrorHandler(t *testing.T) {
 func TestHandleErrorWithNilError(t *testing.T) {
 	// Initialize ErrorHandler
 	ErrorHandler = errors.NewHandler()
-	
+
 	// Test with nil error - should not panic or exit
 	HandleError(nil)
 	// If we reach this point, the function handled nil correctly
@@ -97,13 +97,13 @@ func TestHandleErrorWithNilError(t *testing.T) {
 func TestHandleErrorWithNilHandler(t *testing.T) {
 	// Test error handling when ErrorHandler is nil
 	ErrorHandler = nil
-	
+
 	// We can't test the actual os.Exit behavior, but we can verify the function exists
 	// and would handle the fallback case
 	if ErrorHandler != nil {
 		t.Error("Expected ErrorHandler to be nil for this test")
 	}
-	
+
 	// Reset ErrorHandler for other tests
 	ErrorHandler = errors.NewHandler()
-}
+}