Merge remote-tracking branch 'dev/12-7-stable' into 12-7-stable12-7-stable

6 files changed, 41 insertions, 4 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9dbc908a..05060e45d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -191,8 +191,8 @@ update-downstream-server-version:
 
 include:
   - template: Security/License-Management.gitlab-ci.yml
-  - template: SAST.gitlab-ci.yml
-  - template: Dependency-Scanning.gitlab-ci.yml
+  - template: Security/SAST.gitlab-ci.yml
+  - template: Security/Dependency-Scanning.gitlab-ci.yml
 
 gosec-sast:
   before_script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53a229b71..d3b611090 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Gitaly changelog
 
+## 12.7.9
+
+- No changes.
+
 ## 12.7.8
 
 - No changes.
diff --git a/VERSION b/VERSION
index f92b54868..7e61dcb00 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.8
+12.7.9
diff --git a/internal/praefect/models/node.go b/internal/praefect/models/node.go
index 13c738d99..4cfa9b8d5 100644
--- a/internal/praefect/models/node.go
+++ b/internal/praefect/models/node.go
@@ -1,5 +1,9 @@
 package models
 
+import (
+	"encoding/json"
+)
+
 // Node describes an address that serves a storage
 type Node struct {
 	Storage        string `toml:"storage"`
@@ -8,6 +12,19 @@ type Node struct {
 	DefaultPrimary bool   `toml:"primary"`
 }
 
+// MarshalJSON is a custom marshaller that filters out sensitive fields
+func (n Node) MarshalJSON() ([]byte, error) {
+	return json.Marshal(&struct {
+		Storage string `json:"storage"`
+		Address string `json:"address"`
+		Primary bool   `json:"primary"`
+	}{
+		Storage: n.Storage,
+		Address: n.Address,
+		Primary: n.DefaultPrimary,
+	})
+}
+
 // Repository describes a repository's relative path and its primary and list of secondaries
 type Repository struct {
 	RelativePath string
diff --git a/internal/praefect/models/node_test.go b/internal/praefect/models/node_test.go
index 64942711f..7cefdf7f1 100644
--- a/internal/praefect/models/node_test.go
+++ b/internal/praefect/models/node_test.go
@@ -1,6 +1,7 @@
 package models
 
 import (
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -34,3 +35,18 @@ func TestRepository_Clone(t *testing.T) {
 	clone.Replicas[0].Address = "0.0.0.3"
 	require.Equal(t, "0.0.0.1", src.Replicas[0].Address)
 }
+
+func TestNode_MarshalJSON(t *testing.T) {
+	token := "secretToken"
+	node := &Node{
+		Storage:        "storage",
+		Address:        "address",
+		Token:          token,
+		DefaultPrimary: true,
+	}
+
+	b, err := json.Marshal(node)
+	require.NoError(t, err)
+	require.NotContains(t, string(b), "token")
+	require.NotContains(t, string(b), token)
+}
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index d754487c3..b966da89e 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,5 +1,5 @@
 # This file was auto-generated by release-tools
 #  https://gitlab.com/gitlab-org/release-tools/-/blob/master/lib/release_tools/release/gitaly_release.rb
 module Gitaly
-  VERSION = '12.7.8'
+  VERSION = '12.7.9'
 end