File prevent-command-injection-in-the-snapper-module... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File prevent-command-injection-in-the-snapper-module-bsc-.patch of Package salt (Revision a095397cb4bac950ae21f7557cd149d1)

Currently displaying revision a095397cb4bac950ae21f7557cd149d1 , Show latest

From 299beb056a08ca6171dba56f4fc463a0186718f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
Date: Tue, 27 Apr 2021 11:14:20 +0100
Subject: [PATCH] Prevent command injection in the snapper module
 (bsc#1185281) (CVE-2021-31607)

---
 salt/modules/snapper.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/salt/modules/snapper.py b/salt/modules/snapper.py
index db1b79cf49..dfc044764c 100644
--- a/salt/modules/snapper.py
+++ b/salt/modules/snapper.py
@@ -19,6 +19,7 @@ import logging
 import os
 import time
 import difflib
+import subprocess
 try:
     from pwd import getpwuid
     HAS_PWD = True
@@ -523,7 +524,12 @@ def _is_text_file(filename):
     '''
     Checks if a file is a text file
     '''
-    type_of_file = os.popen('file -bi {0}'.format(filename), 'r').read()
+    type_of_file = subprocess.run(
+        ["file", "-bi", filename],
+        check=False,
+        stdout=subprocess.PIPE,
+        universal_newlines=True,
+    ).stdout
     return type_of_file.startswith('text')
 
 
-- 
2.31.1

Places

File prevent-command-injection-in-the-snapper-module-bsc-.patch of Package salt (Revision a095397cb4bac950ae21f7557cd149d1)

Places