Skip to content

Commit 7704fdb

Browse files
committed
PHPLIB-1088: Update Queryable Encryption tests for QEv2
Following PHPC-2203, ext-mongodb 1.16-dev now uses the QEv2 protocol, which requires MongoDB 7.0+. Serverless does not yet support QEv2, but that should be covered by the existing server version check. Spec tests synced with mongodb/specifications@64deb28 Note: QEv2 spec tests are still skipped pending PHPLIB-878
1 parent 41b0bc8 commit 7704fdb

File tree

60 files changed

+362
-836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+362
-836
lines changed

tests/DocumentationExamplesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,8 +1859,8 @@ public function testQueryableEncryption(): void
18591859
$this->markTestSkipped('Queryable encryption requires replica sets');
18601860
}
18611861

1862-
if (version_compare($this->getServerVersion(), '6.0.0', '<')) {
1863-
$this->markTestSkipped('Queryable encryption requires MongoDB 6.0 or later');
1862+
if (version_compare($this->getServerVersion(), '7.0.0', '<')) {
1863+
$this->markTestSkipped('Explicit encryption tests require MongoDB 7.0 or later');
18641864
}
18651865

18661866
if (! $this->isEnterprise()) {

tests/SpecTests/ClientSideEncryptionSpecTest.php

Lines changed: 198 additions & 198 deletions
Large diffs are not rendered by default.

tests/SpecTests/client-side-encryption/tests/fle2-BypassQueryAnalysis.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-BypassQueryAnalysis.json

Lines changed: 6 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -75,36 +76,6 @@
7576
"masterKey": {
7677
"provider": "local"
7778
}
78-
},
79-
{
80-
"_id": {
81-
"$binary": {
82-
"base64": "q83vqxI0mHYSNBI0VniQEg==",
83-
"subType": "04"
84-
}
85-
},
86-
"keyMaterial": {
87-
"$binary": {
88-
"base64": "HBk9BWihXExNDvTp1lUxOuxuZK2Pe2ZdVdlsxPEBkiO1bS4mG5NNDsQ7zVxJAH8BtdOYp72Ku4Y3nwc0BUpIKsvAKX4eYXtlhv5zUQxWdeNFhg9qK7qb8nqhnnLeT0f25jFSqzWJoT379hfwDeu0bebJHr35QrJ8myZdPMTEDYF08QYQ48ShRBli0S+QzBHHAQiM2iJNr4svg2WR8JSeWQ==",
89-
"subType": "00"
90-
}
91-
},
92-
"creationDate": {
93-
"$date": {
94-
"$numberLong": "1648914851981"
95-
}
96-
},
97-
"updateDate": {
98-
"$date": {
99-
"$numberLong": "1648914851981"
100-
}
101-
},
102-
"status": {
103-
"$numberInt": "0"
104-
},
105-
"masterKey": {
106-
"provider": "local"
107-
}
10879
}
10980
],
11081
"tests": [
@@ -133,7 +104,7 @@
133104
"_id": 1,
134105
"encryptedIndexed": {
135106
"$binary": {
136-
"base64": "BHEBAAAFZAAgAAAAAHb62aV7+mqmaGcotPLdG3KP7S8diFwWMLM/5rYtqLrEBXMAIAAAAAAVJ6OWHRv3OtCozHpt3ZzfBhaxZirLv3B+G8PuaaO4EgVjACAAAAAAsZXWOWA+UiCBbrJNB6bHflB/cn7pWSvwWN2jw4FPeIUFcABQAAAAAMdD1nV2nqeI1eXEQNskDflCy8I7/HvvqDKJ6XxjhrPQWdLqjz+8GosGUsB7A8ee/uG9/guENuL25XD+Fxxkv1LLXtavHOlLF7iW0u9yabqqBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AE0AAAAAq83vqxI0mHYSNBI0VniQEkzZZBBDgeZh+h+gXEmOrSFtVvkUcnHWj/rfPW7iJ0G3UJ8zpuBmUM/VjOMJCY4+eDqdTiPIwX+/vNXegc8FZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsAA==",
107+
"base64": "C18BAAAFZAAgAAAAANnt+eLTkv4GdDPl8IAfJOvTzArOgFJQ2S/DcLza4W0DBXMAIAAAAAD2u+omZme3P2gBPehMQyQHQ153tPN1+z7bksYA9jKTpAVwADAAAAAAUnCOQqIvmR65YKyYnsiVfVrg9hwUVO3RhhKExo3RWOzgaS0QdsBL5xKFS0JhZSoWBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AFAAAAAAEjRWeBI0mHYSNBI0VniQEpQbp/ZJpWBKeDtKLiXb0P2E9wvc0g3f373jnYQYlJquOrlPOoEy3ngsHPJuSUijvWDsrQzqYa349K7G/66qaXEFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsBWwAIAAAAACkm0o9bj6j0HuADKc0svbqO2UHj6GrlNdF6yKNxh63xRJrAAAAAAAAAAAAAA==",
137108
"subType": "06"
138109
}
139110
}
@@ -150,7 +121,7 @@
150121
"result": [
151122
{
152123
"_id": 1,
153-
"encryptedIndexed": "value123"
124+
"encryptedIndexed": "123"
154125
}
155126
]
156127
}
@@ -176,7 +147,7 @@
176147
"_id": 1,
177148
"encryptedIndexed": {
178149
"$binary": {
179-
"base64": "BHEBAAAFZAAgAAAAAHb62aV7+mqmaGcotPLdG3KP7S8diFwWMLM/5rYtqLrEBXMAIAAAAAAVJ6OWHRv3OtCozHpt3ZzfBhaxZirLv3B+G8PuaaO4EgVjACAAAAAAsZXWOWA+UiCBbrJNB6bHflB/cn7pWSvwWN2jw4FPeIUFcABQAAAAAMdD1nV2nqeI1eXEQNskDflCy8I7/HvvqDKJ6XxjhrPQWdLqjz+8GosGUsB7A8ee/uG9/guENuL25XD+Fxxkv1LLXtavHOlLF7iW0u9yabqqBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AE0AAAAAq83vqxI0mHYSNBI0VniQEkzZZBBDgeZh+h+gXEmOrSFtVvkUcnHWj/rfPW7iJ0G3UJ8zpuBmUM/VjOMJCY4+eDqdTiPIwX+/vNXegc8FZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsAA==",
150+
"base64": "C18BAAAFZAAgAAAAANnt+eLTkv4GdDPl8IAfJOvTzArOgFJQ2S/DcLza4W0DBXMAIAAAAAD2u+omZme3P2gBPehMQyQHQ153tPN1+z7bksYA9jKTpAVwADAAAAAAUnCOQqIvmR65YKyYnsiVfVrg9hwUVO3RhhKExo3RWOzgaS0QdsBL5xKFS0JhZSoWBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AFAAAAAAEjRWeBI0mHYSNBI0VniQEpQbp/ZJpWBKeDtKLiXb0P2E9wvc0g3f373jnYQYlJquOrlPOoEy3ngsHPJuSUijvWDsrQzqYa349K7G/66qaXEFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsBWwAIAAAAACkm0o9bj6j0HuADKc0svbqO2UHj6GrlNdF6yKNxh63xRJrAAAAAAAAAAAAAA==",
180151
"subType": "06"
181152
}
182153
}
@@ -230,39 +201,6 @@
230201
},
231202
"command_name": "find"
232203
}
233-
},
234-
{
235-
"command_started_event": {
236-
"command": {
237-
"find": "datakeys",
238-
"filter": {
239-
"$or": [
240-
{
241-
"_id": {
242-
"$in": [
243-
{
244-
"$binary": {
245-
"base64": "q83vqxI0mHYSNBI0VniQEg==",
246-
"subType": "04"
247-
}
248-
}
249-
]
250-
}
251-
},
252-
{
253-
"keyAltNames": {
254-
"$in": []
255-
}
256-
}
257-
]
258-
},
259-
"$db": "keyvault",
260-
"readConcern": {
261-
"level": "majority"
262-
}
263-
},
264-
"command_name": "find"
265-
}
266204
}
267205
],
268206
"outcome": {
@@ -276,7 +214,7 @@
276214
"__safeContent__": [
277215
{
278216
"$binary": {
279-
"base64": "ThpoKfQ8AkOzkFfNC1+9PF0pY2nIzfXvRdxQgjkNbBw=",
217+
"base64": "31eCYlbQoVboc5zwC8IoyJVSkag9PxREka8dkmbXJeY=",
280218
"subType": "00"
281219
}
282220
}

tests/SpecTests/client-side-encryption/tests/fle2-Compact.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-Compact.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

tests/SpecTests/client-side-encryption/tests/fle2-CreateCollection.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-CreateCollection.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

tests/SpecTests/client-side-encryption/tests/fle2-DecryptExistingData.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-DecryptExistingData.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

tests/SpecTests/client-side-encryption/tests/fle2-Delete.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-Delete.json

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -226,7 +227,7 @@
226227
"encryptedIndexed": {
227228
"$eq": {
228229
"$binary": {
229-
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
230+
"base64": "DIkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVsACAAAAAAaZ9s3G+4znfxStxeOZwcZy1OhzjMGc5hjmdMN+b/w6kSY20AAAAAAAAAAAAA",
230231
"subType": "06"
231232
}
232233
}
@@ -271,24 +272,6 @@
271272
}
272273
]
273274
}
274-
},
275-
"deleteTokens": {
276-
"default.default": {
277-
"encryptedIndexed": {
278-
"e": {
279-
"$binary": {
280-
"base64": "65pz95EthqQpfoHS9nWvdCh05AV+OokP7GUaI+7j8+w=",
281-
"subType": "00"
282-
}
283-
},
284-
"o": {
285-
"$binary": {
286-
"base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
287-
"subType": "00"
288-
}
289-
}
290-
}
291-
}
292275
}
293276
}
294277
},

tests/SpecTests/client-side-encryption/tests/fle2-EncryptedFields-vs-EncryptedFieldsMap.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

tests/SpecTests/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-EncryptedFields-vs-jsonSchema.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -231,7 +232,7 @@
231232
"encryptedIndexed": {
232233
"$eq": {
233234
"$binary": {
234-
"base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
235+
"base64": "DIkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVsACAAAAAApJtKPW4+o9B7gAynNLL26jtlB4+hq5TXResijcYet8USY20AAAAAAAAAAAAA",
235236
"subType": "06"
236237
}
237238
}

tests/SpecTests/client-side-encryption/tests/fle2-EncryptedFieldsMap-defaults.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-EncryptedFieldsMap-defaults.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -75,7 +76,6 @@
7576
"default.default": {
7677
"fields": [],
7778
"escCollection": "enxcol_.default.esc",
78-
"eccCollection": "enxcol_.default.ecc",
7979
"ecocCollection": "enxcol_.default.ecoc"
8080
}
8181
}

tests/SpecTests/client-side-encryption/tests/fle2-FindOneAndUpdate.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-FindOneAndUpdate.json

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -231,7 +232,7 @@
231232
"encryptedIndexed": {
232233
"$eq": {
233234
"$binary": {
234-
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
235+
"base64": "DIkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVsACAAAAAAaZ9s3G+4znfxStxeOZwcZy1OhzjMGc5hjmdMN+b/w6kSY20AAAAAAAAAAAAA",
235236
"subType": "06"
236237
}
237238
}
@@ -278,24 +279,6 @@
278279
}
279280
]
280281
}
281-
},
282-
"deleteTokens": {
283-
"default.default": {
284-
"encryptedIndexed": {
285-
"e": {
286-
"$binary": {
287-
"base64": "65pz95EthqQpfoHS9nWvdCh05AV+OokP7GUaI+7j8+w=",
288-
"subType": "00"
289-
}
290-
},
291-
"o": {
292-
"$binary": {
293-
"base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
294-
"subType": "00"
295-
}
296-
}
297-
}
298-
}
299282
}
300283
}
301284
},
@@ -491,7 +474,7 @@
491474
"encryptedIndexed": {
492475
"$eq": {
493476
"$binary": {
494-
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
477+
"base64": "DIkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVsACAAAAAAaZ9s3G+4znfxStxeOZwcZy1OhzjMGc5hjmdMN+b/w6kSY20AAAAAAAAAAAAA",
495478
"subType": "06"
496479
}
497480
}
@@ -540,24 +523,6 @@
540523
}
541524
]
542525
}
543-
},
544-
"deleteTokens": {
545-
"default.default": {
546-
"encryptedIndexed": {
547-
"e": {
548-
"$binary": {
549-
"base64": "65pz95EthqQpfoHS9nWvdCh05AV+OokP7GUaI+7j8+w=",
550-
"subType": "00"
551-
}
552-
},
553-
"o": {
554-
"$binary": {
555-
"base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
556-
"subType": "00"
557-
}
558-
}
559-
}
560-
}
561526
}
562527
}
563528
},

tests/SpecTests/client-side-encryption/tests/fle2-InsertFind-Indexed.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-InsertFind-Indexed.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -227,7 +228,7 @@
227228
"encryptedIndexed": {
228229
"$eq": {
229230
"$binary": {
230-
"base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
231+
"base64": "DIkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVsACAAAAAApJtKPW4+o9B7gAynNLL26jtlB4+hq5TXResijcYet8USY20AAAAAAAAAAAAA",
231232
"subType": "06"
232233
}
233234
}

tests/SpecTests/client-side-encryption/tests/fle2-InsertFind-Unindexed.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-InsertFind-Unindexed.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

tests/SpecTests/client-side-encryption/tests/fle2-MissingKey.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-MissingKey.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

tests/SpecTests/client-side-encryption/tests/fle2-NoEncryption.json renamed to tests/SpecTests/client-side-encryption/tests/fle2v2-NoEncryption.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

0 commit comments

Comments
 (0)