fixup! fixup! fixup! fixup! fixup! fixup! fixup! add support for mong…

…odb Client Side Field Level Encryption (CSFLE)
TurboGears · Sep 12, 2024 · 9f28e70 · 9f28e70
1 parent 3b6334b
commit 9f28e70
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/docs/presentations/demo_encryption.py b/docs/presentations/demo_encryption.py
@@ -3,15 +3,15 @@
 from ming.datastore import create_engine, create_datastore, DataStore
 from ming.encryption import EncryptionConfig
 import ming.schema as S
-from ming.tests import EncryptionConfigHelper
+from ming.tests import make_encryption_key
 
 bind: DataStore = create_datastore(
  'mongodb://localhost:27017/test_database',
  encryption=EncryptionConfig({
  'kms_providers': {
  'local': {
  # Don't use this for production! This is just for demo purposes
- 'key': EncryptionConfigHelper.make_encryption_key('demo_encryption'),
+ 'key': make_encryption_key('demo_encryption'),
  },
  },
  'key_vault_namespace': 'demo_encryption_db.__keyVault',

diff --git a/ming/tests/__init__.py b/ming/tests/__init__.py
@@ -14,12 +14,13 @@ def push_seed(seed):
  random.setstate(rstate)
 
 
-class EncryptionConfigHelper:
+@staticmethod
+def make_encryption_key(seed=__name__):
+ with push_seed(seed):
+ return base64.b64encode(os.urandom(96)).decode('ascii')
+
 
- @staticmethod
- def make_encryption_key(seed=__name__):
- with push_seed(seed):
- return base64.b64encode(os.urandom(96)).decode('ascii')
+class EncryptionConfigHelper:
 
  LOCAL_KEY_VAULT_NAMESPACE = 'encryption_test.coll_key_vault_test'
  LOCAL_KEY = make_encryption_key('test local key')

diff --git a/ming/tests/test_datastore.py b/ming/tests/test_datastore.py
@@ -11,7 +11,7 @@
 from ming import create_datastore, create_engine
 from ming.exc import MingConfigError
 from ming.datastore import Engine
-from ming.tests import EncryptionConfigHelper
+from ming.tests import EncryptionConfigHelper, make_encryption_key
 
 
 class DummyConnection:
@@ -178,7 +178,7 @@ def test_configure_optional_params(self):
  assert session.bind.db is not None
 
  def test_configure_encryption(self):
- encryption_key = EncryptionConfigHelper.make_encryption_key('foo')
+ encryption_key = make_encryption_key('foo')
  ming.configure(**{
  'ming.main.uri': 'mongodb://localhost:27017/test_db',
  'ming.main.replicaSet': 'foobar',

diff --git a/ming/tests/test_declarative.py b/ming/tests/test_declarative.py
@@ -15,7 +15,7 @@
 from ming.odm.odmsession import ODMSession, ThreadLocalODMSession
 from ming.session import Session
 from ming.exc import MingException
-from ming.tests import EncryptionConfigHelper
+from ming.tests import make_encryption_key
 
 
 def mock_datastore():
@@ -183,7 +183,7 @@ def setUp(self):
  encryption_config = EncryptionConfig({
  'kms_providers': {
  'local': {
- 'key': EncryptionConfigHelper.make_encryption_key(__name__),
+ 'key': make_encryption_key(__name__),
  },
  },
  'key_vault_namespace': 'encryption.__keyVault',