Deploying to gh-pages from @ 54b14291ec 🚀

This commit is contained in:
realaravinth
2021-12-03 09:15:08 +00:00
parent 972b1e80cc
commit 485ff66259
81 changed files with 827 additions and 232 deletions

View File

@@ -337,6 +337,169 @@
<span id="337">337</span>
<span id="338">338</span>
<span id="339">339</span>
<span id="340">340</span>
<span id="341">341</span>
<span id="342">342</span>
<span id="343">343</span>
<span id="344">344</span>
<span id="345">345</span>
<span id="346">346</span>
<span id="347">347</span>
<span id="348">348</span>
<span id="349">349</span>
<span id="350">350</span>
<span id="351">351</span>
<span id="352">352</span>
<span id="353">353</span>
<span id="354">354</span>
<span id="355">355</span>
<span id="356">356</span>
<span id="357">357</span>
<span id="358">358</span>
<span id="359">359</span>
<span id="360">360</span>
<span id="361">361</span>
<span id="362">362</span>
<span id="363">363</span>
<span id="364">364</span>
<span id="365">365</span>
<span id="366">366</span>
<span id="367">367</span>
<span id="368">368</span>
<span id="369">369</span>
<span id="370">370</span>
<span id="371">371</span>
<span id="372">372</span>
<span id="373">373</span>
<span id="374">374</span>
<span id="375">375</span>
<span id="376">376</span>
<span id="377">377</span>
<span id="378">378</span>
<span id="379">379</span>
<span id="380">380</span>
<span id="381">381</span>
<span id="382">382</span>
<span id="383">383</span>
<span id="384">384</span>
<span id="385">385</span>
<span id="386">386</span>
<span id="387">387</span>
<span id="388">388</span>
<span id="389">389</span>
<span id="390">390</span>
<span id="391">391</span>
<span id="392">392</span>
<span id="393">393</span>
<span id="394">394</span>
<span id="395">395</span>
<span id="396">396</span>
<span id="397">397</span>
<span id="398">398</span>
<span id="399">399</span>
<span id="400">400</span>
<span id="401">401</span>
<span id="402">402</span>
<span id="403">403</span>
<span id="404">404</span>
<span id="405">405</span>
<span id="406">406</span>
<span id="407">407</span>
<span id="408">408</span>
<span id="409">409</span>
<span id="410">410</span>
<span id="411">411</span>
<span id="412">412</span>
<span id="413">413</span>
<span id="414">414</span>
<span id="415">415</span>
<span id="416">416</span>
<span id="417">417</span>
<span id="418">418</span>
<span id="419">419</span>
<span id="420">420</span>
<span id="421">421</span>
<span id="422">422</span>
<span id="423">423</span>
<span id="424">424</span>
<span id="425">425</span>
<span id="426">426</span>
<span id="427">427</span>
<span id="428">428</span>
<span id="429">429</span>
<span id="430">430</span>
<span id="431">431</span>
<span id="432">432</span>
<span id="433">433</span>
<span id="434">434</span>
<span id="435">435</span>
<span id="436">436</span>
<span id="437">437</span>
<span id="438">438</span>
<span id="439">439</span>
<span id="440">440</span>
<span id="441">441</span>
<span id="442">442</span>
<span id="443">443</span>
<span id="444">444</span>
<span id="445">445</span>
<span id="446">446</span>
<span id="447">447</span>
<span id="448">448</span>
<span id="449">449</span>
<span id="450">450</span>
<span id="451">451</span>
<span id="452">452</span>
<span id="453">453</span>
<span id="454">454</span>
<span id="455">455</span>
<span id="456">456</span>
<span id="457">457</span>
<span id="458">458</span>
<span id="459">459</span>
<span id="460">460</span>
<span id="461">461</span>
<span id="462">462</span>
<span id="463">463</span>
<span id="464">464</span>
<span id="465">465</span>
<span id="466">466</span>
<span id="467">467</span>
<span id="468">468</span>
<span id="469">469</span>
<span id="470">470</span>
<span id="471">471</span>
<span id="472">472</span>
<span id="473">473</span>
<span id="474">474</span>
<span id="475">475</span>
<span id="476">476</span>
<span id="477">477</span>
<span id="478">478</span>
<span id="479">479</span>
<span id="480">480</span>
<span id="481">481</span>
<span id="482">482</span>
<span id="483">483</span>
<span id="484">484</span>
<span id="485">485</span>
<span id="486">486</span>
<span id="487">487</span>
<span id="488">488</span>
<span id="489">489</span>
<span id="490">490</span>
<span id="491">491</span>
<span id="492">492</span>
<span id="493">493</span>
<span id="494">494</span>
<span id="495">495</span>
<span id="496">496</span>
<span id="497">497</span>
<span id="498">498</span>
<span id="499">499</span>
<span id="500">500</span>
<span id="501">501</span>
<span id="502">502</span>
</pre><pre class="rust"><code><span class="comment">/*
* Copyright (C) 2021 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
*
@@ -358,10 +521,13 @@
<span class="kw">use</span> <span class="ident">actix_identity::Identity</span>;
<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">libmcaptcha::master::messages</span>::{<span class="ident">RemoveCaptcha</span>, <span class="ident">RenameBuilder</span>};
<span class="kw">use</span> <span class="ident">libmcaptcha</span>::{<span class="ident">defense::Level</span>, <span class="ident">defense::LevelBuilder</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"><span class="kw">super</span>::get_random</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">super</span>::levels</span>::{<span class="ident">add_captcha_runner</span>, <span class="ident">AddLevels</span>};
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::errors</span>::<span class="kw-2">*</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::settings::DefaultDifficultyStrategy</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::stats::fetch</span>::{<span class="ident">Stats</span>, <span class="ident">StatsUnixTimestamp</span>};
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::AppData</span>;
@@ -370,6 +536,7 @@
<span class="kw">pub</span> <span class="ident">delete</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;static</span> <span class="ident">str</span>,
<span class="kw">pub</span> <span class="ident">update_key</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;static</span> <span class="ident">str</span>,
<span class="kw">pub</span> <span class="ident">stats</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;static</span> <span class="ident">str</span>,
<span class="kw">pub</span> <span class="ident">user_provided_traffic_pattern</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;static</span> <span class="ident">str</span>,
}
<span class="kw">impl</span> <span class="ident">MCaptcha</span> {
@@ -378,6 +545,8 @@
<span class="ident">update_key</span>: <span class="string">&quot;/api/v1/mcaptcha/update/key&quot;</span>,
<span class="ident">delete</span>: <span class="string">&quot;/api/v1/mcaptcha/delete&quot;</span>,
<span class="ident">stats</span>: <span class="string">&quot;/api/v1/mcaptcha/stats&quot;</span>,
<span class="ident">user_provided_traffic_pattern</span>:
<span class="string">&quot;/api/v1/mcaptcha/add/user-provided-traffic-pattern&quot;</span>,
}
}
}
@@ -387,6 +556,7 @@
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">update_token</span>);
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">delete_mcaptcha</span>);
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">get_stats</span>);
<span class="ident">cfg</span>.<span class="ident">service</span>(<span class="ident">from_user_provided_traffic_pattern</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>
@@ -400,58 +570,6 @@
<span class="kw">pub</span> <span class="ident">key</span>: <span class="ident">String</span>,
}
<span class="comment">// this should be called from within add levels</span>
<span class="attribute">#[<span class="ident">inline</span>]</span>
<span class="kw">pub</span> <span class="kw">async</span> <span class="kw">fn</span> <span class="ident">add_mcaptcha_util</span>(
<span class="ident">duration</span>: <span class="ident">u32</span>,
<span class="ident">description</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>,
<span class="ident">data</span>: <span class="kw-2">&amp;</span><span class="ident">AppData</span>,
<span class="ident">id</span>: <span class="kw-2">&amp;</span><span class="ident">Identity</span>,
) -&gt; <span class="ident">ServiceResult</span><span class="op">&lt;</span><span class="ident">MCaptchaDetails</span><span class="op">&gt;</span> {
<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">let</span> <span class="kw-2">mut</span> <span class="ident">key</span>;
<span class="kw">let</span> <span class="ident">resp</span>;
<span class="kw">loop</span> {
<span class="ident">key</span> <span class="op">=</span> <span class="ident">get_random</span>(<span class="number">32</span>);
<span class="kw">let</span> <span class="ident">res</span> <span class="op">=</span> <span class="macro">sqlx::query!</span>(
<span class="string">&quot;INSERT INTO mcaptcha_config
(key, user_id, duration, name)
VALUES ($1, (SELECT ID FROM mcaptcha_users WHERE name = $2), $3, $4)&quot;</span>,
<span class="kw-2">&amp;</span><span class="ident">key</span>,
<span class="kw-2">&amp;</span><span class="ident">username</span>,
<span class="ident">duration</span> <span class="kw">as</span> <span class="ident">i32</span>,
<span class="ident">description</span>,
)
.<span class="ident">execute</span>(<span class="kw-2">&amp;</span><span class="ident">data</span>.<span class="ident">db</span>)
.<span class="kw">await</span>;
<span class="kw">match</span> <span class="ident">res</span> {
<span class="prelude-val">Err</span>(<span class="ident">sqlx::Error::Database</span>(<span class="ident">err</span>)) =&gt; {
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">==</span> <span class="prelude-val">Some</span>(<span class="ident">Cow::from</span>(<span class="string">&quot;23505&quot;</span>))
<span class="op">&amp;&amp;</span> <span class="ident">err</span>.<span class="ident">message</span>().<span class="ident">contains</span>(<span class="string">&quot;mcaptcha_config_key_key&quot;</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::Error::Database</span>(<span class="ident">err</span>).<span class="ident">into</span>());
}
}
<span class="prelude-val">Err</span>(<span class="ident">e</span>) =&gt; <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>) =&gt; {
<span class="ident">resp</span> <span class="op">=</span> <span class="ident">MCaptchaDetails</span> {
<span class="ident">key</span>,
<span class="ident">name</span>: <span class="ident">description</span>.<span class="ident">to_owned</span>(),
};
<span class="kw">break</span>;
}
}
}
<span class="prelude-val">Ok</span>(<span class="ident">resp</span>)
}
<span class="attribute">#[<span class="ident">my_codegen::post</span>(
<span class="ident">path</span> <span class="op">=</span> <span class="string">&quot;crate::V1_API_ROUTES.mcaptcha.update_key&quot;</span>,
<span class="ident">wrap</span> <span class="op">=</span> <span class="string">&quot;crate::CheckLogin&quot;</span>
@@ -604,14 +722,102 @@
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse::Ok</span>().<span class="ident">json</span>(<span class="kw-2">&amp;</span><span class="ident">stats</span>))
}
<span class="comment">// Workflow:</span>
<span class="comment">// 1. Sign up</span>
<span class="comment">// 2. Sign in</span>
<span class="comment">// 3. Add domain(DNS TXT record verification? / put string at path)</span>
<span class="comment">// 4. Create token</span>
<span class="comment">// 5. Add levels</span>
<span class="comment">// 6. Update duration</span>
<span class="comment">// 7. Start syatem</span>
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Serialize</span>, <span class="ident">Deserialize</span>, <span class="ident">Clone</span>, <span class="ident">Debug</span>)]</span>
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">UserProvidedTrafficPattern</span> {
<span class="kw">pub</span> <span class="ident">avg_traffic</span>: <span class="ident">u32</span>,
<span class="kw">pub</span> <span class="ident">peak_sustainable_traffic</span>: <span class="ident">u32</span>,
<span class="kw">pub</span> <span class="ident">broke_my_site_traffic</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">u32</span><span class="op">&gt;</span>,
<span class="kw">pub</span> <span class="ident">description</span>: <span class="ident">String</span>,
}
<span class="kw">impl</span> <span class="ident">UserProvidedTrafficPattern</span> {
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">calculate</span>(
<span class="kw-2">&amp;</span><span class="self">self</span>,
<span class="ident">strategy</span>: <span class="kw-2">&amp;</span><span class="ident">DefaultDifficultyStrategy</span>,
) -&gt; <span class="ident">ServiceResult</span><span class="op">&lt;</span><span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Level</span><span class="op">&gt;</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">levels</span> <span class="op">=</span> <span class="macro">vec!</span>[
<span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">avg_traffic_difficulty</span>)<span class="question-mark">?</span>
.<span class="ident">visitor_threshold</span>(<span class="self">self</span>.<span class="ident">avg_traffic</span>)
.<span class="ident">build</span>()<span class="question-mark">?</span>,
<span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">peak_sustainable_traffic_difficulty</span>)<span class="question-mark">?</span>
.<span class="ident">visitor_threshold</span>(<span class="self">self</span>.<span class="ident">peak_sustainable_traffic</span>)
.<span class="ident">build</span>()<span class="question-mark">?</span>,
];
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">highest_level</span> <span class="op">=</span> <span class="ident">LevelBuilder::default</span>();
<span class="ident">highest_level</span>.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">broke_my_site_traffic_difficulty</span>)<span class="question-mark">?</span>;
<span class="kw">match</span> <span class="self">self</span>.<span class="ident">broke_my_site_traffic</span> {
<span class="prelude-val">Some</span>(<span class="ident">broke_my_site_traffic</span>) =&gt; {
<span class="ident">highest_level</span>.<span class="ident">visitor_threshold</span>(<span class="ident">broke_my_site_traffic</span>)
}
<span class="prelude-val">None</span> =&gt; <span class="kw">match</span> <span class="self">self</span>
.<span class="ident">peak_sustainable_traffic</span>
.<span class="ident">checked_add</span>(<span class="self">self</span>.<span class="ident">peak_sustainable_traffic</span> <span class="op">/</span> <span class="number">2</span>)
{
<span class="prelude-val">Some</span>(<span class="ident">num</span>) =&gt; <span class="ident">highest_level</span>.<span class="ident">visitor_threshold</span>(<span class="ident">num</span>),
<span class="comment">// TODO check for overflow: database saves these values as i32, so this u32 is cast</span>
<span class="comment">// into i32. Should choose bigger number or casts properly</span>
<span class="prelude-val">None</span> =&gt; <span class="ident">highest_level</span>.<span class="ident">visitor_threshold</span>(<span class="ident">u32::MAX</span>),
},
};
<span class="ident">levels</span>.<span class="ident">push</span>(<span class="ident">highest_level</span>.<span class="ident">build</span>()<span class="question-mark">?</span>);
<span class="prelude-val">Ok</span>(<span class="ident">levels</span>)
}
}
<span class="attribute">#[<span class="ident">my_codegen::post</span>(
<span class="ident">path</span> <span class="op">=</span> <span class="string">&quot;crate::V1_API_ROUTES.mcaptcha.user_provided_traffic_pattern&quot;</span>,
<span class="ident">wrap</span> <span class="op">=</span> <span class="string">&quot;crate::CheckLogin&quot;</span>
)]</span>
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">from_user_provided_traffic_pattern</span>(
<span class="ident">payload</span>: <span class="ident">web::Json</span><span class="op">&lt;</span><span class="ident">UserProvidedTrafficPattern</span><span class="op">&gt;</span>,
<span class="ident">data</span>: <span class="ident">AppData</span>,
<span class="ident">id</span>: <span class="ident">Identity</span>,
) -&gt; <span class="ident">ServiceResult</span><span class="op">&lt;</span><span class="kw">impl</span> <span class="ident">Responder</span><span class="op">&gt;</span> {
<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">let</span> <span class="ident">payload</span> <span class="op">=</span> <span class="ident">payload</span>.<span class="ident">into_inner</span>();
<span class="kw">let</span> <span class="ident">levels</span> <span class="op">=</span>
<span class="ident">payload</span>.<span class="ident">calculate</span>(<span class="kw-2">&amp;</span><span class="ident"><span class="kw">crate</span>::SETTINGS</span>.<span class="ident">captcha</span>.<span class="ident">default_difficulty_strategy</span>)<span class="question-mark">?</span>;
<span class="kw">let</span> <span class="ident">msg</span> <span class="op">=</span> <span class="ident">AddLevels</span> {
<span class="ident">levels</span>,
<span class="ident">duration</span>: <span class="ident"><span class="kw">crate</span>::SETTINGS</span>.<span class="ident">captcha</span>.<span class="ident">default_difficulty_strategy</span>.<span class="ident">duration</span>,
<span class="ident">description</span>: <span class="ident">payload</span>.<span class="ident">description</span>,
};
<span class="kw">let</span> <span class="ident">broke_my_site_traffic</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">payload</span>.<span class="ident">broke_my_site_traffic</span> {
<span class="prelude-val">Some</span>(<span class="ident">n</span>) =&gt; <span class="prelude-val">Some</span>(<span class="ident">n</span> <span class="kw">as</span> <span class="ident">i32</span>),
<span class="prelude-val">None</span> =&gt; <span class="prelude-val">None</span>,
};
<span class="kw">let</span> <span class="ident">mcaptcha_config</span> <span class="op">=</span> <span class="ident">add_captcha_runner</span>(<span class="kw-2">&amp;</span><span class="ident">msg</span>, <span class="kw-2">&amp;</span><span class="ident">data</span>, <span class="kw-2">&amp;</span><span class="ident">username</span>).<span class="kw">await</span><span class="question-mark">?</span>;
<span class="macro">sqlx::query!</span>(
<span class="string">&quot;INSERT INTO mcaptcha_sitekey_user_provided_avg_traffic (
config_id,
avg_traffic,
peak_sustainable_traffic,
broke_my_site_traffic
) VALUES (
(SELECT config_id FROM mcaptcha_config
WHERE
key = ($1)
AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = $2)
), $3, $4, $5)&quot;</span>,
<span class="comment">//payload.avg_traffic,</span>
<span class="kw-2">&amp;</span><span class="ident">mcaptcha_config</span>.<span class="ident">key</span>,
<span class="kw-2">&amp;</span><span class="ident">username</span>,
<span class="ident">payload</span>.<span class="ident">avg_traffic</span> <span class="kw">as</span> <span class="ident">i32</span>,
<span class="ident">payload</span>.<span class="ident">peak_sustainable_traffic</span> <span class="kw">as</span> <span class="ident">i32</span>,
<span class="ident">broke_my_site_traffic</span>,
)
.<span class="ident">execute</span>(<span class="kw-2">&amp;</span><span class="ident">data</span>.<span class="ident">db</span>)
.<span class="kw">await</span><span class="question-mark">?</span>;
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse::Ok</span>().<span class="ident">json</span>(<span class="ident">mcaptcha_config</span>))
}
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>
<span class="kw">mod</span> <span class="ident">tests</span> {
@@ -675,6 +881,126 @@
<span class="comment">// if updated key doesn&#39;t exist in databse, a non 200 result will bereturned</span>
<span class="macro">assert_eq!</span>(<span class="ident">get_statis_resp</span>.<span class="ident">status</span>(), <span class="ident">StatusCode::OK</span>);
}
<span class="attribute">#[<span class="ident">actix_rt::test</span>]</span>
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">user_provided_traffic_pattern_calculate_works</span>() {
<span class="kw">const</span> <span class="ident">NAME</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;defaultuserconfgworks&quot;</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">payload</span> <span class="op">=</span> <span class="ident">UserProvidedTrafficPattern</span> {
<span class="ident">avg_traffic</span>: <span class="number">100_000</span>,
<span class="ident">peak_sustainable_traffic</span>: <span class="number">1_000_000</span>,
<span class="ident">broke_my_site_traffic</span>: <span class="prelude-val">Some</span>(<span class="number">10_000_000</span>),
<span class="ident">description</span>: <span class="ident">NAME</span>.<span class="ident">into</span>(),
};
<span class="kw">let</span> <span class="ident">strategy</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident"><span class="kw">crate</span>::SETTINGS</span>.<span class="ident">captcha</span>.<span class="ident">default_difficulty_strategy</span>;
<span class="kw">let</span> <span class="ident">l1</span> <span class="op">=</span> <span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">avg_traffic_difficulty</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">visitor_threshold</span>(<span class="ident">payload</span>.<span class="ident">avg_traffic</span>)
.<span class="ident">build</span>()
.<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">l2</span> <span class="op">=</span> <span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">peak_sustainable_traffic_difficulty</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">visitor_threshold</span>(<span class="ident">payload</span>.<span class="ident">peak_sustainable_traffic</span>)
.<span class="ident">build</span>()
.<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">l3</span> <span class="op">=</span> <span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">broke_my_site_traffic_difficulty</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">visitor_threshold</span>(<span class="ident">payload</span>.<span class="ident">broke_my_site_traffic</span>.<span class="ident">unwrap</span>())
.<span class="ident">build</span>()
.<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">levels</span> <span class="op">=</span> <span class="macro">vec!</span>[<span class="ident">l1</span>, <span class="ident">l2</span>, <span class="ident">l3</span>];
<span class="macro">assert_eq!</span>(<span class="ident">payload</span>.<span class="ident">calculate</span>(<span class="ident">strategy</span>).<span class="ident">unwrap</span>(), <span class="ident">levels</span>);
<span class="kw">let</span> <span class="ident">estimated_lmax</span> <span class="op">=</span> <span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">broke_my_site_traffic_difficulty</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">visitor_threshold</span>(<span class="number">1500000</span>)
.<span class="ident">build</span>()
.<span class="ident">unwrap</span>();
<span class="ident">payload</span>.<span class="ident">broke_my_site_traffic</span> <span class="op">=</span> <span class="prelude-val">None</span>;
<span class="macro">assert_eq!</span>(
<span class="ident">payload</span>.<span class="ident">calculate</span>(<span class="ident">strategy</span>).<span class="ident">unwrap</span>(),
<span class="macro">vec!</span>[<span class="ident">l1</span>, <span class="ident">l2</span>, <span class="ident">estimated_lmax</span>]
);
<span class="kw">let</span> <span class="ident">lmax</span> <span class="op">=</span> <span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">broke_my_site_traffic_difficulty</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">visitor_threshold</span>(<span class="ident">u32::MAX</span>)
.<span class="ident">build</span>()
.<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">very_large_l2_peak_traffic</span> <span class="op">=</span> <span class="ident">u32::MAX</span> <span class="op">-</span> <span class="number">1</span>;
<span class="kw">let</span> <span class="ident">very_large_l2</span> <span class="op">=</span> <span class="ident">LevelBuilder::default</span>()
.<span class="ident">difficulty_factor</span>(<span class="ident">strategy</span>.<span class="ident">peak_sustainable_traffic_difficulty</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">visitor_threshold</span>(<span class="ident">very_large_l2_peak_traffic</span>)
.<span class="ident">build</span>()
.<span class="ident">unwrap</span>();
<span class="comment">// payload.broke_my_site_traffic = Some(very_large_l2_peak_traffic);</span>
<span class="ident">payload</span>.<span class="ident">peak_sustainable_traffic</span> <span class="op">=</span> <span class="ident">very_large_l2_peak_traffic</span>;
<span class="macro">assert_eq!</span>(
<span class="ident">payload</span>.<span class="ident">calculate</span>(<span class="ident">strategy</span>).<span class="ident">unwrap</span>(),
<span class="macro">vec!</span>[<span class="ident">l1</span>, <span class="ident">very_large_l2</span>, <span class="ident">lmax</span>]
);
}
<span class="attribute">#[<span class="ident">actix_rt::test</span>]</span>
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">from_user_provided_traffic_pattern_works</span>() {
<span class="kw">const</span> <span class="ident">NAME</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;defaultuserconfgworks&quot;</span>;
<span class="kw">const</span> <span class="ident">PASSWORD</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;longpassworddomain&quot;</span>;
<span class="kw">const</span> <span class="ident">EMAIL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;defaultuserconfgworks@a.com&quot;</span>;
{
<span class="kw">let</span> <span class="ident">data</span> <span class="op">=</span> <span class="ident">Data::new</span>().<span class="kw">await</span>;
<span class="ident">delete_user</span>(<span class="ident">NAME</span>, <span class="kw-2">&amp;</span><span class="ident">data</span>).<span class="kw">await</span>;
}
<span class="kw">let</span> (<span class="ident">data</span>, <span class="ident">_creds</span>, <span class="ident">signin_resp</span>) <span class="op">=</span>
<span class="ident">register_and_signin</span>(<span class="ident">NAME</span>, <span class="ident">EMAIL</span>, <span class="ident">PASSWORD</span>).<span class="kw">await</span>;
<span class="kw">let</span> <span class="ident">cookies</span> <span class="op">=</span> <span class="macro">get_cookie!</span>(<span class="ident">signin_resp</span>);
<span class="kw">let</span> <span class="ident">app</span> <span class="op">=</span> <span class="macro">get_app!</span>(<span class="ident">data</span>).<span class="kw">await</span>;
<span class="kw">let</span> <span class="ident">payload</span> <span class="op">=</span> <span class="ident">UserProvidedTrafficPattern</span> {
<span class="ident">avg_traffic</span>: <span class="number">100_000</span>,
<span class="ident">peak_sustainable_traffic</span>: <span class="number">1_000_000</span>,
<span class="ident">broke_my_site_traffic</span>: <span class="prelude-val">Some</span>(<span class="number">10_000_000</span>),
<span class="ident">description</span>: <span class="ident">NAME</span>.<span class="ident">into</span>(),
};
<span class="kw">let</span> <span class="ident">default_levels</span> <span class="op">=</span> <span class="ident">payload</span>
.<span class="ident">calculate</span>(<span class="kw-2">&amp;</span><span class="ident"><span class="kw">crate</span>::SETTINGS</span>.<span class="ident">captcha</span>.<span class="ident">default_difficulty_strategy</span>)
.<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">add_token_resp</span> <span class="op">=</span> <span class="ident">test::call_service</span>(
<span class="kw-2">&amp;</span><span class="ident">app</span>,
<span class="macro">post_request!</span>(<span class="kw-2">&amp;</span><span class="ident">payload</span>, <span class="ident">ROUTES</span>.<span class="ident">mcaptcha</span>.<span class="ident">user_provided_traffic_pattern</span>)
.<span class="ident">cookie</span>(<span class="ident">cookies</span>.<span class="ident">clone</span>())
.<span class="ident">to_request</span>(),
)
.<span class="kw">await</span>;
<span class="macro">assert_eq!</span>(<span class="ident">add_token_resp</span>.<span class="ident">status</span>(), <span class="ident">StatusCode::OK</span>);
<span class="kw">let</span> <span class="ident">token_key</span>: <span class="ident">MCaptchaDetails</span> <span class="op">=</span> <span class="ident">test::read_body_json</span>(<span class="ident">add_token_resp</span>).<span class="kw">await</span>;
<span class="kw">let</span> <span class="ident">get_level_resp</span> <span class="op">=</span> <span class="ident">test::call_service</span>(
<span class="kw-2">&amp;</span><span class="ident">app</span>,
<span class="macro">post_request!</span>(<span class="kw-2">&amp;</span><span class="ident">token_key</span>, <span class="ident">ROUTES</span>.<span class="ident">levels</span>.<span class="ident">get</span>)
.<span class="ident">cookie</span>(<span class="ident">cookies</span>.<span class="ident">clone</span>())
.<span class="ident">to_request</span>(),
)
.<span class="kw">await</span>;
<span class="macro">assert_eq!</span>(<span class="ident">get_level_resp</span>.<span class="ident">status</span>(), <span class="ident">StatusCode::OK</span>);
<span class="kw">let</span> <span class="ident">res_levels</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Level</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">test::read_body_json</span>(<span class="ident">get_level_resp</span>).<span class="kw">await</span>;
<span class="macro">assert_eq!</span>(<span class="ident">res_levels</span>, <span class="ident">default_levels</span>);
}
}
</code></pre></div>
</section><section id="search" class="content hidden"></section><div id="rustdoc-vars" data-root-path="../../../../../" data-current-crate="mcaptcha" data-search-index-js="../../../../../search-index.js" data-search-js="../../../../../search.js"></div>

View File

@@ -356,6 +356,59 @@
<span id="356">356</span>
<span id="357">357</span>
<span id="358">358</span>
<span id="359">359</span>
<span id="360">360</span>
<span id="361">361</span>
<span id="362">362</span>
<span id="363">363</span>
<span id="364">364</span>
<span id="365">365</span>
<span id="366">366</span>
<span id="367">367</span>
<span id="368">368</span>
<span id="369">369</span>
<span id="370">370</span>
<span id="371">371</span>
<span id="372">372</span>
<span id="373">373</span>
<span id="374">374</span>
<span id="375">375</span>
<span id="376">376</span>
<span id="377">377</span>
<span id="378">378</span>
<span id="379">379</span>
<span id="380">380</span>
<span id="381">381</span>
<span id="382">382</span>
<span id="383">383</span>
<span id="384">384</span>
<span id="385">385</span>
<span id="386">386</span>
<span id="387">387</span>
<span id="388">388</span>
<span id="389">389</span>
<span id="390">390</span>
<span id="391">391</span>
<span id="392">392</span>
<span id="393">393</span>
<span id="394">394</span>
<span id="395">395</span>
<span id="396">396</span>
<span id="397">397</span>
<span id="398">398</span>
<span id="399">399</span>
<span id="400">400</span>
<span id="401">401</span>
<span id="402">402</span>
<span id="403">403</span>
<span id="404">404</span>
<span id="405">405</span>
<span id="406">406</span>
<span id="407">407</span>
<span id="408">408</span>
<span id="409">409</span>
<span id="410">410</span>
<span id="411">411</span>
</pre><pre class="rust"><code><span class="comment">/*
* Copyright (C) 2021 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
*
@@ -372,6 +425,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see &lt;https://www.gnu.org/licenses/&gt;.
*/</span>
<span class="kw">use</span> <span class="ident">std::borrow::Cow</span>;
<span class="kw">use</span> <span class="ident">actix_identity::Identity</span>;
<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">futures::future::try_join_all</span>;
@@ -379,8 +434,8 @@
<span class="kw">use</span> <span class="ident">log::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="ident"><span class="kw">super</span>::captcha::add_mcaptcha_util</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">super</span>::captcha::MCaptchaDetails</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">super</span>::get_random</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::errors</span>::<span class="kw-2">*</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::AppData</span>;
@@ -423,9 +478,17 @@
<span class="ident">data</span>: <span class="ident">AppData</span>,
<span class="ident">id</span>: <span class="ident">Identity</span>,
) -&gt; <span class="ident">ServiceResult</span><span class="op">&lt;</span><span class="kw">impl</span> <span class="ident">Responder</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">defense</span> <span class="op">=</span> <span class="ident">DefenseBuilder::default</span>();
<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">let</span> <span class="ident">mcaptcha_config</span> <span class="op">=</span> <span class="ident">add_captcha_runner</span>(<span class="kw-2">&amp;</span><span class="ident">payload</span>, <span class="kw-2">&amp;</span><span class="ident">data</span>, <span class="kw-2">&amp;</span><span class="ident">username</span>).<span class="kw">await</span><span class="question-mark">?</span>;
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse::Ok</span>().<span class="ident">json</span>(<span class="ident">mcaptcha_config</span>))
}
<span class="kw">pub</span> <span class="kw">async</span> <span class="kw">fn</span> <span class="ident">add_captcha_runner</span>(
<span class="ident">payload</span>: <span class="kw-2">&amp;</span><span class="ident">AddLevels</span>,
<span class="ident">data</span>: <span class="kw-2">&amp;</span><span class="ident">AppData</span>,
<span class="ident">username</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>,
) -&gt; <span class="ident">ServiceResult</span><span class="op">&lt;</span><span class="ident">MCaptchaDetails</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">defense</span> <span class="op">=</span> <span class="ident">DefenseBuilder::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="kw-2">*</span><span class="ident">level</span>)<span class="question-mark">?</span>;
}
@@ -434,7 +497,51 @@
<span class="macro">debug!</span>(<span class="string">&quot;creating config&quot;</span>);
<span class="kw">let</span> <span class="ident">mcaptcha_config</span> <span class="op">=</span>
<span class="ident">add_mcaptcha_util</span>(<span class="ident">payload</span>.<span class="ident">duration</span>, <span class="kw-2">&amp;</span><span class="ident">payload</span>.<span class="ident">description</span>, <span class="kw-2">&amp;</span><span class="ident">data</span>, <span class="kw-2">&amp;</span><span class="ident">id</span>).<span class="kw">await</span><span class="question-mark">?</span>;
<span class="comment">// add_mcaptcha_util(payload.duration, &amp;payload.description, &amp;data, username).await?;</span>
{
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">key</span>;
<span class="kw">let</span> <span class="ident">resp</span>;
<span class="kw">loop</span> {
<span class="ident">key</span> <span class="op">=</span> <span class="ident">get_random</span>(<span class="number">32</span>);
<span class="kw">let</span> <span class="ident">res</span> <span class="op">=</span> <span class="macro">sqlx::query!</span>(
<span class="string">&quot;INSERT INTO mcaptcha_config
(key, user_id, duration, name)
VALUES ($1, (SELECT ID FROM mcaptcha_users WHERE name = $2), $3, $4)&quot;</span>,
<span class="kw-2">&amp;</span><span class="ident">key</span>,
<span class="kw-2">&amp;</span><span class="ident">username</span>,
<span class="ident">payload</span>.<span class="ident">duration</span> <span class="kw">as</span> <span class="ident">i32</span>,
<span class="kw-2">&amp;</span><span class="ident">payload</span>.<span class="ident">description</span>,
)
.<span class="ident">execute</span>(<span class="kw-2">&amp;</span><span class="ident">data</span>.<span class="ident">db</span>)
.<span class="kw">await</span>;
<span class="kw">match</span> <span class="ident">res</span> {
<span class="prelude-val">Err</span>(<span class="ident">sqlx::Error::Database</span>(<span class="ident">err</span>)) =&gt; {
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">code</span>() <span class="op">==</span> <span class="prelude-val">Some</span>(<span class="ident">Cow::from</span>(<span class="string">&quot;23505&quot;</span>))
<span class="op">&amp;&amp;</span> <span class="ident">err</span>.<span class="ident">message</span>().<span class="ident">contains</span>(<span class="string">&quot;mcaptcha_config_key_key&quot;</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::Error::Database</span>(<span class="ident">err</span>).<span class="ident">into</span>());
}
}
<span class="prelude-val">Err</span>(<span class="ident">e</span>) =&gt; <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>) =&gt; {
<span class="ident">resp</span> <span class="op">=</span> <span class="ident">MCaptchaDetails</span> {
<span class="ident">key</span>,
<span class="ident">name</span>: <span class="ident">payload</span>.<span class="ident">description</span>.<span class="ident">to_owned</span>(),
};
<span class="kw">break</span>;
}
}
}
<span class="ident">resp</span>
};
<span class="macro">debug!</span>(<span class="string">&quot;config created&quot;</span>);
@@ -463,8 +570,7 @@
}
<span class="ident">try_join_all</span>(<span class="ident">futs</span>).<span class="kw">await</span><span class="question-mark">?</span>;
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse::Ok</span>().<span class="ident">json</span>(<span class="ident">mcaptcha_config</span>))
<span class="prelude-val">Ok</span>(<span class="ident">mcaptcha_config</span>)
}
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Serialize</span>, <span class="ident">Deserialize</span>)]</span>