[WARP] Allow containers to be constructed programmatically (#7952)

2 files changed, 23 insertions, 1 deletions

diff --git a/plugins/warp/src/cache/container.rs b/plugins/warp/src/cache/container.rs
index 0b478ed1..99746d9a 100644
--- a/plugins/warp/src/cache/container.rs
+++ b/plugins/warp/src/cache/container.rs
@@ -35,3 +35,8 @@ pub fn cached_containers() -> Vec<Arc<RwLock<Box<dyn Container>>>> {
     let containers_cache = CONTAINER_CACHE.get_or_init(Default::default);
     containers_cache.iter().map(|c| c.clone()).collect()
 }
+
+pub fn cached_container_by_name(name: &str) -> Option<Arc<RwLock<Box<dyn Container>>>> {
+    let containers_cache = CONTAINER_CACHE.get_or_init(Default::default);
+    containers_cache.get(name).map(|c| c.clone())
+}
diff --git a/plugins/warp/src/plugin/ffi/container.rs b/plugins/warp/src/plugin/ffi/container.rs
index 2376ef10..a107a785 100644
--- a/plugins/warp/src/plugin/ffi/container.rs
+++ b/plugins/warp/src/plugin/ffi/container.rs
@@ -1,4 +1,5 @@
-use crate::cache::container::cached_containers;
+use crate::cache::container::{add_cached_container, cached_container_by_name, cached_containers};
+use crate::container::disk::DiskContainer;
 use crate::container::{
     ContainerSearchItem, ContainerSearchItemKind, ContainerSearchQuery, SourcePath, SourceTag,
 };
@@ -12,6 +13,7 @@ use binaryninja::rc::Ref;
 use binaryninja::string::BnString;
 use binaryninja::types::Type;
 use binaryninjacore_sys::{BNArchitecture, BNBinaryView, BNType};
+use std::collections::HashMap;
 use std::ffi::{c_char, CStr};
 use std::mem::ManuallyDrop;
 use std::ops::Deref;
@@ -173,6 +175,21 @@ pub unsafe extern "C" fn BNWARPContainerSearchItemGetFunction(
 }
 
 #[no_mangle]
+pub unsafe extern "C" fn BNWARPAddContainer(name: *const c_char) -> *mut BNWARPContainer {
+    let name_cstr = unsafe { CStr::from_ptr(name) };
+    let name_str = name_cstr.to_str().unwrap();
+    // TODO: Using this generic API name for disk container, I think anything like the network container
+    // TODO: should probably be a second class name so something like BNWARPAddNetworkContainer.
+    let disk_container = DiskContainer::new(name_str.to_string(), HashMap::new());
+    let container_name = disk_container.to_string();
+    add_cached_container(disk_container);
+    match cached_container_by_name(&container_name) {
+        Some(container) => Arc::into_raw(container) as *mut BNWARPContainer,
+        None => std::ptr::null_mut(),
+    }
+}
+
+#[no_mangle]
 pub unsafe extern "C" fn BNWARPGetContainers(count: *mut usize) -> *mut *mut BNWARPContainer {
     // NOTE: Leak the arc pointers to be freed by BNWARPFreeContainerList
     let boxed_raw_containers: Box<[_]> =