ソースを参照

Fix: legacy clients expect ssh_session_id in handshake response

Rod Hynes 9 年 前
コミット
0373662f2e
2 ファイル変更2 行追加0 行削除
  1. 1 0
      psiphon/common/protocol.go
  2. 1 0
      psiphon/server/api.go

+ 1 - 0
psiphon/common/protocol.go

@@ -81,6 +81,7 @@ func TunnelProtocolUsesMeekHTTPS(protocol string) bool {
 }
 }
 
 
 type HandshakeResponse struct {
 type HandshakeResponse struct {
+	SSHSessionID         string              `json:"ssh_session_id"`
 	Homepages            []string            `json:"homepages"`
 	Homepages            []string            `json:"homepages"`
 	UpgradeClientVersion string              `json:"upgrade_client_version"`
 	UpgradeClientVersion string              `json:"upgrade_client_version"`
 	PageViewRegexes      []map[string]string `json:"page_view_regexes"`
 	PageViewRegexes      []map[string]string `json:"page_view_regexes"`

+ 1 - 0
psiphon/server/api.go

@@ -169,6 +169,7 @@ func handshakeAPIRequestHandler(
 	// Note: no guarantee that PsinetDatabase won't reload between database calls
 	// Note: no guarantee that PsinetDatabase won't reload between database calls
 	db := support.PsinetDatabase
 	db := support.PsinetDatabase
 	handshakeResponse := common.HandshakeResponse{
 	handshakeResponse := common.HandshakeResponse{
+		SSHSessionID:         sessionID,
 		Homepages:            db.GetRandomHomepage(sponsorID, geoIPData.Country, isMobile),
 		Homepages:            db.GetRandomHomepage(sponsorID, geoIPData.Country, isMobile),
 		UpgradeClientVersion: db.GetUpgradeClientVersion(clientVersion, normalizedPlatform),
 		UpgradeClientVersion: db.GetUpgradeClientVersion(clientVersion, normalizedPlatform),
 		PageViewRegexes:      make([]map[string]string, 0),
 		PageViewRegexes:      make([]map[string]string, 0),