pam/utils: Use safe formatting also for the values passed as arguments

If safeMessageDebug is used to print multiple types, only the first one
is safely parsed, while the others are not.

This won't cover (and it's not even possible) to do it in case a format
is used, but should allow to easily and safely print things around anyways

Author: 3v1n0

pam/internal/adapter/authentication.go

@@ -204,16 +204,16 @@ func (m authenticationModel) Update(msg tea.Msg) (authModel authenticationModel,
 		return m, sendEvent(startAuthentication{})
 
 	case startAuthentication:
-		safeMessageDebug(msg, "current model %v, focused %v",
-			m.currentModel, m.Focused())
+		safeMessageDebug(msg, "current model:", m.currentModel,
+			"focused:", m.Focused())
 		if !m.Focused() {
 			return m, nil
 		}
 		m.inProgress = true
 
 	case stopAuthentication:
-		safeMessageDebug(msg, "current model %v, focused %v",
-			m.currentModel, m.Focused())
+		safeMessageDebug(msg, "current model:", m.currentModel,
+			"focused:", m.Focused())
 		m.inProgress = false
 
 	case reselectAuthMode:

pam/internal/adapter/model.go

@@ -271,7 +271,7 @@ func (m uiModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	// Events
 	case BrokerListReceived:
-		safeMessageDebug(msg, "brokers: %#v", m.availableBrokers())
+		safeMessageDebug(msg, "brokers:", m.availableBrokers())
 		if m.availableBrokers() == nil {
 			return m, nil
 		}

pam/internal/adapter/reselectbuttonmodel.go

@@ -25,7 +25,7 @@ func (b authReselectButtonModel) Init() tea.Cmd {
 func (b authReselectButtonModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case buttonSelectionEvent:
-		safeMessageDebug(msg, "button: %#v", b)
+		safeMessageDebug(msg, "button:", b)
 		if msg.model == b.buttonModel {
 			return b, sendEvent(reselectAuthMode{})
 		}

pam/internal/adapter/utils.go

@@ -264,7 +264,14 @@ func safeMessageDebugWithPrefix(prefix string, msg tea.Msg, formatAndArgs ...any
 
 	format, ok := formatAndArgs[0].(string)
 	if !ok || !strings.Contains(format, "%") {
-		log.Debug(context.Background(), append([]any{m, ", "}, formatAndArgs...)...)
+		args := []any{m, ", "}
+		for i, arg := range formatAndArgs {
+			args = append(args, debugMessageFormatter(arg))
+			if i < len(formatAndArgs)-1 {
+				args = append(args, " ")
+			}
+		}
+		log.Debug(context.Background(), args...)
 		return
 	}
 

pam/internal/adapter/utils_test.go

@@ -239,6 +239,22 @@ func TestSafeMessageDebug(t *testing.T) {
 			formatAndArgs:  []any{true, false},
 			wantSafeString: "prefix: adapter.startAuthentication{}, true false",
 		},
+		"startAuthentication_message_with_prefix_and_multiple_formatted_values_suffix": {
+			msg:    startAuthentication{},
+			prefix: "prefix",
+			formatAndArgs: []any{
+				newPasswordCheck{password: "password!"},
+				UILayoutReceived{&authd.UILayout{Type: "Foo"}},
+				authModesReceived{
+					authModes: []*authd.GAMResponse_AuthenticationMode{
+						{Id: "id1", Label: "Label1"},
+						{Id: "id2", Label: "Label2"},
+					},
+				},
+			},
+			wantDebugString: `prefix: adapter.startAuthentication{}, adapter.newPasswordCheck{ctx:context.Context(nil), password:"password!"} adapter.UILayoutReceived{layouts:*authd.UILayout{{"type":"Foo"}}} adapter.authModesReceived{authModes:[]*authd.GAMResponse_AuthenticationMode{[{"id":"id1","label":"Label1"},{"id":"id2","label":"Label2"}]}}`,
+			wantSafeString:  `prefix: adapter.startAuthentication{}, adapter.newPasswordCheck{ctx:context.Context(nil), password:"***********"} adapter.UILayoutReceived{layouts:*authd.UILayout{{"type":"Foo"}}} adapter.authModesReceived{authModes:[]*authd.GAMResponse_AuthenticationMode{[{"id":"id1","label":"Label1"},{"id":"id2","label":"Label2"}]}}`,
+		},
 		"startAuthentication_message_with_prefix_and_single_string_suffix": {
 			msg:            startAuthentication{},
 			prefix:         "prefix",
@@ -329,11 +345,12 @@ func TestSafeMessageDebug(t *testing.T) {
 			handlerCalled := false
 			wantCtx := context.Background()
 			log.SetLevelHandler(log.DebugLevel, func(ctx context.Context, l log.Level, format string, args ...interface{}) {
-				t.Logf(format, args...)
+				t.Logf("Format: %q", format)
+				t.Log(append([]any{"Args:"}, args...)...)
 				handlerCalled = true
 				require.Equal(t, wantCtx, ctx, "Context should match expected")
 				require.Equal(t, tc.wantSafeString, fmt.Sprintf(format, args...),
-					"Format should match")
+					"Format for safe usage should match")
 			})
 
 			initialLogLevel := log.GetLevel()
@@ -363,11 +380,11 @@ func TestSafeMessageDebug(t *testing.T) {
 			log.SetLevelHandler(log.DebugLevel, func(ctx context.Context, l log.Level, format string, args ...interface{}) {
 				t.Logf(format, args...)
 				handlerCalled = true
-				t.Logf("Called with %q", format)
-				t.Logf("Atgs are %#v", args)
+				t.Logf("Format: %q", format)
+				t.Log(append([]any{"Args:"}, args...)...)
 				require.Equal(t, wantCtx, ctx, "Context should match expected")
 				require.Equal(t, tc.wantDebugString, fmt.Sprintf(format, args...),
-					"Format should match")
+					"Format for debug usage should match")
 			})
 
 			initialLogLevel := log.GetLevel()