Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(984)

Unified Diff: third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp

Issue 1779413002: Remove Blink's DatabaseIdentifier implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded include Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp
diff --git a/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp b/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp
deleted file mode 100644
index 4d15d7637731307b3a91ecf8acceb2095864332c..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc. 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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.
- */
-
-#include "platform/weborigin/DatabaseIdentifier.h"
-
-#include "platform/weborigin/KURL.h"
-#include "platform/weborigin/KnownPorts.h"
-#include "platform/weborigin/SchemeRegistry.h"
-#include "platform/weborigin/SecurityOriginCache.h"
-#include "platform/weborigin/SecurityPolicy.h"
-#include "wtf/HexNumber.h"
-#include "wtf/StdLibExtras.h"
-#include "wtf/text/StringBuilder.h"
-
-namespace blink {
-
-namespace {
-
-String escapeIPv6Hostname(const String& hostname)
-{
- // Shortest IPv6 hostname would be "[::1]".
- if (hostname.length() < 5 || hostname[0] != '[' || hostname[hostname.length() - 1] != ']')
- return hostname;
-
- // Should be canonicalized before it gets this far.
- // i.e. "[::ffff:8190:3426]" not "[::FFFF:129.144.52.38]"
- ASSERT(!hostname.contains('.'));
- ASSERT(hostname == hostname.lower());
-
- String copy = hostname;
- copy.replace(':', '_');
- return copy;
-}
-
-String unescapeIPv6Hostname(const String& hostname)
-{
- if (hostname.length() < 5 || hostname[0] != '[' || hostname[hostname.length() - 1] != ']')
- return hostname;
-
- String copy = hostname;
- copy.replace('_', ':');
- return copy;
-}
-
-} // namespace
-
-const int maxAllowedPort = 65535;
-
-static const char separatorCharacter = '_';
-
-PassRefPtr<SecurityOrigin> createSecurityOriginFromDatabaseIdentifier(const String& databaseIdentifier)
-{
- if (!databaseIdentifier.containsOnlyASCII())
- return SecurityOrigin::createUnique();
-
- // Match restrictions in storage/common/database/database_identifier.cc
- // TODO(jsbell): Eliminate duplicate implementations.
- if (databaseIdentifier.contains(".."))
- return SecurityOrigin::createUnique();
- char forbidden[] = {'\\', '/', ':', '\0'};
- for (auto c : forbidden) {
- if (databaseIdentifier.contains(c))
- return SecurityOrigin::createUnique();
- }
-
- // Make sure there's a first separator
- size_t separator1 = databaseIdentifier.find(separatorCharacter);
- if (separator1 == kNotFound)
- return SecurityOrigin::createUnique();
-
- // Make sure there's a second separator
- size_t separator2 = databaseIdentifier.reverseFind(separatorCharacter);
- if (separator2 == kNotFound)
- return SecurityOrigin::createUnique();
-
- // Ensure there were at least 2 separator characters. Some hostnames on intranets have
- // underscores in them, so we'll assume that any additional underscores are part of the host.
- if (separator1 == separator2)
- return SecurityOrigin::createUnique();
-
- // Make sure the port section is a valid port number or doesn't exist
- bool portOkay;
- int port = databaseIdentifier.right(databaseIdentifier.length() - separator2 - 1).toInt(&portOkay);
- bool portAbsent = (separator2 == databaseIdentifier.length() - 1);
- if (!(portOkay || portAbsent))
- return SecurityOrigin::createUnique();
-
- if (port < 0 || port > maxAllowedPort)
- return SecurityOrigin::createUnique();
-
- // Split out the 3 sections of data
- String protocol = databaseIdentifier.substring(0, separator1);
- String host = unescapeIPv6Hostname(databaseIdentifier.substring(separator1 + 1, separator2 - separator1 - 1));
-
- // Make sure the components match their canonical representation so we are sure we're round tripping correctly.
- KURL url(KURL(), protocol + "://" + host + ":" + String::number(port) + "/");
- if (!url.isValid() || url.protocol() != protocol || url.host() != host)
- return SecurityOrigin::createUnique();
-
- return SecurityOrigin::create(url);
-}
-
-String createDatabaseIdentifierFromSecurityOrigin(const SecurityOrigin* securityOrigin)
-{
- String separatorString(&separatorCharacter, 1);
- return securityOrigin->protocol() + separatorString + escapeIPv6Hostname(securityOrigin->host()) + separatorString + String::number(securityOrigin->port());
-}
-
-} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698