|
|
|
|
@@ -154,6 +154,175 @@
|
|
|
|
|
<span id="151">151</span>
|
|
|
|
|
<span id="152">152</span>
|
|
|
|
|
<span id="153">153</span>
|
|
|
|
|
<span id="154">154</span>
|
|
|
|
|
<span id="155">155</span>
|
|
|
|
|
<span id="156">156</span>
|
|
|
|
|
<span id="157">157</span>
|
|
|
|
|
<span id="158">158</span>
|
|
|
|
|
<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>
|
|
|
|
|
<span id="166">166</span>
|
|
|
|
|
<span id="167">167</span>
|
|
|
|
|
<span id="168">168</span>
|
|
|
|
|
<span id="169">169</span>
|
|
|
|
|
<span id="170">170</span>
|
|
|
|
|
<span id="171">171</span>
|
|
|
|
|
<span id="172">172</span>
|
|
|
|
|
<span id="173">173</span>
|
|
|
|
|
<span id="174">174</span>
|
|
|
|
|
<span id="175">175</span>
|
|
|
|
|
<span id="176">176</span>
|
|
|
|
|
<span id="177">177</span>
|
|
|
|
|
<span id="178">178</span>
|
|
|
|
|
<span id="179">179</span>
|
|
|
|
|
<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>
|
|
|
|
|
<span id="192">192</span>
|
|
|
|
|
<span id="193">193</span>
|
|
|
|
|
<span id="194">194</span>
|
|
|
|
|
<span id="195">195</span>
|
|
|
|
|
<span id="196">196</span>
|
|
|
|
|
<span id="197">197</span>
|
|
|
|
|
<span id="198">198</span>
|
|
|
|
|
<span id="199">199</span>
|
|
|
|
|
<span id="200">200</span>
|
|
|
|
|
<span id="201">201</span>
|
|
|
|
|
<span id="202">202</span>
|
|
|
|
|
<span id="203">203</span>
|
|
|
|
|
<span id="204">204</span>
|
|
|
|
|
<span id="205">205</span>
|
|
|
|
|
<span id="206">206</span>
|
|
|
|
|
<span id="207">207</span>
|
|
|
|
|
<span id="208">208</span>
|
|
|
|
|
<span id="209">209</span>
|
|
|
|
|
<span id="210">210</span>
|
|
|
|
|
<span id="211">211</span>
|
|
|
|
|
<span id="212">212</span>
|
|
|
|
|
<span id="213">213</span>
|
|
|
|
|
<span id="214">214</span>
|
|
|
|
|
<span id="215">215</span>
|
|
|
|
|
<span id="216">216</span>
|
|
|
|
|
<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>
|
|
|
|
|
<span id="223">223</span>
|
|
|
|
|
<span id="224">224</span>
|
|
|
|
|
<span id="225">225</span>
|
|
|
|
|
<span id="226">226</span>
|
|
|
|
|
<span id="227">227</span>
|
|
|
|
|
<span id="228">228</span>
|
|
|
|
|
<span id="229">229</span>
|
|
|
|
|
<span id="230">230</span>
|
|
|
|
|
<span id="231">231</span>
|
|
|
|
|
<span id="232">232</span>
|
|
|
|
|
<span id="233">233</span>
|
|
|
|
|
<span id="234">234</span>
|
|
|
|
|
<span id="235">235</span>
|
|
|
|
|
<span id="236">236</span>
|
|
|
|
|
<span id="237">237</span>
|
|
|
|
|
<span id="238">238</span>
|
|
|
|
|
<span id="239">239</span>
|
|
|
|
|
<span id="240">240</span>
|
|
|
|
|
<span id="241">241</span>
|
|
|
|
|
<span id="242">242</span>
|
|
|
|
|
<span id="243">243</span>
|
|
|
|
|
<span id="244">244</span>
|
|
|
|
|
<span id="245">245</span>
|
|
|
|
|
<span id="246">246</span>
|
|
|
|
|
<span id="247">247</span>
|
|
|
|
|
<span id="248">248</span>
|
|
|
|
|
<span id="249">249</span>
|
|
|
|
|
<span id="250">250</span>
|
|
|
|
|
<span id="251">251</span>
|
|
|
|
|
<span id="252">252</span>
|
|
|
|
|
<span id="253">253</span>
|
|
|
|
|
<span id="254">254</span>
|
|
|
|
|
<span id="255">255</span>
|
|
|
|
|
<span id="256">256</span>
|
|
|
|
|
<span id="257">257</span>
|
|
|
|
|
<span id="258">258</span>
|
|
|
|
|
<span id="259">259</span>
|
|
|
|
|
<span id="260">260</span>
|
|
|
|
|
<span id="261">261</span>
|
|
|
|
|
<span id="262">262</span>
|
|
|
|
|
<span id="263">263</span>
|
|
|
|
|
<span id="264">264</span>
|
|
|
|
|
<span id="265">265</span>
|
|
|
|
|
<span id="266">266</span>
|
|
|
|
|
<span id="267">267</span>
|
|
|
|
|
<span id="268">268</span>
|
|
|
|
|
<span id="269">269</span>
|
|
|
|
|
<span id="270">270</span>
|
|
|
|
|
<span id="271">271</span>
|
|
|
|
|
<span id="272">272</span>
|
|
|
|
|
<span id="273">273</span>
|
|
|
|
|
<span id="274">274</span>
|
|
|
|
|
<span id="275">275</span>
|
|
|
|
|
<span id="276">276</span>
|
|
|
|
|
<span id="277">277</span>
|
|
|
|
|
<span id="278">278</span>
|
|
|
|
|
<span id="279">279</span>
|
|
|
|
|
<span id="280">280</span>
|
|
|
|
|
<span id="281">281</span>
|
|
|
|
|
<span id="282">282</span>
|
|
|
|
|
<span id="283">283</span>
|
|
|
|
|
<span id="284">284</span>
|
|
|
|
|
<span id="285">285</span>
|
|
|
|
|
<span id="286">286</span>
|
|
|
|
|
<span id="287">287</span>
|
|
|
|
|
<span id="288">288</span>
|
|
|
|
|
<span id="289">289</span>
|
|
|
|
|
<span id="290">290</span>
|
|
|
|
|
<span id="291">291</span>
|
|
|
|
|
<span id="292">292</span>
|
|
|
|
|
<span id="293">293</span>
|
|
|
|
|
<span id="294">294</span>
|
|
|
|
|
<span id="295">295</span>
|
|
|
|
|
<span id="296">296</span>
|
|
|
|
|
<span id="297">297</span>
|
|
|
|
|
<span id="298">298</span>
|
|
|
|
|
<span id="299">299</span>
|
|
|
|
|
<span id="300">300</span>
|
|
|
|
|
<span id="301">301</span>
|
|
|
|
|
<span id="302">302</span>
|
|
|
|
|
<span id="303">303</span>
|
|
|
|
|
<span id="304">304</span>
|
|
|
|
|
<span id="305">305</span>
|
|
|
|
|
<span id="306">306</span>
|
|
|
|
|
<span id="307">307</span>
|
|
|
|
|
<span id="308">308</span>
|
|
|
|
|
<span id="309">309</span>
|
|
|
|
|
<span id="310">310</span>
|
|
|
|
|
<span id="311">311</span>
|
|
|
|
|
<span id="312">312</span>
|
|
|
|
|
<span id="313">313</span>
|
|
|
|
|
<span id="314">314</span>
|
|
|
|
|
<span id="315">315</span>
|
|
|
|
|
<span id="316">316</span>
|
|
|
|
|
<span id="317">317</span>
|
|
|
|
|
<span id="318">318</span>
|
|
|
|
|
<span id="319">319</span>
|
|
|
|
|
<span id="320">320</span>
|
|
|
|
|
<span id="321">321</span>
|
|
|
|
|
<span id="322">322</span>
|
|
|
|
|
</pre><div class="example-wrap"><pre class="rust ">
|
|
|
|
|
<span class="comment">/*
|
|
|
|
|
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
|
|
|
|
@@ -174,10 +343,11 @@
|
|
|
|
|
|
|
|
|
|
<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">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>;
|
|
|
|
|
|
|
|
|
|
<span class="kw">use</span> <span class="kw">super</span>::<span class="ident">is_authenticated</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>;
|
|
|
|
|
|
|
|
|
|
@@ -194,25 +364,115 @@
|
|
|
|
|
) <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">url</span> <span class="op">=</span> <span class="ident">Url</span>::<span class="ident">parse</span>(<span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">name</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">host</span>) <span class="op">=</span> <span class="ident">url</span>.<span class="ident">host_str</span>() {
|
|
|
|
|
<span class="kw">let</span> <span class="ident">user</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">res</span> <span class="op">=</span> <span class="ident">sqlx</span>::<span class="macro">query</span><span class="macro">!</span>(
|
|
|
|
|
<span class="string">"INSERT INTO mcaptcha_domains (name, ID) VALUES
|
|
|
|
|
($1, (SELECT ID FROM mcaptcha_users WHERE name = ($2) ));"</span>,
|
|
|
|
|
<span class="ident">host</span>,
|
|
|
|
|
<span class="ident">user</span>
|
|
|
|
|
)
|
|
|
|
|
.<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">match</span> <span class="ident">res</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">dup_error</span>(<span class="ident">e</span>, <span class="ident">ServiceError</span>::<span class="ident">HostnameTaken</span>)),
|
|
|
|
|
<span class="prelude-val">Ok</span>(<span class="kw">_</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>()),
|
|
|
|
|
}
|
|
|
|
|
} <span class="kw">else</span> {
|
|
|
|
|
<span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">NotAUrl</span>)
|
|
|
|
|
|
|
|
|
|
<span class="kw">let</span> <span class="ident">host</span> <span class="op">=</span> <span class="ident">url</span>.<span class="ident">host_str</span>().<span class="ident">ok_or</span>(<span class="ident">ServiceError</span>::<span class="ident">NotAUrl</span>)<span class="question-mark">?</span>;
|
|
|
|
|
<span class="kw">let</span> <span class="ident">user</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">challenge</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="ident">sqlx</span>::<span class="macro">query</span><span class="macro">!</span>(
|
|
|
|
|
<span class="string">"INSERT INTO mcaptcha_domains_unverified (name, owner_id, verification_challenge) VALUES
|
|
|
|
|
($1, (SELECT ID FROM mcaptcha_users WHERE name = ($2) ), $3);"</span>,
|
|
|
|
|
<span class="ident">host</span>,
|
|
|
|
|
<span class="ident">user</span>,
|
|
|
|
|
<span class="ident">challenge</span>
|
|
|
|
|
)
|
|
|
|
|
.<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">match</span> <span class="ident">res</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">dup_error</span>(<span class="ident">e</span>, <span class="ident">ServiceError</span>::<span class="ident">HostnameTaken</span>)),
|
|
|
|
|
<span class="prelude-val">Ok</span>(<span class="kw">_</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</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">Challenge</span> {
|
|
|
|
|
<span class="ident">verification_challenge</span>: <span class="ident">String</span>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<span class="attribute">#[<span class="ident">post</span>(<span class="string">"/api/v1/mcaptcha/domain/verify/challenge/get"</span>)]</span>
|
|
|
|
|
<span class="kw">pub</span> <span class="kw">async</span> <span class="kw">fn</span> <span class="ident">get_challenge</span>(
|
|
|
|
|
<span class="ident">payload</span>: <span class="ident">web</span>::<span class="ident">Json</span><span class="op"><</span><span class="ident">Domain</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="ident">client</span>: <span class="ident">web</span>::<span class="ident">Data</span><span class="op"><</span><span class="ident">Client</span><span class="op">></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">url</span> <span class="op">=</span> <span class="ident">Url</span>::<span class="ident">parse</span>(<span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">name</span>)<span class="question-mark">?</span>;
|
|
|
|
|
|
|
|
|
|
<span class="kw">let</span> <span class="ident">host</span> <span class="op">=</span> <span class="ident">url</span>.<span class="ident">host_str</span>().<span class="ident">ok_or</span>(<span class="ident">ServiceError</span>::<span class="ident">NotAUrl</span>).<span class="ident">unwrap</span>();
|
|
|
|
|
<span class="kw">let</span> <span class="ident">user</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">res</span> <span class="op">=</span> <span class="ident">sqlx</span>::<span class="macro">query_as</span><span class="macro">!</span>(
|
|
|
|
|
<span class="ident">Challenge</span>,
|
|
|
|
|
<span class="string">"SELECT verification_challenge
|
|
|
|
|
FROM mcaptcha_domains_unverified where
|
|
|
|
|
name = $1 AND owner_id = (SELECT ID from mcaptcha_users where name = $2)"</span>,
|
|
|
|
|
<span class="ident">host</span>,
|
|
|
|
|
<span class="ident">user</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="ident">unwrap</span>();
|
|
|
|
|
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>().<span class="ident">json</span>(<span class="ident">res</span>))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<span class="attribute">#[<span class="ident">post</span>(<span class="string">"/api/v1/mcaptcha/domain/verify/challenge/prove"</span>)]</span>
|
|
|
|
|
<span class="kw">pub</span> <span class="kw">async</span> <span class="kw">fn</span> <span class="ident">verify</span>(
|
|
|
|
|
<span class="ident">payload</span>: <span class="ident">web</span>::<span class="ident">Json</span><span class="op"><</span><span class="ident">Domain</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">client</span>: <span class="ident">web</span>::<span class="ident">Data</span><span class="op"><</span><span class="ident">Client</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="kw">use</span> <span class="ident">futures</span>::{<span class="ident">future</span>::<span class="ident">TryFutureExt</span>, <span class="ident">try_join</span>};
|
|
|
|
|
|
|
|
|
|
<span class="ident">is_authenticated</span>(<span class="kw-2">&</span><span class="ident">id</span>).<span class="ident">unwrap</span>();
|
|
|
|
|
<span class="comment">//let url = Url::parse(&payload.name).unwrap();</span>
|
|
|
|
|
<span class="comment">//let host = url.host_str().ok_or(ServiceError::NotAUrl).unwrap();</span>
|
|
|
|
|
<span class="comment">//let user = id.identity().unwrap();</span>
|
|
|
|
|
<span class="comment">//let challenge_fut = sqlx::query_as!(</span>
|
|
|
|
|
<span class="comment">// Challenge,</span>
|
|
|
|
|
<span class="comment">// "SELECT verification_challenge</span>
|
|
|
|
|
<span class="comment">// FROM mcaptcha_domains_unverified where</span>
|
|
|
|
|
<span class="comment">// name = $1 AND owner_id = (SELECT ID from mcaptcha_users where name = $2)",</span>
|
|
|
|
|
<span class="comment">// &host,</span>
|
|
|
|
|
<span class="comment">// &user,</span>
|
|
|
|
|
<span class="comment">//)</span>
|
|
|
|
|
<span class="comment">//.fetch_one(&data.db)</span>
|
|
|
|
|
<span class="comment">//.map_err(|e| {</span>
|
|
|
|
|
<span class="comment">// let r: ServiceError = e.into();</span>
|
|
|
|
|
<span class="comment">// r</span>
|
|
|
|
|
<span class="comment">//});</span>
|
|
|
|
|
|
|
|
|
|
<span class="comment">//let res_fut = client.get(host).send().map_err(|e| {</span>
|
|
|
|
|
<span class="comment">// let r: ServiceError = e.into();</span>
|
|
|
|
|
<span class="comment">// r</span>
|
|
|
|
|
<span class="comment">//});</span>
|
|
|
|
|
|
|
|
|
|
<span class="comment">//let (challenge, mut server_res) = try_join!(challenge_fut, res_fut).unwrap();</span>
|
|
|
|
|
|
|
|
|
|
<span class="comment">//let server_resp: Challenge = server_res</span>
|
|
|
|
|
<span class="comment">// .json()</span>
|
|
|
|
|
<span class="comment">// .await</span>
|
|
|
|
|
<span class="comment">// .map_err(|_| return ServiceError::ChallengeCourruption)</span>
|
|
|
|
|
<span class="comment">// .unwrap();</span>
|
|
|
|
|
|
|
|
|
|
<span class="comment">//if server_resp.verification_challenge == challenge.verification_challenge {</span>
|
|
|
|
|
<span class="comment">// sqlx::query!(</span>
|
|
|
|
|
<span class="comment">// "INSERT INTO mcaptcha_domains_verified (name, owner_id) VALUES</span>
|
|
|
|
|
<span class="comment">// ($1, (SELECT ID from mcaptcha_users WHERE name = $2))",</span>
|
|
|
|
|
<span class="comment">// &host,</span>
|
|
|
|
|
<span class="comment">// &user</span>
|
|
|
|
|
<span class="comment">// )</span>
|
|
|
|
|
<span class="comment">// .execute(&data.db)</span>
|
|
|
|
|
<span class="comment">// .await</span>
|
|
|
|
|
<span class="comment">// .unwrap();</span>
|
|
|
|
|
|
|
|
|
|
<span class="comment">// // TODO delete staging unverified</span>
|
|
|
|
|
|
|
|
|
|
<span class="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>())
|
|
|
|
|
<span class="comment">//} else {</span>
|
|
|
|
|
<span class="comment">// Err(ServiceError::ChallengeVerificationFailure)</span>
|
|
|
|
|
<span class="comment">//}</span>
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<span class="attribute">#[<span class="ident">post</span>(<span class="string">"/api/v1/mcaptcha/domain/delete"</span>)]</span>
|
|
|
|
|
<span class="kw">pub</span> <span class="kw">async</span> <span class="kw">fn</span> <span class="ident">delete_domain</span>(
|
|
|
|
|
<span class="ident">payload</span>: <span class="ident">web</span>::<span class="ident">Json</span><span class="op"><</span><span class="ident">Domain</span><span class="op">></span>,
|
|
|
|
|
@@ -221,14 +481,14 @@
|
|
|
|
|
) <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">url</span> <span class="op">=</span> <span class="ident">Url</span>::<span class="ident">parse</span>(<span class="kw-2">&</span><span class="ident">payload</span>.<span class="ident">name</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">host</span>) <span class="op">=</span> <span class="ident">url</span>.<span class="ident">host_str</span>() {
|
|
|
|
|
<span class="ident">sqlx</span>::<span class="macro">query</span><span class="macro">!</span>(<span class="string">"DELETE FROM mcaptcha_domains WHERE name = ($1)"</span>, <span class="ident">host</span>,)
|
|
|
|
|
.<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="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>())
|
|
|
|
|
} <span class="kw">else</span> {
|
|
|
|
|
<span class="prelude-val">Err</span>(<span class="ident">ServiceError</span>::<span class="ident">NotAUrl</span>)
|
|
|
|
|
}
|
|
|
|
|
<span class="kw">let</span> <span class="ident">host</span> <span class="op">=</span> <span class="ident">url</span>.<span class="ident">host_str</span>().<span class="ident">ok_or</span>(<span class="ident">ServiceError</span>::<span class="ident">NotAUrl</span>)<span class="question-mark">?</span>;
|
|
|
|
|
<span class="ident">sqlx</span>::<span class="macro">query</span><span class="macro">!</span>(
|
|
|
|
|
<span class="string">"DELETE FROM mcaptcha_domains_verified WHERE name = ($1)"</span>,
|
|
|
|
|
<span class="ident">host</span>,
|
|
|
|
|
)
|
|
|
|
|
.<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="prelude-val">Ok</span>(<span class="ident">HttpResponse</span>::<span class="prelude-val">Ok</span>())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<span class="comment">// Workflow:</span>
|
|
|
|
|
@@ -307,6 +567,85 @@
|
|
|
|
|
)
|
|
|
|
|
.<span class="kw">await</span>;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<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>;
|
|
|
|
|
|
|
|
|
|
<span class="kw">const</span> <span class="ident">NAME</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"testdomainveri"</span>;
|
|
|
|
|
<span class="kw">const</span> <span class="ident">PASSWORD</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"longpassworddomain"</span>;
|
|
|
|
|
<span class="kw">const</span> <span class="ident">EMAIL</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"domainverification@a.com"</span>;
|
|
|
|
|
<span class="kw">const</span> <span class="ident">DOMAIN</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"http://localhost:18001"</span>;
|
|
|
|
|
<span class="kw">const</span> <span class="ident">IP</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"localhost:18001"</span>;
|
|
|
|
|
<span class="kw">const</span> <span class="ident">CHALLENGE_GET</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"/api/v1/mcaptcha/domain/verify/challenge/get"</span>;
|
|
|
|
|
<span class="kw">const</span> <span class="ident">CHALLENGE_VERIFY</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"/api/v1/mcaptcha/domain/verify/challenge/prove"</span>;
|
|
|
|
|
{
|
|
|
|
|
<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">delete_user</span>(<span class="ident">NAME</span>, <span class="kw-2">&</span><span class="ident">data</span>).<span class="kw">await</span>;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<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="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>();
|
|
|
|
|
|
|
|
|
|
<span class="kw">let</span> <span class="ident">client</span> <span class="op">=</span> <span class="ident">Client</span>::<span class="ident">new</span>();
|
|
|
|
|
|
|
|
|
|
<span class="kw">let</span> (<span class="ident">data</span>, <span class="kw">_</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="macro">!</span>(<span class="ident">signin_resp</span>);
|
|
|
|
|
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">app</span> <span class="op">=</span> <span class="ident">test</span>::<span class="ident">init_service</span>(
|
|
|
|
|
<span class="ident">App</span>::<span class="ident">new</span>()
|
|
|
|
|
.<span class="ident">wrap</span>(<span class="ident">get_identity_service</span>())
|
|
|
|
|
.<span class="ident">configure</span>(<span class="ident">v1_services</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="kw">await</span>;
|
|
|
|
|
|
|
|
|
|
<span class="kw">let</span> <span class="ident">domain</span> <span class="op">=</span> <span class="ident">Domain</span> {
|
|
|
|
|
<span class="ident">name</span>: <span class="ident">DOMAIN</span>.<span class="ident">into</span>(),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
<span class="kw">let</span> <span class="ident">add_domain_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="macro">post_request</span><span class="macro">!</span>(<span class="kw-2">&</span><span class="ident">domain</span>, <span class="string">"/api/v1/mcaptcha/domain/add"</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="macro">!</span>(<span class="ident">add_domain_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">get_challenge_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="macro">post_request</span><span class="macro">!</span>(<span class="kw-2">&</span><span class="ident">domain</span>, <span class="ident">CHALLENGE_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="macro">!</span>(<span class="ident">get_challenge_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">challenge</span>: <span class="ident">Challenge</span> <span class="op">=</span> <span class="ident">test</span>::<span class="ident">read_body_json</span>(<span class="ident">get_challenge_resp</span>).<span class="kw">await</span>;
|
|
|
|
|
|
|
|
|
|
<span class="ident">client</span>
|
|
|
|
|
.<span class="ident">post</span>(<span class="macro">format</span><span class="macro">!</span>(<span class="string">"{}/domain_verification_works/"</span>, <span class="ident">DOMAIN</span>))
|
|
|
|
|
.<span class="ident">send_json</span>(<span class="kw-2">&</span><span class="ident">challenge</span>)
|
|
|
|
|
.<span class="kw">await</span>
|
|
|
|
|
.<span class="ident">unwrap</span>();
|
|
|
|
|
|
|
|
|
|
<span class="kw">let</span> <span class="ident">verify_challenge_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="macro">post_request</span><span class="macro">!</span>(<span class="kw-2">&</span><span class="ident">domain</span>, <span class="ident">CHALLENGE_VERIFY</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="macro">!</span>(<span class="ident">verify_challenge_resp</span>.<span class="ident">status</span>(), <span class="ident">StatusCode</span>::<span class="ident">OK</span>);
|
|
|
|
|
<span class="ident">srv</span>.<span class="ident">stop</span>(<span class="bool-val">true</span>).<span class="kw">await</span>;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
</pre></div>
|
|
|
|
|
</section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../../";window.currentCrate = "guard";</script><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>
|
|
|
|
|
</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>
|