Skip to content

chore(guard): centralize cors config #4097

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

Closed
MasterPtato wants to merge 1 commit into from
+44 −17
Closed

chore(guard): centralize cors config #4097

Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions engine/packages/guard-core/src/proxy_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,28 @@ impl ProxyService {
HeaderValue::from_str(&cors.expose_headers)?,
);

if let Some(allow_methods) = &cors.allow_methods {
headers.insert(
"access-control-allow-methods",
HeaderValue::from_str(allow_methods)?,
);
}

if let Some(allow_headers) = &cors.allow_headers {
headers.insert(
"access-control-allow-headers",
HeaderValue::from_str(allow_headers)?,
);
}

if let Some(max_age) = &cors.max_age {
headers.insert(
"access-control-max-age",
HeaderValue::from_str(&max_age.to_string())?,
);
}

// Add Vary header to prevent cache poisoning when echoing origin
if cors.allow_origin != "*" {
headers.insert("vary", HeaderValue::from_static("Origin"));
}
Expand Down
7 changes: 7 additions & 0 deletions engine/packages/guard-core/src/request_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,11 @@ pub struct CorsConfig {
pub allow_origin: String,
pub allow_credentials: bool,
pub expose_headers: String,

// Only set for OPTIONS requests
// TODO: Vec of Method
pub allow_methods: Option<String>,
pub allow_headers: Option<String>,
// Seconds
pub max_age: Option<u32>,
}
32 changes: 15 additions & 17 deletions engine/packages/pegboard-gateway/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,31 +132,29 @@ impl PegboardGateway {
.and_then(|v| v.to_str().ok())
.unwrap_or("*");

let mut response = Response::builder()
req_ctx.set_cors(CorsConfig {
allow_origin: origin.clone(),
allow_credentials: true,
expose_headers: "*".to_string(),
allow_methods: Some("GET, POST, PUT, DELETE, OPTIONS, PATCH".to_string()),
allow_headers: Some(requested_headers.to_string()),
max_age: Some(86400),
});

return Ok(Response::builder()
.status(StatusCode::NO_CONTENT)
.header("access-control-allow-origin", &origin)
.header("access-control-allow-credentials", "true")
.header(
"access-control-allow-methods",
"GET, POST, PUT, DELETE, OPTIONS, PATCH",
)
.header("access-control-allow-headers", requested_headers)
.header("access-control-expose-headers", "*")
.header("access-control-max-age", "86400");

// Add Vary header to prevent cache poisoning when echoing origin
if origin != "*" {
response = response.header("vary", "Origin");
}

return Ok(response.body(ResponseBody::Full(Full::new(Bytes::new())))?);
.body(ResponseBody::Full(Full::new(Bytes::new())))?);
}

// Set CORS headers through guard
req_ctx.set_cors(CorsConfig {
allow_origin: origin.clone(),
allow_credentials: true,
expose_headers: "*".to_string(),
// Not an options req, not required
allow_methods: None,
allow_headers: None,
max_age: None,
});

let body_bytes = req
Expand Down
Loading