RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:38:11 +00:00
Code Issues Activity Actions

LibWeb: Use the URL encoder from AK instead of rolling a custom one

Browse source
This commit is contained in:
Andreas Kling 2020-06-15 17:55:27 +02:00
parent d883607e8f
commit 84f8c91a6f
3 changed files with 6 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/DOM/HTMLFormElement.cpp
View file

@ -69,7 +69,7 @@ void HTMLFormElement::submit(RefPtr<HTMLInputElement> submitter)
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
url.set_query(url_encode(parameters)); url.set_query(urlencode(parameters));
// FIXME: We shouldn't let the form just do this willy-nilly. // FIXME: We shouldn't let the form just do this willy-nilly.
document().frame()->page().load(url); document().frame()->page().load(url);

24
Libraries/LibWeb/URLEncoder.cpp
View file

@ -25,34 +25,18 @@
*/ */
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/URLParser.h>
#include <LibWeb/URLEncoder.h> #include <LibWeb/URLEncoder.h>
namespace Web { namespace Web {
String url_encode(const StringView& view) String urlencode(const Vector<URLQueryParam>& pairs)
{
StringBuilder builder;
for (char c : view) {
if (c == ' ') {
builder.append('+');
} else if (c == '*' || c == '-' || c == '.' || (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z')) {
builder.append(c);
} else {
builder.appendf("%%%02X", c);
}
}
return builder.to_string();
}
String url_encode(const Vector<URLQueryParam>& pairs)
{ {
StringBuilder builder; StringBuilder builder;
for (size_t i = 0; i < pairs.size(); ++i) { for (size_t i = 0; i < pairs.size(); ++i) {
builder.append(url_encode(pairs[i].name)); builder.append(urlencode(pairs[i].name));
builder.append('='); builder.append('=');
builder.append(url_encode(pairs[i].value)); builder.append(urlencode(pairs[i].value));
if (i != pairs.size() - 1) if (i != pairs.size() - 1)
builder.append('&'); builder.append('&');
} }

3
Libraries/LibWeb/URLEncoder.h
View file

@ -36,8 +36,7 @@ struct URLQueryParam {
String value; String value;
}; };
String url_encode(const StringView&); String urlencode(const Vector<URLQueryParam>&);
String url_encode(const Vector<URLQueryParam>&);
} }