[FAB-4166]: Remove a func of stoping peer remotely

This commit takes care to remove peer admin API which allowed to send
remote stop command. Since no ACL in place to ensure only authorized and
permitted entities sends stop command to the peer, it should be disabled
preventing adversaries attacks.

Change-Id: I699c6ae1cdf43f294db5a06f13a0271168ff58cf
Signed-off-by: Artem Barger <[email protected]>

Author: C0rWin

core/admin.go

@@ -17,21 +17,14 @@ limitations under the License.
 package core
 
 import (
-	"os"
-
-	"golang.org/x/net/context"
-
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/hyperledger/fabric/common/flogging"
-	"github.com/hyperledger/fabric/core/config"
 	pb "github.com/hyperledger/fabric/protos/peer"
+	"golang.org/x/net/context"
 )
 
 var log = flogging.MustGetLogger("server")
 
-// Here for unit testing purposes
-var osExit = os.Exit
-
 // NewAdminServer creates and returns a Admin service instance.
 func NewAdminServer() *ServerAdmin {
 	s := new(ServerAdmin)
@@ -56,18 +49,6 @@ func (*ServerAdmin) StartServer(context.Context, *empty.Empty) (*pb.ServerStatus
 	return status, nil
 }
 
-// StopServer stops the server
-func (*ServerAdmin) StopServer(context.Context, *empty.Empty) (*pb.ServerStatus, error) {
-	status := &pb.ServerStatus{Status: pb.ServerStatus_STOPPED}
-	log.Debugf("returning status: %s", status)
-
-	pidFile := config.GetPath("peer.fileSystemPath") + "/peer.pid"
-	log.Debugf("Remove pid file  %s", pidFile)
-	os.Remove(pidFile)
-	defer osExit(1)
-	return status, nil
-}
-
 // GetModuleLogLevel gets the current logging level for the specified module
 // TODO Modify the signature so as to remove the error return - it's always been nil
 func (*ServerAdmin) GetModuleLogLevel(ctx context.Context, request *pb.LogLevelRequest) (*pb.LogLevelResponse, error) {

core/admin_test.go

@@ -46,24 +46,6 @@ func TestStartServer(t *testing.T) {
 	assert.Nil(t, err, "Error should have been nil")
 }
 
-func TestStopServer(t *testing.T) {
-	oldOsExit := osExit
-
-	defer func() { osExit = oldOsExit }()
-
-	var got int
-	myExit := func(code int) {
-		got = code
-	}
-
-	osExit = myExit
-	response, err := adminServer.StopServer(context.Background(), &empty.Empty{})
-	assert.NotNil(t, response, "Response should have been set")
-	assert.Nil(t, err, "Error should have been nil")
-
-	assert.Equal(t, 1, got, "Exit code should be 1")
-}
-
 func TestLoggingCalls(t *testing.T) {
 	flogging.MustGetLogger("test")
 	flogging.SetPeerStartupModulesMap()

peer/node/node.go

@@ -25,20 +25,16 @@ import (
 
 const (
 	nodeFuncName = "node"
-	shortDes     = "Operate a peer node: start|stop|status."
-	longDes      = "Operate a peer node: start|stop|status."
+	shortDes     = "Operate a peer node: start|status."
+	longDes      = "Operate a peer node: start|status."
 )
 
-var (
-	stopPidFile string
-)
 var logger = flogging.MustGetLogger("nodeCmd")
 
 // Cmd returns the cobra command for Node
 func Cmd() *cobra.Command {
 	nodeCmd.AddCommand(startCmd())
 	nodeCmd.AddCommand(statusCmd())
-	nodeCmd.AddCommand(stopCmd())
 
 	return nodeCmd
 }

peer/node/stop.go

@@ -29,7 +29,6 @@ service Admin {
     // Return the serve status.
     rpc GetStatus(google.protobuf.Empty) returns (ServerStatus) {}
     rpc StartServer(google.protobuf.Empty) returns (ServerStatus) {}
-    rpc StopServer(google.protobuf.Empty) returns (ServerStatus) {}
     rpc GetModuleLogLevel(LogLevelRequest) returns (LogLevelResponse) {}
     rpc SetModuleLogLevel(LogLevelRequest) returns (LogLevelResponse) {}
     rpc RevertLogLevels(google.protobuf.Empty) returns (google.protobuf.Empty) {}