King_DuckZ/kamokan
1
0
Fork 0
mirror of https://github.com/KingDuckZ/kamokan.git synced 2024-12-27 21:35:41 +00:00
Code Issues Releases Wiki Activity

Don't redirect after submitting a self-destructing token.

Browse source
This commit is contained in:
King_DuckZ 2017-06-16 20:08:18 +01:00
parent 86a576985e
commit 61170dc371
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/kamokan_impl/submit_paste_response.cpp
View file

@ -29,6 +29,7 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <cstdint> #include <cstdint>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <utility>
namespace kamokan { namespace kamokan {
namespace { namespace {
@ -144,18 +145,22 @@ namespace kamokan {
//over invalid inputs //over invalid inputs
const uint32_t duration_int = std::max(std::min((duration.empty() ? 86400U : boost::lexical_cast<uint32_t>(duration)), 2628000U), 1U); const uint32_t duration_int = std::max(std::min((duration.empty() ? 86400U : boost::lexical_cast<uint32_t>(duration)), 2628000U), 1U);
StringOrHeader submit_result = submit_to_storage(pastie, duration_int, lang, self_destruct); StringOrHeader submit_result = submit_to_storage(pastie, duration_int, lang, self_destruct);
const auto& token = submit_result.first; const boost::optional<std::string>& token = submit_result.first;
if (token) { if (token) {
m_pastie_token = std::move(*token);
std::ostringstream oss; std::ostringstream oss;
oss << *token; oss << m_pastie_token;
if (not lang.empty()) if (not lang.empty())
oss << '?' << lang; oss << '?' << lang;
std::string redirect = oss.str(); std::string redirect = oss.str();
statuslog->info("Pastie token=\"{}\" redirect=\"{}\"", *token, redirect); statuslog->info("Pastie token=\"{}\" redirect=\"{}\"", m_pastie_token, redirect);
return this->make_success_response(std::move(redirect)); if (self_destruct)
return tawashi::make_header_type_html();
else
return this->make_success_response(std::move(redirect));
} }
else { else {
statuslog->info("Empty pastie token (possibly due to a previous failure)"); statuslog->info("Empty pastie token (possibly due to a previous failure)");
@ -182,4 +187,8 @@ namespace kamokan {
using tawashi::HttpStatusCodes; using tawashi::HttpStatusCodes;
return this->make_redirect(HttpStatusCodes::Code303_SeeOther, std::move(parPastieParam)); return this->make_redirect(HttpStatusCodes::Code303_SeeOther, std::move(parPastieParam));
} }
void SubmitPasteResponse::on_mustache_prepare (mstch::map& parContext) {
parContext["pastie_token"] = std::move(m_pastie_token);
}
} //namespace kamokan } //namespace kamokan

5
src/kamokan_impl/submit_paste_response.hpp
View file

@ -43,18 +43,21 @@ namespace kamokan {
); );
protected: protected:
virtual boost::string_view page_basename() const override { assert(false); return boost::string_view(""); } virtual boost::string_view page_basename() const override { return boost::string_view("saved"); }
virtual tawashi::HttpHeader make_success_response (std::string&& parPastieParam); virtual tawashi::HttpHeader make_success_response (std::string&& parPastieParam);
private: private:
typedef std::pair<boost::optional<std::string>, tawashi::HttpHeader> StringOrHeader; typedef std::pair<boost::optional<std::string>, tawashi::HttpHeader> StringOrHeader;
virtual tawashi::HttpHeader on_process() override; virtual tawashi::HttpHeader on_process() override;
virtual void on_mustache_prepare (mstch::map& parContext) override;
StringOrHeader submit_to_storage ( StringOrHeader submit_to_storage (
const boost::string_view& parText, const boost::string_view& parText,
uint32_t parExpiry, uint32_t parExpiry,
const boost::string_view& parLang, const boost::string_view& parLang,
bool parSelfDestruct bool parSelfDestruct
); );
std::string m_pastie_token;
}; };
} //namespace kamokan } //namespace kamokan