mirror/mCaptcha
1
0
Fork 1
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2026-02-11 18:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deploying to gh-pages from @ ac502b7c08 🚀

Browse Source
This commit is contained in:
realaravinth
2022-10-24 16:35:47 +00:00
parent af485c750d
commit 49538a56a4
92 changed files with 213 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/db_sqlx_maria/lib.rs.html
View File

@@ -960,9 +960,6 @@
<span id="960">960</span>
<span id="961">961</span>
<span id="962">962</span>
<span id="963">963</span>
<span id="964">964</span>
<span id="965">965</span>
</pre><pre class="rust"><code><span class="comment">/*
* Copyright (C) 2022 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
*
@@ -1038,9 +1035,6 @@
<span class="kw">if</span> <span class="ident">fresh</span>.<span class="ident">disable_logging</span> {
<span class="ident">connect_options</span>.<span class="ident">disable_statement_logging</span>();
}
<span class="ident">sqlx::mysql::MySqlConnectOptions::from_str</span>(<span class="kw-2">&amp;</span><span class="ident">fresh</span>.<span class="ident">url</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">disable_statement_logging</span>();
<span class="ident">fresh</span>
.<span class="ident">pool_options</span>
.<span class="ident">connect_with</span>(<span class="ident">connect_options</span>)

6
src/db_sqlx_postgres/lib.rs.html
View File

@@ -966,9 +966,6 @@
<span id="966">966</span>
<span id="967">967</span>
<span id="968">968</span>
<span id="969">969</span>
<span id="970">970</span>
<span id="971">971</span>
</pre><pre class="rust"><code><span class="comment">/*
* Copyright (C) 2022 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
*
@@ -1044,9 +1041,6 @@
<span class="kw">if</span> <span class="ident">fresh</span>.<span class="ident">disable_logging</span> {
<span class="ident">connect_options</span>.<span class="ident">disable_statement_logging</span>();
}
<span class="ident">sqlx::postgres::PgConnectOptions::from_str</span>(<span class="kw-2">&amp;</span><span class="ident">fresh</span>.<span class="ident">url</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">disable_statement_logging</span>();
<span class="ident">fresh</span>
.<span class="ident">pool_options</span>
.<span class="ident">connect_with</span>(<span class="ident">connect_options</span>)

48
src/mcaptcha/settings.rs.html
View File

@@ -251,6 +251,19 @@
<span id="251">251</span>
<span id="252">252</span>
<span id="253">253</span>
<span id="254">254</span>
<span id="255">255</span>
<span id="256">256</span>
<span id="257">257</span>
<span id="258">258</span>
<span id="259">259</span>
<span id="260">260</span>
<span id="261">261</span>
<span id="262">262</span>
<span id="263">263</span>
<span id="264">264</span>
<span id="265">265</span>
<span id="266">266</span>
</pre><pre class="rust"><code><span class="comment">/*
* Copyright (C) 2022 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
*
@@ -267,8 +280,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see &lt;https://www.gnu.org/licenses/&gt;.
*/</span>
<span class="kw">use</span> <span class="ident">std::env</span>;
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
<span class="kw">use</span> <span class="ident">std</span>::{<span class="ident">env</span>, <span class="ident">fs</span>};
<span class="kw">use</span> <span class="ident">config</span>::{<span class="ident">Config</span>, <span class="ident">ConfigError</span>, <span class="ident">Environment</span>, <span class="ident">File</span>};
<span class="kw">use</span> <span class="ident">derive_more::Display</span>;
@@ -405,25 +418,34 @@
.<span class="ident">expect</span>(<span class="string">&quot;unable to set capatcha.enable_stats default config&quot;</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::var</span>(<span class="string">&quot;MCAPTCHA_CONFIG&quot;</span>) {
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File::with_name</span>(<span class="kw-2">&amp;</span><span class="ident">path</span>))<span class="question-mark">?</span>;
<span class="kw">let</span> <span class="ident">absolute_path</span> <span class="op">=</span> <span class="ident">Path::new</span>(<span class="kw-2">&amp;</span><span class="ident">path</span>).<span class="ident">canonicalize</span>().<span class="ident">unwrap</span>();
<span class="macro">log::info!</span>(
<span class="string">&quot;Loading config file from {}&quot;</span>,
<span class="ident">absolute_path</span>.<span class="ident">to_str</span>().<span class="ident">unwrap</span>()
);
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File::with_name</span>(<span class="ident">absolute_path</span>.<span class="ident">to_str</span>().<span class="ident">unwrap</span>()))<span class="question-mark">?</span>;
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">Path::new</span>(<span class="ident">CURRENT_DIR</span>).<span class="ident">exists</span>() {
<span class="kw">let</span> <span class="ident">absolute_path</span> <span class="op">=</span> <span class="ident">fs::canonicalize</span>(<span class="ident">CURRENT_DIR</span>).<span class="ident">unwrap</span>();
<span class="macro">log::info!</span>(
<span class="string">&quot;Loading config file from {}&quot;</span>,
<span class="ident">absolute_path</span>.<span class="ident">to_str</span>().<span class="ident">unwrap</span>()
);
<span class="comment">// merging default config from file</span>
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File::with_name</span>(<span class="ident">CURRENT_DIR</span>))<span class="question-mark">?</span>;
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File::with_name</span>(<span class="ident">absolute_path</span>.<span class="ident">to_str</span>().<span class="ident">unwrap</span>()))<span class="question-mark">?</span>;
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">Path::new</span>(<span class="ident">ETC</span>).<span class="ident">exists</span>() {
<span class="macro">log::info!</span>(<span class="string">&quot;{}&quot;</span>, <span class="macro">format!</span>(<span class="string">&quot;Loading config file from {}&quot;</span>, <span class="ident">ETC</span>));
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File::with_name</span>(<span class="ident">ETC</span>))<span class="question-mark">?</span>;
} <span class="kw">else</span> {
<span class="macro">log::warn!</span>(<span class="string">&quot;configuration file not found&quot;</span>);
<span class="macro">log::warn!</span>(<span class="string">&quot;Configuration file not found&quot;</span>);
}
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">Environment::with_prefix</span>(<span class="string">&quot;MCAPTCHA&quot;</span>).<span class="ident">separator</span>(<span class="string">&quot;_&quot;</span>))<span class="question-mark">?</span>;
<span class="ident">check_url</span>(<span class="kw-2">&amp;</span><span class="ident">s</span>);
<span class="kw">match</span> <span class="ident">env::var</span>(<span class="string">&quot;PORT&quot;</span>) {
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) =&gt; {
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">&quot;server.port&quot;</span>, <span class="ident">val</span>).<span class="ident">unwrap</span>();
}
<span class="prelude-val">Err</span>(<span class="ident">e</span>) =&gt; <span class="macro">warn!</span>(<span class="string">&quot;couldn&#39;t interpret PORT: {}&quot;</span>, <span class="ident">e</span>),
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">val</span>) <span class="op">=</span> <span class="ident">env::var</span>(<span class="string">&quot;PORT&quot;</span>) {
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">&quot;server.port&quot;</span>, <span class="ident">val</span>).<span class="ident">unwrap</span>();
<span class="macro">log::info!</span>(<span class="string">&quot;Overriding [server].port with environment variable&quot;</span>);
}
<span class="kw">match</span> <span class="ident">env::var</span>(<span class="string">&quot;DATABASE_URL&quot;</span>) {
@@ -433,6 +455,7 @@
<span class="kw">let</span> <span class="ident">database_type</span> <span class="op">=</span> <span class="ident">DBType::from_url</span>(<span class="kw-2">&amp;</span><span class="ident">url</span>).<span class="ident">unwrap</span>();
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">&quot;database.database_type&quot;</span>, <span class="ident">database_type</span>.<span class="ident">to_string</span>())
.<span class="ident">unwrap</span>();
<span class="macro">log::info!</span>(<span class="string">&quot;Overriding [database].url and [database].database_type with environment variable&quot;</span>);
}
<span class="prelude-val">Err</span>(<span class="ident">e</span>) =&gt; {
<span class="ident">set_database_url</span>(<span class="kw-2">&amp;mut</span> <span class="ident">s</span>);
@@ -468,8 +491,11 @@
<span class="string">r&quot;postgres://{}:{}@{}:{}/{}&quot;</span>,
<span class="ident">s</span>.<span class="ident">get</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>(<span class="string">&quot;database.username&quot;</span>)
.<span class="ident">expect</span>(<span class="string">&quot;Couldn&#39;t access database username&quot;</span>),
<span class="ident">s</span>.<span class="ident">get</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>(<span class="string">&quot;database.password&quot;</span>)
.<span class="ident">expect</span>(<span class="string">&quot;Couldn&#39;t access database password&quot;</span>),
<span class="ident">urlencoding::encode</span>(
<span class="ident">s</span>.<span class="ident">get</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>(<span class="string">&quot;database.password&quot;</span>)
.<span class="ident">expect</span>(<span class="string">&quot;Couldn&#39;t access database password&quot;</span>)
.<span class="ident">as_str</span>()
),
<span class="ident">s</span>.<span class="ident">get</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>(<span class="string">&quot;database.hostname&quot;</span>)
.<span class="ident">expect</span>(<span class="string">&quot;Couldn&#39;t access database hostname&quot;</span>),
<span class="ident">s</span>.<span class="ident">get</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>(<span class="string">&quot;database.port&quot;</span>)