mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2026-02-12 10:35:39 +00:00
Deploying to gh-pages from @ 9e70f8f756 🚀
This commit is contained in:
@@ -92,7 +92,7 @@
|
||||
|
||||
<span class="kw">use</span> <span class="ident">actix</span>::<span class="ident">prelude</span>::<span class="kw-2">*</span>;
|
||||
<span class="kw">use</span> <span class="ident">argon2_creds</span>::{<span class="ident">Config</span>, <span class="ident">ConfigBuilder</span>, <span class="ident">PasswordPolicy</span>};
|
||||
<span class="kw">use</span> <span class="ident">m_captcha</span>::{
|
||||
<span class="kw">use</span> <span class="ident">libmcaptcha</span>::{
|
||||
<span class="ident">cache</span>::<span class="ident">HashCache</span>,
|
||||
<span class="ident">master</span>::<span class="ident">Master</span>,
|
||||
<span class="ident">pow</span>::<span class="ident">ConfigBuilder</span> <span class="kw">as</span> <span class="ident">PoWConfigBuilder</span>,
|
||||
|
||||
@@ -305,9 +305,9 @@
|
||||
.<span class="ident">expect</span>(<span class="string">"Couldn't get the number of CPUs"</span>);
|
||||
|
||||
<span class="kw">const</span> <span class="ident">CURRENT_DIR</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"./config/default.toml"</span>;
|
||||
<span class="kw">const</span> <span class="ident">ETC</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"/etc/guard/config.toml"</span>;
|
||||
<span class="kw">const</span> <span class="ident">ETC</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"/etc/mcaptcha/config.toml"</span>;
|
||||
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">path</span>) <span class="op">=</span> <span class="ident">env</span>::<span class="ident">var</span>(<span class="string">"GUARD_CONFIG"</span>) {
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">path</span>) <span class="op">=</span> <span class="ident">env</span>::<span class="ident">var</span>(<span class="string">"MCAPTCHA_CONFIG"</span>) {
|
||||
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="kw-2">&</span><span class="ident">path</span>))<span class="question-mark">?</span>;
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">Path</span>::<span class="ident">new</span>(<span class="ident">CURRENT_DIR</span>).<span class="ident">exists</span>() {
|
||||
<span class="comment">// merging default config from file</span>
|
||||
@@ -318,7 +318,7 @@
|
||||
<span class="ident">log</span>::<span class="macro">warn</span><span class="macro">!</span>(<span class="string">"configuration file not found"</span>);
|
||||
}
|
||||
|
||||
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">Environment</span>::<span class="ident">with_prefix</span>(<span class="string">"GUARD"</span>).<span class="ident">separator</span>(<span class="string">"_"</span>))<span class="question-mark">?</span>;
|
||||
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">Environment</span>::<span class="ident">with_prefix</span>(<span class="string">"MCAPTCHA"</span>).<span class="ident">separator</span>(<span class="string">"_"</span>))<span class="question-mark">?</span>;
|
||||
|
||||
<span class="ident">check_url</span>(<span class="kw-2">&</span><span class="ident">s</span>);
|
||||
|
||||
@@ -342,7 +342,7 @@
|
||||
|
||||
<span class="kw">match</span> <span class="ident">s</span>.<span class="ident">try_into</span>() {
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Ok</span>(<span class="ident">val</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Err</span>(<span class="ident">ConfigError</span>::<span class="ident">Message</span>(<span class="macro">format</span><span class="macro">!</span>(<span class="string">"\n\nError: {}. If it says missing fields, then please refer to https://github.com/mCaptcha/guard#configuration to learn more about how guard reads configuration\n\n"</span>, <span class="ident">e</span>)))<span class="question-mark">?</span>,
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Err</span>(<span class="ident">ConfigError</span>::<span class="ident">Message</span>(<span class="macro">format</span><span class="macro">!</span>(<span class="string">"\n\nError: {}. If it says missing fields, then please refer to https://github.com/mCaptcha/mcaptcha#configuration to learn more about how mcaptcha reads configuration\n\n"</span>, <span class="ident">e</span>)))<span class="question-mark">?</span>,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user