tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: bug of default_app for cleartext http

Browse source
This commit is contained in:
Jun Kurihara 2023-07-21 22:42:47 +09:00
commit 5e76c2b055
No known key found for this signature in database
GPG key ID: 6D3FEE70E498C15B
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpxy-bin/src/config/parse.rs
View file

@ -80,15 +80,15 @@ pub fn build_settings() -> std::result::Result<(ProxyConfig, AppConfigList<Crypt
// let mut backends = Backends::new();
for (app_name, app) in apps.0.iter() {
let server_name_string = app.server_name.as_ref().ok_or(anyhow!("No server name"))?;
let app_config = app.try_into()?;
let _server_name_string = app.server_name.as_ref().ok_or(anyhow!("No server name"))?;
let registered_app_name = app_name.to_ascii_lowercase();
let app_config = app.build_app_config(&registered_app_name)?;
app_config_list_inner.push(app_config);
info!("Registering application: {} ({})", app_name, server_name_string);
}
let app_config_list = AppConfigList {
inner: app_config_list_inner,
default_app: config.default_app, // default backend application for plaintext http requests
default_app: config.default_app.map(|v| v.to_ascii_lowercase()), // default backend application for plaintext http requests
};
Ok((proxy_config, app_config_list))

7
rpxy-bin/src/config/toml.rs
View file

@ -168,10 +168,8 @@ impl ConfigToml {
}
}
impl TryInto<AppConfig<CryptoFileSource>> for &Application {
type Error = anyhow::Error;
fn try_into(self) -> std::result::Result<AppConfig<CryptoFileSource>, Self::Error> {
impl Application {
pub fn build_app_config(&self, app_name: &str) -> std::result::Result<AppConfig<CryptoFileSource>, anyhow::Error> {
let server_name_string = self.server_name.as_ref().ok_or(anyhow!("Missing server_name"))?;
// reverse proxy settings
@ -202,6 +200,7 @@ impl TryInto<AppConfig<CryptoFileSource>> for &Application {
};
Ok(AppConfig {
app_name: app_name.to_owned(),
server_name: server_name_string.to_owned(),
reverse_proxy: reverse_proxy_config,
tls: tls_config,