Attachment 21859 Details for Bug 59836 – Исправляющий патч

[patch] Исправляющий патч

NetworkManager-fix-agent-owned-secrets.patch (text/plain), 2.57 KB, created by Жора Змейкин on 2026-07-15 01:55:31 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Жора Змейкин

Created: 2026-07-15 01:55:31 MSK

Size: 2.57 KB

patch

obsolete

>From 51c2345830c6e07a145cb1f801f314ac5efcb54a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?=D0=96=D0=BE=D1=80=D0=B0=20=D0=97=D0=BC=D0=B5=D0=B9=D0=BA?=
> =?UTF-8?q?=D0=B8=D0=BD?= <me@katze-942.ru>
>Date: Mon, 13 Jul 2026 21:32:31 +0300
>Subject: [PATCH] settings-connection: keep agent-owned secrets for GetSecrets
>
>ALT commit 6e5cc4d24fe4 clears AGENT_OWNED secrets received from a secret
>agent, preventing a later GetSecrets() call from returning the Wi-Fi PSK.
>
>Clear only NOT_SAVED and NOT_REQUIRED secrets.  PERSIST_MODE_NO_PERSIST
>keeps the agent-owned secret out of persistent storage.
>
>Fixes: 6e5cc4d24fe4 ("settings-connection: don't store non-system secrets from agent")
>
>---
> .../core/settings/nm-settings-connection.c    | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/NetworkManager/src/core/settings/nm-settings-connection.c b/NetworkManager/src/core/settings/nm-settings-connection.c
>index 76428827be..0ccd9ee996 100644
>--- a/NetworkManager/src/core/settings/nm-settings-connection.c
>+++ b/NetworkManager/src/core/settings/nm-settings-connection.c
>@@ -916,12 +916,14 @@ match_secret_by_setting_name_and_flags_cb(NMSetting           *setting,
> }
> 
> static gboolean
>-match_secret_is_system_owned(NMSetting           *setting,
>-                             const char          *secret,
>-                             NMSettingSecretFlags flags,
>-                             gpointer             user_data)
>+match_secret_is_not_saved_or_not_required(NMSetting           *setting,
>+                                          const char          *secret,
>+                                          NMSettingSecretFlags flags,
>+                                          gpointer             user_data)
> {
>-    return !secret_is_system_owned(flags, user_data);
>+    return NM_FLAGS_ANY(flags,
>+                        NM_SETTING_SECRET_FLAG_NOT_SAVED
>+                            | NM_SETTING_SECRET_FLAG_NOT_REQUIRED);
> }
> 
> static void
>@@ -1043,11 +1045,9 @@ get_secrets_done_cb(NMAgentManager              *manager,
>         _LOGD("(%s:%p) new agent secrets processed", setting_name, call_id);
>     }
> 
>-    /*
>-     * We don't want to store secrets to settings-connection, that don't belong
>-     * to the system
>-     */
>-    nm_connection_clear_secrets_with_flags(new_connection, match_secret_is_system_owned, NULL);
>+    nm_connection_clear_secrets_with_flags(new_connection,
>+                                           match_secret_is_not_saved_or_not_required,
>+                                           NULL);
> 
>     if (!nm_settings_connection_update(
>             self,
>-- 
>2.50.1

Actions: View | Diff

Attachments on bug 59836: 21859