danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Get rabbitmq password from file instead of static string

Browse source
This commit is contained in:
Cole Helbling 2024-05-19 12:59:42 -07:00
parent 9254a448b7
commit aa70c3db6e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ofborg/src/config.rs
View file

@ -35,7 +35,7 @@ pub struct RabbitMqConfig {
pub host: String, pub host: String,
pub virtualhost: Option<String>, pub virtualhost: Option<String>,
pub username: String, pub username: String,
pub password: String, pub password_file: PathBuf,
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
@ -155,15 +155,17 @@ impl Config {
} }
impl RabbitMqConfig { impl RabbitMqConfig {
pub fn as_uri(&self) -> String { pub fn as_uri(&self) -> Result<String, std::io::Error> {
format!( let password = std::fs::read_to_string(&self.password_file)?;
let uri = format!(
"{}://{}:{}@{}/{}", "{}://{}:{}@{}/{}",
if self.ssl { "amqps" } else { "amqp" }, if self.ssl { "amqps" } else { "amqp" },
self.username, self.username,
self.password, password,
self.host, self.host,
self.virtualhost.clone().unwrap_or_else(|| "/".to_owned()), self.virtualhost.clone().unwrap_or_else(|| "/".to_owned()),
) );
Ok(uri)
} }
} }

2
ofborg/src/easylapin.rs
View file

@ -31,7 +31,7 @@ pub fn from_config(cfg: &RabbitMqConfig) -> Result<Connection, lapin::Error> {
client_properties: props, client_properties: props,
..Default::default() ..Default::default()
}; };
task::block_on(Connection::connect(&cfg.as_uri(), opts)) task::block_on(Connection::connect(&cfg.as_uri()?, opts))
} }
impl ChannelExt for Channel { impl ChannelExt for Channel {