mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2026-02-12 10:35:39 +00:00
Deploying to gh-pages from @ b3eda16f2c3be3a5d0c44cb6375f864e7d1a8a41 🚀
This commit is contained in:
@@ -181,6 +181,8 @@
|
||||
<a href="#181" id="181">181</a>
|
||||
<a href="#182" id="182">182</a>
|
||||
<a href="#183" id="183">183</a>
|
||||
<a href="#184" id="184">184</a>
|
||||
<a href="#185" id="185">185</a>
|
||||
</pre></div><pre class="rust"><code><span class="attr">#![allow(warnings)]
|
||||
</span><span class="comment">// Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
// SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -276,7 +278,9 @@
|
||||
</span><span class="kw">async fn </span>main() -> std::io::Result<()> {
|
||||
<span class="kw">use </span>std::time::Duration;
|
||||
|
||||
env::set_var(<span class="string">"RUST_LOG"</span>, <span class="string">"info"</span>);
|
||||
<span class="kw">if </span>env::var(<span class="string">"RUST_LOG"</span>).is_err() {
|
||||
env::set_var(<span class="string">"RUST_LOG"</span>, <span class="string">"info"</span>);
|
||||
}
|
||||
|
||||
pretty_env_logger::init();
|
||||
<span class="macro">info!</span>(
|
||||
|
||||
@@ -404,6 +404,7 @@
|
||||
<a href="#404" id="404">404</a>
|
||||
<a href="#405" id="405">405</a>
|
||||
<a href="#406" id="406">406</a>
|
||||
<a href="#407" id="407">407</a>
|
||||
</pre></div><pre class="rust"><code><span class="comment">// Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
// SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
//
|
||||
@@ -524,8 +525,8 @@
|
||||
(<span class="string">"database.pool"</span>, <span class="string">"MCAPTCHA_database_POOL"</span>),
|
||||
|
||||
<span class="comment">/* redis */
|
||||
</span>(<span class="string">"redis.url"</span>, <span class="string">"MCPATCHA_redis_URL"</span>),
|
||||
(<span class="string">"redis.pool"</span>, <span class="string">"MCPATCHA_redis_POOL"</span>),
|
||||
</span>(<span class="string">"redis.url"</span>, <span class="string">"MCAPTCHA_redis_URL"</span>),
|
||||
(<span class="string">"redis.pool"</span>, <span class="string">"MCAPTCHA_redis_POOL"</span>),
|
||||
|
||||
<span class="comment">/* server */
|
||||
</span>(<span class="string">"server.port"</span>, <span class="string">"PORT"</span>),
|
||||
@@ -551,12 +552,12 @@
|
||||
|
||||
|
||||
<span class="comment">/* SMTP */
|
||||
</span>(<span class="string">"smtp.from"</span>, <span class="string">"MCPATCHA_smtp_FROM"</span>),
|
||||
(<span class="string">"smtp.reply"</span>, <span class="string">"MCPATCHA_smtp_REPLY"</span>),
|
||||
(<span class="string">"smtp.url"</span>, <span class="string">"MCPATCHA_smtp_URL"</span>),
|
||||
(<span class="string">"smtp.username"</span>, <span class="string">"MCPATCHA_smtp_USERNAME"</span>),
|
||||
(<span class="string">"smtp.password"</span>, <span class="string">"MCPATCHA_smtp_PASSWORD"</span>),
|
||||
(<span class="string">"smtp.port"</span>, <span class="string">"MCPATCHA_smtp_PORT"</span>),
|
||||
</span>(<span class="string">"smtp.from"</span>, <span class="string">"MCAPTCHA_smtp_FROM"</span>),
|
||||
(<span class="string">"smtp.reply"</span>, <span class="string">"MCAPTCHA_smtp_REPLY"</span>),
|
||||
(<span class="string">"smtp.url"</span>, <span class="string">"MCAPTCHA_smtp_URL"</span>),
|
||||
(<span class="string">"smtp.username"</span>, <span class="string">"MCAPTCHA_smtp_USERNAME"</span>),
|
||||
(<span class="string">"smtp.password"</span>, <span class="string">"MCAPTCHA_smtp_PASSWORD"</span>),
|
||||
(<span class="string">"smtp.port"</span>, <span class="string">"MCAPTCHA_smtp_PORT"</span>),
|
||||
|
||||
|
||||
|
||||
@@ -617,6 +618,7 @@
|
||||
|
||||
<span class="kw">fn </span>env_override(<span class="kw-2">mut </span>s: ConfigBuilder<DefaultState>) -> ConfigBuilder<DefaultState> {
|
||||
<span class="kw">for </span>(parameter, env_var_name) <span class="kw">in </span>ENV_VAR_CONFIG.iter() {
|
||||
<span class="macro">println!</span>(<span class="string">"[{env_var_name}]{:?}"</span>, env::var(env_var_name));
|
||||
<span class="kw">if let </span><span class="prelude-val">Ok</span>(val) = env::var(env_var_name) {
|
||||
<span class="macro">log::debug!</span>(
|
||||
<span class="string">"Overriding [{parameter}] with environment variable {env_var_name}"
|
||||
@@ -697,7 +699,7 @@
|
||||
<span class="comment">/* redis */
|
||||
|
||||
/* redis.url */
|
||||
</span><span class="kw">let </span>env = <span class="string">"MCPATCHA_redis_URL"</span>;
|
||||
</span><span class="kw">let </span>env = <span class="string">"MCAPTCHA_redis_URL"</span>;
|
||||
<span class="kw">let </span>val = <span class="string">"redis://redis.example.org"</span>;
|
||||
<span class="macro">println!</span>(<span class="string">"Setting env var {} to {} for test"</span>, env, val);
|
||||
env::set_var(env, val);
|
||||
@@ -710,7 +712,7 @@
|
||||
env::remove_var(env);
|
||||
|
||||
<span class="comment">/* redis.pool */
|
||||
</span><span class="kw">let </span>env = <span class="string">"MCPATCHA_redis_POOL"</span>;
|
||||
</span><span class="kw">let </span>env = <span class="string">"MCAPTCHA_redis_POOL"</span>;
|
||||
<span class="kw">let </span>val = <span class="number">999</span>;
|
||||
<span class="macro">println!</span>(<span class="string">"Setting env var {} to {} for test"</span>, env, val);
|
||||
env::set_var(env, val.to_string());
|
||||
@@ -761,12 +763,12 @@
|
||||
<span class="comment">/* SMTP */
|
||||
|
||||
</span><span class="kw">let </span>vals = [
|
||||
<span class="string">"MCPATCHA_smtp_FROM"</span>,
|
||||
<span class="string">"MCPATCHA_smtp_REPLY"</span>,
|
||||
<span class="string">"MCPATCHA_smtp_URL"</span>,
|
||||
<span class="string">"MCPATCHA_smtp_USERNAME"</span>,
|
||||
<span class="string">"MCPATCHA_smtp_PASSWORD"</span>,
|
||||
<span class="string">"MCPATCHA_smtp_PORT"</span>,
|
||||
<span class="string">"MCAPTCHA_smtp_FROM"</span>,
|
||||
<span class="string">"MCAPTCHA_smtp_REPLY"</span>,
|
||||
<span class="string">"MCAPTCHA_smtp_URL"</span>,
|
||||
<span class="string">"MCAPTCHA_smtp_USERNAME"</span>,
|
||||
<span class="string">"MCAPTCHA_smtp_PASSWORD"</span>,
|
||||
<span class="string">"MCAPTCHA_smtp_PORT"</span>,
|
||||
];
|
||||
<span class="kw">for </span>env <span class="kw">in </span>vals.iter() {
|
||||
<span class="macro">println!</span>(<span class="string">"Setting env var {} to {} for test"</span>, env, env);
|
||||
@@ -774,15 +776,15 @@
|
||||
}
|
||||
|
||||
<span class="kw">let </span>port = <span class="number">9999</span>;
|
||||
env::set_var(<span class="string">"MCPATCHA_smtp_PORT"</span>, port.to_string());
|
||||
env::set_var(<span class="string">"MCAPTCHA_smtp_PORT"</span>, port.to_string());
|
||||
|
||||
new_settings = get_settings();
|
||||
<span class="kw">let </span>smtp_new = new_settings.smtp.as_ref().unwrap();
|
||||
<span class="kw">let </span>smtp_old = init_settings.smtp.as_ref().unwrap();
|
||||
<span class="macro">assert_eq!</span>(smtp_new.from, <span class="string">"MCPATCHA_smtp_FROM"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.reply, <span class="string">"MCPATCHA_smtp_REPLY"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.username, <span class="string">"MCPATCHA_smtp_USERNAME"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.password, <span class="string">"MCPATCHA_smtp_PASSWORD"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.from, <span class="string">"MCAPTCHA_smtp_FROM"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.reply, <span class="string">"MCAPTCHA_smtp_REPLY"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.username, <span class="string">"MCAPTCHA_smtp_USERNAME"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.password, <span class="string">"MCAPTCHA_smtp_PASSWORD"</span>);
|
||||
<span class="macro">assert_eq!</span>(smtp_new.port, port);
|
||||
<span class="macro">assert_ne!</span>(smtp_new, smtp_old);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user