Commit e5f283dc authored by Alex Moshchuk's avatar Alex Moshchuk Committed by Commit Bot

Remove the list of isolated origins from chrome://process-internals.

The full list of isolated origins might include sensitive info in
upcoming field trials, so show the number of isolated origins instead
of actual list.

Bug: 872375
Change-Id: I944919cc9ce2afa953bbca77a489c9df62105ab8
Reviewed-on: https://chromium-review.googlesource.com/1167962Reviewed-by: default avatarNasko Oskov <nasko@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581965}
parent 079fa669
......@@ -11,7 +11,6 @@ interface ProcessInternalsHandler {
// Returns a string containing the currently active isolation modes.
GetIsolationMode() => (string mode);
// Returns a list of isolated origins in their serialized to string
// format. This avoids duplicating serialization code to JavaScript.
GetIsolatedOrigins() => (array<string> isolated_origins);
// Returns the number of isolated origins.
GetIsolatedOriginsSize() => (uint32 size);
};
......@@ -30,15 +30,10 @@ void ProcessInternalsHandlerImpl::GetIsolationMode(
: base::JoinString(modes, ", "));
}
void ProcessInternalsHandlerImpl::GetIsolatedOrigins(
GetIsolatedOriginsCallback callback) {
std::vector<url::Origin> origins_list =
SiteIsolationPolicy::GetIsolatedOrigins();
std::vector<std::string> origins;
for (size_t i = 0; i < origins_list.size(); ++i)
origins.push_back(origins_list[i].Serialize());
std::move(callback).Run(origins);
void ProcessInternalsHandlerImpl::GetIsolatedOriginsSize(
GetIsolatedOriginsSizeCallback callback) {
int size = SiteIsolationPolicy::GetIsolatedOrigins().size();
std::move(callback).Run(size);
}
} // namespace content
......@@ -22,7 +22,7 @@ class ProcessInternalsHandlerImpl : public ::mojom::ProcessInternalsHandler {
// mojom::ProcessInternalsHandler overrides:
void GetIsolationMode(GetIsolationModeCallback callback) override;
void GetIsolatedOrigins(GetIsolatedOriginsCallback callback) override;
void GetIsolatedOriginsSize(GetIsolatedOriginsSizeCallback callback) override;
private:
mojo::Binding<::mojom::ProcessInternalsHandler> binding_;
......
......@@ -12,5 +12,5 @@
<title>Process Model Internals</title>
</head>
<div id="site-isolation-mode">Site Isolation mode: <span id='isolation-mode'>unknown</span></div>
<div id="isolated-origins-container">Isolated origins: <span id='isolated-origins'></span></div>
<div id="isolated-origins-container">Number of isolated origins: <span id='isolated-origins'></span></div>
</html>
......@@ -24,9 +24,8 @@ document.addEventListener('DOMContentLoaded', function() {
uiHandler.getIsolationMode().then((response) => {
document.getElementById('isolation-mode').innerText = response.mode;
});
uiHandler.getIsolatedOrigins().then((response) => {
document.getElementById('isolated-origins').innerText =
response.isolatedOrigins.join(', ');
uiHandler.getIsolatedOriginsSize().then((response) => {
document.getElementById('isolated-origins').innerText = response.size;
});
});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment