-
Notifications
You must be signed in to change notification settings - Fork 25
INTPYTHON-527 Add Queryable Encryption support #329
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.
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
Open
aclark4life
wants to merge
133
commits into
mongodb:main
Choose a base branch
from
aclark4life:INTPYTHON-527
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+669
−13
Open
Changes from all commits
Commits
Show all changes
133 commits
Select commit
Hold shift + click to select a range
bc52c8e
INTPYTHON-527 Add Queryable Encryption support
aclark4life 38fb110
Fix test for unencrypted field not in field map
aclark4life 65bd15a
Fix test for unencrypted field not in field map
aclark4life e08945b
Add comment about suppressing EncryptedCollectionError
aclark4life 7b34b44
Don't rely on features to fall back to unencrypted
aclark4life 8e83ada
Remove _nodb_cursor and disable version check
aclark4life 4da895c
Don't surpress encrypted error
aclark4life ed54a9b
Rename get_encrypted_client -> get_client_encryption
aclark4life 8a7766c
Add encryption router
aclark4life eab2f2e
Add "encryption" database to encryption tests
aclark4life 10a361e
Move encrypted_fields_map to schema (1/2)
aclark4life 01d5485
Move encrypted_fields_map to schema (2/x)
aclark4life db32487
Refactor helpers
aclark4life b2be223
Restore get_database_version functionality
aclark4life 27d4b8e
Move encrypted router to tests
aclark4life c4d1c66
Fix router tests
aclark4life 2772aff
Test feature `supports_queryable_encryption`
aclark4life d2ddf4e
Add path and bsonType to _get_encrypted_fields_map
aclark4life e25357e
Use the right database; rename some vars
aclark4life 6487086
Refactor helpers again
aclark4life bc76db3
Allow user to customize some QE settings.
aclark4life 4dbaa8f
Allow uer to customize KMS provider.
aclark4life 9cc5ad2
Refactor
aclark4life c751b2d
Alpha sort helper functions
aclark4life b13a07f
Fix get_database_version
aclark4life 534da6b
A better fix for using `buildInfo` command.
aclark4life 13578ab
Add `queries` key to encrypted fields map
aclark4life 3342d7f
Update django_mongodb_backend/schema.py
aclark4life 9fd21e4
Update django_mongodb_backend/schema.py
aclark4life 9bbe741
Update tests/encryption_/models.py
aclark4life d1eb737
Update tests/encryption_/models.py
aclark4life 176f016
Fix conditional
aclark4life 264b37a
Use column instead of name
aclark4life 1771f56
Avoid double conditional
aclark4life 819058a
Update tests and remove test router
aclark4life 9a3c18e
Update django_mongodb_backend/fields/encryption.py
aclark4life 071192e
Add deconstruct method for encryption fields
aclark4life b2a0534
Add setup & teardown for QE features test
aclark4life 81cc887
Add query type classes and update test
aclark4life be3dd16
Add missing queries to deconstruct
aclark4life a2342e2
Add get_encrypted_fields_map management command
aclark4life 05a7610
Add EncryptedRouter
aclark4life 96b3fda
Optimistically add QE to release notes :-)
aclark4life 1eb71d5
Fix label
aclark4life 08209d3
Save encrypted models to encrypted db
aclark4life 90fe562
Refactor and rename QueryTypes -> QueryType
aclark4life 8c2b84c
Refactor, reword, alpha sort, add comments.
aclark4life ab680fd
Alpha-sort
aclark4life 4a267f5
Document-driven design
aclark4life 3fdc1f7
Document-driven design
aclark4life d562a76
Document-driven design
aclark4life 163758d
Add encryption.rst
aclark4life b95c343
Make key_vault_namespace a required kwarg
aclark4life 5205a0b
Reuse schema editor to create encrypted fields map
aclark4life b07c3e6
Add --database to get_encrypted_fields_map command
aclark4life e557632
Add WIP configuration docs
aclark4life c5f8888
Add check for mongodb 7.0
aclark4life a7bc5c5
Let's go with "Queryable Encryption" everywhere.
aclark4life 09423bc
Update django_mongodb_backend/fields/encryption.py
aclark4life c756cf8
Update tests/encryption_/tests.py
aclark4life 841797c
Update tests/encryption_/tests.py
aclark4life 2386397
Remove gratuitous use of with and append
aclark4life d685d2a
Always use `assertRaisesMessage` for > precision
aclark4life 08ea317
only include migratable models for given database
aclark4life 3e839d7
Refactor QueryType, add encryptino_ migration
aclark4life 75c6936
Refactor tests and fix schema test
aclark4life 534452f
Remove migration, already tested by schema
aclark4life bf26a8a
Router & schema updates
aclark4life bf078ad
Re-add test routers
aclark4life 2780e32
Fix test router
aclark4life 31d3feb
Remove ENCRYPTED_DB_ALIAS, ENCRYPTED_APPS
aclark4life b005726
Get rid of more settings
aclark4life e7290e4
Remove router allow_relation
aclark4life 76deec0
Use class method
aclark4life 02ce21e
Remove ENCRYPTED_DB_ALIAS
aclark4life c8a5118
Rename Person to Patient to match tutorial
aclark4life 39f1cbc
queries only takes a single object
timgraham e504fc5
Move kms_provder to monkeypatch'd ConnectionRouter
aclark4life 0aa423f
Check settings for KMS_PROVIDER & add test.
aclark4life c27be37
Remove get_key_vault_namespace
aclark4life 13de3bb
Remove get_kms_providers, get_customer_master_key
aclark4life 7e3cd34
Update QE config docs
aclark4life 4a9daa7
Add remaining KMS providers
aclark4life 516642f
Look out for more credentials!
aclark4life a319e8e
Move encrypted db name back to router
aclark4life 5807033
Remove comments
aclark4life 37e7e06
Remove comments
aclark4life f19c901
Update comment
aclark4life 528d503
I don't like `conn` either!
aclark4life c7c091b
Use correct verb style "Return" (per relevant PEP)
aclark4life b3a302b
Move connection router patching to routers.py
aclark4life acb0554
Update django_mongodb_backend/features.py
aclark4life 67a640d
Update test models to match design doc
aclark4life 9e76295
Refactor management command and fix test
aclark4life 97196ed
Update Sphinx root_doc to index (the default value)
aclark4life 1614919
Move kms_provider to user router
aclark4life a1bc5f3
Move kms_credentials to user router
aclark4life 75c3cd1
Update docs
aclark4life a81d2ae
Move kms_credentials to settings
aclark4life e562718
Remove get_auto_encryption_opts
aclark4life 3dca177
Remove get_client_encryption
aclark4life 3432818
Define public helpers API
aclark4life cb7f153
Refactor test_auto_encryption_opts
aclark4life e0ef5b3
Assert the entire expected output via json.dumps
aclark4life ba4a6c8
Update docs
aclark4life 1b9a714
Rename test methods
aclark4life 3340ae7
Fix doc string
aclark4life c90406b
Rename tests -> test_schema & add charfield tests
aclark4life 8a1f381
Add test_integerfield from django
aclark4life edb2fa6
Avoid reentrancy issue checking mongodb version
aclark4life 0701160
Add encrypted Post model schema to expected schema
aclark4life 08f7934
Re-add namespace to schema_map
aclark4life 2c4d53b
Add a note about copying field tests from Django
aclark4life 9919ce9
Add query type tests, remove django field tests
aclark4life 45ea5b5
Restored documentation navigation
timgraham 3e468e7
Test negative query type cases
aclark4life 8869bc1
Refactor and start watching for bad schema maps
aclark4life 8a05af8
Refactor and update helpers
aclark4life 3353fd0
Update docs
aclark4life 948d21c
Add billing model fields & tee command output
aclark4life aae8df9
Fix router
aclark4life 9c7c82f
Add a fixme to test router for kms_provider
aclark4life cec0289
Use custom db table for tests
aclark4life 43df16a
Code review fixes
aclark4life 94ecbe1
Delete now-existing attribute in teardown
aclark4life 041336e
Update django_mongodb_backend/schema.py
aclark4life e894fe1
Fix credentials for create_encrypted_collection
aclark4life a683a6c
One less import, use client.codec_options
aclark4life 3c2bc97
Remove key vault helpers
aclark4life 7f6971b
Add custom _router_func to require kms_provider
aclark4life 14ad6a8
Fix import
aclark4life 3fba90c
Remove comment
aclark4life b88b167
Add CI for QE
aclark4life File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
#!/usr/bin/bash | ||
|
||
set -eux | ||
|
||
# Clone drivers-tools and set var | ||
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git drivers_tools | ||
export DRIVERS_TOOLS=$(pwd)/drivers_tools | ||
|
||
git clone https://github.com/mongodb/pymongo/ pymongo_repo | ||
pushd pymongo_repo | ||
|
||
# Setup encryption | ||
just run-server --topology=replica_set | ||
just setup-tests encryption | ||
|
||
# Install django-mongodb-backend | ||
/opt/python/3.10/bin/python3 -m venv venv | ||
. venv/bin/activate | ||
python -m pip install -U pip | ||
pip install -e .\[encryption\] | ||
|
||
# Install django and test dependencies | ||
git clone --branch mongodb-5.2.x https://github.com/mongodb-forks/django django_repo | ||
pushd django_repo/tests/ | ||
pip install -e .. | ||
pip install -r requirements/py3.txt | ||
popd | ||
|
||
# Copy the test settings file | ||
cp ./.github/workflows/mongodb_settings.py django_repo/tests/ | ||
|
||
# Copy the test runner file | ||
cp ./.github/workflows/runtests.py django_repo/tests/runtests_.py | ||
|
||
# Run tests | ||
python django_repo/tests/runtests_.py |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
# Queryable Encryption helper functions and constants for MongoDB | ||
# | ||
# These helper functions and constants are optional and Queryable | ||
# Encryption can be used in Django without them. They are provided | ||
# to make it easier configure Queryable Encryption in Django. | ||
|
||
import base64 | ||
import os | ||
|
||
KMS_CREDENTIALS = { | ||
"aws": { | ||
"key": os.getenv("AWS_KEY_ARN", ""), | ||
"region": os.getenv("AWS_KEY_REGION", ""), | ||
}, | ||
"azure": { | ||
"keyName": os.getenv("AZURE_KEY_NAME", ""), | ||
"keyVaultEndpoint": os.getenv("AZURE_KEY_VAULT_ENDPOINT", ""), | ||
}, | ||
"gcp": { | ||
"projectId": os.getenv("GCP_PROJECT_ID", ""), | ||
"location": os.getenv("GCP_LOCATION", ""), | ||
"keyRing": os.getenv("GCP_KEY_RING", ""), | ||
"keyName": os.getenv("GCP_KEY_NAME", ""), | ||
}, | ||
"kmip": {}, | ||
"local": {}, | ||
} | ||
KMS_PROVIDERS = { | ||
"aws": { | ||
"accessKeyId": os.getenv("AWS_ACCESS_KEY_ID", "not an access key"), | ||
"secretAccessKey": os.getenv("AWS_SECRET_ACCESS_KEY", "not a secret key"), | ||
}, | ||
"azure": { | ||
"tenantId": os.getenv("AZURE_TENANT_ID", "not a tenant ID"), | ||
"clientId": os.getenv("AZURE_CLIENT_ID", "not a client ID"), | ||
"clientSecret": os.getenv("AZURE_CLIENT_SECRET", "not a client secret"), | ||
}, | ||
"gcp": { | ||
"email": os.getenv("GCP_EMAIL", "not an email"), | ||
"privateKey": os.getenv( | ||
"GCP_PRIVATE_KEY", | ||
base64.b64encode(b"not a private key").decode("ascii"), | ||
), | ||
}, | ||
"kmip": { | ||
"endpoint": os.getenv("KMIP_KMS_ENDPOINT", "not a valid endpoint"), | ||
}, | ||
"local": { | ||
"key": bytes.fromhex( | ||
"000102030405060708090a0b0c0d0e0f" | ||
"101112131415161718191a1b1c1d1e1f" | ||
"202122232425262728292a2b2c2d2e2f" | ||
"303132333435363738393a3b3c3d3e3f" | ||
"404142434445464748494a4b4c4d4e4f" | ||
"505152535455565758595a5b5c5d5e5f" | ||
) | ||
}, | ||
} | ||
|
||
|
||
class EncryptedRouter: | ||
"""A sample database router for Django that routes encrypted | ||
models to an encrypted database with a local KMS provider. | ||
""" | ||
|
||
def allow_migrate(self, db, app_label, model_name=None, model=None, **hints): | ||
if model: | ||
return db == ("encrypted" if getattr(model, "encrypted", False) else "default") | ||
return db == "default" | ||
|
||
def db_for_read(self, model, **hints): | ||
if getattr(model, "encrypted", False): | ||
return "encrypted" | ||
return "default" | ||
|
||
db_for_write = db_for_read | ||
|
||
def kms_provider(self, model): | ||
return "local" | ||
|
||
|
||
class QueryType: | ||
""" | ||
Class that supports building encrypted equality and range queries | ||
for MongoDB's Queryable Encryption. | ||
""" | ||
|
||
@classmethod | ||
def equality(cls, *, contention=None): | ||
query = {"queryType": "equality"} | ||
if contention is not None: | ||
query["contention"] = contention | ||
return query | ||
|
||
@classmethod | ||
def range( | ||
cls, *, contention=None, max=None, min=None, precision=None, sparsity=None, trimFactor=None | ||
): | ||
query = {"queryType": "range"} | ||
options = { | ||
"contention": contention, | ||
"max": max, | ||
"min": min, | ||
"precision": precision, | ||
"sparsity": sparsity, | ||
"trimFactor": trimFactor, | ||
} | ||
query.update({k: v for k, v in options.items() if v is not None}) | ||
return query |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
from django.db import models | ||
|
||
|
||
class EncryptedFieldMixin(models.Field): | ||
encrypted = True | ||
|
||
def __init__(self, *args, queries=None, **kwargs): | ||
self.queries = queries | ||
super().__init__(*args, **kwargs) | ||
|
||
def deconstruct(self): | ||
name, path, args, kwargs = super().deconstruct() | ||
|
||
if self.queries is not None: | ||
kwargs["queries"] = self.queries | ||
|
||
if path.startswith("django_mongodb_backend.fields.encryption"): | ||
path = path.replace( | ||
"django_mongodb_backend.fields.encryption", | ||
"django_mongodb_backend.fields", | ||
) | ||
|
||
return name, path, args, kwargs | ||
|
||
|
||
class EncryptedCharField(EncryptedFieldMixin, models.CharField): | ||
pass | ||
|
||
|
||
class EncryptedIntegerField(EncryptedFieldMixin, models.IntegerField): | ||
pass |
36 changes: 36 additions & 0 deletions
36
django_mongodb_backend/management/commands/get_encrypted_fields_map.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import json | ||
|
||
from django.apps import apps | ||
from django.core.management.base import BaseCommand | ||
from django.db import DEFAULT_DB_ALIAS, connections, router | ||
|
||
|
||
class Command(BaseCommand): | ||
help = "Generate a `schema_map` of encrypted fields for all encrypted" | ||
" models in the database for use with `AutoEncryptionOpts` in" | ||
" production environments." | ||
|
||
def add_arguments(self, parser): | ||
parser.add_argument( | ||
"--database", | ||
default=DEFAULT_DB_ALIAS, | ||
help="Specify the database to use for generating the encrypted" | ||
"fields map. Defaults to the 'default' database.", | ||
) | ||
|
||
def handle(self, *args, **options): | ||
db = options["database"] | ||
connection = connections[db] | ||
schema_map = self.get_encrypted_fields_map(connection) | ||
self.stdout.write(json.dumps(schema_map, indent=2)) | ||
|
||
def get_encrypted_fields_map(self, connection): | ||
schema_map = {} | ||
for app_config in apps.get_app_configs(): | ||
for model in router.get_migratable_models( | ||
app_config, connection.alias, include_auto_created=False | ||
): | ||
if getattr(model, "encrypted", False): | ||
fields = connection.schema_editor()._get_encrypted_fields_map(model) | ||
schema_map[f"{connection.alias}.{model._meta.db_table}"] = fields | ||
return schema_map |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there some documentation we can link to help users know how to configure credentials, providers, etc? It doesn't feel like Django's job to document and maintain this sort of mapping.
I also read:
so this won't work for that use case (I think).
I'd suggest trying to minimize the amount of "helpers" in this PR. We can always add things later if there are user pain points, but I feel these thing shouldn't be our focus for v1. Really, we should enhance MongoDB/pymongo docs if it's unclear how to construct the providers dictionary. I don't think a solution of "set these environment variables instead" is making things simpler.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's definitely not Django's job but it may be Django MongoDB Backend's job since we are trying to support QE and we may need that mapping or something like it in the schema.
Good catch! Let me test some vendors with what I have now and if we can rely on PyMongo for some of this even better.
Agreed. I definitely don't want to be in the env var business but I do want to be in the "make this feature work with minimal effort" business.