From b14d048e6089233f5c698426652e85bfa1d89488 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Tue, 23 Mar 2021 17:10:45 +0100
Subject: Don't expose the full gateway out of the vpn module

We just care about locations and fullness.
---
 pkg/backend/status.go | 38 ++++++++++++++++----------------------
 pkg/backend/webapi.go |  7 +++----
 2 files changed, 19 insertions(+), 26 deletions(-)

(limited to 'pkg/backend')

diff --git a/pkg/backend/status.go b/pkg/backend/status.go
index 3d78a0b..0e92253 100644
--- a/pkg/backend/status.go
+++ b/pkg/backend/status.go
@@ -8,7 +8,6 @@ import (
 
 	"0xacab.org/leap/bitmask-vpn/pkg/bitmask"
 	"0xacab.org/leap/bitmask-vpn/pkg/config"
-	"0xacab.org/leap/bitmask-vpn/pkg/vpn/bonafide"
 )
 
 const (
@@ -33,22 +32,21 @@ var updateMutex sync.Mutex
 // them.
 
 type connectionCtx struct {
-	AppName         string `json:"appName"`
-	Provider        string `json:"provider"`
-	TosURL          string `json:"tosURL"`
-	HelpURL         string `json:"helpURL"`
-	AskForDonations bool   `json:"askForDonations"`
-	DonateDialog    bool   `json:"donateDialog"`
-	DonateURL       string `json:"donateURL"`
-	LoginDialog     bool   `json:"loginDialog"`
-	LoginOk         bool   `json:"loginOk"`
-	Version         string `json:"version"`
-	Errors          string `json:"errors"`
-	Status          status `json:"status"`
-	/* XXX perhaps rename to GatewaysByCity */
-	Gateways        map[string]bonafide.Gateway `json:"gateways"`
-	CurrentGateway  string                      `json:"currentGateway"`
-	CurrentLocation string                      `json:"currentLocation"`
+	AppName         string             `json:"appName"`
+	Provider        string             `json:"provider"`
+	TosURL          string             `json:"tosURL"`
+	HelpURL         string             `json:"helpURL"`
+	AskForDonations bool               `json:"askForDonations"`
+	DonateDialog    bool               `json:"donateDialog"`
+	DonateURL       string             `json:"donateURL"`
+	LoginDialog     bool               `json:"loginDialog"`
+	LoginOk         bool               `json:"loginOk"`
+	Version         string             `json:"version"`
+	Errors          string             `json:"errors"`
+	Status          status             `json:"status"`
+	Locations       map[string]float64 `json:"locations"`
+	CurrentGateway  string             `json:"currentGateway"`
+	CurrentLocation string             `json:"currentLocation"`
 	bm              bitmask.Bitmask
 	autostart       bitmask.Autostart
 	cfg             *config.Config
@@ -57,11 +55,7 @@ type connectionCtx struct {
 func (c connectionCtx) toJson() ([]byte, error) {
 	statusMutex.Lock()
 	if c.bm != nil {
-		gws, err := c.bm.ListGatewaysByCity("openvpn")
-		if err != nil {
-			log.Println("error getting gateways for city")
-		}
-		c.Gateways = gws
+		c.Locations = c.bm.ListLocationFullness("openvpn")
 		c.CurrentGateway = c.bm.GetCurrentGateway()
 		c.CurrentLocation = c.bm.GetCurrentLocation()
 	}
diff --git a/pkg/backend/webapi.go b/pkg/backend/webapi.go
index a19d933..3e4efd3 100644
--- a/pkg/backend/webapi.go
+++ b/pkg/backend/webapi.go
@@ -64,12 +64,11 @@ func webGatewaySet(w http.ResponseWriter, r *http.Request) {
 }
 
 func webGatewayList(w http.ResponseWriter, r *http.Request) {
-	gws, err := ctx.bm.ListGatewaysByCity(ctx.Provider)
+	locationJson, err := json.Marshal(ctx.bm.ListLocationFullness("openvpn"))
 	if err != nil {
-		fmt.Fprintf(w, "ListGatewaysByCity() err: %v", err)
+		fmt.Fprintf(w, "Error converting json: %v", err)
 	}
-	gwJson, _ := json.Marshal(gws)
-	fmt.Fprintf(w, string(gwJson))
+	fmt.Fprintf(w, string(locationJson))
 }
 
 // TODO
-- 
cgit v1.2.3