Merge pull request #74 from ADORSYS-GIS/iss-67--oob-invitation

OOB Invitation

did-endpoint/Cargo.toml

@@ -8,17 +8,18 @@ edition = "2021"
 [dependencies]
 axum = { version = "0.6.20", features = ["macros"] }
 chrono = { version = "0.4.26" }
-did-utils = { path = "../did-utils"}
+did-utils = { path = "../did-utils" }
 dotenv-flow = "0.15.0"
 hyper = { version = "0.14.27", features = ["full"] }
-multibase = { version = "0.8.0" } # earlier version due to 'did-utils'
+multibase = { version = "0.8.0" }                    # earlier version due to 'did-utils'
 serde_json = "1.0.104"
 thiserror = "1.0.49"
 tokio = { version = "1.30.0", features = ["full"] }
 tracing = "0.1.37"
 url = { version = "2.4.0" }
 uuid = { version = "1.4.1", features = ["v4"] }
 zeroize = { version = "1.6.0" }
+nix = "0.22.0"
 
 # Plugins traits
 server-plugin = { path = "../server-plugin" }

did-endpoint/src/util/filesystem.rs

@@ -1,11 +1,15 @@
+use nix::fcntl::{flock, FlockArg};
+use std::fs::OpenOptions;
 use std::io::{Error as IoError, ErrorKind, Result as IoResult};
+use std::os::unix::io::AsRawFd;
 
 // Define a trait for file system operations
 pub trait FileSystem: Send + 'static {
     fn read_to_string(&self, path: &str) -> IoResult<String>;
     fn write(&mut self, path: &str, content: &str) -> IoResult<()>;
     fn read_dir_files(&self, path: &str) -> IoResult<Vec<String>>;
     fn create_dir_all(&mut self, path: &str) -> IoResult<()>;
+    fn write_with_lock(&self, path: &str, content: &str) -> IoResult<()>;
     // Add other file system operations as needed
 }
 
@@ -42,6 +46,25 @@ impl FileSystem for StdFileSystem {
         std::fs::create_dir_all(path)
     }
 
+    fn write_with_lock(&self, path: &str, content: &str) -> IoResult<()> {
+        let mut options = OpenOptions::new();
+        options.read(true);
+        options.write(true);
+        options.create(true);
+
+        let file = options.open(path)?;
+
+        // Acquire an exclusive lock before writing to the file
+        flock(file.as_raw_fd(), FlockArg::LockExclusive)
+            .map_err(|_| IoError::new(ErrorKind::Other, "Error acquiring file lock"))?;
+
+        std::fs::write(&path, &content).expect("Error saving base64-encoded image to file");
+
+        // Release the lock after writing to the file
+        flock(file.as_raw_fd(), FlockArg::Unlock).expect("Error releasing file lock");
+        Ok(())
+    }
+
     // Implement other file system operations as needed
 }
 
@@ -74,8 +97,14 @@ mod tests {
         fn create_dir_all(&mut self, _path: &str) -> IoResult<()> {
             Ok(())
         }
+
+        fn write_with_lock(&self, _path: &str, _content: &str) -> IoResult<()>{
+            Ok(())
+        }
     }
 
+
+
     #[test]
     fn can_mock_fs_operations() {
         let mut mock_fs = MockFileSystem::default();

did-endpoint/src/util/keystore.rs

@@ -211,6 +211,10 @@ mod tests {
         fn create_dir_all(&mut self, _path: &str) -> IoResult<()> {
             Ok(())
         }
+
+        fn write_with_lock(&self, _path: &str, _content: &str) -> IoResult<()>{
+            Ok(())
+        }
     }
 
     #[test]

generic-server/Cargo.toml

@@ -24,13 +24,15 @@ server-plugin = { path = "../server-plugin" }
 # optional
 chrono = { version = "0.4.26", optional = true }
 did-endpoint = { path = "../did-endpoint", optional = true }
+oob-messages = { path = "../oob-messages", optional = true }
 
 [dev-dependencies]
 tower = { version = "0.4.13", features = ["util"] }
 
 [features]
-default = ["plugin-index", "plugin-did_endpoint"]
+default = ["plugin-index", "plugin-did_endpoint", "plugin-oob_messages"]
 
 # plugins
 plugin-index = ["dep:chrono"]
 plugin-did_endpoint = ["dep:did-endpoint"]
+plugin-oob_messages = ["dep:oob-messages"]

generic-server/src/plugin/index/web.rs

@@ -7,7 +7,7 @@ use crate::util::crate_name;
 
 pub fn routes() -> Router {
     Router::new() //
-        .route("/", get(index))
+        .route("/about", get(index))
 }
 
 pub async fn index() -> Json<Value> {
@@ -36,7 +36,7 @@ mod tests {
         let app = routes();
 
         let response = app
-            .oneshot(Request::builder().uri("/").body(Body::empty()).unwrap())
+            .oneshot(Request::builder().uri("/about").body(Body::empty()).unwrap())
             .await
             .unwrap();
 

generic-server/src/plugin/mod.rs

@@ -12,5 +12,7 @@ lazy_static! {
         Box::<index::IndexPlugin>::default(),
         #[cfg(feature = "plugin-did_endpoint")]
         Box::<did_endpoint::plugin::DidEndpointPlugin>::default(),
+        #[cfg(feature = "plugin-oob_messages")]
+        Box::<oob_messages::plugin::OOBMessagesPlugin>::default(),
     ];
 }

mediator-coordination/src/util/mod.rs

@@ -185,4 +185,8 @@ impl FileSystem for MockFileSystem {
     fn create_dir_all(&mut self, _path: &str) -> IoResult<()> {
         Ok(())
     }
+
+    fn write_with_lock(&self, _path: &str, _content: &str) -> IoResult<()>{
+        Ok(())
+    }
 }

mediator-server/Cargo.toml

@@ -31,7 +31,7 @@ lazy-regex = "2"
 async-trait = "0.1"
 strum = "0.24"
 strum_macros = "0.24"
-uuid = { version = "1", features = ["fast-rng", "v4",] }
+uuid = { version = "1", features = ["fast-rng", "v4"] }
 
 csv = "1.1.6"
 

oob-messages/.env

@@ -0,0 +1,3 @@
+SERVER_PUBLIC_DOMAIN=https://example.com
+SERVER_LOCAL_PORT=3000
+STORAGE_DIRPATH="target/storage"

oob-messages/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "oob-messages"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+uuid = { version = "1", features = ["fast-rng", "v4"] }
+multibase = "0.9.1"
+serde_json = "1"
+serde = { version = "1", features = ["derive"] }
+dotenv-flow = "0.16.0"
+url = { version = "2.4.0" }
+axum = { version = "0.6.20" }
+tracing = "0.1.37"
+qrcode = "0.12.0"
+image = "0.23"
+base64 = "0.13.0"
+reqwest = "0.11"
+tempdir = "0.3.7"
+headers = "0.3"
+lazy_static = "1.4.0"
+# Plugins traits
+server-plugin = { path = "../server-plugin" }
+did-endpoint = { path = "../did-endpoint" }
+
+[dev-dependencies]
+tokio = { version = "1.30.0", features = ["full"] }
+tower-http = { version = "0.4.3", features = ["catch-panic", "trace"] }
+hyper = { version = "0.14.27", features = ["full"] }
+tower = "0.4"

oob-messages/src/constants.rs

@@ -0,0 +1 @@
+pub const OOB_INVITATION_2_0: &str = "https://didcomm.org/out-of-band/2.0/invitation";

oob-messages/src/lib.rs

@@ -0,0 +1,5 @@
+mod models;
+mod constants;
+mod util;
+pub mod plugin;
+pub mod web;