feat:add opt CORS #92

Marsyew · 2024-03-03T13:38:56Z

No description provided.

a-wing · 2024-03-04T09:23:49Z

Maybe need add a example in config-dist.toml

a-wing · 2024-03-05T10:07:43Z

I have a good idea

We can design look like this, Because CORS belong http, So:

[http]
listen = "[::]:7777"

# I think default should disable
core = false

a-wing · 2024-03-05T10:08:09Z

#78

a-wing

I think, last version is more good

a-wing · 2024-03-05T18:10:54Z

config-dist.toml

@@ -30,3 +30,16 @@ urls = [
 # Default: info
 # Values: off, error, warn, info, debug, trace
 # level = "warn"
+
+[http]


Should only one [http] block

This config begin is a listen right?

Actually, this listen and cors belong [http]

We need changed config, add a [http] block, and move listen to [http], after add core to http

a-wing · 2024-03-05T18:13:19Z

config-dist.toml

+
+[http]
+listen = "[::]:7777"
+cors = false


If you want to describe core item

You can describe:

# Cross-Origin Resource Sharing (CORS) # reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS cors = false

a-wing · 2024-03-05T18:14:07Z

config-dist.toml

+listen = "[::]:7777"
+cors = false
+
+#[http]


Remove this

a-wing · 2024-03-05T18:15:26Z

src/config.rs

@@ -16,6 +18,7 @@ pub struct Config {
    pub auth: Auth,
    #[serde(default = "default_log")]
    pub log: Log,
+    pub enable_cors: bool,


you move to core in http block, this field name is changed

a-wing · 2024-03-05T18:16:08Z

src/config.rs

@@ -157,6 +160,7 @@ impl Config {
                listen: default_listen(),
                auth: Default::default(),
                log: default_log(),
+                enable_cors: true,


default false

field name is changed

a-wing · 2024-03-05T18:19:16Z

src/config.rs

+
+
+pub fn cors_layer() -> CorsLayer {
+    let config_cors = fs::read_to_string("config-dist.toml")


What this? read config-dist.toml should only read one time

cors_layer() should a params, enable: boolean

a-wing · 2024-03-05T18:21:30Z

src/config.rs

+        eprintln!("Unable to read config-dist.toml");
+        String::from(r#"
+            [http]
+            listen = "[::]:7777"


Why together display listen error and cors

a-wing

Config struct should changed

look like:

pub struct Http {
    pub listen: String,
    pub core: Boolean,
}

a-wing · 2024-03-06T06:34:10Z

config-dist.toml

@@ -30,3 +30,16 @@ urls = [
 # Default: info
 # Values: off, error, warn, info, debug, trace
 # level = "warn"
+
+[http]


This config begin is a listen right?

Actually, this listen and cors belong [http]

We need changed config, add a [http] block, and move listen to [http], after add core to http

a-wing · 2024-03-06T06:37:42Z

src/config.rs

+
+
+pub fn cors_layer() -> CorsLayer {
+    let config_cors = fs::read_to_string("config-dist.toml")


cors_layer() should a params, enable: boolean

a-wing · 2024-03-06T06:39:18Z

src/main.rs

@@ -79,6 +79,7 @@ async fn main() {
        config: cfg.clone(),
    };
    let auth_layer = ValidateRequestHeaderLayer::custom(ManyValidate::new(cfg.auth));
+    let cors = cors_layer();


You should cors enable in here, For example cfg.http.core

Marsyew force-pushed the main branch from e09ef50 to 58d8e4f Compare March 5, 2024 14:58

a-wing requested changes Mar 5, 2024

View reviewed changes

Marsyew force-pushed the main branch from 58d8e4f to fc56da9 Compare March 6, 2024 02:05

a-wing requested changes Mar 6, 2024

View reviewed changes

feat:add opt CORS

aa27a46

Marsyew force-pushed the main branch from fc56da9 to aa27a46 Compare March 6, 2024 13:51

fix: core

ed18410

a-wing merged commit 2850d64 into binbat:main Mar 6, 2024
4 checks passed

a-wing added enhancement New feature or request mod::live777 Live777 server labels Mar 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat:add opt CORS #92

feat:add opt CORS #92

Marsyew commented Mar 3, 2024

a-wing commented Mar 4, 2024

a-wing commented Mar 5, 2024

a-wing commented Mar 5, 2024

a-wing left a comment

a-wing Mar 5, 2024

a-wing Mar 6, 2024

a-wing Mar 5, 2024

a-wing Mar 5, 2024

a-wing Mar 5, 2024

a-wing Mar 5, 2024

a-wing Mar 5, 2024

a-wing Mar 5, 2024

a-wing Mar 6, 2024

a-wing Mar 5, 2024

a-wing left a comment

a-wing Mar 6, 2024

a-wing Mar 6, 2024

a-wing Mar 6, 2024



		pub fn cors_layer() -> CorsLayer {
		let config_cors = fs::read_to_string("config-dist.toml")

feat:add opt CORS #92

feat:add opt CORS #92

Conversation

Marsyew commented Mar 3, 2024

a-wing commented Mar 4, 2024

a-wing commented Mar 5, 2024

a-wing commented Mar 5, 2024

a-wing left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

a-wing left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment