Merge pull request dbus2#1039 from zeenix/drop-cookies

💥 zb: Drop support for `DBUS_COOKIE_SHA1` auth mechanism

.github/workflows/rust.yml

@@ -85,9 +85,6 @@ jobs:
           dbus-run-session --config-file /tmp/dbus-session.conf -- \
             cargo --locked test --profile "$PROFILE" --verbose --features uuid,url,time,chrono,option-as-array,vsock,bus-impl \
               -- --skip fdpass_systemd
-          # check cookie-sha1 auth against dbus-daemon
-          sed -i s/EXTERNAL/DBUS_COOKIE_SHA1/g /tmp/dbus-session.conf
-          dbus-run-session --config-file /tmp/dbus-session.conf -- cargo --locked test --profile "$PROFILE" --verbose -- basic_connection
           # Test tokio support.
           dbus-run-session --config-file /tmp/dbus-session.conf -- \
             cargo --locked test --profile "$PROFILE" --verbose --tests -p zbus --no-default-features \

zbus/Cargo.toml

@@ -58,7 +58,6 @@ async-broadcast = "0.7.0"
 hex = "0.4.3"
 ordered-stream = "0.2"
 rand = "0.8.5"
-sha1 = { version = "0.10.6", features = ["std"] }
 event-listener = "5.3.0"
 static_assertions = "1.1.0"
 async-trait = "0.1.80"

zbus/src/abstractions/mod.rs

@@ -7,7 +7,6 @@ pub use executor::*;
 mod async_drop;
 pub(crate) mod async_lock;
 pub use async_drop::*;
-pub(crate) mod file;
 
 // Not macOS-specific itself but only used on macOS.
 #[cfg(target_os = "macos")]

zbus/src/blocking/connection/builder.rs

@@ -10,7 +10,7 @@ use tokio::net::UnixStream;
 #[cfg(all(windows, not(feature = "tokio")))]
 use uds_windows::UnixStream;
 
-use zvariant::{ObjectPath, Str};
+use zvariant::ObjectPath;
 
 #[cfg(feature = "p2p")]
 use crate::Guid;
@@ -94,33 +94,6 @@ impl<'a> Builder<'a> {
         Self(self.0.auth_mechanism(auth_mechanism))
     }
 
-    /// The cookie context to use during authentication.
-    ///
-    /// This is only used when the `cookie` authentication mechanism is enabled and only valid for
-    /// server connections.
-    ///
-    /// If not specified, the default cookie context of `org_freedesktop_general` will be used.
-    ///
-    /// # Errors
-    ///
-    /// If the given string is not a valid cookie context.
-    pub fn cookie_context<C>(self, context: C) -> Result<Self>
-    where
-        C: Into<Str<'a>>,
-    {
-        self.0.cookie_context(context).map(Self)
-    }
-
-    /// The ID of the cookie to use during authentication.
-    ///
-    /// This is only used when the `cookie` authentication mechanism is enabled and only valid for
-    /// server connections.
-    ///
-    /// If not specified, the first cookie found in the cookie context file will be used.
-    pub fn cookie_id(self, id: usize) -> Self {
-        Self(self.0.cookie_id(id))
-    }
-
     /// The to-be-created connection will be a peer-to-peer connection.
     ///
     /// This method is only available when the `p2p` feature is enabled.

zbus/src/connection/builder.rs

@@ -21,7 +21,7 @@ use uds_windows::UnixStream;
 #[cfg(all(feature = "vsock", not(feature = "tokio")))]
 use vsock::VsockStream;
 
-use zvariant::{ObjectPath, Str};
+use zvariant::ObjectPath;
 
 use crate::{
     address::{Address, ToAddresses},
@@ -71,8 +71,6 @@ pub struct Builder<'a> {
     auth_mechanisms: Option<VecDeque<AuthMechanism>>,
     #[cfg(feature = "bus-impl")]
     unique_name: Option<crate::names::UniqueName<'a>>,
-    cookie_context: Option<super::handshake::CookieContext<'a>>,
-    cookie_id: Option<usize>,
 }
 
 assert_impl_all!(Builder<'_>: Send, Sync, Unpin);
@@ -197,37 +195,6 @@ impl<'a> Builder<'a> {
         self
     }
 
-    /// The cookie context to use during authentication.
-    ///
-    /// This is only used when the `cookie` authentication mechanism is enabled and only valid for
-    /// server connections.
-    ///
-    /// If not specified, the default cookie context of `org_freedesktop_general` will be used.
-    ///
-    /// # Errors
-    ///
-    /// If the given string is not a valid cookie context.
-    pub fn cookie_context<C>(mut self, context: C) -> Result<Self>
-    where
-        C: Into<Str<'a>>,
-    {
-        self.cookie_context = Some(context.into().try_into()?);
-
-        Ok(self)
-    }
-
-    /// The ID of the cookie to use during authentication.
-    ///
-    /// This is only used when the `cookie` authentication mechanism is enabled and only valid for
-    /// server connections.
-    ///
-    /// If not specified, the first cookie found in the cookie context file will be used.
-    pub fn cookie_id(mut self, id: usize) -> Self {
-        self.cookie_id = Some(id);
-
-        self
-    }
-
     /// The to-be-created connection will be a peer-to-peer connection.
     ///
     /// This method is only available when the `p2p` feature is enabled.
@@ -436,8 +403,6 @@ impl<'a> Builder<'a> {
                         #[cfg(windows)]
                         client_sid,
                         self.auth_mechanisms,
-                        self.cookie_id,
-                        self.cookie_context.unwrap_or_default(),
                         unique_name,
                     )
                     .await?
@@ -506,8 +471,6 @@ impl<'a> Builder<'a> {
             auth_mechanisms: None,
             #[cfg(feature = "bus-impl")]
             unique_name: None,
-            cookie_id: None,
-            cookie_context: None,
         }
     }