Merge pull request #1510 from getlantern/thomas/issues

add tracks to issue submission

Author: thomasjib

issue/issue.go

@@ -2,12 +2,14 @@ package issue
 
 import (
 	"bytes"
+	"context"
 	"net/http"
 	"net/http/httputil"
 	"strconv"
 	"time"
 
 	"github.com/getlantern/flashlight/v7/common"
+	userconfig "github.com/getlantern/flashlight/v7/config/user"
 	"github.com/getlantern/flashlight/v7/geolookup"
 	"github.com/getlantern/flashlight/v7/logging"
 	"github.com/getlantern/flashlight/v7/util"
@@ -129,6 +131,22 @@ func sendReport(
 		}
 	}
 
+	// get which tracks the user was given in their config, if any are present
+	ctx, cancel := context.WithTimeout(context.Background(), -time.Second)
+	defer cancel()
+
+	userProxyConfig, err := userconfig.GetConfig(ctx)
+	if err != nil {
+		log.Errorf("unable to get user config: %v", err)
+	}
+	if userProxyConfig != nil {
+		tracks := []string{}
+		for _, proxy := range userProxyConfig.GetProxy().GetProxies() {
+			tracks = append(tracks, proxy.GetTrack())
+		}
+		r.Tracks = tracks
+	}
+
 	// send message to lantern-cloud
 	out, err := proto.Marshal(r)
 	if err != nil {

issue/issue_test.go

@@ -2,10 +2,12 @@ package issue
 
 import (
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
 	"github.com/getlantern/flashlight/v7/common"
+	userconfig "github.com/getlantern/flashlight/v7/config/user"
 	"github.com/getlantern/flashlight/v7/geolookup"
 )
 
@@ -22,6 +24,10 @@ func TestSendReport(t *testing.T) {
 	//manually set library version since its only populated when run from a binary
 	common.LibraryVersion = "7.0.0"
 	UserConfigData := common.UserConfigData{}
+
+	closeTestFiles := initTestConfig(t)
+	defer closeTestFiles()
+
 	err := sendReport(
 		&UserConfigData,
 		"34qsdf-24qsadf-32542q",
@@ -48,3 +54,58 @@ func TestSendReport(t *testing.T) {
 		t.Errorf("SendReport() error = %v", err)
 	}
 }
+
+func initTestConfig(t *testing.T) func() {
+	dir := "testdata"
+	err := os.MkdirAll(dir, 0755)
+	if err != nil {
+		t.Logf("Failed to create testdata dir: %v", err)
+	}
+
+	f, err := os.Create(filepath.Join(dir, "user.conf"))
+	if err != nil {
+		t.Logf("Failed to create temp file: %v", err)
+	}
+
+	f.Write([]byte(`{
+	  "country": "US",
+	  "proxy": {
+	    "proxies": [
+	      {
+	        "addr": "1.1.1.1",
+	        "track": "raichu",
+	        "location": {
+	          "city": "New York",
+	          "country": "United States",
+	          "countryCode": "US",
+	          "latitude": 1.23,
+	          "longitude": 4.56
+	        },
+	        "name": "raichu-proxy",
+	        "port": 123,
+	        "protocol": "tlsmasq",
+	        "certPem": "pem",
+	        "authToken": "token",
+	        "trusted": true,
+	        "connectCfgTlsmasq": {
+	          "originAddr": "google.com",
+	          "secret": "password",
+	          "tlsMinVersion": "1"
+	        }
+	      }
+	    ]
+	  }
+	}`))
+
+	conf, err := userconfig.Init(dir, true)
+	if err != nil {
+		t.Logf("Failed to initialize user config: %v", err)
+	}
+	if conf != nil {
+		t.Logf("User config initialized successfully")
+	}
+	return func() {
+		f.Close()
+		os.RemoveAll(dir)
+	}
+}