Merge branch 'add-ip-address-to-call-to-rails-api' into 'master'

Extend group IP restriction to Git activity

See merge request gitlab-org/gitlab-shell!335

go/internal/gitlabnet/accessverifier/client.go

@@ -8,6 +8,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/config"
 	"gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet"
+	"gitlab.com/gitlab-org/gitlab-shell/go/internal/sshenv"
 )
 
 const (
@@ -26,6 +27,7 @@ type Request struct {
 	Protocol string                  `json:"protocol"`
 	KeyId    string                  `json:"key_id,omitempty"`
 	Username string                  `json:"username,omitempty"`
+	CheckIp  string                  `json:"check_ip,omitempty"`
 }
 
 type Gitaly struct {
@@ -80,6 +82,8 @@ func (c *Client) Verify(args *commandargs.Shell, action commandargs.CommandType,
 		request.KeyId = args.GitlabKeyId
 	}
 
+	request.CheckIp = sshenv.LocalAddr()
+
 	response, err := c.client.Post("/allowed", request)
 	if err != nil {
 		return nil, err

go/internal/sshenv/sshenv.go

+package sshenv
+
+import (
+	"os"
+	"strings"
+)
+
+func LocalAddr() string {
+	address := os.Getenv("SSH_CONNECTION")
+
+	if address != "" {
+		return strings.Fields(address)[0]
+	}
+	return ""
+}

go/internal/sshenv/sshenv_test.go

+package sshenv
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/gitlab-shell/go/internal/testhelper"
+)
+
+func TestLocalAddr(t *testing.T) {
+	cleanup, err := testhelper.Setenv("SSH_CONNECTION", "127.0.0.1 0")
+	require.NoError(t, err)
+	defer cleanup()
+
+	require.Equal(t, LocalAddr(), "127.0.0.1")
+}
+
+func TestEmptyLocalAddr(t *testing.T) {
+	require.Equal(t, LocalAddr(), "")
+}

go/internal/testhelper/testhelper.go

@@ -85,3 +85,9 @@ func getTestDataDir() (string, error) {
 
 	return path.Join(path.Dir(currentFile), "testdata"), nil
 }
+
+func Setenv(key, value string) (func(), error) {
+	oldValue := os.Getenv(key)
+	err := os.Setenv(key, value)
+	return func() { os.Setenv(key, oldValue) }, err
+}