Merge pull request #196 from rod-hynes/master

Fix: "keepalive@openssh.com" requests incorrectly logged as invalid requests
Psiphon-Labs · Jun 28, 2016 · 5e3cc08 · 5e3cc08
2 parents f262aa3 + 3f7a651
commit 5e3cc08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/psiphon/server/api.go b/psiphon/server/api.go
@@ -60,7 +60,8 @@ func sshAPIRequestHandler(
 	var params requestJSONObject
 	err := json.Unmarshal(requestPayload, &params)
 	if err != nil {
-		return nil, psiphon.ContextError(err)
+		return nil, psiphon.ContextError(
+			fmt.Errorf("invalid payload for request name: %s: %s", name, err))
 	}
 
 	switch name {

diff --git a/psiphon/server/tunnelServer.go b/psiphon/server/tunnelServer.go
@@ -641,7 +641,12 @@ func (sshClient *sshClient) runClient(
 
 		for request := range requests {
 
-			// requests are processed serially; responses must be sent in request order.
+			// Discard keepalive requests.
+			if request.Type == "keepalive@openssh.com" && request.WantReply == false {
+				continue
+			}
+
+			// Requests are processed serially; responses must be sent in request order.
 			responsePayload, err := sshAPIRequestHandler(
 				sshClient.sshServer.support,
 				sshClient.geoIPData,