Attachment 2223 Details for Bug 17354

[patch] Fix shell escaping error

17354_umc-security-update.diff (text/plain), 1.23 KB, created by Philipp Hahn on 2010-01-14 17:54 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2010-01-14 17:54 CET

Size: 1.23 KB

patch

obsolete

>Index: __init__.py
>===================================================================
>--- __init__.py	(Revision 14754)
>+++ __init__.py	(Arbeitskopie)
>@@ -690,10 +690,11 @@
> 
> 	def __create_at_job(self, command):
> 		script = '''
>+exec >> /var/log/univention/security-updates.log 2>&1
> dpkg-statoverride --add root root 0644 /usr/sbin/univention-management-console-server
> dpkg-statoverride --add root root 0644 /usr/sbin/apache2
> chmod -x /usr/sbin/univention-management-console-server /usr/sbin/apache2
>-%s
>+%s </dev/null
> if [ $? -eq 0 ]; then
> 	univention-config-registry set update/reboot/required=yes
> fi
>@@ -701,8 +702,8 @@
> dpkg-statoverride --remove /usr/sbin/apache2
> chmod +x /usr/sbin/univention-management-console-server /usr/sbin/apache2
> ''' % command
>-		p1 = subprocess.Popen(['echo "%s" | at now' % script], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
>-		(stdout,stderr) = p1.communicate()
>+		p1 = subprocess.Popen(['at', 'now'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>+		(stdout,stderr) = p1.communicate(script)
> 		ud.debug(ud.ADMIN, ud.WARN, 'executing "%s"' % command)
> 		ud.debug(ud.ADMIN, ud.WARN, 'install stderr=%s' % stderr)
> 		ud.debug(ud.ADMIN, ud.INFO, 'install stdout=%s' % stdout)

Actions: View | Diff

Attachments on bug 17354: 2223