From c35f1af6095a4fefa7f0e742eac565133abc141d Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 22 Feb 2020 19:48:53 +0300 Subject: Add UTF-8 error details to CI and submit service responces --- mod/mod-ci.cxx | 7 +++++-- mod/mod-submit.cxx | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mod/mod-ci.cxx b/mod/mod-ci.cxx index 42a38ca..77377eb 100644 --- a/mod/mod-ci.cxx +++ b/mod/mod-ci.cxx @@ -268,10 +268,13 @@ handle (request& rq, response& rs) // // Actually, the expected ones must satisfy too, so check them as well. // + string what; for (const name_value& nv: rps) { - if (nv.value && !utf8 (*nv.value, codepoint_types::graphic, U"\r\n\t")) - return respond_manifest (400, "invalid parameter " + nv.name); + if (nv.value && + !utf8 (*nv.value, what, codepoint_types::graphic, U"\n\r\t")) + return respond_manifest (400, + "invalid parameter " + nv.name + ": " + what); } // Parse and validate overrides, if present. diff --git a/mod/mod-submit.cxx b/mod/mod-submit.cxx index ce36a19..0dea2b7 100644 --- a/mod/mod-submit.cxx +++ b/mod/mod-submit.cxx @@ -257,10 +257,13 @@ handle (request& rq, response& rs) // // Actually, the expected ones must satisfy too, so check them as well. // + string what; for (const name_value& nv: rps) { - if (nv.value && !utf8 (*nv.value, codepoint_types::graphic, U"\r\n\t")) - return respond_manifest (400, "invalid parameter " + nv.name); + if (nv.value && + !utf8 (*nv.value, what, codepoint_types::graphic, U"\n\r\t")) + return respond_manifest (400, + "invalid parameter " + nv.name + ": " + what); } // Note that from now on the result manifest we respond with will contain -- cgit v1.1