Skip to content

configure CORS with env var #846

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 3 commits into from
Jul 10, 2024
Merged

configure CORS with env var #846

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
0bc6901
configure CORS with env var
nikhilsinhaparseable Jul 9, 2024
1bdb868
Merge branch 'main' into configure-cors
nikhilsinhaparseable Jul 9, 2024
a6313b6
Merge branch 'main' into configure-cors
nikhilsinhaparseable Jul 9, 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
18 changes: 18 additions & 0 deletions server/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ pub struct Cli {

/// Size for local cache
pub query_cache_size: u64,

/// CORS behaviour
pub cors: bool,
}

impl Cli {
Expand Down Expand Up @@ -130,6 +133,7 @@ impl Cli {
pub const DEFAULT_USERNAME: &'static str = "admin";
pub const DEFAULT_PASSWORD: &'static str = "admin";
pub const FLIGHT_PORT: &'static str = "flight-port";
pub const CORS: &'static str = "cors";

pub fn local_stream_data_path(&self, stream_name: &str) -> PathBuf {
self.local_staging_path.join(stream_name)
Expand Down Expand Up @@ -316,6 +320,16 @@ impl Cli {
.value_parser(value_parser!(u16))
.help("Port for Arrow Flight Querying Engine"),
)
.arg(
Arg::new(Self::CORS)
.long(Self::CORS)
.env("P_CORS")
.value_name("BOOL")
.required(false)
.default_value("true")
.value_parser(value_parser!(bool))
.help("Enable/Disable CORS, default disabled"),
)
.arg(
Arg::new(Self::LIVETAIL_CAPACITY)
.long(Self::LIVETAIL_CAPACITY)
Expand Down Expand Up @@ -451,6 +465,10 @@ impl FromArgMatches for Cli {
.get_one::<u16>(Self::FLIGHT_PORT)
.cloned()
.expect("default for flight port");
self.cors = m
.get_one::<bool>(Self::CORS)
.cloned()
.expect("default for CORS");
self.livetail_channel_capacity = m
.get_one::<usize>(Self::LIVETAIL_CAPACITY)
.cloned()
Expand Down
2 changes: 1 addition & 1 deletion server/src/handlers/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub fn metrics_path() -> String {
}

pub(crate) fn cross_origin_config() -> Cors {
if cfg!(feature = "debug") {
if !CONFIG.parseable.cors || cfg!(feature = "debug") {
Cors::permissive().block_on_origin_mismatch(false)
} else {
Cors::default().block_on_origin_mismatch(false)
Expand Down