1- //! Configuration settings for [`HttpServerProvider`](crate::HttpServerProvider).
2- //! The "values" map in the component link definition may contain
3- //! one or more of the following keys,
1+ //! Common Configuration settings for the http server provider and built in http server. This
2+ //! requires that the `http` feature be enabled.
3+ //!
4+ //! The "values" map in the component link definition may contain one or more of the following keys,
45//! which determine how the configuration is parsed.
56//!
6- //! For the key...
7- /// `config_file`: load configuration from file name.
8- /// Interprets file as json or toml, based on file extension.
9- /// `config_b64`: Configuration is a base64-encoded json string
10- /// `config_json`: Configuration is a raw json string
7+ //! For the key... `config_file`: load configuration from file name. Interprets file as json
8+ /// or toml, based on file extension. `config_b64`: Configuration is a base64-encoded json
9+ /// string `config_json`: Configuration is a raw json string
1110///
1211/// If no configuration is provided, the default settings below will be used:
1312/// - TLS is disabled
14- /// - CORS allows all hosts(origins), most methods, and common headers
15- /// (see constants below).
13+ /// - CORS allows all hosts(origins), most methods, and common headers (see constants below).
1614/// - Default listener is bound to 127.0.0.1 port 8000.
1715///
1816use core:: fmt;
@@ -387,8 +385,7 @@ impl FromStr for CorsOrigin {
387385 return Err ( std:: io:: Error :: new (
388386 ErrorKind :: InvalidInput ,
389387 format ! (
390- "Cors origin invalid schema {}, only [http] and [https] are supported: " ,
391- uri. scheme_str( ) . unwrap( )
388+ "Cors origin invalid schema {s}, only [http] and [https] are supported: " ,
392389 ) ,
393390 ) ) ;
394391 }
@@ -532,7 +529,7 @@ where
532529mod test {
533530 use std:: str:: FromStr ;
534531
535- use crate :: settings :: { CorsOrigin , ServiceSettings } ;
532+ use super :: { CorsOrigin , ServiceSettings } ;
536533
537534 const GOOD_ORIGINS : & [ & str ] = & [
538535 // origins that should be parsed correctly
@@ -561,9 +558,11 @@ mod test {
561558 fn settings_init ( ) {
562559 let s = ServiceSettings :: default ( ) ;
563560 assert ! ( s. address. is_ipv4( ) ) ;
561+ let allowed_origins = s
562+ . cors_allowed_origins
563+ . expect ( "allowed_origins should be set" ) ;
564564 assert ! ( s. cors_allowed_methods. is_some( ) ) ;
565- assert ! ( s. cors_allowed_origins. is_some( ) ) ;
566- assert ! ( s. cors_allowed_origins. unwrap( ) . 0 . is_empty( ) ) ;
565+ assert ! ( allowed_origins. 0 . is_empty( ) ) ;
567566 }
568567
569568 #[ test]
@@ -575,10 +574,21 @@ mod test {
575574 }"# ;
576575
577576 let s = ServiceSettings :: from_json ( json) . expect ( "parse_json" ) ;
578- assert_eq ! ( s. cors_allowed_headers. as_ref( ) . unwrap( ) . 0 . len( ) , 1 ) ;
579577 assert_eq ! (
580- s. cors_allowed_headers. as_ref( ) . unwrap( ) . 0 . first( ) . unwrap( ) ,
581- "X-Cookies"
578+ s. cors_allowed_headers
579+ . as_ref( )
580+ . expect( "allowed headers should be set" )
581+ . 0
582+ . len( ) ,
583+ 1
584+ ) ;
585+ assert_eq ! (
586+ s. cors_allowed_headers
587+ . as_ref( )
588+ . expect( "allowed headers should be set" )
589+ . 0
590+ . first( ) ,
591+ Some ( & "X-Cookies" . into( ) )
582592 ) ;
583593 }
584594
@@ -588,24 +598,22 @@ mod test {
588598 for valid in GOOD_ORIGINS {
589599 let o = serde_json:: from_value :: < CorsOrigin > ( serde_json:: Value :: String (
590600 ( * valid) . to_string ( ) ,
591- ) ) ;
592- assert ! ( o . is_ok ( ) , "from_value '{valid}' ") ;
601+ ) )
602+ . expect ( "deserialize should succeed ") ;
593603
594604 // test as_ref()
595- assert_eq ! ( & o. unwrap ( ) . 0 , valid) ;
605+ assert_eq ! ( & o. 0 , valid) ;
596606 }
597607 }
598608
599609 #[ test]
600610 fn origins_from_str ( ) {
601611 // test CorsOrigin
602612 for & valid in GOOD_ORIGINS {
603- let o = CorsOrigin :: from_str ( valid) ;
604- println ! ( "{valid}: {o:?}" ) ;
605- assert ! ( o. is_ok( ) , "from_str '{valid}'" ) ;
613+ let o = CorsOrigin :: from_str ( valid) . expect ( "deserialize should succeed" ) ;
606614
607615 // test as_ref()
608- assert_eq ! ( & o. unwrap ( ) . 0 , valid) ;
616+ assert_eq ! ( & o. 0 , valid) ;
609617 }
610618 }
611619
@@ -614,11 +622,9 @@ mod test {
614622 for bad in BAD_ORIGINS {
615623 let o =
616624 serde_json:: from_value :: < CorsOrigin > ( serde_json:: Value :: String ( ( * bad) . to_string ( ) ) ) ;
617- println ! ( "{bad}: {o:?}" ) ;
618625 assert ! ( o. is_err( ) , "from_value '{bad}' (expect err)" ) ;
619626
620627 let o = serde_json:: from_str :: < CorsOrigin > ( bad) ;
621- println ! ( "{bad}: {o:?}" ) ;
622628 assert ! ( o. is_err( ) , "from_str '{bad}' (expect err)" ) ;
623629 }
624630 }
0 commit comments