forked from pool/rpmlint
Dirk Mueller
2764482b3b
0001-Handle-post-scripts-that-contain-non-ascii-character.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=515
121 lines
5.3 KiB
Diff
121 lines
5.3 KiB
Diff
From 53b868fcaba87016c623f47e8d40e09f4fccaafa Mon Sep 17 00:00:00 2001
|
|
From: Dirk Mueller <dirk@dmllr.de>
|
|
Date: Wed, 4 Oct 2017 14:40:02 +0200
|
|
Subject: [PATCH] Handle %post scripts that contain non-ascii characters
|
|
|
|
when running LC_ALL=C and python3 this otherwise traces with:
|
|
|
|
File "rpmlint/PostCheck.py", line 83, in check_syntax_script
|
|
tmpfile.write(script)
|
|
UnicodeEncodeError: 'ascii' codec can't encode character '\xfc' in position 16: ordinal not in range(128)
|
|
|
|
Add test coverage.
|
|
---
|
|
PostCheck.py | 31 +++++++++++++++++------------
|
|
test/binary/Nonutfpostcheck-0-0.x86_64.rpm | Bin 0 -> 6028 bytes
|
|
2 files changed, 18 insertions(+), 13 deletions(-)
|
|
create mode 100644 test/binary/Nonutfpostcheck-0-0.x86_64.rpm
|
|
|
|
Index: rpmlint-rpmlint-1.10/PostCheck.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/PostCheck.py
|
|
+++ rpmlint-rpmlint-1.10/PostCheck.py
|
|
@@ -10,6 +10,7 @@
|
|
|
|
import os
|
|
import re
|
|
+import tempfile
|
|
|
|
import rpm
|
|
|
|
@@ -78,7 +79,8 @@ def check_syntax_script(prog, commandlin
|
|
if not script:
|
|
return False
|
|
# TODO: test that "prog" is available/executable
|
|
- tmpfile, tmpname = Pkg.mktemp()
|
|
+ tmpfd, tmpname = tempfile.mkstemp(prefix='rpmlint.')
|
|
+ tmpfile = os.fdopen(tmpfd, 'wb')
|
|
try:
|
|
tmpfile.write(script)
|
|
tmpfile.close()
|
|
@@ -105,35 +107,38 @@ class PostCheck(AbstractCheck.AbstractCh
|
|
prog = pkg.scriptprog(tag[1])
|
|
if prog:
|
|
prog = prog.split()[0]
|
|
- self.check_aux(pkg, files, prog, script, tag[2], prereq)
|
|
+ self.check_aux(pkg, files, prog, pkg.header[tag[0]],
|
|
+ tag[2], prereq)
|
|
else:
|
|
prog = pkg[tag[1]]
|
|
for idx in range(0, len(prog)):
|
|
self.check_aux(
|
|
- pkg, files, prog[idx], script[idx], tag[2], prereq)
|
|
+ pkg, files, prog[idx],
|
|
+ pkg.header[tag[0]][idx], tag[2], prereq)
|
|
|
|
def check_aux(self, pkg, files, prog, script, tag, prereq):
|
|
if script:
|
|
+ script_str = Pkg.b2s(script)
|
|
if prog:
|
|
if prog not in valid_shells:
|
|
printError(pkg, 'invalid-shell-in-' + tag, prog)
|
|
if prog in empty_shells:
|
|
printError(pkg, 'non-empty-' + tag, prog)
|
|
if prog in syntaxcheck_shells or prog == '/usr/bin/perl':
|
|
- if percent_regex.search(script):
|
|
+ if percent_regex.search(script_str):
|
|
printWarning(pkg, 'percent-in-' + tag)
|
|
- if bracket_regex.search(script):
|
|
+ if bracket_regex.search(script_str):
|
|
printWarning(pkg, 'spurious-bracket-in-' + tag)
|
|
- res = dangerous_command_regex.search(script)
|
|
+ res = dangerous_command_regex.search(script_str)
|
|
if res:
|
|
printWarning(pkg, 'dangerous-command-in-' + tag,
|
|
res.group(2))
|
|
- res = selinux_regex.search(script)
|
|
+ res = selinux_regex.search(script_str)
|
|
if res:
|
|
printError(pkg, 'forbidden-selinux-command-in-' + tag,
|
|
res.group(2))
|
|
|
|
- if 'update-menus' in script:
|
|
+ if 'update-menus' in script_str:
|
|
menu_error = True
|
|
for f in files:
|
|
if menu_regex.search(f):
|
|
@@ -142,10 +147,10 @@ class PostCheck(AbstractCheck.AbstractCh
|
|
if menu_error:
|
|
printError(pkg, 'update-menus-without-menu-file-in-' +
|
|
tag)
|
|
- if tmp_regex.search(script):
|
|
+ if tmp_regex.search(script_str):
|
|
printError(pkg, 'use-tmp-in-' + tag)
|
|
for c in prereq_assoc:
|
|
- if c[0].search(script):
|
|
+ if c[0].search(script_str):
|
|
found = False
|
|
for p in c[1]:
|
|
if p in prereq or p in files:
|
|
@@ -157,9 +162,9 @@ class PostCheck(AbstractCheck.AbstractCh
|
|
if prog in syntaxcheck_shells:
|
|
if incorrect_shell_script(prog, script):
|
|
printError(pkg, 'shell-syntax-error-in-' + tag)
|
|
- if home_regex.search(script):
|
|
+ if home_regex.search(script_str):
|
|
printError(pkg, 'use-of-home-in-' + tag)
|
|
- res = bogus_var_regex.search(script)
|
|
+ res = bogus_var_regex.search(script_str)
|
|
if res:
|
|
printWarning(pkg, 'bogus-variable-use-in-' + tag,
|
|
res.group(1))
|
|
@@ -168,7 +173,7 @@ class PostCheck(AbstractCheck.AbstractCh
|
|
if incorrect_perl_script(prog, script):
|
|
printError(pkg, 'perl-syntax-error-in-' + tag)
|
|
elif prog.endswith('sh'):
|
|
- res = single_command_regex.search(script)
|
|
+ res = single_command_regex.search(script_str)
|
|
if res:
|
|
printWarning(pkg, 'one-line-command-in-' + tag,
|
|
res.group(1))
|