mirror of
https://github.com/python/cpython.git
synced 2025-11-01 22:21:35 +00:00
gh-137044: Support large limit values in getrlimit() and setrlimit() (GH-137338)
* Return large limit values as positive integers instead of negative integers in resource.getrlimit(). * Accept large values and reject negative values (except RLIM_INFINITY) for limits in resource.setrlimit().
This commit is contained in:
Serhiy Storchaka
GitHub
parent
5be872350d
commit
baefaa6cba
4 changed files with 200 additions and 121 deletions
|
|
@ -14,89 +14,154 @@ class ResourceTest(unittest.TestCase):
|
|||
|
||||
def test_args(self):
|
||||
self.assertRaises(TypeError, resource.getrlimit)
|
||||
self.assertRaises(TypeError, resource.getrlimit, 42, 42)
|
||||
self.assertRaises(TypeError, resource.getrlimit, 0, 42)
|
||||
self.assertRaises(OverflowError, resource.getrlimit, 2**1000)
|
||||
self.assertRaises(OverflowError, resource.getrlimit, -2**1000)
|
||||
self.assertRaises(TypeError, resource.getrlimit, '0')
|
||||
self.assertRaises(TypeError, resource.setrlimit)
|
||||
self.assertRaises(TypeError, resource.setrlimit, 42, 42, 42)
|
||||
self.assertRaises(TypeError, resource.setrlimit, 0)
|
||||
self.assertRaises(TypeError, resource.setrlimit, 0, 42)
|
||||
self.assertRaises(TypeError, resource.setrlimit, 0, 42, 42)
|
||||
self.assertRaises(OverflowError, resource.setrlimit, 2**1000, (42, 42))
|
||||
self.assertRaises(OverflowError, resource.setrlimit, -2**1000, (42, 42))
|
||||
self.assertRaises(ValueError, resource.setrlimit, 0, (42,))
|
||||
self.assertRaises(ValueError, resource.setrlimit, 0, (42, 42, 42))
|
||||
self.assertRaises(TypeError, resource.setrlimit, '0', (42, 42))
|
||||
self.assertRaises(TypeError, resource.setrlimit, 0, ('42', 42))
|
||||
self.assertRaises(TypeError, resource.setrlimit, 0, (42, '42'))
|
||||
|
||||
@unittest.skipIf(sys.platform == "vxworks",
|
||||
"setting RLIMIT_FSIZE is not supported on VxWorks")
|
||||
@unittest.skipUnless(hasattr(resource, 'RLIMIT_FSIZE'), 'requires resource.RLIMIT_FSIZE')
|
||||
def test_fsize_ismax(self):
|
||||
try:
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
except AttributeError:
|
||||
pass
|
||||
else:
|
||||
# RLIMIT_FSIZE should be RLIM_INFINITY, which will be a really big
|
||||
# number on a platform with large file support. On these platforms,
|
||||
# we need to test that the get/setrlimit functions properly convert
|
||||
# the number to a C long long and that the conversion doesn't raise
|
||||
# an error.
|
||||
self.assertEqual(resource.RLIM_INFINITY, max)
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
# RLIMIT_FSIZE should be RLIM_INFINITY, which will be a really big
|
||||
# number on a platform with large file support. On these platforms,
|
||||
# we need to test that the get/setrlimit functions properly convert
|
||||
# the number to a C long long and that the conversion doesn't raise
|
||||
# an error.
|
||||
self.assertEqual(resource.RLIM_INFINITY, max)
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
|
||||
|
||||
@unittest.skipIf(sys.platform == "vxworks",
|
||||
"setting RLIMIT_FSIZE is not supported on VxWorks")
|
||||
@unittest.skipUnless(hasattr(resource, 'RLIMIT_FSIZE'), 'requires resource.RLIMIT_FSIZE')
|
||||
def test_fsize_enforced(self):
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
# Check to see what happens when the RLIMIT_FSIZE is small. Some
|
||||
# versions of Python were terminated by an uncaught SIGXFSZ, but
|
||||
# pythonrun.c has been fixed to ignore that exception. If so, the
|
||||
# write() should return EFBIG when the limit is exceeded.
|
||||
|
||||
# At least one platform has an unlimited RLIMIT_FSIZE and attempts
|
||||
# to change it raise ValueError instead.
|
||||
try:
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
except AttributeError:
|
||||
pass
|
||||
else:
|
||||
# Check to see what happens when the RLIMIT_FSIZE is small. Some
|
||||
# versions of Python were terminated by an uncaught SIGXFSZ, but
|
||||
# pythonrun.c has been fixed to ignore that exception. If so, the
|
||||
# write() should return EFBIG when the limit is exceeded.
|
||||
|
||||
# At least one platform has an unlimited RLIMIT_FSIZE and attempts
|
||||
# to change it raise ValueError instead.
|
||||
try:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (1024, max))
|
||||
limit_set = True
|
||||
except ValueError:
|
||||
limit_set = False
|
||||
f = open(os_helper.TESTFN, "wb")
|
||||
try:
|
||||
f.write(b"X" * 1024)
|
||||
try:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (1024, max))
|
||||
limit_set = True
|
||||
except ValueError:
|
||||
limit_set = False
|
||||
f = open(os_helper.TESTFN, "wb")
|
||||
try:
|
||||
f.write(b"X" * 1024)
|
||||
try:
|
||||
f.write(b"Y")
|
||||
f.write(b"Y")
|
||||
f.flush()
|
||||
# On some systems (e.g., Ubuntu on hppa) the flush()
|
||||
# doesn't always cause the exception, but the close()
|
||||
# does eventually. Try flushing several times in
|
||||
# an attempt to ensure the file is really synced and
|
||||
# the exception raised.
|
||||
for i in range(5):
|
||||
time.sleep(.1)
|
||||
f.flush()
|
||||
# On some systems (e.g., Ubuntu on hppa) the flush()
|
||||
# doesn't always cause the exception, but the close()
|
||||
# does eventually. Try flushing several times in
|
||||
# an attempt to ensure the file is really synced and
|
||||
# the exception raised.
|
||||
for i in range(5):
|
||||
time.sleep(.1)
|
||||
f.flush()
|
||||
except OSError:
|
||||
if not limit_set:
|
||||
raise
|
||||
if limit_set:
|
||||
# Close will attempt to flush the byte we wrote
|
||||
# Restore limit first to avoid getting a spurious error
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
|
||||
finally:
|
||||
f.close()
|
||||
finally:
|
||||
except OSError:
|
||||
if not limit_set:
|
||||
raise
|
||||
if limit_set:
|
||||
# Close will attempt to flush the byte we wrote
|
||||
# Restore limit first to avoid getting a spurious error
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
|
||||
os_helper.unlink(os_helper.TESTFN)
|
||||
finally:
|
||||
f.close()
|
||||
finally:
|
||||
if limit_set:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
|
||||
os_helper.unlink(os_helper.TESTFN)
|
||||
|
||||
def test_fsize_toobig(self):
|
||||
@unittest.skipIf(sys.platform == "vxworks",
|
||||
"setting RLIMIT_FSIZE is not supported on VxWorks")
|
||||
@unittest.skipUnless(hasattr(resource, 'RLIMIT_FSIZE'), 'requires resource.RLIMIT_FSIZE')
|
||||
def test_fsize_too_big(self):
|
||||
# Be sure that setrlimit is checking for really large values
|
||||
too_big = 10**50
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
try:
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
except AttributeError:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (too_big, max))
|
||||
except (OverflowError, ValueError):
|
||||
pass
|
||||
try:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (max, too_big))
|
||||
except (OverflowError, ValueError):
|
||||
pass
|
||||
|
||||
@unittest.skipIf(sys.platform == "vxworks",
|
||||
"setting RLIMIT_FSIZE is not supported on VxWorks")
|
||||
@unittest.skipUnless(hasattr(resource, 'RLIMIT_FSIZE'), 'requires resource.RLIMIT_FSIZE')
|
||||
def test_fsize_not_too_big(self):
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
self.addCleanup(resource.setrlimit, resource.RLIMIT_FSIZE, (cur, max))
|
||||
|
||||
def expected(cur):
|
||||
if resource.RLIM_INFINITY < 0:
|
||||
return [(cur, max), (resource.RLIM_INFINITY, max)]
|
||||
elif resource.RLIM_INFINITY < cur:
|
||||
return [(resource.RLIM_INFINITY, max)]
|
||||
else:
|
||||
return [(cur, max)]
|
||||
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**31-5, max))
|
||||
self.assertEqual(resource.getrlimit(resource.RLIMIT_FSIZE), (2**31-5, max))
|
||||
|
||||
try:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**32, max))
|
||||
except OverflowError:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**31, max))
|
||||
self.assertIn(resource.getrlimit(resource.RLIMIT_FSIZE), expected(2**31))
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**32-5, max))
|
||||
self.assertIn(resource.getrlimit(resource.RLIMIT_FSIZE), expected(2**32-5))
|
||||
else:
|
||||
self.assertIn(resource.getrlimit(resource.RLIMIT_FSIZE), expected(2**32))
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**31, max))
|
||||
self.assertEqual(resource.getrlimit(resource.RLIMIT_FSIZE), (2**31, max))
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**32-5, max))
|
||||
self.assertEqual(resource.getrlimit(resource.RLIMIT_FSIZE), (2**32-5, max))
|
||||
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**63-5, max))
|
||||
self.assertIn(resource.getrlimit(resource.RLIMIT_FSIZE), expected(2**63-5))
|
||||
try:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (too_big, max))
|
||||
except (OverflowError, ValueError):
|
||||
pass
|
||||
try:
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (max, too_big))
|
||||
except (OverflowError, ValueError):
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**63, max))
|
||||
except ValueError:
|
||||
# There is a hard limit on macOS.
|
||||
pass
|
||||
else:
|
||||
self.assertIn(resource.getrlimit(resource.RLIMIT_FSIZE), expected(2**63))
|
||||
resource.setrlimit(resource.RLIMIT_FSIZE, (2**64-5, max))
|
||||
self.assertIn(resource.getrlimit(resource.RLIMIT_FSIZE), expected(2**64-5))
|
||||
|
||||
@unittest.skipIf(sys.platform == "vxworks",
|
||||
"setting RLIMIT_FSIZE is not supported on VxWorks")
|
||||
@unittest.skipUnless(hasattr(resource, 'RLIMIT_FSIZE'), 'requires resource.RLIMIT_FSIZE')
|
||||
def test_fsize_negative(self):
|
||||
(cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
|
||||
for value in -5, -2**31, -2**32-5, -2**63, -2**64-5, -2**1000:
|
||||
with self.subTest(value=value):
|
||||
# This test assumes that the values don't map to RLIM_INFINITY,
|
||||
# though Posix doesn't guarantee it.
|
||||
self.assertNotEqual(value, resource.RLIM_INFINITY)
|
||||
|
||||
self.assertRaises(ValueError, resource.setrlimit, resource.RLIMIT_FSIZE, (value, max))
|
||||
self.assertRaises(ValueError, resource.setrlimit, resource.RLIMIT_FSIZE, (cur, value))
|
||||
|
||||
@unittest.skipUnless(hasattr(resource, "getrusage"), "needs getrusage")
|
||||
def test_getrusage(self):
|
||||
|
|
@ -117,21 +182,18 @@ def test_getrusage(self):
|
|||
# Issue 6083: Reference counting bug
|
||||
@unittest.skipIf(sys.platform == "vxworks",
|
||||
"setting RLIMIT_CPU is not supported on VxWorks")
|
||||
@unittest.skipUnless(hasattr(resource, 'RLIMIT_CPU'), 'requires resource.RLIMIT_CPU')
|
||||
def test_setrusage_refcount(self):
|
||||
try:
|
||||
limits = resource.getrlimit(resource.RLIMIT_CPU)
|
||||
except AttributeError:
|
||||
pass
|
||||
else:
|
||||
class BadSequence:
|
||||
def __len__(self):
|
||||
return 2
|
||||
def __getitem__(self, key):
|
||||
if key in (0, 1):
|
||||
return len(tuple(range(1000000)))
|
||||
raise IndexError
|
||||
limits = resource.getrlimit(resource.RLIMIT_CPU)
|
||||
class BadSequence:
|
||||
def __len__(self):
|
||||
return 2
|
||||
def __getitem__(self, key):
|
||||
if key in (0, 1):
|
||||
return len(tuple(range(1000000)))
|
||||
raise IndexError
|
||||
|
||||
resource.setrlimit(resource.RLIMIT_CPU, BadSequence())
|
||||
resource.setrlimit(resource.RLIMIT_CPU, BadSequence())
|
||||
|
||||
def test_pagesize(self):
|
||||
pagesize = resource.getpagesize()
|
||||
|
|
@ -168,7 +230,8 @@ class BadSeq:
|
|||
def __len__(self):
|
||||
return 2
|
||||
def __getitem__(self, key):
|
||||
return limits[key] - 1 # new reference
|
||||
lim = limits[key]
|
||||
return lim - 1 if lim > 0 else lim + sys.maxsize*2 # new reference
|
||||
|
||||
limits = resource.getrlimit(resource.RLIMIT_AS)
|
||||
self.assertEqual(resource.prlimit(0, resource.RLIMIT_AS, BadSeq()),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue