matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Add missing clippy lints in mas-axum-utils

Browse Source
This commit is contained in:
Quentin Gliech
2022-08-08 09:55:19 +02:00
parent c1ed726dc8
commit d00bf6a2d2
5 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/axum-utils/src/client_authorization.rs
View File

@ -257,12 +257,13 @@ where
{
type Rejection = ClientAuthorizationError;
#[allow(clippy::too_many_lines)]
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
let header = TypedHeader::<Authorization<Basic>>::from_request(req).await;
// Take the Authorization header
let credentials_from_header = match header {
Ok(header) => Some((header.username().to_string(), header.password().to_string())),
Ok(header) => Some((header.username().to_owned(), header.password().to_owned())),
Err(err) => match err.reason() {
// If it's missing it is fine
TypedHeaderRejectionReason::Missing => None,
@ -423,7 +424,7 @@ mod tests {
.unwrap(),
ClientAuthorization {
credentials: Credentials::None {
client_id: "client-id".to_string(),
client_id: "client-id".to_owned(),
},
form: Some(serde_json::json!({"foo": "bar"})),
}
@ -453,8 +454,8 @@ mod tests {
.unwrap(),
ClientAuthorization {
credentials: Credentials::ClientSecretBasic {
client_id: "client-id".to_string(),
client_secret: "client-secret".to_string(),
client_id: "client-id".to_owned(),
client_secret: "client-secret".to_owned(),
},
form: Some(serde_json::json!({"foo": "bar"})),
}
@ -482,8 +483,8 @@ mod tests {
.unwrap(),
ClientAuthorization {
credentials: Credentials::ClientSecretBasic {
client_id: "client-id".to_string(),
client_secret: "client-secret".to_string(),
client_id: "client-id".to_owned(),
client_secret: "client-secret".to_owned(),
},
form: Some(serde_json::json!({"foo": "bar"})),
}
@ -550,8 +551,8 @@ mod tests {
.unwrap(),
ClientAuthorization {
credentials: Credentials::ClientSecretPost {
client_id: "client-id".to_string(),
client_secret: "client-secret".to_string(),
client_id: "client-id".to_owned(),
client_secret: "client-secret".to_owned(),
},
form: Some(serde_json::json!({"foo": "bar"})),
}

1
crates/axum-utils/src/cookies.rs
View File

@ -30,6 +30,7 @@ pub trait CookieExt {
where
T: DeserializeOwned;
#[must_use]
fn encode<T>(self, t: &T) -> Self
where
T: Serialize;

5
crates/axum-utils/src/lib.rs
View File

@ -12,6 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#![forbid(unsafe_code)]
#![deny(clippy::all, clippy::str_to_string, rustdoc::broken_intra_doc_links)]
#![warn(clippy::pedantic)]
#![allow(clippy::module_name_repetitions, clippy::missing_errors_doc)]
pub mod client_authorization;
pub mod cookies;
pub mod csrf;

5
crates/axum-utils/src/session.rs
View File

@ -62,8 +62,13 @@ impl SessionInfo {
}
pub trait SessionInfoExt {
#[must_use]
fn session_info(self) -> (SessionInfo, Self);
#[must_use]
fn update_session_info(self, info: &SessionInfo) -> Self;
#[must_use]
fn set_session(self, session: &BrowserSession<PostgresqlBackend>) -> Self
where
Self: Sized,

4
crates/axum-utils/src/user_authorization.rs
View File

@ -218,7 +218,7 @@ impl Header for WwwAuthenticate {
};
let params = params.into_iter().map(|(k, v)| format!(" {}={:?}", k, v));
let value: String = std::iter::once(scheme.to_string()).chain(params).collect();
let value: String = std::iter::once(scheme.to_owned()).chain(params).collect();
let value = HeaderValue::from_str(&value).unwrap();
values.extend(std::iter::once(value));
}
@ -291,7 +291,7 @@ where
// Take the Authorization header
let token_from_header = match header {
Ok(header) => Some(header.token().to_string()),
Ok(header) => Some(header.token().to_owned()),
Err(err) => match err.reason() {
// If it's missing it is fine
TypedHeaderRejectionReason::Missing => None,