tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Merge pull request #109 from warner/2023-caution 

Avoid Popen() of executables that don't exist
This commit is contained in:
Daira Hopwood 2014-09-13 10:58:55 +01:00
parent 38668c9e35 d27a57cb49
commit d91170a7ac
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/allmydata/__init__.py
View File

@ -106,6 +106,7 @@ def get_linux_distro():
if _distname and _version: if _distname and _version:
return (_distname, _version) return (_distname, _version)
if os.path.isfile("/usr/bin/lsb_release") or os.path.isfile("/bin/lsb_release"):
try: try:
p = subprocess.Popen(["lsb_release", "--all"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(["lsb_release", "--all"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
rc = p.wait() rc = p.wait()

1
src/allmydata/test/test_iputil.py
View File

@ -130,6 +130,7 @@ class ListAddresses(testutil.SignalMixin, unittest.TestCase):
e.errno = errno.ENOENT e.errno = errno.ENOENT
raise e raise e
self.patch(subprocess, 'Popen', call_Popen) self.patch(subprocess, 'Popen', call_Popen)
self.patch(os.path, 'isfile', lambda x: True)
def call_get_local_ip_for(target): def call_get_local_ip_for(target):
if target in ("localhost", "127.0.0.1"): if target in ("localhost", "127.0.0.1"):

2
src/allmydata/util/iputil.py
View File

@ -190,6 +190,8 @@ def _synchronously_find_addresses_via_config():
return [] return []
def _query(path, args, regex): def _query(path, args, regex):
if not os.path.isfile(path):
return []
env = {'LANG': 'en_US.UTF-8'} env = {'LANG': 'en_US.UTF-8'}
TRIES = 5 TRIES = 5
for trial in xrange(TRIES): for trial in xrange(TRIES):