Whitelisting staging config URL

oxtoacart · oxtoacart · commit 33a7932014a5 · 2016-06-03T08:19:37.000-05:00
diff --git a/src/github.com/getlantern/flashlight/config/config.go b/src/github.com/getlantern/flashlight/config/config.go
@@ -3,15 +3,13 @@ package config
 import (
 	"crypto/x509"
 	"fmt"
-	"net/url"
 	"os"
 	"path/filepath"
 	"regexp"
 	"sort"
 	"time"
 
 	"github.com/getlantern/appdir"
-	"github.com/getlantern/detour"
 	"github.com/getlantern/fronted"
 	"github.com/getlantern/golog"
 	"github.com/getlantern/keyman"
@@ -53,14 +51,6 @@ type Config struct {
 
 // StartPolling starts the process of polling for new configuration files.
 func StartPolling() {
-	// Force detour to whitelist chained domain
-	u, err := url.Parse(defaultChainedCloudConfigURL)
-	if err != nil {
-		log.Fatalf("Unable to parse chained cloud config URL: %v", err)
-	}
-	log.Debugf("Polling at %v", defaultChainedCloudConfigURL)
-	detour.ForceWhitelist(u.Host)
-
 	// No-op if already started.
 	m.StartPolling()
 }
diff --git a/src/github.com/getlantern/flashlight/config/fetcher.go b/src/github.com/getlantern/flashlight/config/fetcher.go
@@ -7,9 +7,11 @@ import (
 	"math/rand"
 	"net/http"
 	"net/http/httputil"
+	"net/url"
 	"strconv"
 	"time"
 
+	"github.com/getlantern/detour"
 	"github.com/getlantern/yamlconf"
 
 	"code.google.com/p/go-uuid/uuid"
@@ -85,6 +87,15 @@ func NewFetcher(conf UserConfig, rt http.RoundTripper, flags map[string]interfac
 		}
 	}
 
+	log.Debugf("Will poll for config at %v (%v)", chained, fronted)
+
+	// Force detour to whitelist chained domain
+	u, err := url.Parse(chained)
+	if err != nil {
+		log.Fatalf("Unable to parse chained cloud config URL: %v", err)
+	}
+	detour.ForceWhitelist(u.Host)
+
 	return &fetcher{
 		lastCloudConfigETag: map[string]string{},
 		user:                conf,
