87c183df6a
* chore: bump chromium in DEPS to 109.0.5386.0 * chore: bump chromium in DEPS to 109.0.5388.0 * chore: bump chromium in DEPS to 109.0.5390.0 * chore: bump chromium in DEPS to 109.0.5392.0 * chore: bump chromium in DEPS to 109.0.5394.0 * chore: bump chromium in DEPS to 109.0.5396.0 * chore: bump chromium in DEPS to 109.0.5398.0 * chore: bump chromium in DEPS to 109.0.5400.0 * chore: update galactus * chore: bump chromium in DEPS to 109.0.5402.0 * chore: bump chromium in DEPS to 109.0.5403.0 * chore: bump chromium in DEPS to 109.0.5406.0 * chore: update patches * 4004247: Delete unused DocumentWebContentsDelegate Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4004247 * chore: bump chromium in DEPS to 109.0.5408.1 * chore: update patches * 3949284: Support pkey debug mode without pkey 0 access Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3949284 * chore: bump chromium in DEPS to 109.0.5410.0 * chore: update patches * 4000944: [Extensions] Create an API directory in //chrome/renderer/extensions Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4000944 * 3988524: Remove DocumentOverlayWindowViews | https://chromium-review.googlesource.com/c/chromium/src/+/3988524 Co-authored-by: George Xu <33054982+georgexu99@users.noreply.github.com> * chore: bump chromium in DEPS to 109.0.5412.0 * chore: update patches * 3984022: Add AddChildWindowToBrowser to DisplayClient mojo interface Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3984022 * 3957079: Delete the CryptoToken component extension and internal API Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3957079 * 4004421: Migreate ScopedAllowIO to ScopedAllowBlocking Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4004421 Co-authored-by: George Xu <georgexu99@users.noreply.github.com> * chore: bump chromium in DEPS to 109.0.5414.0 * chore: update patches * 4016180: Split PPAPI Mojo interfaces out of RenderFrameHostImpl. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4016180 * 3970838: [MPArch] Convert HostZoomMap and ZoomController off of RenderViewHost ids Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3970838 * 3997795: Don't add Chromium as a login item Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3997795 * 3993482: Remove RefCountedString::TakeString Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3993482 * 3990749: Allow forward-declared sources in base::ScopedObservation<> Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3990749 * fixup! 3957079: Delete the CryptoToken component extension and internal API * chore: bump chromium in DEPS to 110.0.5415.0 * 3883790: Move devtools_frame_token to the RenderFrameHost, to preserve RFH identity across MPArch activations. https://chromium-review.googlesource.com/c/chromium/src/+/3883790 * 4022205: Move license tooling into //tools/licenses https://chromium-review.googlesource.com/c/chromium/src/+/4022205 * chore: fixup patch indices * fixup! 3957079: Delete the CryptoToken component extension and internal API * 4008687: Finish ScopedAllowIO migration https://chromium-review.googlesource.com/c/chromium/src/+/4008687 * 3991548: Move WindowButtonOrderObserver and WindowFrameAction to LinuxUi https://chromium-review.googlesource.com/c/chromium/src/+/3991548 * fixup! 3984022: Add AddChildWindowToBrowser to DisplayClient mojo interface * 4016595: Migrate non-default ScopedObservation<> instantiations to ScopedObservationTraits<> in chrome/browser/ https://chromium-review.googlesource.com/c/chromium/src/+/4016595 * 4000481: Rename :chromedriver to :chromedriver_server Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4000481 * 4008687: Finish ScopedAllowIO migration https://chromium-review.googlesource.com/c/chromium/src/+/4008687 * 3988524: Remove DocumentOverlayWindowViews https://chromium-review.googlesource.com/c/chromium/src/+/3988524 * fixup! 3997795: Don't add Chromium as a login item * chore: fixup patches * 3996872: Plumb input event task runner to EventFactoryEvdev https://chromium-review.googlesource.com/c/chromium/src/+/3996872 * 4014994: Enable SiteIsolationForGuests by default. https://chromium-review.googlesource.com/c/chromium/src/+/4014994 * chore: adopt new thread restrictions api for //electron (#36357) chore: add thread blocking api * fixup! 4014994: Enable SiteIsolationForGuests by default. * pull parent HWND for dialogs on ui thread * chore: set parent_window in MessageBoxSettings * chore: remove redundant patch * chore: revert accidental deletion * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: George Xu <33054982+georgexu99@users.noreply.github.com> Co-authored-by: George Xu <georgexu99@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Robo <hop2deep@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
172 lines
4.9 KiB
C++
172 lines
4.9 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/asar/asar_util.h"
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/lazy_instance.h"
|
|
#include "base/logging.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/stl_util.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "base/synchronization/lock.h"
|
|
#include "base/threading/thread_local.h"
|
|
#include "crypto/secure_hash.h"
|
|
#include "crypto/sha2.h"
|
|
#include "shell/common/asar/archive.h"
|
|
#include "shell/common/thread_restrictions.h"
|
|
|
|
namespace asar {
|
|
|
|
namespace {
|
|
|
|
typedef std::map<base::FilePath, std::shared_ptr<Archive>> ArchiveMap;
|
|
|
|
const base::FilePath::CharType kAsarExtension[] = FILE_PATH_LITERAL(".asar");
|
|
|
|
bool IsDirectoryCached(const base::FilePath& path) {
|
|
static base::NoDestructor<std::map<base::FilePath, bool>>
|
|
s_is_directory_cache;
|
|
static base::NoDestructor<base::Lock> lock;
|
|
|
|
base::AutoLock auto_lock(*lock);
|
|
auto& is_directory_cache = *s_is_directory_cache;
|
|
|
|
auto it = is_directory_cache.find(path);
|
|
if (it != is_directory_cache.end()) {
|
|
return it->second;
|
|
}
|
|
electron::ScopedAllowBlockingForElectron allow_blocking;
|
|
return is_directory_cache[path] = base::DirectoryExists(path);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ArchiveMap& GetArchiveCache() {
|
|
static base::NoDestructor<ArchiveMap> s_archive_map;
|
|
return *s_archive_map;
|
|
}
|
|
|
|
base::Lock& GetArchiveCacheLock() {
|
|
static base::NoDestructor<base::Lock> lock;
|
|
return *lock;
|
|
}
|
|
|
|
std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
|
|
base::AutoLock auto_lock(GetArchiveCacheLock());
|
|
ArchiveMap& map = GetArchiveCache();
|
|
|
|
// if we have it, return it
|
|
const auto lower = map.lower_bound(path);
|
|
if (lower != std::end(map) && !map.key_comp()(path, lower->first))
|
|
return lower->second;
|
|
|
|
// if we can create it, return it
|
|
auto archive = std::make_shared<Archive>(path);
|
|
if (archive->Init()) {
|
|
map.try_emplace(lower, path, archive);
|
|
return archive;
|
|
}
|
|
|
|
// didn't have it, couldn't create it
|
|
return nullptr;
|
|
}
|
|
|
|
void ClearArchives() {
|
|
base::AutoLock auto_lock(GetArchiveCacheLock());
|
|
ArchiveMap& map = GetArchiveCache();
|
|
|
|
map.clear();
|
|
}
|
|
|
|
bool GetAsarArchivePath(const base::FilePath& full_path,
|
|
base::FilePath* asar_path,
|
|
base::FilePath* relative_path,
|
|
bool allow_root) {
|
|
base::FilePath iter = full_path;
|
|
while (true) {
|
|
base::FilePath dirname = iter.DirName();
|
|
if (iter.MatchesExtension(kAsarExtension) && !IsDirectoryCached(iter))
|
|
break;
|
|
else if (iter == dirname)
|
|
return false;
|
|
iter = dirname;
|
|
}
|
|
|
|
base::FilePath tail;
|
|
if (!((allow_root && iter == full_path) ||
|
|
iter.AppendRelativePath(full_path, &tail)))
|
|
return false;
|
|
|
|
*asar_path = iter;
|
|
*relative_path = tail;
|
|
return true;
|
|
}
|
|
|
|
bool ReadFileToString(const base::FilePath& path, std::string* contents) {
|
|
base::FilePath asar_path, relative_path;
|
|
if (!GetAsarArchivePath(path, &asar_path, &relative_path))
|
|
return base::ReadFileToString(path, contents);
|
|
|
|
std::shared_ptr<Archive> archive = GetOrCreateAsarArchive(asar_path);
|
|
if (!archive)
|
|
return false;
|
|
|
|
Archive::FileInfo info;
|
|
if (!archive->GetFileInfo(relative_path, &info))
|
|
return false;
|
|
|
|
if (info.unpacked) {
|
|
base::FilePath real_path;
|
|
// For unpacked file it will return the real path instead of doing the copy.
|
|
archive->CopyFileOut(relative_path, &real_path);
|
|
return base::ReadFileToString(real_path, contents);
|
|
}
|
|
|
|
base::File src(asar_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
|
|
if (!src.IsValid())
|
|
return false;
|
|
|
|
contents->resize(info.size);
|
|
if (static_cast<int>(info.size) !=
|
|
src.Read(info.offset, const_cast<char*>(contents->data()),
|
|
contents->size())) {
|
|
return false;
|
|
}
|
|
|
|
if (info.integrity.has_value()) {
|
|
ValidateIntegrityOrDie(contents->data(), contents->size(),
|
|
info.integrity.value());
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void ValidateIntegrityOrDie(const char* data,
|
|
size_t size,
|
|
const IntegrityPayload& integrity) {
|
|
if (integrity.algorithm == HashAlgorithm::SHA256) {
|
|
uint8_t hash[crypto::kSHA256Length];
|
|
auto hasher = crypto::SecureHash::Create(crypto::SecureHash::SHA256);
|
|
hasher->Update(data, size);
|
|
hasher->Finish(hash, sizeof(hash));
|
|
const std::string hex_hash =
|
|
base::ToLowerASCII(base::HexEncode(hash, sizeof(hash)));
|
|
|
|
if (integrity.hash != hex_hash) {
|
|
LOG(FATAL) << "Integrity check failed for asar archive ("
|
|
<< integrity.hash << " vs " << hex_hash << ")";
|
|
}
|
|
} else {
|
|
LOG(FATAL) << "Unsupported hashing algorithm in ValidateIntegrityOrDie";
|
|
}
|
|
}
|
|
|
|
} // namespace asar
|