openstack/oslo.rootwrap
Code Issues Proposed changes

Don't open subdirectories rootwrap filter directories

Browse Source 
A rootwrap filter directory may contain subdirectories. The rootwrap
daemon will crash when it tries to load filters from subdirectories.
So subdirectories should be skipped.

Change-Id: I4f618734300bf5eb81282fbf8fc213f995a4fe59
This commit is contained in:
Stephen Ma 2017-02-22 11:09:04 -08:00
parent 1335a543be
commit 0694fbc7a9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oslo_rootwrap/tests/test_rootwrap.py
View File

@ -46,6 +46,7 @@ class RootwrapLoaderTestCase(testtools.TestCase):
def test_strict_switched_off_in_configparser(self): def test_strict_switched_off_in_configparser(self):
temp_dir = self.useFixture(fixtures.TempDir()).path temp_dir = self.useFixture(fixtures.TempDir()).path
os.mkdir(os.path.join(temp_dir, 'nested'))
temp_file = os.path.join(temp_dir, 'test.conf') temp_file = os.path.join(temp_dir, 'test.conf')
f = open(temp_file, 'w') f = open(temp_file, 'w')
f.write("""[Filters] f.write("""[Filters]

5
oslo_rootwrap/wrapper.py
View File

@ -117,9 +117,12 @@ def load_filters(filters_path):
continue continue
for filterfile in filter(lambda f: not f.startswith('.'), for filterfile in filter(lambda f: not f.startswith('.'),
os.listdir(filterdir)): os.listdir(filterdir)):
filterfilepath = os.path.join(filterdir, filterfile)
if not os.path.isfile(filterfilepath):
continue
kwargs = {"strict": False} if six.PY3 else {} kwargs = {"strict": False} if six.PY3 else {}
filterconfig = moves.configparser.RawConfigParser(**kwargs) filterconfig = moves.configparser.RawConfigParser(**kwargs)
filterconfig.read(os.path.join(filterdir, filterfile)) filterconfig.read(filterfilepath)
for (name, value) in filterconfig.items("Filters"): for (name, value) in filterconfig.items("Filters"):
filterdefinition = [s.strip() for s in value.split(',')] filterdefinition = [s.strip() for s in value.split(',')]
newfilter = build_filter(*filterdefinition) newfilter = build_filter(*filterdefinition)