FLE spec test update (#517)

kevinAlbs · web-flow · commit 96424eda6337 · 2019-07-17T18:50:28.000-04:00
diff --git a/driver-core/src/test/resources/client-side-encryption-corpus/corpus-encrypted.json b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-encrypted.json
diff --git a/driver-core/src/test/resources/client-side-encryption-corpus/corpus-schema.json b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-schema.json
diff --git a/driver-core/src/test/resources/client-side-encryption/aggregate.json b/driver-core/src/test/resources/client-side-encryption/aggregate.json
@@ -23,7 +23,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/badQueries.json b/driver-core/src/test/resources/client-side-encryption/badQueries.json
@@ -32,7 +32,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/basic.json b/driver-core/src/test/resources/client-side-encryption/basic.json
@@ -13,7 +13,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/bulk.json b/driver-core/src/test/resources/client-side-encryption/bulk.json
@@ -13,7 +13,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/bypassAutoEncryption.json b/driver-core/src/test/resources/client-side-encryption/bypassAutoEncryption.json
@@ -23,7 +23,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
@@ -233,7 +233,7 @@
                                     "encrypt": {
                                         "keyId": "/altname",
                                         "bsonType": "string",
-                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                                     }
                                 },
                                 "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/count.json b/driver-core/src/test/resources/client-side-encryption/count.json
@@ -32,7 +32,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/countDocuments.json b/driver-core/src/test/resources/client-side-encryption/countDocuments.json
@@ -32,7 +32,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/delete.json b/driver-core/src/test/resources/client-side-encryption/delete.json
@@ -32,7 +32,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/distinct.json b/driver-core/src/test/resources/client-side-encryption/distinct.json
@@ -41,7 +41,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/explain.json b/driver-core/src/test/resources/client-side-encryption/explain.json
@@ -32,7 +32,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/find.json b/driver-core/src/test/resources/client-side-encryption/find.json
@@ -38,7 +38,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/findOneAndDelete.json b/driver-core/src/test/resources/client-side-encryption/findOneAndDelete.json
@@ -32,7 +32,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/findOneAndReplace.json b/driver-core/src/test/resources/client-side-encryption/findOneAndReplace.json
@@ -23,7 +23,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/findOneAndUpdate.json b/driver-core/src/test/resources/client-side-encryption/findOneAndUpdate.json
@@ -23,7 +23,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/getMore.json b/driver-core/src/test/resources/client-side-encryption/getMore.json
@@ -41,7 +41,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/insert.json b/driver-core/src/test/resources/client-side-encryption/insert.json
@@ -13,7 +13,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/keyAltName.json b/driver-core/src/test/resources/client-side-encryption/keyAltName.json
@@ -13,7 +13,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
@@ -178,10 +178,7 @@
                                 {
                                     "_id": 1,
                                     "encrypted_w_altname": {
-                                        "$binary": {
-                                            "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
-                                            "subType": "06"
-                                        }
+                                        "$$type": "binData"
                                     },
                                     "altname": "altname"
                                 }
@@ -198,10 +195,7 @@
                         {
                             "_id": 1,
                             "encrypted_w_altname": {
-                                "$binary": {
-                                    "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
-                                    "subType": "06"
-                                }
+                                "$$type": "binData"
                             },
                             "altname": "altname"
                         }
diff --git a/driver-core/src/test/resources/client-side-encryption/localSchema.json b/driver-core/src/test/resources/client-side-encryption/localSchema.json
@@ -56,7 +56,7 @@
                                     "encrypt": {
                                         "keyId": "/altname",
                                         "bsonType": "string",
-                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                                     }
                                 },
                                 "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/malformedCiphertext.json b/driver-core/src/test/resources/client-side-encryption/malformedCiphertext.json
@@ -83,7 +83,7 @@
                                     "encrypt": {
                                         "keyId": "/altname",
                                         "bsonType": "string",
-                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                                     }
                                 },
                                 "encrypted_string": {
@@ -170,7 +170,7 @@
                                     "encrypt": {
                                         "keyId": "/altname",
                                         "bsonType": "string",
-                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                                     }
                                 },
                                 "encrypted_string": {
@@ -249,7 +249,7 @@
                                     "encrypt": {
                                         "keyId": "/altname",
                                         "bsonType": "string",
-                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                                     }
                                 },
                                 "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/missingKey.json b/driver-core/src/test/resources/client-side-encryption/missingKey.json
@@ -13,7 +13,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
@@ -61,12 +61,48 @@
         },
         "bsonType": "object"
     },
-    "key_vault_data": [],
+    "key_vault_data": [
+        {
+            "status": 1,
+            "_id": {
+                "$binary": {
+                    "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                    "subType": "04"
+                }
+            },
+            "masterKey": {
+                "provider": "aws",
+                "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+                "region": "us-east-1"
+            },
+            "updateDate": {
+                "$date": {
+                    "$numberLong": "1552949630483"
+                }
+            },
+            "keyMaterial": {
+                "$binary": {
+                    "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+                    "subType": "00"
+                }
+            },
+            "creationDate": {
+                "$date": {
+                    "$numberLong": "1552949630483"
+                }
+            },
+            "keyAltNames": [
+                "altname",
+                "another_altname"
+            ]
+        }
+    ],
     "tests": [
         {
             "description": "Insert with encryption on a missing key",
             "clientOptions": {
                 "autoEncryptOpts": {
+                    "keyVaultNamespace": "admin.different",
                     "kmsProviders": {
                         "aws": {}
                     }
@@ -91,7 +127,64 @@
                 "collection": {
                     "data": []
                 }
-            }
+            },
+            "expectations": [
+                {
+                    "command_started_event": {
+                        "command": {
+                            "listCollections": 1,
+                            "cursor": {},
+                            "filter": {
+                                "name": "default"
+                            }
+                        },
+                        "command_name": "listCollections"
+                    }
+                },
+                {
+                    "command_started_event": {
+                        "command": {
+                            "listCollections": 1,
+                            "cursor": {},
+                            "filter": {
+                                "name": "different"
+                            },
+                            "$db": "admin"
+                        },
+                        "command_name": "listCollections"
+                    }
+                },
+                {
+                    "command_started_event": {
+                        "command": {
+                            "find": "different",
+                            "filter": {
+                                "$or": [
+                                    {
+                                        "_id": {
+                                            "$in": [
+                                                {
+                                                    "$binary": {
+                                                        "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                                                        "subType": "04"
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    {
+                                        "keyAltNames": {
+                                            "$in": []
+                                        }
+                                    }
+                                ]
+                            },
+                            "$db": "admin"
+                        },
+                        "command_name": "find"
+                    }
+                }
+            ]
         }
     ]
 }
diff --git a/driver-core/src/test/resources/client-side-encryption/replaceOne.json b/driver-core/src/test/resources/client-side-encryption/replaceOne.json
@@ -23,7 +23,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/unsupportedCommand.json b/driver-core/src/test/resources/client-side-encryption/unsupportedCommand.json
@@ -34,7 +34,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/updateMany.json b/driver-core/src/test/resources/client-side-encryption/updateMany.json
@@ -32,7 +32,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-core/src/test/resources/client-side-encryption/updateOne.json b/driver-core/src/test/resources/client-side-encryption/updateOne.json
@@ -23,7 +23,7 @@
                 "encrypt": {
                     "keyId": "/altname",
                     "bsonType": "string",
-                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
                 }
             },
             "encrypted_string": {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java
@@ -227,8 +227,13 @@ public void apply(final SslSettings.Builder builder) {
             }
         }
 
+        String keyVaultNamespace = "admin.datakeys";
+        if (cryptOptions.containsKey("keyVaultNamespace")) {
+            keyVaultNamespace = cryptOptions.getString ("keyVaultNamespace").getValue();
+        }
+
         createMongoClient(AutoEncryptionSettings.builder()
-                .keyVaultNamespace("admin.datakeys")
+                .keyVaultNamespace(keyVaultNamespace)
                 .kmsProviders(kmsProvidersMap)
                 .schemaMap(namespaceToSchemaMap)
                 .bypassAutoEncryption(bypassAutoEncryption)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"encrypt": {`
`24`	`24`	`"keyId": "/altname",`
`25`	`25`	`"bsonType": "string",`
`26`		`- "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"`
	`26`	`+ "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`"encrypted_string": {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"encrypt": {`
`33`	`33`	`"keyId": "/altname",`
`34`	`34`	`"bsonType": "string",`
`35`		`- "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"`
	`35`	`+ "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"`
`36`	`36`	`}`
`37`	`37`	`},`
`38`	`38`	`"encrypted_string": {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"encrypt": {`
`14`	`14`	`"keyId": "/altname",`
`15`	`15`	`"bsonType": "string",`
`16`		`- "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"`
	`16`	`+ "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`	`"encrypted_string": {`