mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2026-02-12 02:25:41 +00:00
Deploying to gh-pages from @ dcfba60c86 🚀
This commit is contained in:
@@ -138,7 +138,7 @@
|
||||
}
|
||||
}
|
||||
<span class="prelude-val">Err</span>(<span class="ident">RowNotFound</span>) <span class="op">=</span><span class="op">></span> <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">UsernameNotFound</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="kw">_</span>) <span class="op">=</span><span class="op">></span> <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">InternalServerError</span>)<span class="question-mark">?</span>,
|
||||
<span class="prelude-val">Err</span>(<span class="kw">_</span>) <span class="op">=</span><span class="op">></span> <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">InternalServerError</span>),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -172,14 +172,14 @@
|
||||
)
|
||||
.<span class="ident">execute</span>(<span class="kw-2">&</span><span class="ident">data</span>.<span class="ident">db</span>)
|
||||
.<span class="kw">await</span>;
|
||||
<span class="kw">if</span> <span class="op">!</span><span class="ident">res</span>.<span class="ident">is_ok</span>() {
|
||||
<span class="kw">if</span> <span class="ident">res</span>.<span class="ident">is_err</span>() {
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>)) <span class="op">=</span> <span class="ident">res</span> {
|
||||
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">=</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">Cow</span>::<span class="ident">from</span>(<span class="string">"23505"</span>))
|
||||
<span class="op">&&</span> <span class="ident">err</span>.<span class="ident">message</span>().<span class="ident">contains</span>(<span class="string">"mcaptcha_users_email_key"</span>)
|
||||
{
|
||||
<span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">EmailTaken</span>)<span class="question-mark">?</span>
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">EmailTaken</span>);
|
||||
} <span class="kw">else</span> {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>))<span class="question-mark">?</span>
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>).<span class="ident">into</span>());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -77,6 +77,7 @@
|
||||
<span id="74">74</span>
|
||||
<span id="75">75</span>
|
||||
<span id="76">76</span>
|
||||
<span id="77">77</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -112,8 +113,8 @@
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Account</span> {
|
||||
<span class="kw">pub</span> <span class="ident">delete</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">email_exists</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">update_email</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">get_secret</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">update_email</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">update_secret</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">username_exists</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
}
|
||||
@@ -127,12 +128,13 @@
|
||||
<span class="kw">let</span> <span class="ident">username_exists</span> <span class="op">=</span> <span class="string">"/api/v1/account/username/exists"</span>;
|
||||
<span class="kw">let</span> <span class="ident">update_email</span> <span class="op">=</span> <span class="string">"/api/v1/account/email/update"</span>;
|
||||
<span class="ident">Account</span> {
|
||||
<span class="ident">get_secret</span>,
|
||||
<span class="ident">update_secret</span>,
|
||||
<span class="ident">username_exists</span>,
|
||||
<span class="ident">update_email</span>,
|
||||
<span class="ident">delete</span>,
|
||||
<span class="ident">email_exists</span>,
|
||||
|
||||
<span class="ident">get_secret</span>,
|
||||
<span class="ident">update_email</span>,
|
||||
<span class="ident">update_secret</span>,
|
||||
<span class="ident">username_exists</span>,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,8 +91,6 @@
|
||||
<span id="88">88</span>
|
||||
<span id="89">89</span>
|
||||
<span id="90">90</span>
|
||||
<span id="91">91</span>
|
||||
<span id="92">92</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -167,16 +165,14 @@
|
||||
.<span class="kw">await</span>;
|
||||
<span class="kw">if</span> <span class="ident">res</span>.<span class="ident">is_ok</span>() {
|
||||
<span class="kw">break</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>)) <span class="op">=</span> <span class="ident">res</span> {
|
||||
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">=</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">Cow</span>::<span class="ident">from</span>(<span class="string">"23505"</span>))
|
||||
<span class="op">&&</span> <span class="ident">err</span>.<span class="ident">message</span>().<span class="ident">contains</span>(<span class="string">"mcaptcha_users_secret_key"</span>)
|
||||
{
|
||||
<span class="kw">continue</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>))<span class="question-mark">?</span>;
|
||||
}
|
||||
};
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>)) <span class="op">=</span> <span class="ident">res</span> {
|
||||
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">=</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">Cow</span>::<span class="ident">from</span>(<span class="string">"23505"</span>))
|
||||
<span class="op">&&</span> <span class="ident">err</span>.<span class="ident">message</span>().<span class="ident">contains</span>(<span class="string">"mcaptcha_users_secret_key"</span>)
|
||||
{
|
||||
<span class="kw">continue</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>).<span class="ident">into</span>());
|
||||
}
|
||||
}
|
||||
}
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>())
|
||||
|
||||
@@ -183,15 +183,6 @@
|
||||
<span id="180">180</span>
|
||||
<span id="181">181</span>
|
||||
<span id="182">182</span>
|
||||
<span id="183">183</span>
|
||||
<span id="184">184</span>
|
||||
<span id="185">185</span>
|
||||
<span id="186">186</span>
|
||||
<span id="187">187</span>
|
||||
<span id="188">188</span>
|
||||
<span id="189">189</span>
|
||||
<span id="190">190</span>
|
||||
<span id="191">191</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -223,8 +214,8 @@
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">routes</span> {
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Auth</span> {
|
||||
<span class="kw">pub</span> <span class="ident">login</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">logout</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">login</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">register</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
}
|
||||
|
||||
@@ -234,8 +225,8 @@
|
||||
<span class="kw">let</span> <span class="ident">logout</span> <span class="op">=</span> <span class="string">"/logout"</span>;
|
||||
<span class="kw">let</span> <span class="ident">register</span> <span class="op">=</span> <span class="string">"/api/v1/signup"</span>;
|
||||
<span class="ident">Auth</span> {
|
||||
<span class="ident">login</span>,
|
||||
<span class="ident">logout</span>,
|
||||
<span class="ident">login</span>,
|
||||
<span class="ident">register</span>,
|
||||
}
|
||||
}
|
||||
@@ -243,16 +234,9 @@
|
||||
}
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">services</span>(<span class="ident">cfg</span>: <span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">web</span>::<span class="ident">ServiceConfig</span>) {
|
||||
<span class="comment">// protect_get!(cfg, V1_API_ROUTES.auth.logout, signout);</span>
|
||||
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">signup</span>);
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">signin</span>);
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">signout</span>);
|
||||
|
||||
<span class="comment">// define_resource!(cfg, V1_API_ROUTES.auth.register, Methods::Post, signup);</span>
|
||||
<span class="comment">// define_resource!(cfg, V1_API_ROUTES.auth.logout, Methods::ProtectGet, signout);</span>
|
||||
<span class="comment">// define_resource!(cfg, V1_API_ROUTES.auth.login, Methods::Post, signin);</span>
|
||||
<span class="comment">//post!(cfg, V1_API_ROUTES.auth.login, signin);</span>
|
||||
}
|
||||
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Clone</span>, <span class="ident">Debug</span>, <span class="ident">Deserialize</span>, <span class="ident">Serialize</span>)]</span>
|
||||
@@ -280,10 +264,10 @@
|
||||
<span class="ident">data</span>: <span class="ident">AppData</span>,
|
||||
) <span class="op">-</span><span class="op">></span> <span class="ident">ServiceResult</span><span class="op"><</span><span class="kw">impl</span> <span class="ident">Responder</span><span class="op">></span> {
|
||||
<span class="kw">if</span> <span class="op">!</span><span class="kw">crate</span>::<span class="ident">SETTINGS</span>.<span class="ident">server</span>.<span class="ident">allow_registration</span> {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">ClosedForRegistration</span>)<span class="question-mark">?</span>
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">ClosedForRegistration</span>);
|
||||
}
|
||||
|
||||
<span class="kw">if</span> <span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">password</span> <span class="op">!</span><span class="op">=</span> <span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">confirm_password</span> {
|
||||
<span class="kw">if</span> <span class="ident">payload</span>.<span class="ident">password</span> <span class="op">!</span><span class="op">=</span> <span class="ident">payload</span>.<span class="ident">confirm_password</span> {
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">PasswordsDontMatch</span>);
|
||||
}
|
||||
<span class="kw">let</span> <span class="ident">username</span> <span class="op">=</span> <span class="ident">data</span>.<span class="ident">creds</span>.<span class="ident">username</span>(<span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">username</span>)<span class="question-mark">?</span>;
|
||||
@@ -322,22 +306,20 @@
|
||||
}
|
||||
<span class="kw">if</span> <span class="ident">res</span>.<span class="ident">is_ok</span>() {
|
||||
<span class="kw">break</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>)) <span class="op">=</span> <span class="ident">res</span> {
|
||||
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">=</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">Cow</span>::<span class="ident">from</span>(<span class="string">"23505"</span>)) {
|
||||
<span class="kw">let</span> <span class="ident">msg</span> <span class="op">=</span> <span class="ident">err</span>.<span class="ident">message</span>();
|
||||
<span class="kw">if</span> <span class="ident">msg</span>.<span class="ident">contains</span>(<span class="string">"mcaptcha_users_name_key"</span>) {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">UsernameTaken</span>)<span class="question-mark">?</span>;
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">msg</span>.<span class="ident">contains</span>(<span class="string">"mcaptcha_users_secret_key"</span>) {
|
||||
<span class="kw">continue</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">InternalServerError</span>)<span class="question-mark">?</span>;
|
||||
}
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>)) <span class="op">=</span> <span class="ident">res</span> {
|
||||
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">=</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">Cow</span>::<span class="ident">from</span>(<span class="string">"23505"</span>)) {
|
||||
<span class="kw">let</span> <span class="ident">msg</span> <span class="op">=</span> <span class="ident">err</span>.<span class="ident">message</span>();
|
||||
<span class="kw">if</span> <span class="ident">msg</span>.<span class="ident">contains</span>(<span class="string">"mcaptcha_users_name_key"</span>) {
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">UsernameTaken</span>);
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">msg</span>.<span class="ident">contains</span>(<span class="string">"mcaptcha_users_secret_key"</span>) {
|
||||
<span class="kw">continue</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>))<span class="question-mark">?</span>;
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">InternalServerError</span>);
|
||||
}
|
||||
};
|
||||
}
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>).<span class="ident">into</span>());
|
||||
}
|
||||
};
|
||||
}
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>())
|
||||
}
|
||||
@@ -369,14 +351,14 @@
|
||||
<span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">WrongPassword</span>)
|
||||
}
|
||||
}
|
||||
<span class="prelude-val">Err</span>(<span class="ident">RowNotFound</span>) <span class="op">=</span><span class="op">></span> <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">UsernameNotFound</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="kw">_</span>) <span class="op">=</span><span class="op">></span> <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">InternalServerError</span>)<span class="question-mark">?</span>,
|
||||
<span class="prelude-val">Err</span>(<span class="ident">RowNotFound</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">UsernameNotFound</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="kw">_</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">InternalServerError</span>),
|
||||
}
|
||||
}
|
||||
|
||||
<span class="attribute">#[<span class="ident">my_codegen</span>::<span class="ident">get</span>(<span class="ident">path</span> <span class="op">=</span> <span class="string">"crate::V1_API_ROUTES.auth.logout"</span>, <span class="ident">wrap</span> <span class="op">=</span> <span class="string">"crate::CheckLogin"</span>)]</span>
|
||||
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">signout</span>(<span class="ident">id</span>: <span class="ident">Identity</span>) <span class="op">-</span><span class="op">></span> <span class="kw">impl</span> <span class="ident">Responder</span> {
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="kw">_</span>) <span class="op">=</span> <span class="ident">id</span>.<span class="ident">identity</span>() {
|
||||
<span class="kw">if</span> <span class="ident">id</span>.<span class="ident">identity</span>().<span class="ident">is_some</span>() {
|
||||
<span class="ident">id</span>.<span class="ident">forget</span>();
|
||||
}
|
||||
<span class="ident">HttpResponse</span>::<span class="ident">Found</span>()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Source of the Rust file `src/api/v1/mcaptcha/mcaptcha.rs`."><meta name="keywords" content="rust, rustlang, rust-lang"><title>mcaptcha.rs - source</title><link rel="stylesheet" type="text/css" href="../../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../../light.css" id="themeStyle"><link rel="stylesheet" type="text/css" href="../../../../../dark.css" disabled ><link rel="stylesheet" type="text/css" href="../../../../../ayu.css" disabled ><script id="default-settings"></script><script src="../../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../../noscript.css"></noscript><link rel="icon" type="image/svg+xml" href="../../../../../favicon.svg">
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Source of the Rust file `src/api/v1/mcaptcha/captcha.rs`."><meta name="keywords" content="rust, rustlang, rust-lang"><title>captcha.rs - source</title><link rel="stylesheet" type="text/css" href="../../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../../light.css" id="themeStyle"><link rel="stylesheet" type="text/css" href="../../../../../dark.css" disabled ><link rel="stylesheet" type="text/css" href="../../../../../ayu.css" disabled ><script id="default-settings"></script><script src="../../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../../noscript.css"></noscript><link rel="icon" type="image/svg+xml" href="../../../../../favicon.svg">
|
||||
<link rel="alternate icon" type="image/png" href="../../../../../favicon-16x16.png">
|
||||
<link rel="alternate icon" type="image/png" href="../../../../../favicon-32x32.png"><style type="text/css">#crate-search{background-image:url("../../../../../down-arrow.svg");}</style></head><body class="rustdoc source"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../../../mcaptcha/index.html'><div class='logo-container rust-logo'><img src='../../../../../rust-logo.png' alt='logo'></div></a></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu"><img src="../../../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices" role="menu"></div></div><script src="../../../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><button type="button" class="help-button">?</button>
|
||||
<a id="settings-menu" href="../../../../../settings.html"><img src="../../../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><pre class="line-numbers"><span id="1"> 1</span>
|
||||
@@ -322,8 +322,6 @@
|
||||
<span id="319">319</span>
|
||||
<span id="320">320</span>
|
||||
<span id="321">321</span>
|
||||
<span id="322">322</span>
|
||||
<span id="323">323</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -421,10 +419,10 @@
|
||||
{
|
||||
<span class="kw">continue</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>))<span class="question-mark">?</span>;
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>).<span class="ident">into</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">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="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">e</span>.<span class="ident">into</span>()),
|
||||
|
||||
<span class="prelude-val">Ok</span>(<span class="kw">_</span>) <span class="op">=</span><span class="op">></span> {
|
||||
<span class="ident">resp</span> <span class="op">=</span> <span class="ident">MCaptchaDetails</span> {
|
||||
@@ -455,15 +453,13 @@
|
||||
<span class="kw">let</span> <span class="ident">res</span> <span class="op">=</span> <span class="ident">update_token_helper</span>(<span class="kw-2">&</span><span class="ident">key</span>, <span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">key</span>, <span class="kw-2">&</span><span class="ident">username</span>, <span class="kw-2">&</span><span class="ident">data</span>).<span class="kw">await</span>;
|
||||
<span class="kw">if</span> <span class="ident">res</span>.<span class="ident">is_ok</span>() {
|
||||
<span class="kw">break</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>)) <span class="op">=</span> <span class="ident">res</span> {
|
||||
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">=</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">Cow</span>::<span class="ident">from</span>(<span class="string">"23505"</span>)) {
|
||||
<span class="kw">continue</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>))<span class="question-mark">?</span>;
|
||||
}
|
||||
};
|
||||
}
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>)) <span class="op">=</span> <span class="ident">res</span> {
|
||||
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">=</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">Cow</span>::<span class="ident">from</span>(<span class="string">"23505"</span>)) {
|
||||
<span class="kw">continue</span>;
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">sqlx</span>::<span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>).<span class="ident">into</span>());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
<span class="kw">let</span> <span class="ident">resp</span> <span class="op">=</span> <span class="ident">MCaptchaDetails</span> {
|
||||
@@ -219,7 +219,7 @@
|
||||
<span class="kw">use</span> <span class="ident">actix_web</span>::{<span class="ident">web</span>, <span class="ident">HttpResponse</span>, <span class="ident">Responder</span>};
|
||||
<span class="kw">use</span> <span class="ident">serde</span>::{<span class="ident">Deserialize</span>, <span class="ident">Serialize</span>};
|
||||
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">mcaptcha</span>::<span class="ident">mcaptcha</span>::<span class="ident">MCaptchaDetails</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">mcaptcha</span>::<span class="ident">captcha</span>::<span class="ident">MCaptchaDetails</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">errors</span>::<span class="kw-2">*</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">AppData</span>;
|
||||
|
||||
|
||||
@@ -391,8 +391,8 @@
|
||||
<span class="kw">use</span> <span class="ident">log</span>::<span class="ident">debug</span>;
|
||||
<span class="kw">use</span> <span class="ident">serde</span>::{<span class="ident">Deserialize</span>, <span class="ident">Serialize</span>};
|
||||
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">mcaptcha</span>::<span class="ident">add_mcaptcha_util</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">mcaptcha</span>::<span class="ident">mcaptcha</span>::<span class="ident">MCaptchaDetails</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">captcha</span>::<span class="ident">add_mcaptcha_util</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">captcha</span>::<span class="ident">MCaptchaDetails</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">errors</span>::<span class="kw-2">*</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">AppData</span>;
|
||||
|
||||
@@ -400,9 +400,9 @@
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Levels</span> {
|
||||
<span class="kw">pub</span> <span class="ident">add</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">update</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">delete</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">get</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
<span class="kw">pub</span> <span class="ident">update</span>: <span class="kw-2">&</span><span class="lifetime">'static</span> <span class="ident">str</span>,
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">Levels</span> {
|
||||
@@ -413,9 +413,9 @@
|
||||
<span class="kw">let</span> <span class="ident">get</span> <span class="op">=</span> <span class="string">"/api/v1/mcaptcha/levels/get"</span>;
|
||||
<span class="ident">Levels</span> {
|
||||
<span class="ident">add</span>,
|
||||
<span class="ident">delete</span>,
|
||||
<span class="ident">get</span>,
|
||||
<span class="ident">update</span>,
|
||||
<span class="ident">delete</span>,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -447,7 +447,7 @@
|
||||
<span class="kw">let</span> <span class="ident">username</span> <span class="op">=</span> <span class="ident">id</span>.<span class="ident">identity</span>().<span class="ident">unwrap</span>();
|
||||
|
||||
<span class="kw">for</span> <span class="ident">level</span> <span class="kw">in</span> <span class="ident">payload</span>.<span class="ident">levels</span>.<span class="ident">iter</span>() {
|
||||
<span class="ident">defense</span>.<span class="ident">add_level</span>(<span class="ident">level</span>.<span class="ident">clone</span>())<span class="question-mark">?</span>;
|
||||
<span class="ident">defense</span>.<span class="ident">add_level</span>(<span class="kw-2">*</span><span class="ident">level</span>)<span class="question-mark">?</span>;
|
||||
}
|
||||
|
||||
<span class="ident">defense</span>.<span class="ident">build</span>()<span class="question-mark">?</span>;
|
||||
@@ -503,7 +503,7 @@
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">defense</span> <span class="op">=</span> <span class="ident">DefenseBuilder</span>::<span class="ident">default</span>();
|
||||
|
||||
<span class="kw">for</span> <span class="ident">level</span> <span class="kw">in</span> <span class="ident">payload</span>.<span class="ident">levels</span>.<span class="ident">iter</span>() {
|
||||
<span class="ident">defense</span>.<span class="ident">add_level</span>(<span class="ident">level</span>.<span class="ident">clone</span>())<span class="question-mark">?</span>;
|
||||
<span class="ident">defense</span>.<span class="ident">add_level</span>(<span class="kw-2">*</span><span class="ident">level</span>)<span class="question-mark">?</span>;
|
||||
}
|
||||
|
||||
<span class="comment">// I feel this is necessary as both difficulty factor _and_ visitor threshold of a</span>
|
||||
|
||||
@@ -59,9 +59,9 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/</span>
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">captcha</span>;
|
||||
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">duration</span>;
|
||||
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">levels</span>;
|
||||
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">mcaptcha</span>;
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_random</span>(<span class="ident">len</span>: <span class="ident">usize</span>) <span class="op">-</span><span class="op">></span> <span class="ident">String</span> {
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">iter</span>;
|
||||
@@ -80,7 +80,7 @@
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">services</span>(<span class="ident">cfg</span>: <span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">actix_web</span>::<span class="ident">web</span>::<span class="ident">ServiceConfig</span>) {
|
||||
<span class="ident">duration</span>::<span class="ident">services</span>(<span class="ident">cfg</span>);
|
||||
<span class="ident">levels</span>::<span class="ident">services</span>(<span class="ident">cfg</span>);
|
||||
<span class="ident">mcaptcha</span>::<span class="ident">services</span>(<span class="ident">cfg</span>);
|
||||
<span class="ident">captcha</span>::<span class="ident">services</span>(<span class="ident">cfg</span>);
|
||||
}
|
||||
</pre></div>
|
||||
</section><section id="search" class="content hidden"></section><section class="footer"></section><div id="rustdoc-vars" data-root-path="../../../../../" data-current-crate="mcaptcha"></div>
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">build_details</span>() <span class="op">-</span><span class="op">></span> <span class="kw">impl</span> <span class="ident">Responder</span> {
|
||||
<span class="kw">let</span> <span class="ident">build</span> <span class="op">=</span> <span class="ident">BuildDetails</span> {
|
||||
<span class="ident">version</span>: <span class="ident">VERSION</span>,
|
||||
<span class="ident">git_commit_hash</span>: <span class="kw-2">&</span><span class="ident">GIT_COMMIT_HASH</span>,
|
||||
<span class="ident">git_commit_hash</span>: <span class="ident">GIT_COMMIT_HASH</span>,
|
||||
};
|
||||
<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>().<span class="ident">json</span>(<span class="ident">build</span>)
|
||||
}
|
||||
@@ -196,7 +196,7 @@
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">resp_builder</span> <span class="op">=</span> <span class="ident">HealthBuilder</span>::<span class="ident">default</span>();
|
||||
<span class="ident">resp_builder</span>.<span class="ident">db</span>(<span class="bool-val">false</span>);
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="kw-2">mut</span> <span class="ident">con</span>) <span class="op">=</span> <span class="ident">data</span>.<span class="ident">db</span>.<span class="ident">acquire</span>().<span class="kw">await</span> {
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="kw">_</span>) <span class="op">=</span> <span class="ident">con</span>.<span class="ident">ping</span>().<span class="kw">await</span> {
|
||||
<span class="kw">if</span> <span class="ident">con</span>.<span class="ident">ping</span>().<span class="kw">await</span>.<span class="ident">is_ok</span>() {
|
||||
<span class="ident">resp_builder</span>.<span class="ident">db</span>(<span class="bool-val">true</span>);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -287,7 +287,7 @@
|
||||
<span class="macro">assert_eq</span><span class="macro">!</span>(<span class="ident">notification</span>.<span class="ident">heading</span>, <span class="ident">HEADING</span>);
|
||||
|
||||
<span class="kw">let</span> <span class="ident">mark_read_payload</span> <span class="op">=</span> <span class="ident">MarkReadReq</span> {
|
||||
<span class="ident">id</span>: <span class="ident">notification</span>.<span class="ident">id</span>.<span class="ident">clone</span>(),
|
||||
<span class="ident">id</span>: <span class="ident">notification</span>.<span class="ident">id</span>,
|
||||
};
|
||||
<span class="kw">let</span> <span class="ident">mark_read_resp</span> <span class="op">=</span> <span class="ident">test</span>::<span class="ident">call_service</span>(
|
||||
<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">app</span>,
|
||||
|
||||
@@ -397,9 +397,9 @@
|
||||
.<span class="ident">to_request</span>(),
|
||||
)
|
||||
.<span class="kw">await</span>;
|
||||
<span class="comment">// assert_eq!(get_config_resp.status(), StatusCode::OK);</span>
|
||||
<span class="comment">// let config: PoWConfig = test::read_body_json(get_config_resp).await;</span>
|
||||
<span class="comment">// assert_eq!(config.difficulty_factor, L1.difficulty_factor);</span>
|
||||
<span class="macro">assert_eq</span><span class="macro">!</span>(<span class="ident">get_config_resp</span>.<span class="ident">status</span>(), <span class="ident">StatusCode</span>::<span class="ident">OK</span>);
|
||||
<span class="kw">let</span> <span class="ident">config</span>: <span class="ident">PoWConfig</span> <span class="op">=</span> <span class="ident">test</span>::<span class="ident">read_body_json</span>(<span class="ident">get_config_resp</span>).<span class="kw">await</span>;
|
||||
<span class="macro">assert_eq</span><span class="macro">!</span>(<span class="ident">config</span>.<span class="ident">difficulty_factor</span>, <span class="ident">L1</span>.<span class="ident">difficulty_factor</span>);
|
||||
}
|
||||
}
|
||||
</pre></div>
|
||||
|
||||
@@ -74,9 +74,9 @@
|
||||
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">account</span>::<span class="ident">routes</span>::<span class="ident">Account</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">auth</span>::<span class="ident">routes</span>::<span class="ident">Auth</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">mcaptcha</span>::<span class="ident">captcha</span>::<span class="ident">routes</span>::<span class="ident">MCaptcha</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">mcaptcha</span>::<span class="ident">duration</span>::<span class="ident">routes</span>::<span class="ident">Duration</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">mcaptcha</span>::<span class="ident">levels</span>::<span class="ident">routes</span>::<span class="ident">Levels</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">mcaptcha</span>::<span class="ident">mcaptcha</span>::<span class="ident">routes</span>::<span class="ident">MCaptcha</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">meta</span>::<span class="ident">routes</span>::<span class="ident">Meta</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">notifications</span>::<span class="ident">routes</span>::<span class="ident">Notifications</span>;
|
||||
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">pow</span>::<span class="ident">routes</span>::<span class="ident">PoW</span>;
|
||||
|
||||
@@ -259,8 +259,6 @@
|
||||
<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>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -485,12 +483,10 @@
|
||||
<span class="kw">match</span> <span class="self">self</span>.<span class="ident">status_code</span>() {
|
||||
<span class="ident">StatusCode</span>::<span class="ident">INTERNAL_SERVER_ERROR</span> <span class="op">=</span><span class="op">></span> <span class="ident">HttpResponse</span>::<span class="ident">Found</span>()
|
||||
.<span class="ident">header</span>(<span class="ident">header</span>::<span class="ident">LOCATION</span>, <span class="ident">PAGES</span>.<span class="ident">errors</span>.<span class="ident">internal_server_error</span>)
|
||||
.<span class="ident">finish</span>()
|
||||
.<span class="ident">into</span>(),
|
||||
.<span class="ident">finish</span>(),
|
||||
<span class="kw">_</span> <span class="op">=</span><span class="op">></span> <span class="ident">HttpResponse</span>::<span class="ident">Found</span>()
|
||||
.<span class="ident">header</span>(<span class="ident">header</span>::<span class="ident">LOCATION</span>, <span class="ident">PAGES</span>.<span class="ident">errors</span>.<span class="ident">unknown_error</span>)
|
||||
.<span class="ident">finish</span>()
|
||||
.<span class="ident">into</span>(),
|
||||
.<span class="ident">finish</span>(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -162,10 +162,6 @@
|
||||
<span id="159">159</span>
|
||||
<span id="160">160</span>
|
||||
<span id="161">161</span>
|
||||
<span id="162">162</span>
|
||||
<span id="163">163</span>
|
||||
<span id="164">164</span>
|
||||
<span id="165">165</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -188,8 +184,8 @@
|
||||
|
||||
<span class="kw">use</span> <span class="ident">actix_identity</span>::{<span class="ident">CookieIdentityPolicy</span>, <span class="ident">IdentityService</span>};
|
||||
<span class="kw">use</span> <span class="ident">actix_web</span>::{
|
||||
<span class="ident">client</span>::<span class="ident">Client</span>, <span class="ident">error</span>::<span class="ident">InternalError</span>, <span class="ident">http</span>::<span class="ident">StatusCode</span>,
|
||||
<span class="ident">middleware</span> <span class="kw">as</span> <span class="ident">actix_middleware</span>, <span class="ident">web</span>::<span class="ident">JsonConfig</span>, <span class="ident">App</span>, <span class="ident">HttpServer</span>,
|
||||
<span class="ident">error</span>::<span class="ident">InternalError</span>, <span class="ident">http</span>::<span class="ident">StatusCode</span>, <span class="ident">middleware</span> <span class="kw">as</span> <span class="ident">actix_middleware</span>,
|
||||
<span class="ident">web</span>::<span class="ident">JsonConfig</span>, <span class="ident">App</span>, <span class="ident">HttpServer</span>,
|
||||
};
|
||||
<span class="kw">use</span> <span class="ident">lazy_static</span>::<span class="ident">lazy_static</span>;
|
||||
<span class="kw">use</span> <span class="ident">log</span>::<span class="ident">info</span>;
|
||||
@@ -238,7 +234,7 @@
|
||||
<span class="doccomment">/// points to source files matching build commit</span>
|
||||
<span class="kw">pub</span> <span class="kw">static</span> <span class="kw-2">ref</span> <span class="ident">SOURCE_FILES_OF_INSTANCE</span>: <span class="ident">String</span> <span class="op">=</span> {
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">url</span> <span class="op">=</span> <span class="ident">SETTINGS</span>.<span class="ident">source_code</span>.<span class="ident">clone</span>();
|
||||
<span class="kw">if</span> <span class="ident">url</span>.<span class="ident">chars</span>().<span class="ident">last</span>() <span class="op">!</span><span class="op">=</span> <span class="prelude-val">Some</span>(<span class="string">'/'</span>) {
|
||||
<span class="kw">if</span> <span class="op">!</span><span class="ident">url</span>.<span class="ident">ends_with</span>(<span class="string">'/'</span>) {
|
||||
<span class="ident">url</span>.<span class="ident">push</span>(<span class="string">'/'</span>);
|
||||
}
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">base</span> <span class="op">=</span> <span class="ident">url</span>::<span class="ident">Url</span>::<span class="ident">parse</span>(<span class="kw-2">&</span><span class="ident">url</span>).<span class="ident">unwrap</span>();
|
||||
@@ -264,7 +260,6 @@
|
||||
<span class="attribute">#[<span class="ident">actix_web</span>::<span class="ident">main</span>]</span>
|
||||
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">main</span>() <span class="op">-</span><span class="op">></span> <span class="ident">std</span>::<span class="ident">io</span>::<span class="prelude-ty">Result</span><span class="op"><</span>()<span class="op">></span> {
|
||||
<span class="kw">use</span> <span class="ident">api</span>::<span class="ident">v1</span>;
|
||||
<span class="kw">use</span> <span class="ident">docs</span>;
|
||||
<span class="ident">pretty_env_logger</span>::<span class="ident">init</span>();
|
||||
<span class="macro">info</span><span class="macro">!</span>(
|
||||
<span class="string">"{}: {}.\nFor more information, see: {}\nBuild info:\nVersion: {} commit: {}"</span>,
|
||||
@@ -274,14 +269,11 @@
|
||||
<span class="kw">let</span> <span class="ident">data</span> <span class="op">=</span> <span class="ident">Data</span>::<span class="ident">new</span>().<span class="kw">await</span>;
|
||||
<span class="ident">sqlx</span>::<span class="macro">migrate</span><span class="macro">!</span>(<span class="string">"./migrations/"</span>).<span class="ident">run</span>(<span class="kw-2">&</span><span class="ident">data</span>.<span class="ident">db</span>).<span class="kw">await</span>.<span class="ident">unwrap</span>();
|
||||
<span class="ident">HttpServer</span>::<span class="ident">new</span>(<span class="kw">move</span> <span class="op">|</span><span class="op">|</span> {
|
||||
<span class="kw">let</span> <span class="ident">client</span> <span class="op">=</span> <span class="ident">Client</span>::<span class="ident">default</span>();
|
||||
|
||||
<span class="ident">App</span>::<span class="ident">new</span>()
|
||||
.<span class="ident">wrap</span>(<span class="ident">actix_middleware</span>::<span class="ident">Logger</span>::<span class="ident">default</span>())
|
||||
.<span class="ident">wrap</span>(<span class="ident">get_identity_service</span>())
|
||||
.<span class="ident">wrap</span>(<span class="ident">actix_middleware</span>::<span class="ident">Compress</span>::<span class="ident">default</span>())
|
||||
.<span class="ident">data</span>(<span class="ident">data</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">data</span>(<span class="ident">client</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">wrap</span>(<span class="ident">actix_middleware</span>::<span class="ident">NormalizePath</span>::<span class="ident">new</span>(
|
||||
<span class="ident">actix_middleware</span>::<span class="ident">normalize</span>::<span class="ident">TrailingSlash</span>::<span class="ident">Trim</span>,
|
||||
))
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
<span class="kw">use</span> <span class="ident">actix_web</span>::{<span class="ident">HttpResponse</span>, <span class="ident">Responder</span>};
|
||||
<span class="kw">use</span> <span class="ident">sailfish</span>::<span class="ident">TemplateOnce</span>;
|
||||
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">mcaptcha</span>::<span class="ident">mcaptcha</span>::<span class="ident">MCaptchaDetails</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">mcaptcha</span>::<span class="ident">captcha</span>::<span class="ident">MCaptchaDetails</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">errors</span>::<span class="kw-2">*</span>;
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">AppData</span>;
|
||||
|
||||
|
||||
@@ -272,7 +272,7 @@
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">tarpaulin_include</span>))]</span>
|
||||
<span class="kw">fn</span> <span class="ident">extract_database_url</span>(<span class="ident">url</span>: <span class="kw-2">&</span><span class="ident">Url</span>) <span class="op">-</span><span class="op">></span> <span class="self">Self</span> {
|
||||
<span class="macro">debug</span><span class="macro">!</span>(<span class="string">"Databse name: {}"</span>, <span class="ident">url</span>.<span class="ident">path</span>());
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">path</span> <span class="op">=</span> <span class="ident">url</span>.<span class="ident">path</span>().<span class="ident">split</span>(<span class="string">"/"</span>);
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">path</span> <span class="op">=</span> <span class="ident">url</span>.<span class="ident">path</span>().<span class="ident">split</span>(<span class="string">'/'</span>);
|
||||
<span class="ident">path</span>.<span class="ident">next</span>();
|
||||
<span class="kw">let</span> <span class="ident">name</span> <span class="op">=</span> <span class="ident">path</span>.<span class="ident">next</span>().<span class="ident">expect</span>(<span class="string">"no database name"</span>).<span class="ident">to_string</span>();
|
||||
<span class="ident">DatabaseBuilder</span> {
|
||||
@@ -356,7 +356,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/mcaptcha#configuration to learn more about how mcaptcha 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>))),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,12 +47,6 @@
|
||||
<span id="44">44</span>
|
||||
<span id="45">45</span>
|
||||
<span id="46">46</span>
|
||||
<span id="47">47</span>
|
||||
<span id="48">48</span>
|
||||
<span id="49">49</span>
|
||||
<span id="50">50</span>
|
||||
<span id="51">51</span>
|
||||
<span id="52">52</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -77,21 +71,15 @@
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">FileMap</span> {
|
||||
<span class="attribute">#[<span class="ident">allow</span>(<span class="ident">clippy</span>::<span class="ident">new_without_default</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">new</span>() <span class="op">-</span><span class="op">></span> <span class="self">Self</span> {
|
||||
<span class="kw">let</span> <span class="ident">map</span> <span class="op">=</span> <span class="macro">include_str</span><span class="macro">!</span>(<span class="string">"../cache_buster_data.json"</span>);
|
||||
<span class="kw">let</span> <span class="ident">files</span> <span class="op">=</span> <span class="ident">Files</span>::<span class="ident">new</span>(<span class="kw-2">&</span><span class="ident">map</span>);
|
||||
<span class="self">Self</span> { <span class="ident">files</span> }
|
||||
}
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get</span><span class="op"><</span><span class="lifetime">'a</span><span class="op">></span>(<span class="kw-2">&</span><span class="lifetime">'a</span> <span class="self">self</span>, <span class="ident">path</span>: <span class="kw-2">&</span><span class="lifetime">'a</span> <span class="ident">str</span>) <span class="op">-</span><span class="op">></span> <span class="prelude-ty">Option</span><span class="op"><</span><span class="kw-2">&</span><span class="lifetime">'a</span> <span class="ident">str</span><span class="op">></span> {
|
||||
<span class="comment">// let file_path = self.files.get(path);</span>
|
||||
<span class="kw">let</span> <span class="ident">file_path</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">files</span>.<span class="ident">get_full_path</span>(<span class="ident">path</span>);
|
||||
|
||||
<span class="kw">if</span> <span class="ident">file_path</span>.<span class="ident">is_some</span>() {
|
||||
<span class="kw">let</span> <span class="ident">file_path</span> <span class="op">=</span> <span class="kw-2">&</span><span class="ident">file_path</span>.<span class="ident">unwrap</span>()[<span class="number">1</span>..];
|
||||
<span class="kw">return</span> <span class="prelude-val">Some</span>(<span class="ident">file_path</span>);
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">return</span> <span class="prelude-val">None</span>;
|
||||
}
|
||||
<span class="ident">file_path</span>.<span class="ident">map</span>(<span class="op">|</span><span class="ident">file_path</span><span class="op">|</span> <span class="kw-2">&</span><span class="ident">file_path</span>[<span class="number">1</span>..])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -256,7 +256,7 @@
|
||||
|
||||
<span class="kw">let</span> <span class="ident">resp</span> <span class="op">=</span> <span class="ident">test</span>::<span class="ident">call_service</span>(
|
||||
<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">app</span>,
|
||||
<span class="ident">test</span>::<span class="ident">TestRequest</span>::<span class="ident">get</span>().<span class="ident">uri</span>(<span class="kw-2">&</span><span class="kw-2">*</span><span class="kw">crate</span>::<span class="ident">JS</span>).<span class="ident">to_request</span>(),
|
||||
<span class="ident">test</span>::<span class="ident">TestRequest</span>::<span class="ident">get</span>().<span class="ident">uri</span>(<span class="kw-2">*</span><span class="kw">crate</span>::<span class="ident">JS</span>).<span class="ident">to_request</span>(),
|
||||
)
|
||||
.<span class="kw">await</span>;
|
||||
<span class="macro">assert_eq</span><span class="macro">!</span>(<span class="ident">resp</span>.<span class="ident">status</span>(), <span class="ident">StatusCode</span>::<span class="ident">OK</span>);
|
||||
@@ -264,7 +264,7 @@
|
||||
<span class="kw">let</span> <span class="ident">resp</span> <span class="op">=</span> <span class="ident">test</span>::<span class="ident">call_service</span>(
|
||||
<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">app</span>,
|
||||
<span class="ident">test</span>::<span class="ident">TestRequest</span>::<span class="ident">get</span>()
|
||||
.<span class="ident">uri</span>(<span class="kw-2">&</span><span class="kw-2">*</span><span class="kw">crate</span>::<span class="ident">VERIFICATIN_WIDGET_JS</span>)
|
||||
.<span class="ident">uri</span>(<span class="kw-2">*</span><span class="kw">crate</span>::<span class="ident">VERIFICATIN_WIDGET_JS</span>)
|
||||
.<span class="ident">to_request</span>(),
|
||||
)
|
||||
.<span class="kw">await</span>;
|
||||
@@ -273,7 +273,7 @@
|
||||
<span class="kw">let</span> <span class="ident">resp</span> <span class="op">=</span> <span class="ident">test</span>::<span class="ident">call_service</span>(
|
||||
<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">app</span>,
|
||||
<span class="ident">test</span>::<span class="ident">TestRequest</span>::<span class="ident">get</span>()
|
||||
.<span class="ident">uri</span>(<span class="kw-2">&</span><span class="kw-2">*</span><span class="kw">crate</span>::<span class="ident">VERIFICATIN_WIDGET_CSS</span>)
|
||||
.<span class="ident">uri</span>(<span class="kw-2">*</span><span class="kw">crate</span>::<span class="ident">VERIFICATIN_WIDGET_CSS</span>)
|
||||
.<span class="ident">to_request</span>(),
|
||||
)
|
||||
.<span class="kw">await</span>;
|
||||
|
||||
Reference in New Issue
Block a user