Ver Fonte

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.
Andreas Kling há 5 anos atrás
pai
commit
7382b27c22

+ 10 - 1
Libraries/LibWeb/DOM/Document.cpp

@@ -52,14 +52,16 @@
 #include <LibWeb/HtmlView.h>
 #include <LibWeb/HtmlView.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutTreeBuilder.h>
 #include <LibWeb/Layout/LayoutTreeBuilder.h>
+#include <LibWeb/Origin.h>
 #include <LibWeb/Parser/CSSParser.h>
 #include <LibWeb/Parser/CSSParser.h>
 #include <stdio.h>
 #include <stdio.h>
 
 
 namespace Web {
 namespace Web {
 
 
-Document::Document()
+Document::Document(const URL& url)
     : ParentNode(*this, NodeType::DOCUMENT_NODE)
     : ParentNode(*this, NodeType::DOCUMENT_NODE)
     , m_style_resolver(make<StyleResolver>(*this))
     , m_style_resolver(make<StyleResolver>(*this))
+    , m_url(url)
     , m_window(Window::create_with_document(*this))
     , m_window(Window::create_with_document(*this))
 {
 {
     m_style_update_timer = Core::Timer::create_single_shot(0, [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()
 void Document::schedule_style_update()
 {
 {
     if (m_style_update_timer->is_active())
     if (m_style_update_timer->is_active())

+ 3 - 1
Libraries/LibWeb/DOM/Document.h

@@ -48,12 +48,14 @@ class Document
 public:
 public:
     using WrapperType = Bindings::DocumentWrapper;
     using WrapperType = Bindings::DocumentWrapper;
 
 
-    Document();
+    explicit Document(const URL& = {});
     virtual ~Document() override;
     virtual ~Document() override;
 
 
     void set_url(const URL& url) { m_url = url; }
     void set_url(const URL& url) { m_url = url; }
     const URL& url() const { return m_url; }
     const URL& url() const { return m_url; }
 
 
+    Origin origin() const;
+
     URL complete_url(const String&) const;
     URL complete_url(const String&) const;
 
 
     void fixup();
     void fixup();

+ 1 - 0
Libraries/LibWeb/Forward.h

@@ -45,6 +45,7 @@ class LayoutDocument;
 class LayoutNode;
 class LayoutNode;
 class MouseEvent;
 class MouseEvent;
 class Node;
 class Node;
+class Origin;
 class Selector;
 class Selector;
 class StyleResolver;
 class StyleResolver;
 class StyleRule;
 class StyleRule;

+ 1 - 2
Libraries/LibWeb/HtmlView.cpp

@@ -315,8 +315,7 @@ void HtmlView::reload()
 
 
 static RefPtr<Document> create_image_document(const ByteBuffer& data, const URL& url)
 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());
     auto bitmap = Gfx::load_png_from_memory(data.data(), data.size());
     ASSERT(bitmap);
     ASSERT(bitmap);

+ 55 - 0
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 };
+};
+
+}

+ 1 - 2
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)
 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);
     document->set_source(html);
 
 
     if (!parse_html_document(html, *document, *document))
     if (!parse_html_document(html, *document, *document))