Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Digest AKA to Algorithm Directive from RFC 3110 and RFC 4169 #30

Merged
merged 3 commits into from
Oct 1, 2024
Merged

Add Digest AKA to Algorithm Directive from RFC 3110 and RFC 4169 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
554eb86
add aka namespace to algorithm directive, rfc3310
Jul 16, 2024
9f343cb
change type of password to Vec<u8>
Jul 17, 2024
44c2c38
Merge branch 'kbalt:main' into add-digest-aka-extension
tobiasfunke1 Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions crates/sip-auth/src/digest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ use crate::{Error, RequestParts, ResponseEntry, UacAuthenticator};
use bytesstr::BytesStr;
use sha2::Digest;
use sip_types::header::typed::{
Algorithm, AuthChallenge, AuthResponse, DigestChallenge, DigestResponse, QopOption,
QopResponse, Username,
Algorithm, AlgorithmValue, AuthChallenge, AuthResponse, DigestChallenge, DigestResponse,
QopOption, QopResponse, Username,
};
use sip_types::print::{AppendCtx, PrintCtx, UriContext};

pub struct DigestCredentials {
user: String,
password: String,
password: Vec<u8>,
}

impl DigestCredentials {
pub fn new<U, P>(user: U, password: P) -> Self
where
U: Into<String>,
P: Into<String>,
P: Into<Vec<u8>>,
{
Self {
user: user.into(),
Expand Down Expand Up @@ -162,26 +162,31 @@ impl DigestAuthenticator {
digest: DigestChallenge,
request_parts: RequestParts<'_>,
) -> Result<AuthResponse, Error> {
let (hash, is_session): (HashFn, bool) = match digest.algorithm {
Algorithm::MD5 => {
let algorithm_value = match digest.algorithm.clone() {
Algorithm::AkaNamespace((_, av)) => av,
Algorithm::AlgorithmValue(av) => av,
};

let (hash, is_session): (HashFn, bool) = match algorithm_value {
AlgorithmValue::MD5 => {
if self.reject_md5 {
return Err(Error::UnsupportedAlgorithm(BytesStr::from_static("MD5")));
} else {
(hash_md5, false)
}
}
Algorithm::MD5Sess => {
AlgorithmValue::MD5Sess => {
if self.reject_md5 {
return Err(Error::UnsupportedAlgorithm(BytesStr::from_static("MD5")));
} else {
(hash_md5, true)
}
}
Algorithm::SHA256 => (hash_sha256, false),
Algorithm::SHA256Sess => (hash_sha256, true),
Algorithm::SHA512256 => (hash_sha512_trunc256, false),
Algorithm::SHA512256Sess => (hash_sha512_trunc256, true),
Algorithm::Other(other) => return Err(Error::UnsupportedAlgorithm(other)),
AlgorithmValue::SHA256 => (hash_sha256, false),
AlgorithmValue::SHA256Sess => (hash_sha256, true),
AlgorithmValue::SHA512256 => (hash_sha512_trunc256, false),
AlgorithmValue::SHA512256Sess => (hash_sha512_trunc256, true),
AlgorithmValue::Other(other) => return Err(Error::UnsupportedAlgorithm(other)),
};

let response = self.digest_respond(digest, request_parts, credentials, is_session, hash)?;
Expand All @@ -199,13 +204,13 @@ impl DigestAuthenticator {
) -> Result<DigestResponse, Error> {
let cnonce = BytesStr::from(uuid::Uuid::new_v4().simple().to_string());

let mut ha1 = hash(
let mut ha1 = hash([
format!(
"{}:{}:{}",
credentials.user, challenge.realm, credentials.password
)
.as_bytes(),
);
"{}:{}:",
credentials.user,
challenge.realm
).as_bytes(), &credentials.password
].concat().as_slice());

if is_session {
ha1 = format!("{}:{}:{}", ha1, challenge.nonce, cnonce);
Expand Down Expand Up @@ -373,7 +378,7 @@ mod test {
nonce: "YWmh5GFpoLjiTDCA1hTSSygkgdj99aHE".into(),
opaque: None,
stale: false,
algorithm: Algorithm::MD5,
algorithm: Algorithm::AlgorithmValue(AlgorithmValue::MD5),
qop: vec![],
userhash: false,
other: vec![],
Expand Down Expand Up @@ -426,7 +431,7 @@ mod test {
assert_eq!(nonce, "YWmh5GFpoLjiTDCA1hTSSygkgdj99aHE");
assert_eq!(uri, "sip:example.org");
assert_eq!(response, "bc185e4893f17f12dc53153d2a62e6a6");
assert_eq!(algorithm, Algorithm::MD5);
assert_eq!(algorithm, Algorithm::AlgorithmValue(AlgorithmValue::MD5));
assert_eq!(opaque, None);
assert_eq!(qop_response, None);
assert!(!userhash);
Expand All @@ -450,7 +455,7 @@ mod test {
nonce: "YWmh5GFpoLjiTDCA1hTSSygkgdj99aHE".into(),
opaque: None,
stale: false,
algorithm: Algorithm::MD5,
algorithm: Algorithm::AlgorithmValue(AlgorithmValue::MD5),
qop: vec![QopOption::AuthInt],
userhash: false,
other: vec![],
Expand Down Expand Up @@ -502,7 +507,7 @@ mod test {
assert_eq!(realm, "example.org");
assert_eq!(nonce, "YWmh5GFpoLjiTDCA1hTSSygkgdj99aHE");
assert_eq!(uri, "sip:example.org");
assert_eq!(algorithm, Algorithm::MD5);
assert_eq!(algorithm, Algorithm::AlgorithmValue(AlgorithmValue::MD5));
assert_eq!(opaque, None);
let qop_response = qop_response.unwrap();
assert_eq!(qop_response.qop, QopOption::AuthInt);
Expand Down Expand Up @@ -539,7 +544,7 @@ mod test {
assert_eq!(nonce, "YWmh5GFpoLjiTDCA1hTSSygkgdj99aHE");
assert_eq!(uri, "sip:example.org");

assert_eq!(algorithm, Algorithm::MD5);
assert_eq!(algorithm, Algorithm::AlgorithmValue(AlgorithmValue::MD5));
assert_eq!(opaque, None);
let qop_response = qop_response.unwrap();
assert_eq!(qop_response.qop, QopOption::AuthInt);
Expand Down
Loading
Loading