Radish alpha
h
heartwood
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
radicle/profile: Control socket path for Windows
Lorenz Leutgeb committed 8 months ago
commit ce11f03fe63b458c38c331e1c0441b3967b44fc5
parent fd34b680b59ed99b9e1c1283bdbfef8d779efaf5
3 files changed +50 -5
added crates/radicle/CHANGELOG.md
@@ -0,0 +1,24 @@
+ 
# Changelog
+
+ 
All notable changes to this project will be documented in this file.
+
+ 
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+ 
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+ 
## [Unreleased]
+
+ 
### Added
+
+ 
### Changed
+
+ 
- `radicle::profile::Home::socket` defaults to the path `\\.\pipe\radicle-node`
+ 
  on Windows. The behavior on Unix-like systems has *not* changed.
+
+ 
### Deprecated
+
+ 
### Removed
+
+ 
- `radicle::node::DEFAULT_SOCKET_NAME`, use `radicle::profile::Home::socket`
+ 
  instead.
+
+ 
### Security
modified crates/radicle/src/node.rs
@@ -53,8 +53,6 @@ pub use timestamp::Timestamp;


/// Peer-to-peer protocol version.

pub const PROTOCOL_VERSION: u8 = 1;
- 
/// Default name for control socket file.
- 
pub const DEFAULT_SOCKET_NAME: &str = "control.sock";

/// Default radicle protocol port.

pub const DEFAULT_PORT: u16 = 8776;

/// Default timeout when waiting for the node to respond with data.
modified crates/radicle/src/profile.rs
@@ -578,9 +578,32 @@ impl Home {
    }



    pub fn socket(&self) -> PathBuf {
- 
        env::var_os(env::RAD_SOCKET)
- 
            .map(PathBuf::from)
- 
            .unwrap_or_else(|| self.node().join(node::DEFAULT_SOCKET_NAME))
+ 
        use env::RAD_SOCKET;
+
+ 
        #[cfg(unix)]
+ 
        const DEFAULT_SOCKET_NAME: &str = "control.sock";
+
+ 
        #[cfg(windows)]
+ 
        const DEFAULT_SOCKET_NAME: &str = r#"\\.\pipe\radicle-node"#;
+
+ 
        match env::var_os(RAD_SOCKET).map(PathBuf::from) {
+ 
            None => {
+ 
                #[cfg(unix)]
+ 
                return self.node().join(DEFAULT_SOCKET_NAME);
+
+ 
                #[cfg(windows)]
+ 
                return PathBuf::from(DEFAULT_SOCKET_NAME);
+ 
            }
+ 
            Some(path) => {
+ 
                #[cfg(windows)]
+ 
                {
+ 
                    const PIPE_PREFIX: &str = r#"\\.\pipe\"#;
+ 
                    assert!(path.starts_with(PIPE_PREFIX), "The value of the environment variable {RAD_SOCKET} ('{}') must start with {PIPE_PREFIX}. This restriction might be relaxed in the future.", path.display());
+ 
                }
+
+ 
                path
+ 
            }
+ 
        }

    }



    /// Return a read-write handle to the notifications database.