Bug fixes

* Explicitly cast redis value to string
* Don't clobber "None" GeoIP value with empty string

psiphon/server/geoip.go

@@ -67,12 +67,18 @@ func GeoIPLookup(ipAddress string) GeoIPData {
 		log.WithContextFields(LogFields{"error": err}).Warning("GeoIP lookup failed")
 	}
 
-	result.Country = geoIPFields.Country.ISOCode
+	if geoIPFields.Country.ISOCode != "" {
+		result.Country = geoIPFields.Country.ISOCode
+	}
+
 	name, ok := geoIPFields.City.Names["en"]
-	if ok {
+	if ok && name != "" {
 		result.City = name
 	}
-	result.ISP = geoIPFields.ISP
+
+	if geoIPFields.ISP != "" {
+		result.ISP = geoIPFields.ISP
+	}
 
 	return result
 }

psiphon/server/redis.go

@@ -73,9 +73,9 @@ func UpdateRedisForLegacyPsiWeb(psiphonSessionID string, geoIPData GeoIPData) er
 
 	conn.Send("MULTI")
 	conn.Send("SELECT", redisSessionDBIndex)
-	conn.Send("SET", psiphonSessionID, sessionRecord, "NX", "EX", sessionExpireSeconds)
+	conn.Send("SET", psiphonSessionID, string(sessionRecord), "NX", "EX", sessionExpireSeconds)
 	conn.Send("SELECT", redisDiscoveryDBIndex)
-	conn.Send("SET", psiphonSessionID, discoveryRecord, "NX", "EX", discoveryExpireSeconds)
+	conn.Send("SET", psiphonSessionID, string(discoveryRecord), "NX", "EX", discoveryExpireSeconds)
 	_, err = conn.Do("EXEC")
 	if err != nil {
 		return psiphon.ContextError(err)