Remove Improved URL Masking feature flag

Author: saracen

apps/gitlab-runner-helper/main.go

@@ -10,7 +10,6 @@ import (
 	"go.uber.org/automaxprocs/maxprocs"
 
 	"gitlab.com/gitlab-org/gitlab-runner/common"
-	"gitlab.com/gitlab-org/gitlab-runner/helpers/featureflags"
 	"gitlab.com/gitlab-org/gitlab-runner/log"
 
 	_ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers"
@@ -48,9 +47,6 @@ func main() {
 		logrus.Fatalln("Command", command, "not found")
 	}
 
-	if !featureflags.IsOn(logrus.StandardLogger(), os.Getenv(featureflags.UseImprovedURLMasking)) {
-		log.AddSecretsCleanupLogHook(logrus.StandardLogger())
-	}
 	log.ConfigureLogging(app)
 
 	if err := app.Run(os.Args); err != nil {

common/buildlogger/build_logger.go

@@ -7,7 +7,6 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"gitlab.com/gitlab-org/gitlab-runner/helpers"
-	url_helpers "gitlab.com/gitlab-org/gitlab-runner/helpers/url"
 )
 
 type Trace interface {
@@ -30,10 +29,6 @@ const (
 	StreamStartingServiceLevel = 15
 )
 
-type jobTraceIsMaskingURLParams interface {
-	IsMaskingURLParams() bool
-}
-
 func New(log Trace, entry *logrus.Entry) Logger {
 	return Logger{
 		log:   log,
@@ -77,10 +72,6 @@ func (e *Logger) sendLog(logger func(args ...interface{}), logPrefix string, arg
 		// (fmt.Sprintln consistently adds a space between arguments).
 		logLine := fmt.Sprintln(args...)
 		logLine = logLine[:len(logLine)-1]
-
-		if trace, ok := e.log.(jobTraceIsMaskingURLParams); !ok || !trace.IsMaskingURLParams() {
-			logLine = url_helpers.ScrubSecrets(logLine)
-		}
 		logLine += helpers.ANSI_RESET + "\n"
 
 		e.SendRawLog(logPrefix + logLine)

common/buildtest/masking.go

@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"gitlab.com/gitlab-org/gitlab-runner/common"
-	"gitlab.com/gitlab-org/gitlab-runner/helpers/featureflags"
 	"gitlab.com/gitlab-org/gitlab-runner/helpers/trace"
 )
 
@@ -30,8 +29,6 @@ func RunBuildWithMasking(t *testing.T, config *common.RunnerConfig, setup BuildS
 		Runner:      config,
 	}
 
-	build.Runner.FeatureFlags = map[string]bool{featureflags.UseImprovedURLMasking: true}
-
 	build.Variables = append(
 		build.Variables,
 		common.JobVariable{Key: "MASKED_KEY", Value: "MASKED_VALUE", Masked: true},

helpers/featureflags/flags.go

@@ -24,7 +24,6 @@ const (
 	EnableJobCleanup                     string = "FF_ENABLE_JOB_CLEANUP"
 	KubernetesHonorEntrypoint            string = "FF_KUBERNETES_HONOR_ENTRYPOINT"
 	PosixlyCorrectEscapes                string = "FF_POSIXLY_CORRECT_ESCAPES"
-	UseImprovedURLMasking                string = "FF_USE_IMPROVED_URL_MASKING"
 	ResolveFullTLSChain                  string = "FF_RESOLVE_FULL_TLS_CHAIN"
 	DisablePowershellStdin               string = "FF_DISABLE_POWERSHELL_STDIN"
 	UsePodActiveDeadlineSeconds          string = "FF_USE_POD_ACTIVE_DEADLINE_SECONDS"
@@ -209,15 +208,6 @@ var flags = []FeatureFlag{
 			"are used rather than [`bash`-style ANSI-C quoting](https://www.gnu.org/software/bash/manual/html_node/Quoting.html). " +
 			"This should be enabled if the job environment uses a POSIX-compliant shell.",
 	},
-	{
-		Name:         UseImprovedURLMasking,
-		DefaultValue: false,
-		Deprecated:   false,
-		Description: "When enabled, any sensitive URL parameters are masked no matter where they appear in the trace " +
-			"log output. When this is disabled, sensitive URL parameters are only masked in select places and can " +
-			"[occasionally be revealed](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/4625). This feature " +
-			"flag can only be configured via Runner's config and not from a job.",
-	},
 	{
 		Name:         ResolveFullTLSChain,
 		DefaultValue: false,

network/trace.go

@@ -448,10 +448,6 @@ func (c *clientJobTrace) setupLogLimit() {
 	c.buffer.SetLimit(bytesLimit)
 }
 
-func (c *clientJobTrace) IsMaskingURLParams() bool {
-	return c.config.IsFeatureFlagOn(featureflags.UseImprovedURLMasking)
-}
-
 func (c *clientJobTrace) SetDebugModeEnabled(isEnabled bool) {
 	c.debugModeEnabled = isEnabled
 }