beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK+Everywhere: Replace usages of URLParser::urlencode() and urldecode()

Browse source 
This replaces all occurrences of those functions with the newly
implemented functions URL::percent_encode() and URL::percent_decode().
The old functions will be removed in a further commit.
This commit is contained in:
Max Wipfli 2021-05-25 14:06:03 +02:00 committed by Andreas Kling
parent 2a6c9bc5f7
commit a603e69599
Notes: sideshowbarker 2024-07-18 17:04:40 +09:00 
Author: https://github.com/MaxWipfli
Commit: https://github.com/SerenityOS/serenity/commit/a603e69599c
Pull-request: https://github.com/SerenityOS/serenity/pull/7478
Reviewed-by: https://github.com/awesomekling
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AK/URL.cpp
View file

@ -8,7 +8,6 @@
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/URL.h> #include <AK/URL.h>
#include <AK/URLParser.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
namespace AK { namespace AK {
@ -237,7 +236,7 @@ bool URL::parse(const StringView& string)
if (state == State::InFragment) if (state == State::InFragment)
m_fragment = String::copy(buffer); m_fragment = String::copy(buffer);
if (state == State::InDataPayload) if (state == State::InDataPayload)
m_data_payload = urldecode(String::copy(buffer)); m_data_payload = URL::percent_decode(String::copy(buffer));
if (state == State::InPort) { if (state == State::InPort) {
auto port_opt = String::copy(buffer).to_uint(); auto port_opt = String::copy(buffer).to_uint();
if (port_opt.has_value()) if (port_opt.has_value())

4
AK/URL.h
View file

@ -9,7 +9,6 @@
#include <AK/String.h> #include <AK/String.h>
#include <AK/StringView.h> #include <AK/StringView.h>
#include <AK/URLParser.h>
namespace AK { namespace AK {
@ -62,8 +61,7 @@ public:
String to_string() const; String to_string() const;
String to_string_encoded() const String to_string_encoded() const
{ {
// Exclusion character set is the same JS's encodeURI() uses return percent_encode(to_string(), PercentEncodeSet::EncodeURI);
return urlencode(to_string(), "#$&+,/:;=?@");
} }
URL complete_url(const String&) const; URL complete_url(const String&) const;

3
Userland/Applications/Browser/Tab.cpp
View file

@ -12,6 +12,7 @@
#include "ConsoleWidget.h" #include "ConsoleWidget.h"
#include "DownloadWidget.h" #include "DownloadWidget.h"
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/URL.h>
#include <Applications/Browser/TabGML.h> #include <Applications/Browser/TabGML.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
@ -39,7 +40,7 @@ URL url_from_user_input(const String& input)
{ {
if (input.starts_with("?") && !g_search_engine.is_null()) { if (input.starts_with("?") && !g_search_engine.is_null()) {
auto url = g_search_engine; auto url = g_search_engine;
url.replace("{}", urlencode(input.substring(1))); url.replace("{}", URL::percent_encode(input.substring_view(1)));
return URL(url); return URL(url);
} }

6
Userland/Libraries/LibWeb/URLEncoder.cpp
View file

@ -5,7 +5,7 @@
*/ */
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/URLParser.h> #include <AK/URL.h>
#include <LibWeb/URLEncoder.h> #include <LibWeb/URLEncoder.h>
namespace Web { namespace Web {
@ -14,9 +14,9 @@ String urlencode(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(urlencode(pairs[i].name)); builder.append(URL::percent_encode(pairs[i].name));
builder.append('='); builder.append('=');
builder.append(urlencode(pairs[i].value)); builder.append(URL::percent_encode(pairs[i].value));
if (i != pairs.size() - 1) if (i != pairs.size() - 1)
builder.append('&'); builder.append('&');
} }

4
Userland/Services/WebServer/Client.cpp
View file

@ -11,7 +11,7 @@
#include <AK/MappedFile.h> #include <AK/MappedFile.h>
#include <AK/MemoryStream.h> #include <AK/MemoryStream.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/URLParser.h> #include <AK/URL.h>
#include <LibCore/DateTime.h> #include <LibCore/DateTime.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/File.h> #include <LibCore/File.h>
@ -223,7 +223,7 @@ void Client::handle_directory_listing(const String& requested_path, const String
builder.append("<tr>"); builder.append("<tr>");
builder.appendff("<td><div class=\"{}\"></div></td>", is_directory ? "folder" : "file"); builder.appendff("<td><div class=\"{}\"></div></td>", is_directory ? "folder" : "file");
builder.append("<td><a href=\""); builder.append("<td><a href=\"");
builder.append(urlencode(name)); builder.append(URL::percent_encode(name));
builder.append("\">"); builder.append("\">");
builder.append(escape_html_entities(name)); builder.append(escape_html_entities(name));
builder.append("</a></td><td>&nbsp;</td>"); builder.append("</a></td><td>&nbsp;</td>");