File 0001-fw_nm-Make-nm_get_zone_of_connection-only-... of Package firewalld.8960

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-fw_nm-Make-nm_get_zone_of_connection-only-check-perm.patch of Package firewalld.8960

From 07551d2259ff1f249e8598aba04136a6397119d4 Mon Sep 17 00:00:00 2001
From: Eric Garver <e@erig.me>
Date: Tue, 17 Jul 2018 14:43:42 -0400
Subject: [PATCH 1/8] fw_nm: Make nm_get_zone_of_connection() only check
 permanent conns

We really only care about permanent connections for NM. So make sure
we're only considering permanent ones.

(cherry picked from commit ceb5dc341bd8a302f5cfca438ae47481026c2e5f)
---
 src/firewall/core/fw_nm.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/firewall/core/fw_nm.py b/src/firewall/core/fw_nm.py
index b3280ca7..2cbb017e 100644
--- a/src/firewall/core/fw_nm.py
+++ b/src/firewall/core/fw_nm.py
@@ -81,6 +81,16 @@ def nm_get_zone_of_connection(connection):
     if setting_con is None:
         return None
 
+    try:
+        if con.get_flags() & (NM.SettingsConnectionFlags.NM_GENERATED
+                              | NM.SettingsConnectionFlags.NM_VOLATILE):
+            return False
+    except AttributeError:
+        # Prior to NetworkManager 1.12, we can only guess
+        # that a connection was generated/volatile.
+        if con.get_unsaved():
+            return False
+
     zone = setting_con.get_zone()
     if zone is None:
         zone = ""
-- 
2.19.0

Places

File 0001-fw_nm-Make-nm_get_zone_of_connection-only-check-perm.patch of Package firewalld.8960

Places