diff --git a/ng-net/src/app_protocol.rs b/ng-net/src/app_protocol.rs index cf5faed..a062888 100644 --- a/ng-net/src/app_protocol.rs +++ b/ng-net/src/app_protocol.rs @@ -26,16 +26,16 @@ use crate::types::*; lazy_static! { #[doc(hidden)] static ref RE_FILE_READ_CAP: Regex = - Regex::new(r"^did:ng:j:([A-Za-z0-9-_%.]*):k:([A-Za-z0-9-_%.]*)$").unwrap(); + Regex::new(r"^did:ng:j:([A-Za-z0-9-_]*):k:([A-Za-z0-9-_]*)$").unwrap(); #[doc(hidden)] static ref RE_REPO: Regex = - Regex::new(r"^did:ng:o:([A-Za-z0-9-_%.]*):v:([A-Za-z0-9-_%.]*)$").unwrap(); + Regex::new(r"^did:ng:o:([A-Za-z0-9-_]*):v:([A-Za-z0-9-_]*)$").unwrap(); #[doc(hidden)] static ref RE_BRANCH: Regex = - Regex::new(r"^did:ng:o:([A-Za-z0-9-_%.]*):v:([A-Za-z0-9-_%.]*):b:([A-Za-z0-9-_%.]*)$").unwrap(); + Regex::new(r"^did:ng:o:([A-Za-z0-9-_]*):v:([A-Za-z0-9-_]*):b:([A-Za-z0-9-_]*)$").unwrap(); #[doc(hidden)] static ref RE_NAMED_BRANCH_OR_COMMIT: Regex = - Regex::new(r"^did:ng:o:([A-Za-z0-9-_%.]*):v:([A-Za-z0-9-_%.]*):a:([A-Za-z0-9-_%.]*)$").unwrap(); //TODO: allow international chars. disallow digit as first char + Regex::new(r"^did:ng:o:([A-Za-z0-9-_]*):v:([A-Za-z0-9-_]*):a:([A-Za-z0-9-_%]*)$").unwrap(); //TODO: allow international chars. disallow digit as first char } #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/ng-oxigraph/src/oxigraph/storage/mod.rs b/ng-oxigraph/src/oxigraph/storage/mod.rs index dc4f979..8e9e20e 100644 --- a/ng-oxigraph/src/oxigraph/storage/mod.rs +++ b/ng-oxigraph/src/oxigraph/storage/mod.rs @@ -85,16 +85,16 @@ const DID_PREFIX: &str = "did:ng"; lazy_static! { #[doc(hidden)] static ref RE_REPO: Regex = - Regex::new(r"^did:ng:o:([A-Za-z0-9-_%.]*):v:([A-Za-z0-9-_%.]*)$").unwrap(); + Regex::new(r"^did:ng:o:([A-Za-z0-9-_]*):v:([A-Za-z0-9-_]*)$").unwrap(); #[doc(hidden)] static ref RE_BRANCH: Regex = - Regex::new(r"^:b:([A-Za-z0-9-_%.]*)$").unwrap(); + Regex::new(r"^:b:([A-Za-z0-9-_]*)$").unwrap(); #[doc(hidden)] static ref RE_COMMITS: Regex = - Regex::new(r":c:([A-Za-z0-9-_%.]*)").unwrap(); + Regex::new(r":c:([A-Za-z0-9-_]*)").unwrap(); #[doc(hidden)] static ref RE_NAMED_BRANCH_OR_COMMIT: Regex = - Regex::new(r"^:a:([A-Za-z0-9-_%.]*)$").unwrap(); //TODO: allow international chars. disallow digit as first char + Regex::new(r"^:a:([A-Za-z0-9-_%]*)$").unwrap(); //TODO: allow international chars. disallow digit as first char } pub(crate) enum MatchBy {