Openvpn get settings http route

internal/models/alias.go

@@ -1,5 +1,10 @@
 package models
 
+import (
+	"fmt"
+	"strings"
+)
+
 type (
 	// VPNDevice is the device name used to tunnel using Openvpn
 	VPNDevice string
@@ -14,7 +19,45 @@ type (
 	// TinyProxyLogLevel is the log level for TinyProxy
 	TinyProxyLogLevel string
 	// VPNProvider is the name of the VPN provider to be used
-	VPNProvider string // TODO
+	VPNProvider string
 	// NetworkProtocol contains the network protocol to be used to communicate with the VPN servers
 	NetworkProtocol string
 )
+
+func marshalJSONString(s string) (data []byte, err error) {
+	return []byte(fmt.Sprintf("%q", s)), nil
+}
+
+func unmarshalJSONString(data []byte) (s string) {
+	s = string(data)
+	s = strings.TrimPrefix(s, "\"")
+	s = strings.TrimSuffix(s, "\"")
+	return s
+}
+
+func (v *VPNProvider) MarshalJSON() ([]byte, error) {
+	return marshalJSONString(string(*v))
+}
+
+func (v *VPNProvider) UnmarshalJSON(data []byte) error {
+	*v = VPNProvider(unmarshalJSONString(data))
+	return nil
+}
+
+func (n *NetworkProtocol) MarshalJSON() ([]byte, error) {
+	return marshalJSONString(string(*n))
+}
+
+func (n *NetworkProtocol) UnmarshalJSON(data []byte) error {
+	*n = NetworkProtocol(unmarshalJSONString(data))
+	return nil
+}
+
+func (f *Filepath) MarshalJSON() ([]byte, error) {
+	return marshalJSONString(string(*f))
+}
+
+func (f *Filepath) UnmarshalJSON(data []byte) error {
+	*f = Filepath(unmarshalJSONString(data))
+	return nil
+}

internal/models/alias_test.go

@@ -0,0 +1,41 @@
+package models
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_VPNProvider_JSON(t *testing.T) {
+	t.Parallel()
+	v := VPNProvider("name")
+	data, err := v.MarshalJSON()
+	require.NoError(t, err)
+	assert.Equal(t, []byte{0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22}, data)
+	err = v.UnmarshalJSON(data)
+	require.NoError(t, err)
+	assert.Equal(t, VPNProvider("name"), v)
+}
+
+func Test_NetworkProtocol_JSON(t *testing.T) {
+	t.Parallel()
+	v := NetworkProtocol("name")
+	data, err := v.MarshalJSON()
+	require.NoError(t, err)
+	assert.Equal(t, []byte{0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22}, data)
+	err = v.UnmarshalJSON(data)
+	require.NoError(t, err)
+	assert.Equal(t, NetworkProtocol("name"), v)
+}
+
+func Test_Filepath_JSON(t *testing.T) {
+	t.Parallel()
+	v := Filepath("name")
+	data, err := v.MarshalJSON()
+	require.NoError(t, err)
+	assert.Equal(t, []byte{0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22}, data)
+	err = v.UnmarshalJSON(data)
+	require.NoError(t, err)
+	assert.Equal(t, Filepath("name"), v)
+}

internal/models/selection.go

@@ -8,48 +8,48 @@ import (
 
 // ProviderSettings contains settings specific to a VPN provider
 type ProviderSettings struct {
-	Name               VPNProvider
-	ServerSelection    ServerSelection
-	ExtraConfigOptions ExtraConfigOptions
-	PortForwarding     PortForwarding
+	Name               VPNProvider        `json:"name"`
+	ServerSelection    ServerSelection    `json:"serverSelection"`
+	ExtraConfigOptions ExtraConfigOptions `json:"extraConfig"`
+	PortForwarding     PortForwarding     `json:"portForwarding"`
 }
 
 type ServerSelection struct { //nolint:maligned
 	// Common
-	Protocol NetworkProtocol
-	TargetIP net.IP
+	Protocol NetworkProtocol `json:"networkProtocol"`
+	TargetIP net.IP          `json:"targetIP,omitempty"`
 
 	// Cyberghost, PIA, Surfshark, Windscribe, Vyprvpn, NordVPN
-	Region string
+	Region string `json:"region"`
 
 	// Cyberghost
-	Group string
+	Group string `json:"group"`
 
 	// Mullvad
-	Country string
-	City    string
-	ISP     string
-	Owned   bool
+	Country string `json:"country"`
+	City    string `json:"city"`
+	ISP     string `json:"isp"`
+	Owned   bool   `json:"owned"`
 
 	// Mullvad, Windscribe
-	CustomPort uint16
-
-	// PIA
-	EncryptionPreset string
+	CustomPort uint16 `json:"customPort"`
 
 	// NordVPN
-	Number uint16
+	Number uint16 `json:"number"`
+
+	// PIA
+	EncryptionPreset string `json:"encryptionPreset"`
 }
 
 type ExtraConfigOptions struct {
-	ClientKey        string // Cyberghost
-	EncryptionPreset string // PIA
+	ClientKey        string `json:"-"`                // Cyberghost
+	EncryptionPreset string `json:"encryptionPreset"` // PIA
 }
 
 // PortForwarding contains settings for port forwarding
 type PortForwarding struct {
-	Enabled  bool
-	Filepath Filepath
+	Enabled  bool     `json:"enabled"`
+	Filepath Filepath `json:"filepath"`
 }
 
 func (p *PortForwarding) String() string {