summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-04-07 22:56:13 +0200
committerAndreas Kling <kling@serenityos.org>2020-04-07 23:01:45 +0200
commit7382b27c220327470a84a2e920277be93224a6d3 (patch)
treefb8116bcd7c0c467e6c5a64e17dba202e82c4411
parent53f63058b9714bfda4cae5b0ab70fd84e921c91a (diff)
downloadserenity-7382b27c220327470a84a2e920277be93224a6d3.zip
LibWeb: Add Origin concept (protocol, host, port tuple)
Every Document now has an Origin, found via Document::origin(). It's based on the URL of the document. This will be used to implement things like the same-origin policy.
-rw-r--r--Libraries/LibWeb/DOM/Document.cpp11
-rw-r--r--Libraries/LibWeb/DOM/Document.h4
-rw-r--r--Libraries/LibWeb/Forward.h1
-rw-r--r--Libraries/LibWeb/HtmlView.cpp3
-rw-r--r--Libraries/LibWeb/Origin.h55
-rw-r--r--Libraries/LibWeb/Parser/HTMLParser.cpp3
6 files changed, 71 insertions, 6 deletions
diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp
index 43c881ce8f..6162deaac2 100644
--- a/Libraries/LibWeb/DOM/Document.cpp
+++ b/Libraries/LibWeb/DOM/Document.cpp
@@ -52,14 +52,16 @@
#include <LibWeb/HtmlView.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutTreeBuilder.h>
+#include <LibWeb/Origin.h>
#include <LibWeb/Parser/CSSParser.h>
#include <stdio.h>
namespace Web {
-Document::Document()
+Document::Document(const URL& url)
: ParentNode(*this, NodeType::DOCUMENT_NODE)
, m_style_resolver(make<StyleResolver>(*this))
+ , m_url(url)
, m_window(Window::create_with_document(*this))
{
m_style_update_timer = Core::Timer::create_single_shot(0, [this] {
@@ -71,6 +73,13 @@ Document::~Document()
{
}
+Origin Document::origin() const
+{
+ if (!m_url.is_valid())
+ return {};
+ return { m_url.protocol(), m_url.host(), m_url.port() };
+}
+
void Document::schedule_style_update()
{
if (m_style_update_timer->is_active())
diff --git a/Libraries/LibWeb/DOM/Document.h b/Libraries/LibWeb/DOM/Document.h
index 18110088ad..66161a8742 100644
--- a/Libraries/LibWeb/DOM/Document.h
+++ b/Libraries/LibWeb/DOM/Document.h
@@ -48,12 +48,14 @@ class Document
public:
using WrapperType = Bindings::DocumentWrapper;
- Document();
+ explicit Document(const URL& = {});
virtual ~Document() override;
void set_url(const URL& url) { m_url = url; }
const URL& url() const { return m_url; }
+ Origin origin() const;
+
URL complete_url(const String&) const;
void fixup();
diff --git a/Libraries/LibWeb/Forward.h b/Libraries/LibWeb/Forward.h
index 230c112208..8322c32b85 100644
--- a/Libraries/LibWeb/Forward.h
+++ b/Libraries/LibWeb/Forward.h
@@ -45,6 +45,7 @@ class LayoutDocument;
class LayoutNode;
class MouseEvent;
class Node;
+class Origin;
class Selector;
class StyleResolver;
class StyleRule;
diff --git a/Libraries/LibWeb/HtmlView.cpp b/Libraries/LibWeb/HtmlView.cpp
index 60c177c569..34f45597ba 100644
--- a/Libraries/LibWeb/HtmlView.cpp
+++ b/Libraries/LibWeb/HtmlView.cpp
@@ -315,8 +315,7 @@ void HtmlView::reload()
static RefPtr<Document> create_image_document(const ByteBuffer& data, const URL& url)
{
- auto document = adopt(*new Document);
- document->set_url(url);
+ auto document = adopt(*new Document(url));
auto bitmap = Gfx::load_png_from_memory(data.data(), data.size());
ASSERT(bitmap);
diff --git a/Libraries/LibWeb/Origin.h b/Libraries/LibWeb/Origin.h
new file mode 100644
index 0000000000..5ec3d12a3d
--- /dev/null
+++ b/Libraries/LibWeb/Origin.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <AK/String.h>
+
+namespace Web {
+
+class Origin {
+public:
+ Origin() {}
+ Origin(const String& protocol, const String& host, u16 port)
+ : m_protocol(protocol)
+ , m_host(host)
+ , m_port(port)
+ {
+ }
+
+ bool is_null() const { return m_protocol.is_null() && m_host.is_null() && !m_port; }
+
+ const String& protocol() const { return m_protocol; }
+ const String& host() const { return m_host; }
+ u16 port() const { return m_port; }
+
+private:
+ String m_protocol;
+ String m_host;
+ u16 m_port { 0 };
+};
+
+}
diff --git a/Libraries/LibWeb/Parser/HTMLParser.cpp b/Libraries/LibWeb/Parser/HTMLParser.cpp
index 359121ab46..91afd58f50 100644
--- a/Libraries/LibWeb/Parser/HTMLParser.cpp
+++ b/Libraries/LibWeb/Parser/HTMLParser.cpp
@@ -386,8 +386,7 @@ RefPtr<DocumentFragment> parse_html_fragment(Document& document, const StringVie
RefPtr<Document> parse_html_document(const StringView& html, const URL& url)
{
- auto document = adopt(*new Document);
- document->set_url(url);
+ auto document = adopt(*new Document(url));
document->set_source(html);
if (!parse_html_document(html, *document, *document))