Merge pull request #185 from rod-hynes/master

Pass inputs to psinet database lookups
Psiphon-Labs · Jun 16, 2016 · 6ce4c8f · 6ce4c8f
2 parents b1f4e75 + 11a4ec4
commit 6ce4c8f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/psiphon/server/api.go b/psiphon/server/api.go
@@ -105,8 +105,6 @@ func handshakeAPIRequestHandler(
 			baseRequestParams)).Info("API event")
 
 	// TODO: share struct definition with psiphon/serverApi.go?
-	// TODO: populate response data using psinet database
-
 	var handshakeResponse struct {
 		Homepages            []string            `json:"homepages"`
 		UpgradeClientVersion string              `json:"upgrade_client_version"`
@@ -117,19 +115,26 @@ func handshakeAPIRequestHandler(
 		ServerTimestamp      string              `json:"server_timestamp"`
 	}
 
+	// Ignoring errors as params are validated
+	sponsorID, _ := getStringRequestParam(params, "sponsor_id")
+	propagationChannelID, _ := getStringRequestParam(params, "propagation_channel_id")
+	clientVersion, _ := getStringRequestParam(params, "client_version")
+	clientPlatform, _ := getStringRequestParam(params, "client_platform")
+	clientRegion := geoIPData.Country
+
 	handshakeResponse.Homepages = psinetDatabase.GetHomepages(
-		"", "", "") // TODO: sponsorID, clientRegion, clientPlatform)
+		sponsorID, clientRegion, clientPlatform)
 
 	handshakeResponse.UpgradeClientVersion = psinetDatabase.GetUpgradeClientVersion(
-		"") // TODO: clientVersion)
+		clientVersion, clientPlatform)
 
 	handshakeResponse.HttpsRequestRegexes = psinetDatabase.GetHttpsRequestRegexes(
-		"", "", "") // TODO: sponsorID, clientRegion, clientPlatform)
+		sponsorID)
 
 	handshakeResponse.EncodedServerList = psinetDatabase.DiscoverServers(
-		"", 0) // TODO: propagationChannelID, discoveryValue)
+		propagationChannelID, geoIPData.DiscoveryValue)
 
-	handshakeResponse.ClientRegion = geoIPData.Country
+	handshakeResponse.ClientRegion = clientRegion
 
 	handshakeResponse.ServerTimestamp = psiphon.GetCurrentTimestamp()
 

diff --git a/psiphon/server/psinet.go b/psiphon/server/psinet.go
@@ -48,16 +48,16 @@ func (psinet *PsinetDatabase) GetHomepages(sponsorID, clientRegion, clientPlatfo
 // GetUpgradeClientVersion returns a new client version when an upgrade is
 // indicated for the specified client current version. The result is "" when
 // no upgrade is available.
-func (psinet *PsinetDatabase) GetUpgradeClientVersion(clientVersion string) string {
+func (psinet *PsinetDatabase) GetUpgradeClientVersion(clientVersion, clientPlatform string) string {
 
 	// TODO: implement
 
 	return ""
 }
 
 // GetHttpsRequestRegexes returns bytes transferred stats regexes for the
-// specified client inputs.
-func (psinet *PsinetDatabase) GetHttpsRequestRegexes(sponsorID, clientRegion, clientPlatform string) []map[string]string {
+// specified sponsor.
+func (psinet *PsinetDatabase) GetHttpsRequestRegexes(sponsorID string) []map[string]string {
 
 	return make([]map[string]string, 0)
 }