mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2026-02-11 18:15:39 +00:00
Deploying to gh-pages from @ 76b9f11430 🚀
This commit is contained in:
@@ -324,6 +324,7 @@
|
||||
<span id="321">321</span>
|
||||
<span id="322">322</span>
|
||||
<span id="323">323</span>
|
||||
<span id="324">324</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -343,8 +344,8 @@
|
||||
*/</span>
|
||||
|
||||
<span class="kw">use</span> <span class="ident">actix_identity</span>::<span class="ident">Identity</span>;
|
||||
<span class="kw">use</span> <span class="ident">actix_web</span>::{<span class="ident">post</span>, <span class="ident">web</span>, <span class="ident">HttpResponse</span>, <span class="ident">Responder</span>};
|
||||
<span class="kw">use</span> <span class="ident">awc</span>::<span class="ident">Client</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">post</span>, <span class="ident">web</span>, <span class="ident">HttpResponse</span>, <span class="ident">Responder</span>};
|
||||
<span class="comment">//use awc::Client;</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="ident">url</span>::<span class="ident">Url</span>;
|
||||
|
||||
@@ -490,6 +491,8 @@
|
||||
)
|
||||
.<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="question-mark">?</span>;
|
||||
<span class="comment">// TODO check running actors and delete</span>
|
||||
<span class="comment">// if domain(api_key) matches mcaptcha actor id</span>
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>())
|
||||
}
|
||||
|
||||
@@ -573,7 +576,6 @@
|
||||
<span class="attribute">#[<span class="ident">actix_rt</span>::<span class="ident">test</span>]</span>
|
||||
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">domain_verification_works</span>() {
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::<span class="ident">api</span>::<span class="ident">v1</span>::<span class="ident">tests</span>::<span class="kw-2">*</span>;
|
||||
<span class="kw">use</span> <span class="ident">awc</span>::<span class="ident">Client</span>;
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">sync</span>::<span class="ident">mpsc</span>;
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">thread</span>;
|
||||
|
||||
@@ -591,7 +593,7 @@
|
||||
|
||||
<span class="kw">let</span> (<span class="ident">tx</span>, <span class="ident">rx</span>) <span class="op">=</span> <span class="ident">mpsc</span>::<span class="ident">channel</span>();
|
||||
<span class="ident">thread</span>::<span class="ident">spawn</span>(<span class="kw">move</span> <span class="op">|</span><span class="op">|</span> {
|
||||
<span class="ident">rt</span>::<span class="ident">System</span>::<span class="ident">new</span>(<span class="string">""</span>).<span class="ident">block_on</span>(<span class="ident">server</span>(<span class="ident">IP</span>, <span class="ident">tx</span>));
|
||||
<span class="ident">actix_rt</span>::<span class="ident">System</span>::<span class="ident">new</span>(<span class="string">""</span>).<span class="ident">block_on</span>(<span class="ident">server</span>(<span class="ident">IP</span>, <span class="ident">tx</span>));
|
||||
});
|
||||
<span class="kw">let</span> <span class="ident">srv</span> <span class="op">=</span> <span class="ident">rx</span>.<span class="ident">recv</span>().<span class="ident">unwrap</span>();
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
<span id="35">35</span>
|
||||
<span id="36">36</span>
|
||||
<span id="37">37</span>
|
||||
<span id="38">38</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -60,6 +61,7 @@
|
||||
<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">mod</span> <span class="ident">pow</span>;
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">use</span> <span class="kw">super</span>::<span class="ident">auth</span>::<span class="ident">is_authenticated</span>;
|
||||
|
||||
|
||||
125
src/guard/api/v1/mcaptcha/pow.rs.html
Normal file
125
src/guard/api/v1/mcaptcha/pow.rs.html
Normal file
@@ -0,0 +1,125 @@
|
||||
<!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/pow.rs`."><meta name="keywords" content="rust, rustlang, rust-lang"><title>pow.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='../../../../../guard/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>
|
||||
<span id="2"> 2</span>
|
||||
<span id="3"> 3</span>
|
||||
<span id="4"> 4</span>
|
||||
<span id="5"> 5</span>
|
||||
<span id="6"> 6</span>
|
||||
<span id="7"> 7</span>
|
||||
<span id="8"> 8</span>
|
||||
<span id="9"> 9</span>
|
||||
<span id="10">10</span>
|
||||
<span id="11">11</span>
|
||||
<span id="12">12</span>
|
||||
<span id="13">13</span>
|
||||
<span id="14">14</span>
|
||||
<span id="15">15</span>
|
||||
<span id="16">16</span>
|
||||
<span id="17">17</span>
|
||||
<span id="18">18</span>
|
||||
<span id="19">19</span>
|
||||
<span id="20">20</span>
|
||||
<span id="21">21</span>
|
||||
<span id="22">22</span>
|
||||
<span id="23">23</span>
|
||||
<span id="24">24</span>
|
||||
<span id="25">25</span>
|
||||
<span id="26">26</span>
|
||||
<span id="27">27</span>
|
||||
<span id="28">28</span>
|
||||
<span id="29">29</span>
|
||||
<span id="30">30</span>
|
||||
<span id="31">31</span>
|
||||
<span id="32">32</span>
|
||||
<span id="33">33</span>
|
||||
<span id="34">34</span>
|
||||
<span id="35">35</span>
|
||||
<span id="36">36</span>
|
||||
<span id="37">37</span>
|
||||
<span id="38">38</span>
|
||||
<span id="39">39</span>
|
||||
<span id="40">40</span>
|
||||
<span id="41">41</span>
|
||||
<span id="42">42</span>
|
||||
<span id="43">43</span>
|
||||
<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>
|
||||
<span id="53">53</span>
|
||||
<span id="54">54</span>
|
||||
<span id="55">55</span>
|
||||
<span id="56">56</span>
|
||||
<span id="57">57</span>
|
||||
<span id="58">58</span>
|
||||
<span id="59">59</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/</span>
|
||||
|
||||
<span class="kw">use</span> <span class="ident">actix_identity</span>::<span class="ident">Identity</span>;
|
||||
<span class="kw">use</span> <span class="ident">actix_web</span>::{<span class="ident">post</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">super</span>::{<span class="ident">get_random</span>, <span class="ident">is_authenticated</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">Data</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>
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">PoWConfig</span> {
|
||||
<span class="kw">pub</span> <span class="ident">name</span>: <span class="ident">String</span>,
|
||||
<span class="kw">pub</span> <span class="ident">domain</span>: <span class="ident">String</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>
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">GetConfigPayload</span> {
|
||||
<span class="kw">pub</span> <span class="ident">key</span>: <span class="ident">String</span>,
|
||||
}
|
||||
|
||||
<span class="comment">// API keys are mcaptcha actor names</span>
|
||||
|
||||
<span class="attribute">#[<span class="ident">post</span>(<span class="string">"/api/v1/mcaptcha/pow/config"</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">async</span> <span class="kw">fn</span> <span class="ident">get_config</span>(
|
||||
<span class="ident">payload</span>: <span class="ident">web</span>::<span class="ident">Json</span><span class="op"><</span><span class="ident">GetConfigPayload</span><span class="op">></span>,
|
||||
<span class="ident">data</span>: <span class="ident">web</span>::<span class="ident">Data</span><span class="op"><</span><span class="ident">Data</span><span class="op">></span>,
|
||||
<span class="ident">id</span>: <span class="ident">Identity</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="ident">is_authenticated</span>(<span class="kw-2">&</span><span class="ident">id</span>)<span class="question-mark">?</span>;
|
||||
|
||||
<span class="kw">let</span> <span class="ident">res</span> <span class="op">=</span> <span class="ident">sqlx</span>::<span class="macro">query</span><span class="macro">!</span>(
|
||||
<span class="string">"SELECT EXISTS (SELECT 1 from mcaptcha_config WHERE key = $1)"</span>,
|
||||
<span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">key</span>,
|
||||
)
|
||||
.<span class="ident">fetch_one</span>(<span class="kw-2">&</span><span class="ident">data</span>.<span class="ident">db</span>)
|
||||
.<span class="kw">await</span><span class="question-mark">?</span>;
|
||||
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">x</span>) <span class="op">=</span> <span class="ident">res</span>.<span class="ident">exists</span> {
|
||||
<span class="macro">println</span><span class="macro">!</span>(<span class="string">"{}"</span>, <span class="ident">x</span>);
|
||||
}
|
||||
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</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="guard"></div>
|
||||
<script src="../../../../../main.js"></script><script src="../../../../../source-script.js"></script><script src="../../../../../source-files.js"></script><script defer src="../../../../../search-index.js"></script></body></html>
|
||||
@@ -61,6 +61,9 @@
|
||||
<span id="58">58</span>
|
||||
<span id="59">59</span>
|
||||
<span id="60">60</span>
|
||||
<span id="61">61</span>
|
||||
<span id="62">62</span>
|
||||
<span id="63">63</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -86,6 +89,10 @@
|
||||
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">meta</span>;
|
||||
|
||||
<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">ServiceConfig</span>) {
|
||||
<span class="comment">// meta</span>
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">meta</span>::<span class="ident">build_details</span>);
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">meta</span>::<span class="ident">health</span>);
|
||||
|
||||
<span class="comment">// auth</span>
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">auth</span>::<span class="ident">signout</span>);
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">auth</span>::<span class="ident">signin</span>);
|
||||
@@ -115,9 +122,8 @@
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">mcaptcha</span>::<span class="ident">duration</span>::<span class="ident">update_duration</span>);
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">mcaptcha</span>::<span class="ident">duration</span>::<span class="ident">get_duration</span>);
|
||||
|
||||
<span class="comment">// meta</span>
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">meta</span>::<span class="ident">build_details</span>);
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">meta</span>::<span class="ident">health</span>);
|
||||
<span class="comment">// pow</span>
|
||||
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">mcaptcha</span>::<span class="ident">pow</span>::<span class="ident">get_config</span>);
|
||||
}
|
||||
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Data</span> {
|
||||
<span class="kw">pub</span> <span class="ident">db</span>: <span class="ident">PgPool</span>,
|
||||
<span class="kw">pub</span> <span class="ident">creds</span>: <span class="ident">Config</span>,
|
||||
<span class="kw">pub</span> <span class="ident">captcha</span>: <span class="ident">System</span><span class="op"><</span><span class="ident">HashCache</span><span class="op">></span>,
|
||||
<span class="comment">// pub captcha: System<HashCache>,</span>
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">Data</span> {
|
||||
@@ -127,21 +127,21 @@
|
||||
.<span class="ident">build</span>()
|
||||
.<span class="ident">unwrap</span>();
|
||||
|
||||
<span class="kw">let</span> <span class="ident">master</span> <span class="op">=</span> <span class="ident">Master</span>::<span class="ident">new</span>(<span class="ident">SETTINGS</span>.<span class="ident">pow</span>.<span class="ident">gc</span>).<span class="ident">start</span>();
|
||||
<span class="kw">let</span> <span class="ident">cache</span> <span class="op">=</span> <span class="ident">HashCache</span>::<span class="ident">default</span>().<span class="ident">start</span>();
|
||||
<span class="kw">let</span> <span class="ident">pow</span> <span class="op">=</span> <span class="ident">PoWConfigBuilder</span>::<span class="ident">default</span>()
|
||||
.<span class="ident">salt</span>(<span class="ident">SETTINGS</span>.<span class="ident">pow</span>.<span class="ident">salt</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">build</span>()
|
||||
.<span class="ident">unwrap</span>();
|
||||
<span class="comment">// let master = Master::new(SETTINGS.pow.gc).start();</span>
|
||||
<span class="comment">// let cache = HashCache::default().start();</span>
|
||||
<span class="comment">// let pow = PoWConfigBuilder::default()</span>
|
||||
<span class="comment">// .salt(SETTINGS.pow.salt.clone())</span>
|
||||
<span class="comment">// .build()</span>
|
||||
<span class="comment">// .unwrap();</span>
|
||||
|
||||
<span class="kw">let</span> <span class="ident">captcha</span> <span class="op">=</span> <span class="ident">SystemBuilder</span>::<span class="ident">default</span>()
|
||||
.<span class="ident">master</span>(<span class="ident">master</span>)
|
||||
.<span class="ident">cache</span>(<span class="ident">cache</span>)
|
||||
.<span class="ident">pow</span>(<span class="ident">pow</span>)
|
||||
.<span class="ident">build</span>()
|
||||
.<span class="ident">unwrap</span>();
|
||||
<span class="comment">// let captcha = SystemBuilder::default()</span>
|
||||
<span class="comment">// .master(master)</span>
|
||||
<span class="comment">// .cache(cache)</span>
|
||||
<span class="comment">// .pow(pow)</span>
|
||||
<span class="comment">// .build()</span>
|
||||
<span class="comment">// .unwrap();</span>
|
||||
|
||||
<span class="ident">Data</span> { <span class="ident">creds</span>, <span class="ident">db</span>, <span class="ident">captcha</span> }
|
||||
<span class="ident">Data</span> { <span class="ident">creds</span>, <span class="ident">db</span> } <span class="comment">//captcha }</span>
|
||||
}
|
||||
}
|
||||
</pre></div>
|
||||
|
||||
@@ -220,6 +220,9 @@
|
||||
<span id="217">217</span>
|
||||
<span id="218">218</span>
|
||||
<span id="219">219</span>
|
||||
<span id="220">220</span>
|
||||
<span id="221">221</span>
|
||||
<span id="222">222</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -241,13 +244,14 @@
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">convert</span>::<span class="ident">From</span>;
|
||||
|
||||
<span class="kw">use</span> <span class="ident">actix_web</span>::{
|
||||
<span class="ident">client</span>::<span class="ident">SendRequestError</span>,
|
||||
<span class="ident">dev</span>::<span class="ident">HttpResponseBuilder</span>,
|
||||
<span class="ident">error</span>::<span class="ident">ResponseError</span>,
|
||||
<span class="ident">http</span>::{<span class="ident">header</span>, <span class="ident">StatusCode</span>},
|
||||
<span class="ident">HttpResponse</span>,
|
||||
};
|
||||
<span class="kw">use</span> <span class="ident">argon2_creds</span>::<span class="ident">errors</span>::<span class="ident">CredsError</span>;
|
||||
<span class="kw">use</span> <span class="ident">awc</span>::<span class="ident">error</span>::<span class="ident">SendRequestError</span>;
|
||||
<span class="comment">//use awc::error::SendRequestError;</span>
|
||||
<span class="kw">use</span> <span class="ident">derive_more</span>::{<span class="ident">Display</span>, <span class="ident">Error</span>};
|
||||
<span class="kw">use</span> <span class="ident">log</span>::<span class="ident">debug</span>;
|
||||
<span class="kw">use</span> <span class="ident">m_captcha</span>::<span class="ident">errors</span>::<span class="ident">CaptchaError</span>;
|
||||
@@ -301,6 +305,9 @@
|
||||
<span class="doccomment">/// when the a host name is already taken</span>
|
||||
<span class="attribute">#[<span class="ident">display</span>(<span class="ident">fmt</span> <span class="op">=</span> <span class="string">"host name not available"</span>)]</span>
|
||||
<span class="ident">HostnameTaken</span>,
|
||||
<span class="doccomment">/// token not found</span>
|
||||
<span class="attribute">#[<span class="ident">display</span>(<span class="ident">fmt</span> <span class="op">=</span> <span class="string">"Token not found. Is token registered?"</span>)]</span>
|
||||
<span class="ident">TokenNotFound</span>,
|
||||
|
||||
<span class="attribute">#[<span class="ident">display</span>(<span class="ident">fmt</span> <span class="op">=</span> <span class="string">"{}"</span>, <span class="ident">_0</span>)]</span>
|
||||
<span class="ident">CaptchaError</span>(<span class="ident">CaptchaError</span>),
|
||||
@@ -332,7 +339,6 @@
|
||||
|
||||
<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">status_code</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">StatusCode</span> {
|
||||
<span class="macro">println</span><span class="macro">!</span>(<span class="string">"{:?}"</span>, <span class="kw-2">&</span><span class="self">self</span>);
|
||||
<span class="kw">match</span> <span class="self">self</span> {
|
||||
<span class="ident">ServiceError</span>::<span class="ident">InternalServerError</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">INTERNAL_SERVER_ERROR</span>,
|
||||
<span class="ident">ServiceError</span>::<span class="ident">NotAnEmail</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">BAD_REQUEST</span>,
|
||||
@@ -347,6 +353,7 @@
|
||||
<span class="ident">ServiceError</span>::<span class="ident">UsernameCaseMappedError</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">BAD_REQUEST</span>,
|
||||
<span class="ident">ServiceError</span>::<span class="ident">UsernameTaken</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">BAD_REQUEST</span>,
|
||||
<span class="ident">ServiceError</span>::<span class="ident">TokenNameTaken</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">BAD_REQUEST</span>,
|
||||
<span class="ident">ServiceError</span>::<span class="ident">TokenNotFound</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">NOT_FOUND</span>,
|
||||
<span class="ident">ServiceError</span>::<span class="ident">HostnameTaken</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">BAD_REQUEST</span>,
|
||||
<span class="ident">ServiceError</span>::<span class="ident">ClientServerUnreachable</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">SERVICE_UNAVAILABLE</span>,
|
||||
<span class="ident">ServiceError</span>::<span class="ident">ChallengeCourruption</span> <span class="op">=</span><span class="op">></span> <span class="ident">StatusCode</span>::<span class="ident">BAD_REQUEST</span>,
|
||||
@@ -426,7 +433,6 @@
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">dup_error</span>(<span class="ident">e</span>: <span class="ident">sqlx</span>::<span class="ident">Error</span>, <span class="ident">dup_error</span>: <span class="ident">ServiceError</span>) <span class="op">-</span><span class="op">></span> <span class="ident">ServiceError</span> {
|
||||
<span class="kw">use</span> <span class="ident">sqlx</span>::<span class="ident">error</span>::<span class="ident">Error</span>;
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">borrow</span>::<span class="ident">Cow</span>;
|
||||
<span class="macro">println</span><span class="macro">!</span>(<span class="string">"database error: {:?}"</span>, <span class="kw-2">&</span><span class="ident">e</span>);
|
||||
<span class="kw">if</span> <span class="kw">let</span> <span class="ident">Error</span>::<span class="ident">Database</span>(<span class="ident">err</span>) <span class="op">=</span> <span class="ident">e</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="ident">dup_error</span>
|
||||
|
||||
@@ -103,6 +103,11 @@
|
||||
<span id="100">100</span>
|
||||
<span id="101">101</span>
|
||||
<span id="102">102</span>
|
||||
<span id="103">103</span>
|
||||
<span id="104">104</span>
|
||||
<span id="105">105</span>
|
||||
<span id="106">106</span>
|
||||
<span id="107">107</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="comment">/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
@@ -122,11 +127,13 @@
|
||||
*/</span>
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">env</span>;
|
||||
|
||||
<span class="kw">use</span> <span class="ident">actix_files</span>::<span class="ident">Files</span>;
|
||||
<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="ident">web</span>::<span class="ident">JsonConfig</span>, <span class="ident">App</span>,
|
||||
<span class="ident">HttpServer</span>,
|
||||
};
|
||||
<span class="comment">//use awc::Client;</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>;
|
||||
|
||||
@@ -135,6 +142,7 @@
|
||||
<span class="comment">//mod routes;</span>
|
||||
<span class="kw">mod</span> <span class="ident">api</span>;
|
||||
<span class="kw">mod</span> <span class="ident">settings</span>;
|
||||
<span class="comment">//mod templates;</span>
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>
|
||||
<span class="attribute">#[<span class="ident">macro_use</span>]</span>
|
||||
<span class="kw">mod</span> <span class="ident">tests</span>;
|
||||
@@ -165,20 +173,22 @@
|
||||
);
|
||||
|
||||
<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">configure</span>(<span class="ident">v1_services</span>)
|
||||
.<span class="ident">wrap</span>(<span class="ident">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">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">middleware</span>::<span class="ident">NormalizePath</span>::<span class="ident">default</span>())
|
||||
.<span class="ident">wrap</span>(<span class="ident">middleware</span>::<span class="ident">NormalizePath</span>::<span class="ident">new</span>(
|
||||
<span class="ident">middleware</span>::<span class="ident">normalize</span>::<span class="ident">TrailingSlash</span>::<span class="ident">Trim</span>,
|
||||
))
|
||||
.<span class="ident">app_data</span>(<span class="ident">get_json_err</span>())
|
||||
.<span class="ident">configure</span>(<span class="ident">v1_services</span>)
|
||||
.<span class="ident">service</span>(<span class="ident">Files</span>::<span class="ident">new</span>(<span class="string">"/"</span>, <span class="string">"./static"</span>))
|
||||
})
|
||||
.<span class="ident">bind</span>(<span class="ident">SETTINGS</span>.<span class="ident">server</span>.<span class="ident">get_ip</span>())
|
||||
.<span class="ident">unwrap</span>()
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Data</span> {
|
||||
<span class="kw">pub</span> <span class="ident">db</span>: <span class="ident">PgPool</span>,
|
||||
<span class="kw">pub</span> <span class="ident">creds</span>: <span class="ident">Config</span>,
|
||||
<span class="kw">pub</span> <span class="ident">captcha</span>: <span class="ident">System</span><span class="op"><</span><span class="ident">HashCache</span><span class="op">></span>,
|
||||
<span class="comment">// pub captcha: System<HashCache>,</span>
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">Data</span> {
|
||||
@@ -127,21 +127,21 @@
|
||||
.<span class="ident">build</span>()
|
||||
.<span class="ident">unwrap</span>();
|
||||
|
||||
<span class="kw">let</span> <span class="ident">master</span> <span class="op">=</span> <span class="ident">Master</span>::<span class="ident">new</span>(<span class="ident">SETTINGS</span>.<span class="ident">pow</span>.<span class="ident">gc</span>).<span class="ident">start</span>();
|
||||
<span class="kw">let</span> <span class="ident">cache</span> <span class="op">=</span> <span class="ident">HashCache</span>::<span class="ident">default</span>().<span class="ident">start</span>();
|
||||
<span class="kw">let</span> <span class="ident">pow</span> <span class="op">=</span> <span class="ident">PoWConfigBuilder</span>::<span class="ident">default</span>()
|
||||
.<span class="ident">salt</span>(<span class="ident">SETTINGS</span>.<span class="ident">pow</span>.<span class="ident">salt</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">build</span>()
|
||||
.<span class="ident">unwrap</span>();
|
||||
<span class="comment">// let master = Master::new(SETTINGS.pow.gc).start();</span>
|
||||
<span class="comment">// let cache = HashCache::default().start();</span>
|
||||
<span class="comment">// let pow = PoWConfigBuilder::default()</span>
|
||||
<span class="comment">// .salt(SETTINGS.pow.salt.clone())</span>
|
||||
<span class="comment">// .build()</span>
|
||||
<span class="comment">// .unwrap();</span>
|
||||
|
||||
<span class="kw">let</span> <span class="ident">captcha</span> <span class="op">=</span> <span class="ident">SystemBuilder</span>::<span class="ident">default</span>()
|
||||
.<span class="ident">master</span>(<span class="ident">master</span>)
|
||||
.<span class="ident">cache</span>(<span class="ident">cache</span>)
|
||||
.<span class="ident">pow</span>(<span class="ident">pow</span>)
|
||||
.<span class="ident">build</span>()
|
||||
.<span class="ident">unwrap</span>();
|
||||
<span class="comment">// let captcha = SystemBuilder::default()</span>
|
||||
<span class="comment">// .master(master)</span>
|
||||
<span class="comment">// .cache(cache)</span>
|
||||
<span class="comment">// .pow(pow)</span>
|
||||
<span class="comment">// .build()</span>
|
||||
<span class="comment">// .unwrap();</span>
|
||||
|
||||
<span class="ident">Data</span> { <span class="ident">creds</span>, <span class="ident">db</span>, <span class="ident">captcha</span> }
|
||||
<span class="ident">Data</span> { <span class="ident">creds</span>, <span class="ident">db</span> } <span class="comment">//captcha }</span>
|
||||
}
|
||||
}
|
||||
</pre></div>
|
||||
|
||||
Reference in New Issue
Block a user