Skip to content

GitLab

T
tangled
Commit e369aa73 authored by rbpotter's avatar rbpotter Committed by Chromium LUCI CQ
Browse files
Options

Net internals: Remove flattenhtml for index.html 

This is in preparation for converting net internals to JS modules and
autogenerating the grd file.

Bug: 1132403,1152343
Change-Id: Ie6cb09197f71b0b18de3e9b252161de8c064b601
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639274Reviewed-by: default avatardpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845456}
parent f6cfac1b
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 189 deletions
chrome/browser/resources/net_internals/chromeos_view.css deleted 100644 → 0
View file @ f6cfac1b
/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
#chromeos-view-password-div,
#chromeos-view-parse-status {
margin-top: 20px;
}
input + label {
margin-inline-start: 10px;
}
chrome/browser/resources/net_internals/chromeos_view.html deleted 100644 → 0
View file @ f6cfac1b
<div id="chromeos-view-tab-content" class=content-box>
<h4 style='margin-top:0'>Import ONC file</h4>
<div>
Import ONC File has moved to
<a href="chrome://network#general">chrome://network#general</a>.
</div>
<h4>Store system logs</h4>
<div>
Store system logs has moved to
<a href="chrome://network#logs">chrome://network#logs</a>.
</div>
<h4>Network Debugging</h4>
<div>
Network Debugging has moved to
<a href="chrome://network#logs">chrome://network#logs</a>.
</div>
</div>
chrome/browser/resources/net_internals/dns_view.html deleted 100644 → 0
View file @ f6cfac1b
<!-- Host resolver info -->
<div id=dns-view-tab-content class=content-box>
<h4>
Host resolver cache
<input type=button value="Clear host cache" id=dns-view-clear-cache>
</h4>
</div>
chrome/browser/resources/net_internals/domain_security_policy_view.html deleted 100644 → 0
View file @ f6cfac1b
<style>
#domain-security-policy-view-tab-content tt {
word-wrap: break-word;
}
</style>
<!-- HSTS/PKP/Expect-CT tab -->
<div id=domain-security-policy-view-tab-content class=content-box>
<!-- This UI allows a user to query and update the browser's list of
HSTS/PKP/Expect-CT domains. -->
<h3>HSTS/PKP</h3>
<div class=deindent-header>
HSTS is HTTP Strict Transport Security: a way for sites to elect to
always use HTTPS. See <a href="https://www.chromium.org/hsts" target=_blank>
https://www.chromium.org/hsts</a>. PKP is Public Key Pinning: Chrome "pins"
certain public keys for certain sites in official builds.</div>
<h4>Add HSTS domain</h4>
<p>Input a domain name to add it to the HSTS set:</p>
<form id=hsts-view-add-form>
Domain: <input type=text id=hsts-view-add-input type="url"
placeholder="example.com"><br>
<label>Include subdomains for STS: <input type="checkbox" id=hsts-view-check-sts-input></label><br>
<input type=submit value="Add" id=hsts-view-add-submit>
</form>
<h4>Query HSTS/PKP domain</h4>
<p>Input a domain name to query the current HSTS/PKP set:</p>
<form id=hsts-view-query-form>
Domain: <input type=text id=hsts-view-query-input type="url"
placeholder="example.com">
<input type=submit value="Query" id=hsts-view-query-submit>
</form>
<div style="margin-top: 1em; margin-left: 2em;" id=hsts-view-query-output></div>
<h3>Expect-CT</h3>
<div class=deindent-header>
Expect-CT allows sites to elect to always require valid Certificate
Transparency information. See
<a href="https://tools.ietf.org/html/draft-ietf-httpbis-expect-ct" target=_blank>https://tools.ietf.org/html/draft-ietf-httpbis-expect-ct</a>.</div>
<p>To protect against cross-site tracking, Expect-CT data will soon be keyed
on the site of the main frame and innermost frame when an Expect-CT
header is encountered. When that behavior is enabled, both adding and
querying an Expect-CT domain use the eTLD+1 of the provided domain as
the site for both frames. Deleting policies affects information stored
for that domain in the context of all sites, however.</p>
<h4>Add Expect-CT domain</h4>
<p>Input a domain name to add it to the Expect-CT set. Leave Enforce unchecked
to configure Expect-CT in report-only mode.</p>
<form id=expect-ct-view-add-form>
<div><label>Domain: <input type=text id=expect-ct-view-add-input type="url"
placeholder="example.com"></label></div>
<div><label>Report URI (optional):
<input type=text id=expect-ct-view-add-report-uri-input type="url"
placeholder="https://reporting.example.com/expect-ct"></label>
</div>
<div><label>Enforce:
<input type="checkbox" id=expect-ct-view-check-enforce-input></label>
</div>
<input type=submit value="Add" id=expect-ct-view-add-submit>
</form>
<h4>Query Expect-CT domain</h4>
<p>Input a domain name to query the current Expect-CT set:</p>
<form id=expect-ct-view-query-form>
<label>Domain: <input type=text id=expect-ct-view-query-input type="url"
placeholder="example.com"></label>
<input type=submit value="Query" id=expect-ct-view-query-submit>
</form>
<div style="margin-top: 1em; margin-left: 2em;"
id=expect-ct-view-query-output>
</div>
<h4>Send test Expect-CT report</h4>
<p>Trigger a test report to the given report URI. The report will contain a
hostname of "expect-ct-report.test" and dummy data in other fields.</p>
<form id=expect-ct-view-test-report-form>
<label>Report URI: <input type=text id=expect-ct-view-test-report-uri
type="url"></label>
<input type=submit value="Send" id=expect-ct-view-test-report-submit>
</form>
<div style="margin-top: 1em; margin-left: 2em;"
id=expect-ct-view-test-report-output>
</div>
<h3>Delete domain security policies</h3>
<p>
Input a domain name to delete its dynamic domain security policies (HSTS
and Expect-CT). (<i>You cannot delete preloaded entries.</i>):
</p>
<form id=domain-security-policy-view-delete-form>
<label>Domain: <input type=text id=domain-security-policy-view-delete-input
type="url"
placeholder="example.com"></label>
<input type=submit value="Delete"
id=domain-security-policy-view-delete-submit>
</form>
</div>
chrome/browser/resources/net_internals/events_view.html deleted 100644 → 0
View file @ f6cfac1b
<!-- ================= Events view =================== -->
<div id=events-view-tab-content class=content-box>
The net-internals events viewer and related functionality has been removed.
Please use <a href="chrome://net-export">chrome://net-export</a> to save netlogs and the external <a href="https://netlog-viewer.appspot.com/">netlog_viewer</a> to view them.
</div>
chrome/browser/resources/net_internals/index.html
View file @ e369aa73
......@@ -12,7 +12,6 @@ found in the LICENSE file.
maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" href="main.css">
<link rel="stylesheet" href="chromeos_view.css">
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/js/promise_resolver.js"></script>
......@@ -24,12 +23,184 @@ found in the LICENSE file.
</div>
<div id=main-tab-contents>
<include src="events_view.html">
<include src="proxy_view.html">
<include src="dns_view.html">
<include src="sockets_view.html">
<include src="domain_security_policy_view.html">
<include src="chromeos_view.html">
<div id=events-view-tab-content class=content-box>
The net-internals events viewer and related functionality has been removed.
Please use <a href="chrome://net-export">chrome://net-export</a> to save netlogs and the external <a href="https://netlog-viewer.appspot.com/">netlog_viewer</a> to view them.
</div>
<div id=proxy-view-tab-content class=content-box>
<input type=button value="Re-apply settings"
id=proxy-view-reload-settings>
<input type=button value="Clear bad proxies"
id=proxy-view-clear-bad-proxies>
</div>
<div id=dns-view-tab-content class=content-box>
<h4>
Host resolver cache
<input type=button value="Clear host cache" id=dns-view-clear-cache>
</h4>
</div>
<div id=sockets-view-tab-content class=content-box>
<ul style='margin-top:0'>
<li>
<input type=button value="Close idle sockets"
id=sockets-view-close-idle-button>
</li>
<li>
<input type=button value="Flush socket pools"
id=sockets-view-flush-button>
<span class=warning-text>
May break pages with active connections
</span>
</li>
</ul>
</div>
<div id=domain-security-policy-view-tab-content class=content-box>
<!-- This UI allows a user to query and update the browser's list of
HSTS/PKP/Expect-CT domains. -->
<h3>HSTS/PKP</h3>
<div class=deindent-header>
HSTS is HTTP Strict Transport Security: a way for sites to elect to
always use HTTPS. See
<a href="https://www.chromium.org/hsts" target=_blank>
https://www.chromium.org/hsts</a>. PKP is Public Key Pinning: Chrome
"pins" certain public keys for certain sites in official builds.</div>
<h4>Add HSTS domain</h4>
<p>Input a domain name to add it to the HSTS set:</p>
<form id=hsts-view-add-form>
Domain: <input type=text id=hsts-view-add-input type="url"
placeholder="example.com">
<label>Include subdomains for STS: <input type="checkbox"
id=hsts-view-check-sts-input>
</label>
<input type=submit value="Add" id=hsts-view-add-submit>
</form>
<h4>Query HSTS/PKP domain</h4>
<p>Input a domain name to query the current HSTS/PKP set:</p>
<form id=hsts-view-query-form>
Domain: <input type=text id=hsts-view-query-input type="url"
placeholder="example.com">
<input type=submit value="Query" id=hsts-view-query-submit>
</form>
<div style="margin-top: 1em; margin-left: 2em;"
id=hsts-view-query-output>
</div>
<h3>Expect-CT</h3>
<div class=deindent-header>
Expect-CT allows sites to elect to always require valid Certificate
Transparency information. See
<a href="https://tools.ietf.org/html/draft-ietf-httpbis-expect-ct"
target=_blank>
https://tools.ietf.org/html/draft-ietf-httpbis-expect-ct
</a>.
</div>
<p>To protect against cross-site tracking, Expect-CT data will soon be
keyed on the site of the main frame and innermost frame when an
Expect-CT header is encountered. When that behavior is enabled,
both adding and querying an Expect-CT domain use the eTLD+1 of the
provided domain as the site for both frames. Deleting policies
affects information stored for that domain in the context of all
sites, however.</p>
<h4>Add Expect-CT domain</h4>
<p>Input a domain name to add it to the Expect-CT set. Leave Enforce
unchecked to configure Expect-CT in report-only mode.</p>
<form id=expect-ct-view-add-form>
<div><label>Domain: <input type=text
id=expect-ct-view-add-input type="url"
placeholder="example.com"></label></div>
<div>
<label>Report URI (optional):
<input type=text id=expect-ct-view-add-report-uri-input type="url"
placeholder="https://reporting.example.com/expect-ct">
</label>
</div>
<div>
<label>Enforce:
<input type="checkbox" id=expect-ct-view-check-enforce-input>
</label>
</div>
<input type=submit value="Add" id=expect-ct-view-add-submit>
</form>
<h4>Query Expect-CT domain</h4>
<p>Input a domain name to query the current Expect-CT set:</p>
<form id=expect-ct-view-query-form>
<label>Domain: <input type=text id=expect-ct-view-query-input
type="url" placeholder="example.com"></label>
<input type=submit value="Query" id=expect-ct-view-query-submit>
</form>
<div style="margin-top: 1em; margin-left: 2em;"
id=expect-ct-view-query-output>
</div>
<h4>Send test Expect-CT report</h4>
<p>Trigger a test report to the given report URI. The report will
contain a hostname of "expect-ct-report.test" and dummy data in
other fields.</p>
<form id=expect-ct-view-test-report-form>
<label>Report URI: <input type=text id=expect-ct-view-test-report-uri
type="url"></label>
<input type=submit value="Send" id=expect-ct-view-test-report-submit>
</form>
<div style="margin-top: 1em; margin-left: 2em;"
id=expect-ct-view-test-report-output>
</div>
<h3>Delete domain security policies</h3>
<p>
Input a domain name to delete its dynamic domain security policies
(HSTS and Expect-CT). (<i>You cannot delete preloaded entries.</i>):
</p>
<form id=domain-security-policy-view-delete-form>
<label>Domain: <input type=text
id=domain-security-policy-view-delete-input
type="url"
placeholder="example.com"></label>
<input type=submit value="Delete"
id=domain-security-policy-view-delete-submit>
</form>
</div>
<if expr="chromeos">
<div id="chromeos-view-tab-content" class=content-box>
<h4 style='margin-top:0'>Import ONC file</h4>
<div>
Import ONC File has moved to
<a href="chrome://network#general">chrome://network#general</a>.
</div>
<h4>Store system logs</h4>
<div>
Store system logs has moved to
<a href="chrome://network#logs">chrome://network#logs</a>.
</div>
<h4>Network Debugging</h4>
<div>
Network Debugging has moved to
<a href="chrome://network#logs">chrome://network#logs</a>.
</div>
</div>
</if>
</div>
</body>
......
chrome/browser/resources/net_internals/main.css
View file @ e369aa73
......@@ -2,8 +2,6 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
/* Only common styles should be declared here. */
* {
box-sizing: border-box;
}
......@@ -65,3 +63,16 @@ ul {
.warning-text {
color: rgb(238, 0, 0);
}
#sockets-view-close-idle-button,
#sockets-view-flush-button {
margin-bottom: 2px;
}
#domain-security-policy-view-tab-content tt {
word-wrap: break-word;
}
input + label {
margin-inline-start: 10px;
}
chrome/browser/resources/net_internals/net_internals_resources.grd
View file @ e369aa73
......@@ -10,7 +10,8 @@
</outputs>
<release seq="1">
<includes>
<include name="IDR_NET_INTERNALS_INDEX_HTML" file="index.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_NET_INTERNALS_INDEX_HTML" file="index.html" type="BINDATA" />
<include name="IDR_NET_INTERNALS_MAIN_CSS" file="main.css" type="BINDATA" />
<include name="IDR_NET_INTERNALS_INDEX_JS" file="index.js" flattenhtml="true" type="BINDATA" />
</includes>
</release>
......
chrome/browser/resources/net_internals/proxy_view.html deleted 100644 → 0
View file @ f6cfac1b
<!-- Proxy info -->
<div id=proxy-view-tab-content class=content-box>
<input type=button value="Re-apply settings" id=proxy-view-reload-settings>
<input type=button value="Clear bad proxies" id=proxy-view-clear-bad-proxies>
</div>
chrome/browser/resources/net_internals/sockets_view.html deleted 100644 → 0
View file @ f6cfac1b
<style>
#sockets-view-close-idle-button,
#sockets-view-flush-button {
margin-bottom: 2px;
}
</style>
<div id=sockets-view-tab-content class=content-box>
<ul style='margin-top:0'>
<li>
<input type=button value="Close idle sockets" id=sockets-view-close-idle-button>
</li>
<li>
<input type=button value="Flush socket pools" id=sockets-view-flush-button>
<span class=warning-text>May break pages with active connections</span>
</li>
</ul>
</div>
chrome/browser/ui/webui/net_internals/net_internals_ui.cc
View file @ e369aa73
......@@ -44,6 +44,7 @@ content::WebUIDataSource* CreateNetInternalsHTMLSource() {
source->SetDefaultResource(IDR_NET_INTERNALS_INDEX_HTML);
source->AddResourcePath("index.js", IDR_NET_INTERNALS_INDEX_JS);
source->AddResourcePath("main.css", IDR_NET_INTERNALS_MAIN_CSS);
source->UseStringsJs();
return source;
}
......
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