Immutability for blake2 + test_freeze module

Signed-off-by: Matthew A Johnson <matjoh@microsoft.com>

Author: matajoh

Lib/test/test_freeze/__init__.py

@@ -0,0 +1,27 @@
+import os
+from test.support import load_package_tests
+import unittest
+
+
+def load_tests(*args):
+    return load_package_tests(os.path.dirname(__file__), *args)
+
+
+class BaseObjectTest(unittest.TestCase):
+    def __init__(self, *args, obj=None, **kwargs):
+        unittest.TestCase.__init__(self, *args, **kwargs)
+        self.obj = obj
+
+    def setUp(self):
+        freeze(self.obj)
+
+    def test_immutable(self):
+        self.assertTrue(isimmutable(self.obj))
+
+    def test_add_attribute(self):
+        freeze(self.obj)
+        with self.assertRaises(NotWriteableError):
+            self.obj.new_attribute = 'value'
+
+    def test_type_immutable(self):
+        self.assertTrue(isimmutable(type(self.obj)))

Lib/test/test_freeze/__main__.py

@@ -0,0 +1,4 @@
+from . import load_tests
+import unittest
+
+unittest.main()

Lib/test/test_freeze/test_array.py

@@ -0,0 +1,56 @@
+from array import array
+from . import BaseObjectTest
+
+
+class TestArray(BaseObjectTest):
+    def __init__(self, *args, **kwargs):
+        obj = array('i', [1, 2, 3, 4])
+        BaseObjectTest.__init__(self, *args, obj=obj, **kwargs)
+
+    def test_set_item(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj[0] = 5
+
+    def test_set_slice(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj[1:3] = [6, 7]
+
+    def test_append(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.append(8)
+
+    def test_extend(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.extend(array('i', [9]))
+
+    def test_insert(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.insert(0, 10)
+
+    def test_pop(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.pop()
+
+    def test_remove(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.remove(1)
+
+    def test_delete(self):
+        with self.assertRaises(NotWriteableError):
+            del self.obj[0]
+
+    def test_reverse(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.reverse()
+
+    def test_inplace_repeat(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj *= 2
+
+    def test_inplace_concat(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj += array('i', [11])
+
+    def test_byteswap(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.byteswap()

Lib/test/test_freeze/test_collections.py

@@ -0,0 +1,71 @@
+from collections import deque
+
+from . import BaseObjectTest
+
+class TestDeque(BaseObjectTest):
+    class C:
+        pass
+
+    def __init__(self, *args, **kwargs):
+        obj = deque([self.C(), self.C(), 1, "two", None])
+        BaseObjectTest.__init__(self, *args, obj=obj, **kwargs)
+
+    def test_set_item(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj[0] = None
+
+    def test_append(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.append(TestDeque.C())
+
+    def test_appendleft(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.appendleft(TestDeque.C())
+
+    def test_extend(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.extend([TestDeque.C()])
+
+    def test_extendleft(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.extendleft([TestDeque.C()])
+
+    def test_insert(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.insert(0, TestDeque.C())
+
+    def test_pop(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.pop()
+
+    def test_popleft(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.popleft()
+
+    def test_remove(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.remove(1)
+
+    def test_delete(self):
+        with self.assertRaises(NotWriteableError):
+            del self.obj[0]
+
+    def test_inplace_repeat(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj *= 2
+
+    def test_inplace_concat(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj += [TestDeque.C()]
+
+    def test_reverse(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.reverse()
+
+    def test_rotate(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.rotate(1)
+
+    def test_clear(self):
+        with self.assertRaises(NotWriteableError):
+            self.obj.clear()

Lib/test/test_freeze.py Lib/test/test_freeze/test_core.pyLib/test/test_freeze.py renamed to Lib/test/test_freeze/test_core.py

@@ -1,6 +1,7 @@
 import unittest
-from collections import deque
-from array import array
+
+from . import BaseObjectTest
+
 
 # This is a canary to check that global variables are not made immutable
 # when others are made immutable
@@ -19,25 +20,6 @@ class MutableGlobalTest(unittest.TestCase):
     def test_global_mutable(self):
         self.assertTrue(not isimmutable(global_canary))
 
-class BaseObjectTest(unittest.TestCase):
-    def __init__(self, *args, obj=None, **kwargs):
-        unittest.TestCase.__init__(self, *args, **kwargs)
-        self.obj = obj
-
-    def setUp(self):
-        freeze(self.obj)
-
-    def test_immutable(self):
-        self.assertTrue(isimmutable(self.obj))
-
-    def test_add_attribute(self):
-        freeze(self.obj)
-        with self.assertRaises(NotWriteableError):
-            self.obj.new_attribute = 'value'
-
-    def test_type_immutable(self):
-        self.assertTrue(isimmutable(type(self.obj)))
-
 
 class TestBasicObject(BaseObjectTest):
     class C:
@@ -120,129 +102,6 @@ def test_sort(self):
             self.obj.sort()
 
 
-class TestDeque(BaseObjectTest):
-    class C:
-        pass
-
-    def __init__(self, *args, **kwargs):
-        obj = deque([self.C(), self.C(), 1, "two", None])
-        BaseObjectTest.__init__(self, *args, obj=obj, **kwargs)
-
-    def test_set_item(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj[0] = None
-
-    def test_append(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.append(TestList.C())
-
-    def test_appendleft(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.appendleft(TestList.C())
-
-    def test_extend(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.extend([TestList.C()])
-
-    def test_extendleft(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.extendleft([TestList.C()])
-
-    def test_insert(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.insert(0, TestList.C())
-
-    def test_pop(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.pop()
-
-    def test_popleft(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.popleft()
-
-    def test_remove(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.remove(1)
-
-    def test_delete(self):
-        with self.assertRaises(NotWriteableError):
-            del self.obj[0]
-
-    def test_inplace_repeat(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj *= 2
-
-    def test_inplace_concat(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj += [TestList.C()]
-
-    def test_reverse(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.reverse()
-
-    def test_rotate(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.rotate(1)
-
-    def test_clear(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.clear()
-
-
-class TestArray(BaseObjectTest):
-    def __init__(self, *args, **kwargs):
-        obj = array('i', [1, 2, 3, 4])
-        BaseObjectTest.__init__(self, *args, obj=obj, **kwargs)
-
-    def test_set_item(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj[0] = 5
-
-    def test_set_slice(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj[1:3] = [6, 7]
-
-    def test_append(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.append(8)
-
-    def test_extend(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.extend(array('i', [9]))
-
-    def test_insert(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.insert(0, 10)
-
-    def test_pop(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.pop()
-
-    def test_remove(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.remove(1)
-
-    def test_delete(self):
-        with self.assertRaises(NotWriteableError):
-            del self.obj[0]
-
-    def test_reverse(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.reverse()
-
-    def test_inplace_repeat(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj *= 2
-
-    def test_inplace_concat(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj += array('i', [11])
-
-    def test_byteswap(self):
-        with self.assertRaises(NotWriteableError):
-            self.obj.byteswap()
-
-
 class TestDict(BaseObjectTest):
     class C:
         pass

Lib/test/test_freeze/test_hashlib.py

@@ -0,0 +1,18 @@
+from hashlib import blake2b, blake2s
+import unittest
+
+
+class TestHashlib(unittest.TestCase):
+    def test_blake2b(self):
+        h = blake2b(digest_size=32)
+        h.update(b'Hello world')
+        freeze(h)
+        with self.assertRaises(NotWriteableError):
+            h.update(b'!')
+
+    def test_blake2s(self):
+        h = blake2s(digest_size=32)
+        h.update(b'Hello world')
+        freeze(h)
+        with self.assertRaises(NotWriteableError):
+            h.update(b'!')

Modules/_blake2/blake2b_impl.c

@@ -19,6 +19,7 @@
 
 #include "Python.h"
 #include "pycore_strhex.h"       // _Py_strhex()
+#include "pycore_object.h"       // Py_CHECKWRITE
 
 #include "../hashlib.h"
 #include "blake2module.h"
@@ -276,6 +277,10 @@ _blake2_blake2b_update(BLAKE2bObject *self, PyObject *data)
 {
     Py_buffer buf;
 
+    if(!Py_CHECKWRITE(self)){
+        return PyErr_WriteToImmutable(self);
+    }
+
     GET_BUFFER_VIEW_OR_ERROUT(data, &buf);
 
     if (self->lock == NULL && buf.len >= HASHLIB_GIL_MINSIZE)

Modules/_blake2/blake2s_impl.c

@@ -19,6 +19,7 @@
 
 #include "Python.h"
 #include "pycore_strhex.h"       // _Py_strhex()
+#include "pycore_object.h"       // Py_CHECKWRITE
 
 #include "../hashlib.h"
 #include "blake2module.h"
@@ -276,6 +277,10 @@ _blake2_blake2s_update(BLAKE2sObject *self, PyObject *data)
 {
     Py_buffer buf;
 
+    if(!Py_CHECKWRITE(self)){
+        return PyErr_WriteToImmutable(self);
+    }
+
     GET_BUFFER_VIEW_OR_ERROUT(data, &buf);
 
     if (self->lock == NULL && buf.len >= HASHLIB_GIL_MINSIZE)