libmongocrypt-helper 1.8.0.0.1001 → 1.11.0.0.1001

data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_dll.c

@@ -95,26 +95,42 @@ mcr_dll_path_result mcr_dll_path(mcr_dll dll) {
     return (mcr_dll_path_result){.error_string = mstr_copy_cstr("Handle not found in loaded modules")};
 }
 
+bool mcr_dll_path_supported(void) {
+    return true;
+}
+
 #elif defined(__linux__) || defined(__FreeBSD__)
 
 #include <link.h>
 
 mcr_dll_path_result mcr_dll_path(mcr_dll dll) {
-    struct link_map *map;
+    struct link_map *map = NULL;
     int rc = dlinfo(dll._native_handle, RTLD_DI_LINKMAP, &map);
     if (rc == 0) {
+        assert(NULL != map);
         return (mcr_dll_path_result){.path = mstr_copy_cstr(map->l_name)};
     } else {
         return (mcr_dll_path_result){.error_string = mstr_copy_cstr(dlerror())};
     }
 }
 
+bool mcr_dll_path_supported(void) {
+    return true;
+}
+
 #elif defined(_WIN32)
 
 // Handled in os_win/os_dll.c
 
 #else
 
-#error "Don't know how to do mcr_dll_path() on this platform"
+mcr_dll_path_result mcr_dll_path(mcr_dll dll) {
+    return (mcr_dll_path_result){.error_string =
+                                     mstr_copy_cstr("Don't know how to do mcr_dll_path() on this platform")};
+}
+
+bool mcr_dll_path_supported(void) {
+    return false;
+}
 
 #endif

data/ext/libmongocrypt/libmongocrypt/src/os_win/os_dll.c

@@ -76,4 +76,8 @@ mcr_dll_path_result mcr_dll_path(mcr_dll dll) {
     };
 }
 
+bool mcr_dll_path_supported(void) {
+    return true;
+}
+
 #endif

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/bypassQueryAnalysis/payload.json

@@ -0,0 +1,53 @@
+{
+   "bulkWrite": {
+      "$numberInt": "1"
+   },
+   "ops": [
+      {
+         "insert": {
+            "$numberInt": "0"
+         },
+         "document": {
+            "plainText": "sample",
+            "encrypted": {
+               "$numberInt": "123"
+            }
+         }
+      }
+   ],
+   "$db": "admin",
+   "nsInfo": [
+      {
+         "ns": "db.test",
+         "encryptionInformation": {
+            "type": {
+               "$numberInt": "1"
+            },
+            "schema": {
+               "db.test": {
+                  "escCollection": "enxcol_.test.esc",
+                  "ecocCollection": "enxcol_.test.ecoc",
+                  "fields": [
+                     {
+                        "keyId": {
+                           "$binary": {
+                              "base64": "YWFhYWFhYWFhYWFhYWFhYQ==",
+                              "subType": "04"
+                           }
+                        },
+                        "path": "encrypted",
+                        "bsonType": "int",
+                        "queries": {
+                           "queryType": "equality",
+                           "contention": {
+                              "$numberLong": "0"
+                           }
+                        }
+                     }
+                  ]
+               }
+            }
+         }
+      }
+   ]
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/jsonSchema/cmd-to-mongocryptd.json

@@ -0,0 +1,23 @@
+{
+    "bulkWrite": {
+        "$numberInt": "1"
+    },
+    "ops": [
+        {
+            "insert": 0,
+            "document": {
+                "plainText": "sample",
+                "encrypted": {
+                    "$numberInt": "123"
+                }
+            }
+        }
+    ],
+    "nsInfo": [
+        {
+            "ns": "db.test"
+        }
+    ],
+    "jsonSchema": {},
+    "isRemoteSchema": false
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/jsonSchema/cmd.json

@@ -0,0 +1,20 @@
+{
+   "bulkWrite": 1,
+   "ops": [
+      {
+         "insert": 0,
+         "document": {
+            "plainText": "sample",
+            "encrypted": {
+               "$numberInt": "123"
+            }
+         }
+      }
+   ],
+   "nsInfo": [
+      {
+         "ns": "db.test"
+      }
+   ],
+   "$db": "admin"
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/cmd-to-mongocryptd.json

@@ -0,0 +1,50 @@
+{
+    "bulkWrite": {
+        "$numberInt": "1"
+    },
+    "ops": [
+        {
+            "insert": 0,
+            "document": {
+                "plainText": "sample",
+                "encrypted": {
+                    "$numberInt": "123"
+                }
+            }
+        }
+    ],
+    "nsInfo": [
+        {
+            "ns": "db.test",
+            "encryptionInformation": {
+                "type": {
+                    "$numberInt": "1"
+                },
+                "schema": {
+                    "db.test": {
+                        "escCollection": "enxcol_.test.esc",
+                        "ecocCollection": "enxcol_.test.ecoc",
+                        "fields": [
+                            {
+                                "keyId": {
+                                    "$binary": {
+                                        "base64": "YWFhYWFhYWFhYWFhYWFhYQ==",
+                                        "subType": "04"
+                                    }
+                                },
+                                "path": "encrypted",
+                                "bsonType": "int",
+                                "queries": {
+                                    "queryType": "equality",
+                                    "contention": {
+                                        "$numberLong": "0"
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    ]
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/cmd.json

@@ -0,0 +1,20 @@
+{
+   "bulkWrite": 1,
+   "ops": [
+      {
+         "insert": 0,
+         "document": {
+            "plainText": "sample",
+            "encrypted": {
+               "$numberInt": "123"
+            }
+         }
+      }
+   ],
+   "nsInfo": [
+      {
+         "ns": "db.test"
+      }
+   ],
+   "$db": "admin"
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/collinfo.json

@@ -0,0 +1,44 @@
+{
+    "name": "test",
+    "type": "collection",
+    "options": {
+        "encryptedFields": {
+            "escCollection": "enxcol_.test.esc",
+            "ecocCollection": "enxcol_.test.ecoc",
+            "fields": [
+                {
+                    "keyId": {
+                        "$binary": {
+                            "base64": "YWFhYWFhYWFhYWFhYWFhYQ==",
+                            "subType": "04"
+                        }
+                    },
+                    "path": "encrypted",
+                    "bsonType": "int",
+                    "queries": {
+                        "queryType": "equality",
+                        "contention": {
+                            "$numberLong": "0"
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    "info": {
+        "readOnly": false,
+        "uuid": {
+            "$binary": {
+                "base64": "4z9fIUN+Sh2WeH/aySC+OA==",
+                "subType": "04"
+            }
+        }
+    },
+    "idIndex": {
+        "v": 2,
+        "key": {
+            "_id": 1
+        },
+        "name": "_id_"
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/encrypted-field-map.json

@@ -0,0 +1,24 @@
+{
+   "db.test": {
+      "escCollection": "enxcol_.test.esc",
+      "ecocCollection": "enxcol_.test.ecoc",
+      "fields": [
+         {
+            "keyId": {
+               "$binary": {
+                  "base64": "YWFhYWFhYWFhYWFhYWFhYQ==",
+                  "subType": "04"
+               }
+            },
+            "path": "encrypted",
+            "bsonType": "int",
+            "queries": {
+               "queryType": "equality",
+               "contention": {
+                  "$numberLong": "0"
+               }
+            }
+         }
+      ]
+   }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/encrypted-payload-pattern.json

@@ -0,0 +1,53 @@
+{
+   "bulkWrite": {
+      "$numberInt": "1"
+   },
+   "ops": [
+      {
+         "insert": {
+            "$numberInt": "0"
+         },
+         "document": {
+            "plainText": "sample",
+            "encrypted": {
+               "$$type": "binData"
+            }
+         }
+      }
+   ],
+   "nsInfo": [
+      {
+         "ns": "db.test",
+         "encryptionInformation": {
+            "type": {
+               "$numberInt": "1"
+            },
+            "schema": {
+               "db.test": {
+                  "escCollection": "enxcol_.test.esc",
+                  "ecocCollection": "enxcol_.test.ecoc",
+                  "fields": [
+                     {
+                        "keyId": {
+                           "$binary": {
+                              "base64": "YWFhYWFhYWFhYWFhYWFhYQ==",
+                              "subType": "04"
+                           }
+                        },
+                        "path": "encrypted",
+                        "bsonType": "int",
+                        "queries": {
+                           "queryType": "equality",
+                           "contention": {
+                              "$numberLong": "0"
+                           }
+                        }
+                     }
+                  ]
+               }
+            }
+         }
+      }
+   ],
+   "$db": "admin"
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/mongocryptd-reply.json

@@ -0,0 +1,62 @@
+{
+    "hasEncryptionPlaceholders": true,
+    "schemaRequiresEncryption": true,
+    "result": {
+        "bulkWrite": {
+            "$numberInt": "1"
+        },
+        "ops": [
+            {
+                "insert": {
+                    "$numberInt": "0"
+                },
+                "document": {
+                    "plainText": "sample",
+                    "encrypted": {
+                        "$binary": {
+                            "base64": "A30AAAAQdAABAAAAEGEAAwAAAAVraQAQAAAABGFhYWFhYWFhYWFhYWFhYWEFa3UAEAAAAARhYWFhYWFhYWFhYWFhYWFhA3YAHgAAABB2AHsAAAAQbWluAAAAAAAQbWF4AMgAAAAAEmNtAAAAAAAAAAAAEnMAAQAAAAAAAAAA",
+                            "subType": "06"
+                        }
+                    }
+                }
+            }
+        ],
+        "nsInfo": [
+            {
+                "ns": "db.test",
+                "encryptionInformation": {
+                    "type": {
+                        "$numberInt": "1"
+                    },
+                    "schema": {
+                        "db.test": {
+                            "escCollection": "enxcol_.test.esc",
+                            "ecocCollection": "enxcol_.test.ecoc",
+                            "fields": [
+                                {
+                                    "keyId": {
+                                        "$binary": {
+                                            "base64": "YWFhYWFhYWFhYWFhYWFhYQ==",
+                                            "subType": "04"
+                                        }
+                                    },
+                                    "path": "encrypted",
+                                    "bsonType": "int",
+                                    "queries": {
+                                        "queryType": "equality",
+                                        "contention": {
+                                            "$numberLong": "0"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        ]
+    },
+    "ok": {
+        "$numberDouble": "1.0"
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/cmd-to-mongocryptd.json

@@ -0,0 +1,30 @@
+{
+    "bulkWrite": {
+        "$numberInt": "1"
+    },
+    "ops": [
+        {
+            "insert": 0,
+            "document": {
+                "plainText": "sample"
+            }
+        }
+    ],
+    "nsInfo": [
+        {
+            "ns": "db.test",
+            "encryptionInformation": {
+                "type": {
+                    "$numberInt": "1"
+                },
+                "schema": {
+                    "db.test": {
+                        "escCollection": "enxcol_.test.esc",
+                        "ecocCollection": "enxcol_.test.ecoc",
+                        "fields": []
+                    }
+                }
+            }
+        }
+    ]
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/cmd.json

@@ -0,0 +1,17 @@
+{
+   "bulkWrite": 1,
+   "ops": [
+      {
+         "insert": 0,
+         "document": {
+            "plainText": "sample"
+         }
+      }
+   ],
+   "nsInfo": [
+      {
+         "ns": "db.test"
+      }
+   ],
+   "$db": "admin"
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/mongocryptd-reply.json

@@ -0,0 +1,39 @@
+{
+    "hasEncryptionPlaceholders": false,
+    "schemaRequiresEncryption": false,
+    "result": {
+        "bulkWrite": {
+            "$numberInt": "1"
+        },
+        "ops": [
+            {
+                "insert": {
+                    "$numberInt": "0"
+                },
+                "document": {
+                    "plainText": "sample"
+                }
+            }
+        ],
+        "nsInfo": [
+            {
+                "ns": "db.test",
+                "encryptionInformation": {
+                    "type": {
+                        "$numberInt": "1"
+                    },
+                    "schema": {
+                        "db.test": {
+                            "escCollection": "enxcol_.test.esc",
+                            "ecocCollection": "enxcol_.test.ecoc",
+                            "fields": []
+                        }
+                    }
+                }
+            }
+        ]
+    },
+    "ok": {
+        "$numberDouble": "1.0"
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/payload.json

@@ -0,0 +1,21 @@
+{
+   "bulkWrite": {
+      "$numberInt": "1"
+   },
+   "ops": [
+      {
+         "insert": {
+            "$numberInt": "0"
+         },
+         "document": {
+            "plainText": "sample"
+         }
+      }
+   ],
+   "$db": "admin",
+   "nsInfo": [
+      {
+         "ns": "db.test"
+      }
+   ]
+}

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/missing-key-id/collinfo.json

@@ -0,0 +1,20 @@
+{
+    "options": {
+        "encryptedFields": {
+            "escCollection": "fle2.basic.esc",
+            "ecocCollection": "fle2.basic.ecoc",
+            "fields": [
+                {
+                    "path": "missingKeyId",
+                    "bsonType": "string",
+                    "queries": {
+                        "queryType": "equality",
+                        "contention": {
+                            "$numberLong": "0"
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/no-fields/collinfo.json

@@ -0,0 +1,9 @@
+{
+    "options": {
+        "encryptedFields": {
+            "escCollection": "esc",
+            "ecocCollection": "ecoc",
+            "fields": []
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/no-fields/encrypted-payload.json

@@ -0,0 +1,4 @@
+{
+    "cleanupStructuredEncryptionData": "test",
+    "cleanupTokens": {}
+ }

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/cmd.json

@@ -0,0 +1 @@
+{ "cleanupStructuredEncryptionData": "test" }

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/collinfo.json

@@ -0,0 +1,63 @@
+{
+    "options": {
+        "encryptedFields": {
+            "escCollection": "esc",
+            "ecocCollection": "ecoc",
+            "fields": [
+                {
+                    "keyId": {
+                        "$binary": {
+                            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                            "subType": "04"
+                        }
+                    },
+                    "path": "encrypted",
+                    "bsonType": "string",
+                    "queries": {
+                        "queryType": "equality",
+                        "contention": 0
+                    }
+                },
+                {
+                    "keyId": {
+                        "$binary": {
+                            "base64": "q83vqxI0mHYSNBI0VniQEg==",
+                            "subType": "04"
+                        }
+                    },
+                    "path": "nested.encrypted",
+                    "bsonType": "string",
+                    "queries": {
+                        "queryType": "equality",
+                        "contention": 0
+                    }
+                },
+                {
+                    "keyId": {
+                        "$binary": {
+                            "base64": "EjRWeBI0mHYSNBI0VniQEw==",
+                            "subType": "04"
+                        }
+                    },
+                    "path": "nested.notindexed",
+                    "bsonType": "string"
+                },
+                {
+                    "keyId": {
+                        "$binary": {
+                            "base64": "EjRWeBI0mHYSNBI0VniQEw==",
+                            "subType": "04"
+                        }
+                    },
+                    "path": "rangeField",
+                    "bsonType": "int",
+                    "queries": {
+                        "queryType": "range",
+                        "contention": 0,
+                        "sparsity": 1
+                    }
+                }
+            ]
+        }
+    }
+}