Skip to content

nexus: Update device_auth endpoint to use the authority psuedo-header for http2 instead of the http1 host header. #1582

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 1 commit into from
Aug 12, 2022
Merged

nexus: Update device_auth endpoint to use the authority psuedo-header for http2 instead of the http1 host header. #1582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 23 additions & 12 deletions nexus/src/external_api/device_auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,16 @@ pub async fn device_auth_request(
let handler = async {
let opctx = nexus.opctx_external_authn();
let request = rqctx.request.lock().await;
let host = match request.headers().get(header::HOST) {
None => {
return build_oauth_response(
StatusCode::BAD_REQUEST,
&serde_json::json!({
"error": "invalid_request",
"error_description": "missing Host header",
}),
)
}
Some(host) => match host.to_str() {

let host = if request.version() > hyper::Version::HTTP_11 {
request.uri().authority().map(|a| a.as_str())
} else {
let host = request
.headers()
.get(header::HOST)
.map(|h| h.to_str())
.transpose();
match host {
Ok(host) => host,
Err(e) => {
return build_oauth_response(
Expand All @@ -94,7 +93,19 @@ pub async fn device_auth_request(
}),
)
}
},
}
};
let host = match host {
Some(host) => host,
None => {
return build_oauth_response(
StatusCode::BAD_REQUEST,
&serde_json::json!({
"error": "invalid_request",
"error_description": "missing Host header",
}),
)
}
};

let model =
Expand Down