escape location before setting header (#100)

Author: oremj

stubservice/stubhandlers/redirect.go

@@ -91,9 +91,13 @@ func (s *redirectHandler) ServeStub(w http.ResponseWriter, req *http.Request, co
 	}
 
 	stubLocation := s.CDNPrefix + key
+	stubLocationUrl, err := url.Parse(stubLocation)
+	if err != nil {
+		return errors.Wrap(err, "url.Parse")
+	}
 	// Cache response for one day
 	w.Header().Set("Cache-Control", "max-age=86400")
-	http.Redirect(w, req, stubLocation, http.StatusFound)
+	http.Redirect(w, req, stubLocationUrl.String(), http.StatusFound)
 	logrus.WithFields(logrus.Fields{
 		"req_url":  req.URL.String(),
 		"location": stubLocation}).Info("Redirected request")

testing/stubtestclient/main.go

@@ -15,12 +15,13 @@ import (
 var (
 	baseURL string
 
-	campaign   string
-	content    string
-	medium     string
-	source     string
-	experiment string
-	variation  string
+	campaign      string
+	content       string
+	medium        string
+	installerType string
+	source        string
+	experiment    string
+	variation     string
 
 	lang    string
 	os      string
@@ -54,6 +55,7 @@ func init() {
 	flag.StringVar(&source, "source", "mozilla.com", "source")
 	flag.StringVar(&experiment, "experiment", "exp1", "experiment")
 	flag.StringVar(&variation, "variation", "var1", "variation")
+	flag.StringVar(&installerType, "installer_type", "full", "installer_type")
 
 	flag.StringVar(&lang, "lang", "en-US", "")
 	flag.StringVar(&os, "os", "win", "")
@@ -71,6 +73,7 @@ func genCode() string {
 	query.Set("medium", medium)
 	query.Set("source", source)
 	query.Set("experiment", experiment)
+	query.Set("installer_type", installerType)
 	query.Set("variation", variation)
 	query.Set("timestamp", fmt.Sprintf("%d", time.Now().UTC().Unix()))