1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469
//! The [`KeySpecifier`] trait and its implementations.
use std::ops::Range;
use std::result::Result as StdResult;
use derive_more::{Deref, DerefMut, Display, From, Into};
use serde::{Deserialize, Serialize};
use thiserror::Error;
/// The path of a key in the Arti key store.
///
/// An `ArtiPath` is a nonempty sequence of [`ArtiPathComponent`]s, separated by `/`. Path
/// components may contain UTF-8 alphanumerics, and (except as the first or last character) `-`,
/// `_`, or `.`.
/// Consequently, leading or trailing or duplicated / are forbidden.
///
/// NOTE: There is a 1:1 mapping between a value that implements `KeySpecifier` and its
/// corresponding `ArtiPath`. A `KeySpecifier` can be converted to an `ArtiPath`, but the reverse
/// conversion is not supported.
//
// TODO HSS: Create an error type for ArtiPath errors instead of relying on internal!
// TODO HSS: disallow consecutive `.` to prevent path traversal.
#[derive(Clone, Debug, PartialOrd, Ord, PartialEq, Eq, Hash, Deref, DerefMut, Into, Display)]
pub struct ArtiPath(String);
/// The identifier of a key.
#[derive(Clone, Debug, PartialOrd, Ord, PartialEq, Eq, Hash, From, Display)]
#[non_exhaustive]
pub enum KeyPath {
/// An Arti key path.
Arti(ArtiPath),
/// A C-Tor key path.
CTor(CTorPath),
}
/// A range specifying a substring of a [`KeyPath`].
#[derive(Clone, Debug, PartialEq, Eq, Hash, From)]
pub struct KeyPathRange(Range<usize>);
impl KeyPath {
/// Check whether this `KeyPath` matches the specified [`KeyPathPattern`].
///
/// If the `KeyPath` matches the pattern, this returns the ranges that match its dynamic parts.
pub fn matches(&self, pat: &KeyPathPatternSet) -> Option<Vec<KeyPathRange>> {
let (pattern, path): (&str, &str) = match self {
KeyPath::Arti(p) => (pat.arti.as_ref(), p.as_ref()),
KeyPath::CTor(p) => (pat.ctor.as_ref(), p.as_ref()),
};
glob_match::glob_match_with_captures(pattern, path)
.map(|res| res.into_iter().map(|r| r.into()).collect())
}
// TODO: rewrite these getters using derive_adhoc if KeyPath grows more variants.
/// Return the underlying [`ArtiPath`], if this is a `KeyPath::Arti`.
pub fn arti(&self) -> Option<&ArtiPath> {
match self {
KeyPath::Arti(ref arti) => Some(arti),
KeyPath::CTor(_) => None,
}
}
/// Return the underlying [`CTorPath`], if this is a `KeyPath::CTor`.
pub fn ctor(&self) -> Option<&CTorPath> {
match self {
KeyPath::Arti(_) => None,
KeyPath::CTor(ref ctor) => Some(ctor),
}
}
}
/// [`KeyPathPattern`]s that can be used to match [`ArtiPath`]s or [`CTorPath`]s.
#[derive(Clone, Debug, PartialEq, Eq, Hash, Into)]
#[non_exhaustive]
pub struct KeyPathPatternSet {
/// A pattern for matching [`ArtiPath`]s.
pub arti: KeyPathPattern,
/// A pattern for matching [`CTorPath`]s.
pub ctor: KeyPathPattern,
}
impl KeyPathPatternSet {
/// Create a new [`KeyPathPatternSet`].
pub fn new(arti: KeyPathPattern, ctor: KeyPathPattern) -> Self {
Self { arti, ctor }
}
}
/// A pattern for matching [`ArtiPath`]s.
#[derive(Clone, Debug, PartialEq, Eq, Hash, Deref, DerefMut, Display)]
pub struct KeyPathPattern(String);
impl KeyPathPattern {
/// Create a new `KeyPathPattern`.
///
/// ## Syntax
///
/// NOTE: this table is copied vebatim from the [`glob-match`] docs.
///
/// | Syntax | Meaning |
/// | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
/// | `?` | Matches any single character. |
/// | `*` | Matches zero or more characters, except for path separators (e.g. `/`). |
/// | `**` | Matches zero or more characters, including path separators. Must match a complete path segment (i.e. followed by a `/` or the end of the pattern). |
/// | `[ab]` | Matches one of the characters contained in the brackets. Character ranges, e.g. `[a-z]` are also supported. Use `[!ab]` or `[^ab]` to match any character _except_ those contained in the brackets. |
/// | `{a,b}` | Matches one of the patterns contained in the braces. Any of the wildcard characters can be used in the sub-patterns. Braces may be nested up to 10 levels deep. |
/// | `!` | When at the start of the glob, this negates the result. Multiple `!` characters negate the glob multiple times. |
/// | `\` | A backslash character may be used to escape any of the above special characters. |
///
/// [`glob-match`]: https://crates.io/crates/glob-match
pub fn new(inner: impl AsRef<str>) -> Self {
Self(inner.as_ref().into())
}
/// Create a `KeyPathPattern` that only matches the empty string.
///
/// This pattern will fail to match any valid [`ArtiPath`]s or [`CTorPath`]s.
pub fn empty() -> Self {
Self("".into())
}
}
/// A separator for `ArtiPath`s.
const PATH_SEP: char = '/';
impl ArtiPath {
/// Create a new [`ArtiPath`].
///
/// This function returns an error if `inner` is not a valid `ArtiPath`.
// TODO HSS this function (and validate_str) should have a bespoke error type
pub fn new(inner: String) -> StdResult<Self, ArtiPathError> {
if let Some(e) = inner
.split(PATH_SEP)
.find_map(|s| ArtiPathComponent::validate_str(s).err())
{
return Err(e);
}
Ok(Self(inner))
}
/// Return the substring corresponding to the specified `range`.
///
/// Returns `None` if `range` is not within the bounds of this `ArtiPath`.
pub fn substring(&self, range: &KeyPathRange) -> Option<&str> {
self.0.get(range.0.clone())
}
}
/// A component of an [`ArtiPath`].
///
/// Path components may contain UTF-8 alphanumerics, and (except as the first or last character)
/// `-`, `_`, or `.`.
#[derive(
Clone,
Debug,
derive_more::Deref,
derive_more::DerefMut,
derive_more::Into,
derive_more::Display,
Hash,
Eq,
PartialEq,
Ord,
PartialOrd,
Serialize,
Deserialize,
)]
#[serde(try_from = "String", into = "String")]
pub struct ArtiPathComponent(String);
impl ArtiPathComponent {
/// Create a new [`ArtiPathComponent`].
///
/// This function returns an error if `inner` is not a valid `ArtiPathComponent`.
pub fn new(inner: String) -> StdResult<Self, ArtiPathError> {
Self::validate_str(&inner)?;
Ok(Self(inner))
}
/// Check whether `c` can be used within an `ArtiPathComponent`.
fn is_allowed_char(c: char) -> bool {
c.is_alphanumeric() || c == '_' || c == '-' || c == '.'
}
/// Validate the underlying representation of an `ArtiPath` or `ArtiPathComponent`.
fn validate_str(inner: &str) -> StdResult<(), ArtiPathError> {
/// These cannot be the first or last chars of an `ArtiPath` or `ArtiPathComponent`.
const MIDDLE_ONLY: &[char] = &['-', '_', '.'];
if inner.is_empty() {
return Err(ArtiPathError::EmptyPathComponent);
}
if let Some(c) = inner.chars().find(|c| !Self::is_allowed_char(*c)) {
return Err(ArtiPathError::DisallowedChar(c));
}
if inner.contains("..") {
return Err(ArtiPathError::PathTraversal);
}
for c in MIDDLE_ONLY {
if inner.starts_with(*c) || inner.ends_with(*c) {
return Err(ArtiPathError::BadOuterChar(*c));
}
}
Ok(())
}
}
impl TryFrom<String> for ArtiPathComponent {
type Error = ArtiPathError;
fn try_from(s: String) -> StdResult<ArtiPathComponent, ArtiPathError> {
Self::new(s)
}
}
impl AsRef<str> for ArtiPathComponent {
fn as_ref(&self) -> &str {
&self.0
}
}
/// The path of a key in the C Tor key store.
#[derive(Clone, Debug, PartialOrd, Ord, PartialEq, Eq, Hash, Deref, DerefMut, Into, Display)]
pub struct CTorPath(String);
/// The "specifier" of a key, which identifies an instance of a key.
///
/// [`KeySpecifier::arti_path()`] should uniquely identify an instance of a key.
pub trait KeySpecifier {
/// The location of the key in the Arti key store.
///
/// This also acts as a unique identifier for a specific key instance.
fn arti_path(&self) -> StdResult<ArtiPath, ArtiPathUnavailableError>;
/// The location of the key in the C Tor key store (if supported).
///
/// This function should return `None` for keys that are recognized by Arti's key stores, but
/// not by C Tor's key store (such as `HsClientIntroAuthKeypair`).
fn ctor_path(&self) -> Option<CTorPath>;
}
/// An error returned by a [`KeySpecifier`].
///
/// The putative `KeySpecifier` might be simply invalid,
/// or it might be being used in an inappropriate context.
#[derive(Error, Debug, Clone)]
#[non_exhaustive]
pub enum ArtiPathUnavailableError {
/// An internal error.
#[error("Internal error")]
Bug(#[from] tor_error::Bug),
/// An error returned by a [`KeySpecifier`] that does not have an [`ArtiPath`].
///
/// This is returned, for example, by [`CTorPath`]'s [`KeySpecifier::arti_path`]
/// implementation.
#[error("ArtiPath unvailable")]
ArtiPathUnavailable,
}
/// An error caused by an invalid [`ArtiPath`].
#[derive(Error, Debug, Copy, Clone)]
#[error("Invalid ArtiPath")]
#[non_exhaustive]
pub enum ArtiPathError {
/// Found an empty path component.
#[error("Empty path component")]
EmptyPathComponent,
/// The path contains a disallowed char.
#[error("Found disallowed char {0}")]
DisallowedChar(char),
/// The path contains the `..` pattern.
#[error("Found `..` pattern")]
PathTraversal,
/// The path starts with a disallowed char.
#[error("Path starts or ends with disallowed char {0}")]
BadOuterChar(char),
}
impl KeySpecifier for ArtiPath {
fn arti_path(&self) -> StdResult<ArtiPath, ArtiPathUnavailableError> {
Ok(self.clone())
}
fn ctor_path(&self) -> Option<CTorPath> {
None
}
}
impl KeySpecifier for CTorPath {
fn arti_path(&self) -> StdResult<ArtiPath, ArtiPathUnavailableError> {
Err(ArtiPathUnavailableError::ArtiPathUnavailable)
}
fn ctor_path(&self) -> Option<CTorPath> {
Some(self.clone())
}
}
impl KeySpecifier for KeyPath {
fn arti_path(&self) -> StdResult<ArtiPath, ArtiPathUnavailableError> {
match self {
KeyPath::Arti(p) => p.arti_path(),
KeyPath::CTor(p) => p.arti_path(),
}
}
fn ctor_path(&self) -> Option<CTorPath> {
match self {
KeyPath::Arti(p) => p.ctor_path(),
KeyPath::CTor(p) => p.ctor_path(),
}
}
}
#[cfg(test)]
mod test {
// @@ begin test lint list maintained by maint/add_warning @@
#![allow(clippy::bool_assert_comparison)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::dbg_macro)]
#![allow(clippy::print_stderr)]
#![allow(clippy::print_stdout)]
#![allow(clippy::single_char_pattern)]
#![allow(clippy::unwrap_used)]
#![allow(clippy::unchecked_duration_subtraction)]
#![allow(clippy::useless_vec)]
#![allow(clippy::needless_pass_by_value)]
//! <!-- @@ end test lint list maintained by maint/add_warning @@ -->
use super::*;
macro_rules! assert_err {
($ty:ident, $inner:expr, $error_kind:pat) => {{
let path = $ty::new($inner.to_string());
assert!(path.is_err(), "{} should be invalid", $inner);
assert!(
matches!(path.as_ref().unwrap_err(), $error_kind),
"wrong error type for {}: {path:?}",
$inner
);
}};
}
macro_rules! assert_ok {
($ty:ident, $inner:expr) => {{
let path = $ty::new($inner.to_string());
assert!(path.is_ok(), "{} should be valid", $inner);
assert_eq!(path.unwrap().to_string(), *$inner);
}};
}
#[test]
#[allow(clippy::cognitive_complexity)]
fn arti_path_validation() {
const VALID_ARTI_PATHS: &[&str] = &[
"my-hs-client-2",
"hs_client",
"client٣¾",
"clientß",
"client.key",
];
const BAD_OUTER_CHAR_ARTI_PATHS: &[&str] = &[
"-hs_client",
"_hs_client",
"hs_client-",
"hs_client_",
".client",
"client.",
"-",
"_",
];
const DISALLOWED_CHAR_ARTI_PATHS: &[&str] = &["c++", "client?", "no spaces please"];
const EMPTY_PATH_COMPONENT: &[&str] =
&["/////", "/alice/bob", "alice//bob", "alice/bob/", "/"];
for path in VALID_ARTI_PATHS {
assert_ok!(ArtiPath, path);
assert_ok!(ArtiPathComponent, path);
}
for path in DISALLOWED_CHAR_ARTI_PATHS {
assert_err!(ArtiPath, path, ArtiPathError::DisallowedChar(_));
assert_err!(ArtiPathComponent, path, ArtiPathError::DisallowedChar(_));
}
for path in BAD_OUTER_CHAR_ARTI_PATHS {
assert_err!(ArtiPath, path, ArtiPathError::BadOuterChar(_));
assert_err!(ArtiPathComponent, path, ArtiPathError::BadOuterChar(_));
}
for path in EMPTY_PATH_COMPONENT {
assert_err!(ArtiPath, path, ArtiPathError::EmptyPathComponent);
assert_err!(ArtiPathComponent, path, ArtiPathError::DisallowedChar('/'));
}
const SEP: char = PATH_SEP;
// This is a valid ArtiPath, but not a valid ArtiPathComponent
let path = format!("a{SEP}client{SEP}key.private");
assert_ok!(ArtiPath, &path);
assert_err!(ArtiPathComponent, &path, ArtiPathError::DisallowedChar('/'));
const PATH_WITH_TRAVERSAL: &str = "alice/../bob";
assert_err!(ArtiPath, PATH_WITH_TRAVERSAL, ArtiPathError::PathTraversal);
assert_err!(
ArtiPathComponent,
PATH_WITH_TRAVERSAL,
ArtiPathError::DisallowedChar('/')
);
const REL_PATH: &str = "./bob";
assert_err!(ArtiPath, REL_PATH, ArtiPathError::BadOuterChar('.'));
assert_err!(
ArtiPathComponent,
REL_PATH,
ArtiPathError::DisallowedChar('/')
);
}
#[test]
fn serde() {
// TODO HSS clone-and-hack with tor_hsservice::::nickname::test::serde
// perhaps there should be some utility in tor-basic-utils for testing
// validated string newtypes, or something
#[derive(Serialize, Deserialize, Debug)]
struct T {
n: ArtiPathComponent,
}
let j = serde_json::from_str(r#"{ "n": "x" }"#).unwrap();
let t: T = serde_json::from_value(j).unwrap();
assert_eq!(&t.n.to_string(), "x");
assert_eq!(&serde_json::to_string(&t).unwrap(), r#"{"n":"x"}"#);
let j = serde_json::from_str(r#"{ "n": "!" }"#).unwrap();
let e = serde_json::from_value::<T>(j).unwrap_err();
assert!(
e.to_string().contains("Found disallowed char"),
"wrong msg {e:?}"
);
}
#[test]
fn substring() {
const KEY_PATH: &str = "hello";
let path = ArtiPath::new(KEY_PATH.to_string()).unwrap();
assert_eq!(path.substring(&(0..1).into()).unwrap(), "h");
assert_eq!(path.substring(&(2..KEY_PATH.len()).into()).unwrap(), "llo");
assert_eq!(
path.substring(&(0..KEY_PATH.len()).into()).unwrap(),
"hello"
);
assert_eq!(path.substring(&(0..KEY_PATH.len() + 1).into()), None);
assert_eq!(path.substring(&(0..0).into()).unwrap(), "");
}
}