chore: Point links to v1.12 of the spec
This commit is contained in:
parent
aae40393bb
commit
cc1b2144ea
@ -602,7 +602,7 @@ mod tests {
|
|||||||
assert!(!"m".matches_word("[[:alpha:]]?"));
|
assert!(!"m".matches_word("[[:alpha:]]?"));
|
||||||
assert!("[[:alpha:]]!".matches_word("[[:alpha:]]?"));
|
assert!("[[:alpha:]]!".matches_word("[[:alpha:]]?"));
|
||||||
|
|
||||||
// From the spec: <https://spec.matrix.org/v1.11/client-server-api/#conditions-1>
|
// From the spec: <https://spec.matrix.org/v1.12/client-server-api/#conditions-1>
|
||||||
assert!("An example event.".matches_word("ex*ple"));
|
assert!("An example event.".matches_word("ex*ple"));
|
||||||
assert!("exple".matches_word("ex*ple"));
|
assert!("exple".matches_word("ex*ple"));
|
||||||
assert!("An exciting triple-whammy".matches_word("ex*ple"));
|
assert!("An exciting triple-whammy".matches_word("ex*ple"));
|
||||||
@ -651,7 +651,7 @@ mod tests {
|
|||||||
assert!("".matches_pattern("*", false));
|
assert!("".matches_pattern("*", false));
|
||||||
assert!(!"foo".matches_pattern("", false));
|
assert!(!"foo".matches_pattern("", false));
|
||||||
|
|
||||||
// From the spec: <https://spec.matrix.org/v1.11/client-server-api/#conditions-1>
|
// From the spec: <https://spec.matrix.org/v1.12/client-server-api/#conditions-1>
|
||||||
assert!("Lunch plans".matches_pattern("lunc?*", false));
|
assert!("Lunch plans".matches_pattern("lunc?*", false));
|
||||||
assert!("LUNCH".matches_pattern("lunc?*", false));
|
assert!("LUNCH".matches_pattern("lunc?*", false));
|
||||||
assert!(!" lunch".matches_pattern("lunc?*", false));
|
assert!(!" lunch".matches_pattern("lunc?*", false));
|
||||||
|
@ -57,7 +57,7 @@ fn is_default_bits(val: &UInt) -> bool {
|
|||||||
///
|
///
|
||||||
/// The only algorithm currently specified is `m.secret_storage.v1.aes-hmac-sha2`, so this
|
/// The only algorithm currently specified is `m.secret_storage.v1.aes-hmac-sha2`, so this
|
||||||
/// essentially represents `AesHmacSha2KeyDescription` in the
|
/// essentially represents `AesHmacSha2KeyDescription` in the
|
||||||
/// [spec](https://spec.matrix.org/v1.11/client-server-api/#msecret_storagev1aes-hmac-sha2).
|
/// [spec](https://spec.matrix.org/v1.12/client-server-api/#msecret_storagev1aes-hmac-sha2).
|
||||||
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
|
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
|
||||||
#[derive(Clone, Debug, Serialize, EventContent)]
|
#[derive(Clone, Debug, Serialize, EventContent)]
|
||||||
#[ruma_event(type = "m.secret_storage.key.*", kind = GlobalAccountData)]
|
#[ruma_event(type = "m.secret_storage.key.*", kind = GlobalAccountData)]
|
||||||
@ -137,7 +137,7 @@ impl SecretStorageEncryptionAlgorithm {
|
|||||||
/// The key properties for the `m.secret_storage.v1.aes-hmac-sha2` algorithm.
|
/// The key properties for the `m.secret_storage.v1.aes-hmac-sha2` algorithm.
|
||||||
///
|
///
|
||||||
/// Corresponds to the AES-specific properties of `AesHmacSha2KeyDescription` in the
|
/// Corresponds to the AES-specific properties of `AesHmacSha2KeyDescription` in the
|
||||||
/// [spec](https://spec.matrix.org/v1.11/client-server-api/#msecret_storagev1aes-hmac-sha2).
|
/// [spec](https://spec.matrix.org/v1.12/client-server-api/#msecret_storagev1aes-hmac-sha2).
|
||||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||||||
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
|
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
|
||||||
pub struct SecretStorageV1AesHmacSha2Properties {
|
pub struct SecretStorageV1AesHmacSha2Properties {
|
||||||
|
@ -77,7 +77,7 @@ pub enum MxcUriError {
|
|||||||
/// Media identifier malformed due to invalid characters detected.
|
/// Media identifier malformed due to invalid characters detected.
|
||||||
///
|
///
|
||||||
/// Valid characters are (in regex notation) `[A-Za-z0-9_-]+`.
|
/// Valid characters are (in regex notation) `[A-Za-z0-9_-]+`.
|
||||||
/// See [here](https://spec.matrix.org/v1.11/client-server-api/#security-considerations-5) for more details.
|
/// See [here](https://spec.matrix.org/v1.12/client-server-api/#security-considerations-5) for more details.
|
||||||
#[error("Media Identifier malformed, invalid characters")]
|
#[error("Media Identifier malformed, invalid characters")]
|
||||||
MediaIdMalformed,
|
MediaIdMalformed,
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ pub fn validate(uri: &str) -> Result<NonZeroU8, MxcUriError> {
|
|||||||
|
|
||||||
let server_name = &uri[..index];
|
let server_name = &uri[..index];
|
||||||
let media_id = &uri[index + 1..];
|
let media_id = &uri[index + 1..];
|
||||||
// See: https://spec.matrix.org/v1.11/client-server-api/#security-considerations-5
|
// See: https://spec.matrix.org/v1.12/client-server-api/#security-considerations-5
|
||||||
let media_id_is_valid = media_id
|
let media_id_is_valid = media_id
|
||||||
.bytes()
|
.bytes()
|
||||||
.all(|b| matches!(b, b'0'..=b'9' | b'a'..=b'z' | b'A'..=b'Z' | b'-' | b'_' ));
|
.all(|b| matches!(b, b'0'..=b'9' | b'a'..=b'z' | b'A'..=b'Z' | b'-' | b'_' ));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user