From c972543c773e74090af267b38de930ec7ca31776 Mon Sep 17 00:00:00 2001
From: Boshi Lian <farmer1992@gmail.com>
Date: Wed, 21 Jun 2017 02:57:34 +0800
Subject: [PATCH] fix ineffassign

---
 ssh/sshpiper.go              | 11 +++++++----
 sshpiperd/workingdir_test.go |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ssh/sshpiper.go b/ssh/sshpiper.go
index 6a5bbbcf..66ef2620 100644
--- a/ssh/sshpiper.go
+++ b/ssh/sshpiper.go
@@ -246,6 +246,10 @@ func NewSSHPiperConn(conn net.Conn, piper *SSHPiperConfig) (pipe *SSHPiperConn,
 		if isQuery {
 			// reply for query msg
 			msg, err = p.validAndAck(mappedUser, upKey, downKey)
+			if err != nil {
+				return nil, err
+			}
+
 		} else {
 
 			ok, err := p.checkPublicKey(msg, downKey, sig)
@@ -259,10 +263,9 @@ func NewSSHPiperConn(conn net.Conn, piper *SSHPiperConfig) (pipe *SSHPiperConn,
 			}
 
 			msg, err = p.signAgain(mappedUser, msg, signer, downKey)
-		}
-
-		if err != nil {
-			return nil, err
+			if err != nil {
+				return nil, err
+			}
 		}
 
 		return msg, nil
diff --git a/sshpiperd/workingdir_test.go b/sshpiperd/workingdir_test.go
index 391faf36..985d3fc9 100644
--- a/sshpiperd/workingdir_test.go
+++ b/sshpiperd/workingdir_test.go
@@ -320,6 +320,9 @@ func TestMapPublicKeyFromUserfile(t *testing.T) {
 	}
 
 	signer, err = mapPublicKeyFromUserfile(stubConnMetadata{user}, privateKey.PublicKey())
+	if err != nil {
+		t.Fatalf("cant mapping key: %v", err)
+	}
 	if signer != nil {
 		t.Fatalf("should not map private key when public key not in UserAuthorizedKeysFile")
 	}