8000 bpo-44260: Do not read system entropy without need in Random() by serhiy-storchaka · Pull Request #26455 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-44260: Do not read system entropy without need in Random() #26455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2021
Merged

bpo-44260: Do not read system entropy without need in Random() #26455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions Lib/test/test_random.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,23 +374,6 @@ def test_pickling(self):
restoredseq = [newgen.random() for i in range(10)]
self.assertEqual(origseq, restoredseq)

@test.support.cpython_only
def test_bug_41052(self):
# _random.Random should not be allowed to serialization
import _random
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
r = _random.Random()
self.assertRaises(TypeError, pickle.dumps, r, proto)

@test.support.cpython_only
def test_bug_42008(self):
# _random.Random should call seed with first element of arg tuple
import _random
r1 = _random.Random()
r1.seed(8675309)
r2 = _random.Random(8675309)
self.assertEqual(r1.random(), r2.random())

def test_bug_1727780(self):
# verify that version-2-pickles can be loaded
# fine, whether they are created on 32-bit or 64-bit
Expand Down Expand Up @@ -573,6 +556,25 @@ def test_randbelow_logic(self, _log=log, int=int):
self.assertTrue(2**k > n > 2**(k-1)) # note the stronger assertion


class TestRawMersenneTwister(unittest.TestCase):
@test.support.cpython_only
def test_bug_41052(self):
# _random.Random should not be allowed to serialization
import _random
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
r = _random.Random()
self.assertRaises(TypeError, pickle.dumps, r, proto)

@test.support.cpython_only
def test_bug_42008(self):
# _random.Random should call seed with first element of arg tuple
import _random
r1 = _random.Random()
r1.seed(8675309)
r2 = _random.Random(8675309)
self.assertEqual(r1.random(), r2.random())


class MersenneTwister_TestBasicOps(TestBasicOps, unittest.TestCase):
gen = random.Random()

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2021-05-30-13-32-09.bpo-44260.ROEbVd.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The :class:`random.Random` constructor no longer reads system entropy
without need.
44 changes: 17 additions & 27 deletions Modules/_randommodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,10 @@ random_seed_time_pid(RandomObject *self)
init_by_array(self, key, Py_ARRAY_LENGTH(key));
}

static PyObject *
static int
random_seed(RandomObject *self, PyObject *arg)
{
PyObject *result = NULL; /* guilty until proved innocent */
int result = -1; /* guilty until proved innocent */
PyObject *n = NULL;
uint32_t *key = NULL;
size_t bits, keyused;
Expand All @@ -280,7 +280,7 @@ random_seed(RandomObject *self, PyObject *arg)
use the current time and process identifier. */
random_seed_time_pid(self);
}
Py_RETURN_NONE;
return 0;
}

/* This algorithm relies on the number being unsigned.
Expand Down Expand Up @@ -339,8 +339,7 @@ random_seed(RandomObject *self, PyObject *arg)
#endif
init_by_array(self, key, keyused);

Py_INCREF(Py_None);
result = Py_None;
result = 0;

Done:
Py_XDECREF(n);
Expand All @@ -365,7 +364,10 @@ static PyObject *
_random_Random_seed_impl(RandomObject *self, PyObject *n)
/*[clinic end generated code: output=0fad1e16ba883681 input=78d6ef0d52532a54]*/
{
return random_seed(self, n);
if (random_seed(self, n) < 0) {
return NULL;
}
Py_RETURN_NONE;
}

/*[clinic input]
Expand Down Expand Up @@ -515,39 +517,26 @@ _random_Random_getrandbits_impl(RandomObject *self, int k)
return result;
}

static PyObject *
random_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static int
random_init(RandomObject *self, PyObject *args, PyObject *kwds)
{
RandomObject *self;
PyObject *tmp;
PyObject *arg = NULL;
_randomstate *state = _randomstate_type(type);
_randomstate *state = _randomstate_type(Py_TYPE(self));

if (type == (PyTypeObject*)state->Random_Type &&
if (Py_IS_TYPE(self, (PyTypeObject *)state->Random_Type) &&
!_PyArg_NoKeywords("Random()", kwds)) {
return NULL;
return -1;
}

self = (RandomObject *)PyType_GenericAlloc(type, 0);
if (self == NULL)
return NULL;

if (PyTuple_GET_SIZE(args) > 1) {
PyErr_SetString(PyExc_TypeError, "Random() requires 0 or 1 argument");
return NULL;
return -1;
}

if (PyTuple_GET_SIZE(args) == 1)
arg = PyTuple_GET_ITEM(args, 0);

tmp = random_seed(self, arg);
if (tmp == NULL) {
Py_DECREF(self);
return NULL;
}
Py_DECREF(tmp);

return (PyObject *)self;
return random_seed(self, arg);
}


Expand All @@ -566,7 +555,8 @@ PyDoc_STRVAR(random_doc,
static PyType_Slot Random_Type_slots[] = {
{Py_tp_doc, (void *)random_doc},
{Py_tp_methods, random_methods},
{Py_tp_new, random_new},
{Py_tp_new, PyType_GenericNew},
{Py_tp_init, random_init},
{Py_tp_free, PyObject_Free},
{0, 0},
};
Expand Down
0