Address deny complaints, re-enable mqtt5 and zenoh plugins

Author: AnotherDaniel

Cargo.lock

@@ -14,27 +14,12 @@
 # Config file for cargo deny
 # For all options see https://github.com/EmbarkStudios/cargo-deny/blob/main/deny.template.toml
 
-[advisories]
-ignore = ["RUSTSEC-2023-0071", "RUSTSEC-2024-0436"]
-
 [bans]
 multiple-versions = "allow"
 
 # If you add a license in the following section also consider changing about.toml
 [licenses]
-allow = [
-    "Apache-2.0",
-    "BSD-2-Clause",
-    "BSD-3-Clause",
-    "CDLA-Permissive-2.0",
-    "EPL-2.0",
-    "ISC",
-    "MIT",
-    "MPL-2.0",
-    "OpenSSL",
-    "Unicode-3.0",
-    "Zlib",
-]
+allow = ["Apache-2.0", "BSD-2-Clause", "MIT", "Unicode-3.0"]
 
 [[licenses.clarify]]
 name = "ring"

deny.toml

@@ -45,4 +45,4 @@ up-transport-mqtt5 = { version = "0.4.0", optional = true }
 up-transport-zenoh = { version = "0.9.0", optional = true }
 
 [target.'cfg(unix)'.dependencies]
-daemonize = { version = "0.5" }
+daemonize2 = { version = "0.6" }

up-subscription-cli/Cargo.toml

@@ -21,21 +21,21 @@ use up_rust::{LocalUriProvider, UTransport};
 use up_subscription::{ConfigurationError, USubscriptionConfiguration, USubscriptionService};
 
 #[cfg(unix)]
-use daemonize::Daemonize;
+use daemonize2::Daemonize;
 
-// #[cfg(feature = "mqtt5")]
-// use up_transport_mqtt5::Mqtt5TransportOptions;
+#[cfg(feature = "mqtt5")]
+use up_transport_mqtt5::Mqtt5TransportOptions;
 
-// #[cfg(feature = "zenoh")]
-// use crate::transport::zenoh::ZenohArgs;
+#[cfg(feature = "zenoh")]
+use crate::transport::zenoh::ZenohArgs;
 
 mod transport;
 #[cfg(feature = "local")]
 use transport::get_local_transport;
-// #[cfg(feature = "mqtt5")]
-// use transport::get_mqtt5_transport;
-// #[cfg(feature = "zenoh")]
-// use transport::get_zenoh_transport;
+#[cfg(feature = "mqtt5")]
+use transport::get_mqtt5_transport;
+#[cfg(feature = "zenoh")]
+use transport::get_zenoh_transport;
 
 fn between_1_and_1024(s: &str) -> Result<usize, String> {
     number_range(s, 1, 1024)
@@ -71,10 +71,10 @@ enum Transport {
     None,
     #[cfg(feature = "local")]
     Local,
-    // #[cfg(feature = "mqtt5")]
-    // Mqtt5,
-    // #[cfg(feature = "zenoh")]
-    // Zenoh,
+    #[cfg(feature = "mqtt5")]
+    Mqtt5,
+    #[cfg(feature = "zenoh")]
+    Zenoh,
 }
 
 // All our args
@@ -113,27 +113,32 @@ pub(crate) struct Args {
     /// Increase verbosity of output, default is false (reduced verbosity)
     #[arg(short, long, env, default_value_t = false)]
     verbose: bool,
-    // #[cfg(feature = "mqtt5")]
-    // #[command(flatten)]
-    // mqtt_args: Mqtt5TransportOptions,
 
-    // #[cfg(feature = "zenoh")]
-    // #[command(flatten)]
-    // zenoh_args: ZenohArgs,
+    #[cfg(feature = "mqtt5")]
+    #[command(flatten)]
+    mqtt_args: Mqtt5TransportOptions,
+
+    #[cfg(feature = "zenoh")]
+    #[command(flatten)]
+    zenoh_args: ZenohArgs,
 }
 
 #[tokio::main]
 async fn main() {
     let args = Args::parse();
 
     // Setup logging, get configuration
-    std::env::set_var("RUST_LOG", "info");
-    // #[cfg(feature = "zenoh")]
-    // std::env::set_var("RUST_LOG", "info,zenoh=warn");
-    if args.verbose {
-        std::env::set_var("RUST_LOG", "trace");
-        // #[cfg(feature = "zenoh")]
-        // std::env::set_var("RUST_LOG", "trace,zenoh=info");
+    unsafe {
+        // accept unsafe for now, as at this point this program definiely is not multi-threaded
+        std::env::set_var("RUST_LOG", "info");
+        #[cfg(feature = "zenoh")]
+        std::env::set_var("RUST_LOG", "info,zenoh=warn");
+
+        if args.verbose {
+            std::env::set_var("RUST_LOG", "trace");
+            #[cfg(feature = "zenoh")]
+            std::env::set_var("RUST_LOG", "trace,zenoh=info");
+        }
     }
     up_subscription::init_once();
 
@@ -153,20 +158,20 @@ async fn main() {
                 .inspect_err(|e| panic!("Error setting up local transport: {}", e.get_message()))
                 .unwrap(),
         ),
-        // #[cfg(feature = "mqtt5")]
-        // Transport::Mqtt5 => Some(
-        //     get_mqtt5_transport(_config.clone(), args.mqtt_args)
-        //         .await
-        //         .inspect_err(|e| panic!("Error setting up MQTT5 transport: {}", e.get_message()))
-        //         .unwrap(),
-        // ),
-        // #[cfg(feature = "zenoh")]
-        // Transport::Zenoh => Some(
-        //     get_zenoh_transport(_config.clone(), args.zenoh_args)
-        //         .await
-        //         .inspect_err(|e| panic!("Error setting up Zenoh transport: {}", e.get_message()))
-        //         .unwrap(),
-        // ),
+        #[cfg(feature = "mqtt5")]
+        Transport::Mqtt5 => Some(
+            get_mqtt5_transport(_config.clone(), args.mqtt_args)
+                .await
+                .inspect_err(|e| panic!("Error setting up MQTT5 transport: {}", e.get_message()))
+                .unwrap(),
+        ),
+        #[cfg(feature = "zenoh")]
+        Transport::Zenoh => Some(
+            get_zenoh_transport(_config.clone(), args.zenoh_args)
+                .await
+                .inspect_err(|e| panic!("Error setting up Zenoh transport: {}", e.get_message()))
+                .unwrap(),
+        ),
         Transport::None => None,
     };
 
@@ -188,7 +193,7 @@ async fn main() {
     #[cfg(unix)]
     if args.daemon {
         let daemonize = Daemonize::new();
-        match daemonize.start() {
+        match unsafe { daemonize.start() } {
             Ok(_) => {
                 debug!("Success, running daemonized");
             }

up-subscription-cli/src/main.rs

@@ -16,12 +16,12 @@ pub(crate) mod local;
 #[cfg(feature = "local")]
 pub(crate) use local::get_local_transport;
 
-// #[cfg(feature = "mqtt5")]
-// pub(crate) mod mqtt5;
-// #[cfg(feature = "mqtt5")]
-// pub(crate) use mqtt5::get_mqtt5_transport;
+#[cfg(feature = "mqtt5")]
+pub(crate) mod mqtt5;
+#[cfg(feature = "mqtt5")]
+pub(crate) use mqtt5::get_mqtt5_transport;
 
-// #[cfg(feature = "zenoh")]
-// pub(crate) mod zenoh;
-// #[cfg(feature = "zenoh")]
-// pub(crate) use zenoh::get_zenoh_transport;
+#[cfg(feature = "zenoh")]
+pub(crate) mod zenoh;
+#[cfg(feature = "zenoh")]
+pub(crate) use zenoh::get_zenoh_transport;