Skip to content

fixed redirect url validation and included support for custom err messsge #944

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

Merged
merged 2 commits into from
Sep 28, 2024
Merged

fixed redirect url validation and included support for custom err messsge #944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bab4dba
fixed redirect url validation and included support for custom err messge
balaji-jr Sep 26, 2024
053ec59
formatting
balaji-jr Sep 27, 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
26 changes: 19 additions & 7 deletions server/src/handlers/http/oidc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use actix_web::{
};
use http::StatusCode;
use openid::{Options, Token, Userinfo};
use regex::Regex;
use serde::Deserialize;
use ulid::Ulid;
use url::Url;
Expand Down Expand Up @@ -64,10 +65,14 @@ pub async fn login(
query: web::Query<RedirectAfterLogin>,
) -> Result<HttpResponse, OIDCError> {
let conn = req.connection_info().clone();
let base_url = format!("{}://{}/", conn.scheme(), conn.host());
if !base_url.eq(query.redirect.as_str()) {
return Err(OIDCError::BadRequest);
let base_url_without_scheme = format!("{}/", conn.host());

if !is_valid_redirect_url(&base_url_without_scheme, query.redirect.as_str()) {
return Err(OIDCError::BadRequest(
"Bad Request, Invalid Redirect URL!".to_string(),
));
}

let oidc_client = req.app_data::<Data<DiscoveredClient>>();
let session_key = extract_session_key_from_req(&req).ok();
let (session_key, oidc_client) = match (session_key, oidc_client) {
Expand Down Expand Up @@ -99,7 +104,7 @@ pub async fn login(
[user_cookie, session_cookie],
))
}
_ => Err(OIDCError::BadRequest),
_ => Err(OIDCError::BadRequest("Bad Request".to_string())),
},
// if it's a valid active session, just redirect back
key @ SessionKey::SessionId(_) => {
Expand Down Expand Up @@ -367,8 +372,8 @@ pub enum OIDCError {
ObjectStorageError(#[from] ObjectStorageError),
#[error("{0}")]
Serde(#[from] serde_json::Error),
#[error("Bad Request")]
BadRequest,
#[error("{0}")]
BadRequest(String),
#[error("Unauthorized")]
Unauthorized,
}
Expand All @@ -378,7 +383,7 @@ impl actix_web::ResponseError for OIDCError {
match self {
Self::ObjectStorageError(_) => StatusCode::INTERNAL_SERVER_ERROR,
Self::Serde(_) => StatusCode::INTERNAL_SERVER_ERROR,
Self::BadRequest => StatusCode::BAD_REQUEST,
Self::BadRequest(_) => StatusCode::BAD_REQUEST,
Self::Unauthorized => StatusCode::UNAUTHORIZED,
}
}
Expand All @@ -389,3 +394,10 @@ impl actix_web::ResponseError for OIDCError {
.body(self.to_string())
}
}

fn is_valid_redirect_url(base_url_without_scheme: &str, redirect_url: &str) -> bool {
let http_scheme_match_regex = Regex::new(r"^(https?://)").unwrap();
let redirect_url_without_scheme = http_scheme_match_regex.replace(redirect_url, "");

base_url_without_scheme == redirect_url_without_scheme
}
Loading