chromium/src
0
Fork 0
Code Activity

Revert "Disable editing managed network config fields."

Browse Source 
This reverts commit 43116fdd29.

Reason for revert: Causing multiple failures on the linux-chromeos-dbg builders:
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8932319379574593136/+/steps/browser_tests/0/logs/CrSettingsInternetDetailPageTest.InternetDetailPage/0

Original change's description:
> Disable editing managed network config fields.
> 
> * Disable network configuration field if the field is enforced by policy.
> * Add policy network indicator if the field is controlled by policy.
> 
> Bug: 877424
> Change-Id: Icfdb6d7fb3deb09696b6d2edce27d3c9851043a2
> Reviewed-on: https://chromium-review.googlesource.com/c/1251447
> Commit-Queue: Nikita Podguzov <nikitapodguzov@google.com>
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Reviewed-by: Alexander Hendrich <hendrich@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#600735}

TBR=stevenjb@chromium.org,hendrich@chromium.org,nikitapodguzov@google.com

Change-Id: Ib787c57ca39873750807076e09b5a2b50ed7230b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 877424
Reviewed-on: https://chromium-review.googlesource.com/c/1288898
Reviewed-by: Joe Downing <joedow@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600791}
This commit is contained in:
Joe Downing
2018-10-18 16:29:30 +00:00
committed by Commit Bot
parent c3c83fe927
commit ab5288ecaa
28 changed files with 227 additions and 682 deletions

4
chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.html

@ -55,12 +55,12 @@
</style>
<cr-dialog id="dialog" no-cancel>
<div slot="title">[[getDialogTitle_(managedProperties_)]]</div>
<div slot="title">[[getDialogTitle_(networkProperties_)]]</div>
<div slot="body">
<network-config id="networkConfig" class="flex"
networking-private="[[networkingPrivate]]"
global-policy="[[globalPolicy_]]"
managed-properties="{{managedProperties_}}"
network-properties="{{networkProperties_}}"
enable-connect="{{enableConnect_}}"
share-allow-enable="[[shareAllowEnable_]]"
share-default="[[shareDefault_]]"

10
chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.js

@ -55,9 +55,9 @@ Polymer({
* The current properties if an existing network is being configured, or
* a minimal subset for a new network. Note: network-config may modify
* this (specifically .name).
* @type {!chrome.networkingPrivate.ManagedProperties}
* @type {!chrome.networkingPrivate.NetworkProperties}
*/
managedProperties_: Object,
networkProperties_: Object,
/**
* Set by network-config when a configuration error occurs.
@ -85,9 +85,9 @@ Polymer({
this.guid_ = params.get('guid') || '';
}
this.managedProperties_ = {
this.networkProperties_ = {
GUID: this.guid_,
Name: {Active: ''},
Name: '',
Type: /** @type {chrome.networkingPrivate.NetworkType} */ (type),
};
@ -110,7 +110,7 @@ Polymer({
* @private
*/
getDialogTitle_: function() {
var type = this.i18n('OncType' + this.managedProperties_.Type);
var type = this.i18n('OncType' + this.networkProperties_.Type);
return this.i18n('internetJoinType', type);
},

4
chrome/browser/resources/settings/internet_page/internet_config.html

@ -24,12 +24,12 @@
</style>
<cr-dialog id="dialog" close-text="$i18n{close}">
<div slot="title">[[getDialogTitle_(managedProperties_)]]</div>
<div slot="title">[[getDialogTitle_(networkProperties_)]]</div>
<div slot="body">
<network-config id="networkConfig" class="flex"
networking-private="[[networkingPrivate]]"
global-policy="[[globalPolicy]]"
managed-properties="{{managedProperties_}}"
network-properties="{{networkProperties_}}"
enable-connect="{{enableConnect_}}" enable-save="{{enableSave_}}"
share-allow-enable="[[shareAllowEnable_]]"
share-default="[[shareDefault_]]"

15
chrome/browser/resources/settings/internet_page/internet_config.js

@ -69,9 +69,9 @@ Polymer({
* The current properties if an existing network is being configured, or
* a minimal subset for a new network. Note: network-config may modify
* this (specifically .name).
* @private {!chrome.networkingPrivate.ManagedProperties}
* @private {!chrome.networkingPrivate.NetworkProperties}
*/
managedProperties_: Object,
networkProperties_: Object,
/**
* Set by network-config when a configuration error occurs.
@ -88,12 +88,12 @@ Polymer({
if (!dialog.open)
dialog.showModal();
// Set managedProperties for new configurations and for existing
// Set networkProperties for new configurations and for existing
// configurations until the current properties are loaded.
assert(this.type && this.type != CrOnc.Type.ALL);
this.managedProperties_ = {
this.networkProperties_ = {
GUID: this.guid,
Name: {Active: this.name},
Name: this.name,
Type: this.type,
};
this.$.networkConfig.init();
@ -120,11 +120,10 @@ Polymer({
* @private
*/
getDialogTitle_: function() {
const name = /** @type {string} */ (
CrOnc.getActiveValue(this.managedProperties_.Name));
const name = this.networkProperties_.Name;
if (name)
return this.i18n('internetConfigName', HTMLEscape(name));
const type = this.i18n('OncType' + this.managedProperties_.Type);
const type = this.i18n('OncType' + this.networkProperties_.Type);
return this.i18n('internetJoinType', type);
},

35
chrome/test/data/webui/chromeos/cr_onc_strings.js

@ -3,12 +3,8 @@
// found in the LICENSE file.
/**
* @fileoverview This file has two parts:
*
* 1. loadTimeData override values for ONC strings used in network_config.html
* and other network configuration UI.
*
* 2. Helper functions to convert and handle ONC properties for using in tests.
* @fileoverview loadTimeData override values for ONC strings used in
* network_config.html and other network configuration UI.
*/
var CrOncTest = CrOncTest || {};
@ -85,30 +81,3 @@ CrOncTest.overrideCrOncStrings = function() {
};
loadTimeData.overrideValues(oncKeys);
};
/**
* Converts an unmanaged ONC dictionary into a managed dictionary by
* setting properties 'Active' values to values from unmanaged dictionary.
* NOTE: Because of having not only managed variables in ManagedProperty (e.g.
* 'GUID', 'Source', 'Type', etc) this function can handle only simple
* dictionaries such as provided in network_config_test.js.
* @param {!Object|undefined} properties An unmanaged ONC dictionary
* @return {!Object|undefined} A managed version of |properties|.
*/
CrOncTest.convertToManagedProperties = function(properties) {
'use strict';
if (!properties)
return undefined;
var result = {};
var keys = Object.keys(properties);
if (typeof properties != 'object')
return {Active: properties};
for (var i = 0; i < keys.length; ++i) {
var k = keys[i];
if (['GUID', 'Source', 'Type'].includes(k))
result[k] = properties[k];
else
result[k] = this.convertToManagedProperties(properties[k]);
}
return result;
};

3
chrome/test/data/webui/chromeos/fake_networking_private.js

@ -116,7 +116,8 @@ cr.define('chrome', function() {
var result = this.networkStates_.find(function(state) {
return state.GUID == guid;
});
callback(CrOncTest.convertToManagedProperties(result));
// TODO(stevenjb): Convert state to ManagedProperties.
callback(result);
this.methodCalled('getManagedProperties');
},

17
chrome/test/data/webui/cr_components/network_config_test.js

@ -13,12 +13,11 @@ suite('network-config', function() {
CrOncTest.overrideCrOncStrings();
});
function setNetworkConfig(properties) {
function setNetworkConfig(networkProperties) {
PolymerTest.clearBody();
networkConfig = document.createElement('network-config');
networkConfig.networkingPrivate = api_;
networkConfig.managedProperties =
CrOncTest.convertToManagedProperties(properties);
networkConfig.networkProperties = networkProperties;
}
function initNetworkConfig() {
@ -74,10 +73,8 @@ suite('network-config', function() {
test('Default', function() {
return flushAsync().then(() => {
assertEquals('someguid', networkConfig.managedProperties.GUID);
assertEquals(
'somename',
CrOnc.getActiveValue(networkConfig.managedProperties.Name));
assertEquals('someguid', networkConfig.networkProperties.GUID);
assertEquals('somename', networkConfig.networkProperties.Name);
assertFalse(!!networkConfig.$$('#share'));
assertTrue(!!networkConfig.$$('#ssid'));
assertTrue(!!networkConfig.$$('#security'));
@ -228,10 +225,8 @@ suite('network-config', function() {
assertEquals('WPA-EAP', networkConfig.security_);
assertEquals(
'PEAP',
CrOnc.getActiveValue(
/** @type {chrome.networkingPrivate.ManagedDOMString|undefined} */
(networkConfig.get(
'Ethernet.EAP.Outer', networkConfig.managedProperties))));
networkConfig.get(
'Ethernet.EAP.Outer', networkConfig.networkProperties));
let outer = networkConfig.$$('#outer');
assertTrue(!!outer);
assertTrue(!outer.disabled);

2
chrome/test/data/webui/settings/cr_settings_browsertest.js

@ -1391,7 +1391,6 @@ CrSettingsInternetPageTest.prototype = {
ROOT_PATH + 'ui/webui/resources/js/assert.js',
'../fake_chrome_event.js',
'../chromeos/fake_networking_private.js',
'../chromeos/cr_onc_strings.js',
'internet_page_tests.js',
]),
};
@ -1420,7 +1419,6 @@ CrSettingsInternetDetailPageTest.prototype = {
ROOT_PATH + 'ui/webui/resources/js/util.js',
'../fake_chrome_event.js',
'../chromeos/fake_networking_private.js',
'../chromeos/cr_onc_strings.js',
'internet_detail_page_tests.js',
]),
};

32
ui/webui/resources/cr_components/chromeos/network/BUILD.gn

@ -9,9 +9,7 @@ js_type_check("closure_compile") {
":network_apnlist",
":network_choose_mobile",
":network_config",
":network_config_input",
":network_config_select",
":network_config_toggle",
":network_ip_config",
":network_nameservers",
":network_password_input",
@ -50,25 +48,8 @@ js_library("network_config") {
extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
}
js_library("network_config_element_behavior") {
deps = [
"//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types",
]
}
js_library("network_config_input") {
deps = [
":network_config_element_behavior",
"//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior",
]
externs_list = [ "$externs_path/networking_private.js" ]
extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
}
js_library("network_config_select") {
deps = [
":network_config_element_behavior",
"//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:i18n_behavior",
]
@ -76,15 +57,6 @@ js_library("network_config_select") {
extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
}
js_library("network_config_toggle") {
deps = [
":network_config_element_behavior",
"//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior",
]
externs_list = [ "$externs_path/networking_private.js" ]
extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
}
js_library("network_ip_config") {
deps = [
"//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types",
@ -101,12 +73,8 @@ js_library("network_nameservers") {
js_library("network_password_input") {
deps = [
":network_config_element_behavior",
"//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior",
"//ui/webui/resources/js:i18n_behavior",
]
externs_list = [ "$externs_path/networking_private.js" ]
extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
}
js_library("network_property_list") {

2
ui/webui/resources/cr_components/chromeos/network/network_apnlist.js

@ -97,7 +97,7 @@ Polymer({
apn = cellular.APN;
if (apn && apn.AccessPointName) {
activeApn = /** @type {!CrOnc.APNProperties|undefined} */ (
CrOnc.getActiveProperties(apn));
CrOnc.getSimpleActiveProperties(apn));
} else if (cellular.LastGoodAPN && cellular.LastGoodAPN.AccessPointName) {
activeApn = cellular.LastGoodAPN;
}

139
ui/webui/resources/cr_components/chromeos/network/network_config.html

@ -1,14 +1,13 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="network_config_input.html">
<link rel="import" href="network_config_select.html">
<link rel="import" href="network_config_toggle.html">
<link rel="import" href="network_password_input.html">
<link rel="import" href="network_shared_css.html">
<link rel="import" href="network_password_input.html">
<link rel="import" href="network_config_select.html">
<dom-module id="network-config">
<template>
@ -17,9 +16,9 @@
<!-- SSID (WiFi) -->
<template is="dom-if" if="[[isType_(NetworkType_.WI_FI, type)]]" restamp>
<network-config-input id="ssid" label="[[i18n('OncWiFi-SSID')]]"
<cr-input id="ssid" label="[[i18n('OncWiFi-SSID')]]"
value="{{configProperties_.WiFi.SSID}}" readonly="[[hasGuid_(guid)]]">
</network-config-input>
</cr-input>
</template>
<!-- Security (WiFi and Ethernet) -->
@ -28,8 +27,7 @@
value="{{security_}}"
disabled="[[!securityIsEnabled_(guid, type)]]"
items="[[getSecurityItems_(type)]]"
onc-prefix="WiFi.Security"
property="[[getManagedSecurity_(managedProperties)]]">
onc-prefix="WiFi.Security">
</network-config-select>
</template>
@ -38,132 +36,119 @@
restamp>
<network-password-input label="[[i18n('OncWiFi-Passphrase')]]"
value="{{configProperties_.WiFi.Passphrase}}"
on-enter="connectIfConfigured_"
property="[[managedProperties.WiFi.Passphrase]]">
on-enter="connectIfConfigured_">
</network-password-input>
</template>
<!-- VPN -->
<template is="dom-if" if="[[showVpn_]]" restamp>
<network-config-input label="[[i18n('OncVPN-Host')]]"
value="{{configProperties_.VPN.Host}}"
property="[[managedProperties.VPN.Host]]">
</network-config-input>
<network-config-input label="[[i18n('OncName')]]"
value="{{configProperties_.Name}}"
readonly="[[hasGuid_(guid)]]">
</network-config-input>
<cr-input label="[[i18n('OncVPN-Host')]]"
value="{{configProperties_.VPN.Host}}">
</cr-input>
<cr-input label="[[i18n('OncName')]]"
value="{{configProperties_.Name}}" readonly="[[hasGuid_(guid)]]">
</cr-input>
<network-config-select id="outer" label="[[i18n('OncVPN-Type')]]"
value="{{vpnType_}}" items="[[vpnTypeItems_]]"
onc-prefix="VPN.Type" disabled="[[hasGuid_(guid)]]"
property="[[managedProperties.VPN.Type]]">
onc-prefix="VPN.Type" disabled="[[hasGuid_(guid)]]">
</network-config-select>
<template is="dom-if" if="[[!showVpn_.OpenVPN]]">
<network-config-input label="[[i18n('OncVPN-L2TP-Username')]]"
value="{{configProperties_.VPN.L2TP.Username}}"
property="[[managedProperties.VPN.L2TP.Username]]">
</network-config-input>
<cr-input label="[[i18n('OncVPN-L2TP-Username')]]"
value="{{configProperties_.VPN.L2TP.Username}}">
</cr-input>
<network-password-input label="[[i18n('OncVPN-L2TP-Password')]]"
value="{{configProperties_.VPN.L2TP.Password}}"
property="[[managedProperties.VPN.L2TP.Password]]">
value="{{configProperties_.VPN.L2TP.Password}}">
</network-password-input>
<network-config-input label="[[i18n('OncVPN-IPsec-Group')]]"
value="{{configProperties_.VPN.IPsec.Group}}"
property="[[managedProperties.VPN.IPsec.Group]]">
</network-config-input>
<cr-input label="[[i18n('OncVPN-IPsec-Group')]]"
value="{{configProperties_.VPN.IPsec.Group}}">
</cr-input>
<template is="dom-if" if="[[!showVpn_.Cert]]">
<network-password-input label="[[i18n('OncVPN-IPsec-PSK')]]"
value="{{configProperties_.VPN.IPsec.PSK}}"
on-focus="onPskFocus_" on-blur="onPskBlur_"
on-input="onPskInput_"
property="[[managedProperties.VPN.IPsec.PSK]]">
on-input="onPskInput_">
</network-password-input>
</template>
</template>
<template is="dom-if" if="[[showVpn_.OpenVPN]]">
<network-config-input label="[[i18n('OncVPN-OpenVPN-Username')]]"
value="{{configProperties_.VPN.OpenVPN.Username}}"
property="[[managedProperties.VPN.OpenVPN.Username]]">
</network-config-input>
<cr-input label="[[i18n('OncVPN-OpenVPN-Username')]]"
value="{{configProperties_.VPN.OpenVPN.Username}}">
</cr-input>
<network-password-input label="[[i18n('OncVPN-OpenVPN-Password')]]"
value="{{configProperties_.VPN.OpenVPN.Password}}"
property="[[managedProperties.VPN.OpenVPN.Password]]">
value="{{configProperties_.VPN.OpenVPN.Password}}">
</network-password-input>
<network-config-input label="[[i18n('OncVPN-OpenVPN-OTP')]]"
value="{{configProperties_.VPN.OpenVPN.OTP}}"
property="[[managedProperties.VPN.OpenVPN.OTP]]">
</network-config-input>
<cr-input label="[[i18n('OncVPN-OpenVPN-OTP')]]"
value="{{configProperties_.VPN.OpenVPN.OTP}}">
</cr-input>
</template>
<template is="dom-if" if="[[showVpn_.Cert]]">
<network-config-select id="vpnServerCa"
label="[[i18n('OncEAP-ServerCA')]]"
value="{{selectedServerCaHash_}}" items="[[serverCaCerts_]]"
cert-list
property="[[getManagedVpnServerCaRefs_(managedProperties)]]">
cert-list>
</network-config-select>
<network-config-select id="vpnUserCert"
label="[[i18n('OncEAP-UserCert')]]"
value="{{selectedUserCertHash_}}" items="[[userCerts_]]"
cert-list
property="[[getManagedVpnClientCertType_(managedProperties)]]">
cert-list>
</network-config-select>
</template>
<network-config-toggle label="[[i18n('networkConfigSaveCredentials')]]"
checked="{{vpnSaveCredentials_}}"
property="[[getManagedVpnSaveCredentials_(managedProperties)]]">
</network-config-toggle>
<div class="property-box">
<div id="vpnSaveCredentialsLabel" class="start">
[[i18n('networkConfigSaveCredentials')]]
</div>
<cr-toggle checked="{{vpnSaveCredentials_}}"
aria-labelledby="vpnSaveCredentialsLabel">
</cr-toggle>
</div>
</template>
<!-- EAP (WiFi, WiMAX, Ethernet) -->
<template is="dom-if" if="[[showEap_]]" restamp>
<network-config-select id="outer" label="[[i18n('OncEAP-Outer')]]"
value="{{eapProperties_.Outer}}" items="[[eapOuterItems_]]"
onc-prefix="EAP.Outer" hidden="[[!showEap_.Outer]]"
property="[[managedEapProperties_.Outer]]">
onc-prefix="EAP.Outer" hidden="[[!showEap_.Outer]]">
</network-config-select>
<network-config-select id="inner" label="[[i18n('OncEAP-Inner')]]"
value="{{eapProperties_.Inner}}"
items="[[getEapInnerItems_(eapProperties_.Outer)]]"
onc-prefix="EAP.Inner" hidden="[[!showEap_.Inner]]"
property="[[managedEapProperties_.Inner]]">
onc-prefix="EAP.Inner" hidden="[[!showEap_.Inner]]">
</network-config-select>
<network-config-select id="serverCa" label="[[i18n('OncEAP-ServerCA')]]"
value="{{selectedServerCaHash_}}" items="[[serverCaCerts_]]"
hidden="[[!showEap_.ServerCA]]" cert-list
property="[[managedEapProperties_.UseSystemCAs]]">
hidden="[[!showEap_.ServerCA]]" cert-list>
</network-config-select>
<network-config-input label="[[i18n('OncEAP-SubjectMatch')]]"
<cr-input label="[[i18n('OncEAP-SubjectMatch')]]"
value="{{eapProperties_.SubjectMatch}}"
hidden="[[!showEap_.SubjectMatch]]"
property="[[managedEapProperties_.SubjectMatch]]">
</network-config-input>
hidden="[[!showEap_.SubjectMatch]]">
</cr-input>
<network-config-select id="userCert" label="[[i18n('OncEAP-UserCert')]]"
value="{{selectedUserCertHash_}}" items="[[userCerts_]]"
hidden="[[!showEap_.UserCert]]" cert-list
property="[[managedEapProperties_.ClientCertType]]">
hidden="[[!showEap_.UserCert]]" cert-list>
</network-config-select>
<network-config-input label="[[i18n('OncEAP-Identity')]]"
value="{{eapProperties_.Identity}}" hidden="[[!showEap_.Identity]]"
property="[[managedEapProperties_.Identity]]">
</network-config-input>
<cr-input label="[[i18n('OncEAP-Identity')]]"
value="{{eapProperties_.Identity}}" hidden="[[!showEap_.Identity]]">
</cr-input>
<network-password-input label="[[i18n('OncEAP-Password')]]"
value="{{eapProperties_.Password}}" hidden="[[!showEap_.Password]]"
property="[[managedEapProperties_.Password]]">
value="{{eapProperties_.Password}}" hidden="[[!showEap_.Password]]">
</network-password-input>
<network-config-input label="[[i18n('OncEAP-AnonymousIdentity')]]"
<cr-input label="[[i18n('OncEAP-AnonymousIdentity')]]"
value="{{eapProperties_.AnonymousIdentity}}"
hidden="[[!showEap_.AnonymousIdentity]]"
property="[[managedEapProperties_.AnonymousIdentity]]">
</network-config-input>
<network-config-toggle label="[[i18n('networkConfigSaveCredentials')]]"
checked="{{eapProperties_.SaveCredentials}}"
property="[[managedEapProperties_.SaveCredentials]]">
</network-config-toggle>
hidden="[[!showEap_.AnonymousIdentity]]">
</cr-input>
<div class="property-box">
<div id="eapSaveCredentialsLabel" class="start">
[[i18n('networkConfigSaveCredentials')]]
</div>
<cr-toggle checked="{{eapProperties_.SaveCredentials}}"
aria-labelledby="eapSaveCredentialsLabel">
</cr-toggle>
</div>
</template>
<!-- Share (WiFi and WiMAX) -->
<template is="dom-if"
if="[[shareIsVisible_(guid, type, managedProperties)]]" restamp>
if="[[shareIsVisible_(guid, type, networkProperties)]]" restamp>
<div class="property-box">
<div id="shareLabel" class="start">[[i18n('networkConfigShare')]]</div>
<cr-toggle id="share" checked="{{shareNetwork_}}"

286
ui/webui/resources/cr_components/chromeos/network/network_config.js

@ -79,36 +79,26 @@ Polymer({
value: false,
},
/**
* The current properties if an existing network being configured.
* This will be undefined when configuring a new network.
* @private {!chrome.networkingPrivate.NetworkProperties|undefined}
*/
networkProperties: {
type: Object,
notify: true,
},
/** Set to any error from the last configuration result. */
error: {
type: String,
notify: true,
},
/**
* The managed properties of an existing network.
* This is used for determination of managed fields.
* This will be undefined when configuring a new network.
* @private {!chrome.networkingPrivate.ManagedProperties|undefined}
*/
managedProperties: {
type: Object,
notify: true,
},
/**
* Managed EAP properties used for determination of managed EAP fields.
* @private {?chrome.networkingPrivate.ManagedEAPProperties}
*/
managedEapProperties_: {
type: Object,
value: null,
},
/** Set if |guid| is not empty once managedProperties are received. */
/** Set if |guid| is not empty once networkProperties are received. */
propertiesReceived_: Boolean,
/** Set once managedProperties have been sent; prevents multiple saves. */
/** Set once properties have been sent; prevents multiple saves. */
propertiesSent_: Boolean,
/**
@ -322,7 +312,7 @@ Polymer({
observers: [
'setEnableConnect_(isConfigured_, propertiesSent_)',
'setEnableSave_(isConfigured_, propertiesReceived_)',
'updateConfigProperties_(managedProperties)',
'updateConfigProperties_(networkProperties)',
'updateSecurity_(configProperties_, security_)',
'updateEapOuter_(eapProperties_.Outer)',
'updateEapCerts_(eapProperties_.*, serverCaCerts_, userCerts_)',
@ -368,14 +358,13 @@ Polymer({
this.propertiesSent_ = false;
this.selectedServerCaHash_ = undefined;
this.selectedUserCertHash_ = undefined;
this.guid = this.managedProperties.GUID;
this.type = this.managedProperties.Type;
this.guid = this.networkProperties.GUID;
this.type = this.networkProperties.Type;
if (this.guid) {
this.networkingPrivate.getManagedProperties(
this.guid, (managedProperties) => {
this.getManagedPropertiesCallback_(managedProperties);
this.focusFirstInput_();
});
this.networkingPrivate.getProperties(this.guid, (properties) => {
this.getPropertiesCallback_(properties);
this.focusFirstInput_();
});
} else {
this.async(() => {
this.focusFirstInput_();
@ -429,7 +418,7 @@ Polymer({
focusFirstInput_: function() {
Polymer.dom.flush();
var e = this.$$(
'network-config-input:not([readonly]),' +
'cr-input:not([readonly]),' +
'network-password-input:not([disabled]),' +
'network-config-select:not([disabled])');
if (e)
@ -464,7 +453,7 @@ Polymer({
getSource_: function() {
if (!this.guid)
return CrOnc.Source.NONE;
var source = this.managedProperties.Source;
var source = this.networkProperties.Source;
return source ? /** @type {!CrOnc.Source} */ (source) : CrOnc.Source.NONE;
},
@ -519,54 +508,45 @@ Polymer({
},
/**
* networkingPrivate.getManagedProperties callback.
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* networkingPrivate.getProperties callback.
* @param {!chrome.networkingPrivate.NetworkProperties} properties
* @private
*/
getManagedPropertiesCallback_: function(managedProperties) {
if (!managedProperties) {
// If |managedProperties| is null,
// the network no longer exists; close the page.
getPropertiesCallback_: function(properties) {
if (!properties) {
// If |properties| is null, the network no longer exists; close the page.
console.error('Network no longer exists: ' + this.guid);
this.close_();
return;
}
if (managedProperties.Type == CrOnc.Type.ETHERNET &&
CrOnc.getActiveValue(
/** @type {chrome.networkingPrivate.ManagedDOMString|undefined} */
(this.get('Ethernet.Authentication', managedProperties))) !=
if (properties.Type == CrOnc.Type.ETHERNET &&
this.get('Ethernet.Authentication', properties) !=
CrOnc.Authentication.WEP_8021X) {
// Ethernet may have EAP properties set in a separate EthernetEap
// configuration. Request that before calling |setManagedProperties_|.
// configuration. Request that before calling |setNetworkProperties_|.
this.networkingPrivate.getNetworks(
{networkType: CrOnc.Type.ETHERNET, visible: false, configured: true},
this.getEthernetEap_.bind(this, managedProperties));
this.getEthernetEap_.bind(this, properties));
return;
}
if (managedProperties.Type == CrOnc.Type.VPN) {
if (properties.Type == CrOnc.Type.VPN) {
this.vpnSaveCredentials_ =
!!CrOnc.getActiveValue(
/** @type {chrome.networkingPrivate.ManagedBoolean|undefined} */
(this.get('VPN.OpenVPN.SaveCredentials', managedProperties))) ||
!!CrOnc.getActiveValue(
/** @type {chrome.networkingPrivate.ManagedBoolean|undefined} */
(this.get('VPN.IPsec.SaveCredentials', managedProperties))) ||
!!CrOnc.getActiveValue(
/** @type {chrome.networkingPrivate.ManagedBoolean|undefined} */
(this.get('VPN.L2TP.SaveCredentials', managedProperties)));
if (CrOnc.getActiveValue(
/** @type {chrome.networkingPrivate.ManagedDOMString|undefined} */
(this.get('VPN.IPsec.PSK', managedProperties))) === '') {
!!this.get('VPN.OpenVPN.SaveCredentials', properties) ||
!!this.get('VPN.IPsec.SaveCredentials', properties) ||
!!this.get('VPN.L2TP.SaveCredentials', properties);
if (this.get('VPN.IPsec.PSK', properties) === '') {
// If an empty PSK is provided, show a blank value in the UI to indicate
// that the PSK has a saved value.
this.pskSavedUnknown_ = true;
this.set('VPN.IPsec.PSK', UNKNOWN_PSK, properties);
} else {
this.pskSavedUnknown_ = false;
}
}
this.setManagedProperties_(managedProperties);
this.setNetworkProperties_(properties);
},
/**
@ -609,14 +589,13 @@ Polymer({
},
/**
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* @param {!chrome.networkingPrivate.NetworkProperties} properties
* @private
*/
setManagedProperties_: function(managedProperties) {
setNetworkProperties_: function(properties) {
this.propertiesReceived_ = true;
this.managedProperties = managedProperties;
this.managedEapProperties_ = this.getManagedEap_(managedProperties);
this.setError_(managedProperties.ErrorState);
this.networkProperties = properties;
this.setError_(properties.ErrorState);
this.updateCertError_();
// Set the current shareNetwork_ value when properties are received.
@ -626,13 +605,13 @@ Polymer({
/**
* networkingPrivate.getNetworks callback. Expects an array of Ethernet
* networks and looks for an EAP configuration to apply.
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* @param {!chrome.networkingPrivate.NetworkProperties} properties
* @param {!Array<chrome.networkingPrivate.NetworkStateProperties>} networks
* @private
*/
getEthernetEap_: function(managedProperties, networks) {
getEthernetEap_: function(properties, networks) {
if (this.getRuntimeError_()) {
this.setManagedProperties_(managedProperties);
this.setNetworkProperties_(properties);
return;
}
@ -643,20 +622,19 @@ Polymer({
network.Ethernet.Authentication == CrOnc.Authentication.WEP_8021X;
});
if (!ethernetEap) {
this.setManagedProperties_(managedProperties);
this.setNetworkProperties_(properties);
return;
}
this.networkingPrivate.getManagedProperties(
ethernetEap.GUID, (eapProperties) => {
if (!this.getRuntimeError_() && eapProperties.Ethernet.EAP) {
this.guid = eapProperties.GUID;
this.security_ = CrOnc.Security.WPA_EAP;
managedProperties.GUID = eapProperties.GUID;
managedProperties.Ethernet.EAP = eapProperties.Ethernet.EAP;
}
this.setManagedProperties_(managedProperties);
});
this.networkingPrivate.getProperties(ethernetEap.GUID, (eapProperties) => {
if (!this.getRuntimeError_() && eapProperties.Ethernet.EAP) {
this.guid = eapProperties.GUID;
this.security_ = CrOnc.Security.WPA_EAP;
properties.GUID = eapProperties.GUID;
properties.Ethernet.EAP = eapProperties.Ethernet.EAP;
}
this.setNetworkProperties_(properties);
});
},
/**
@ -664,7 +642,7 @@ Polymer({
* @private
*/
getSecurityItems_() {
if (this.managedProperties.Type == CrOnc.Type.WI_FI) {
if (this.networkProperties.Type == CrOnc.Type.WI_FI) {
return [
CrOnc.Security.NONE, CrOnc.Security.WEP_PSK, CrOnc.Security.WPA_PSK,
CrOnc.Security.WPA_EAP
@ -688,7 +666,7 @@ Polymer({
}
if (this.shareAllowEnable) {
// New insecure WiFi networks are always shared.
if (this.managedProperties.Type == CrOnc.Type.WI_FI &&
if (this.networkProperties.Type == CrOnc.Type.WI_FI &&
this.security_ == CrOnc.Security.NONE) {
this.shareNetwork_ = true;
return;
@ -704,7 +682,7 @@ Polymer({
},
/**
* Updates the config properties when |this.managedProperties| changes.
* Updates the config properties when |this.networkProperties| changes.
* This gets called once when navigating to the page when default properties
* are set, and again for existing networks when the properties are received.
* @private
@ -714,27 +692,21 @@ Polymer({
this.showVpn_ = null;
this.vpnType_ = undefined;
var managedProperties = this.managedProperties;
var properties = this.networkProperties;
var configProperties =
/** @type {chrome.networkingPrivate.NetworkConfigProperties} */ ({
Name: managedProperties.Name || '',
Type: managedProperties.Type,
Name: properties.Name || '',
Type: properties.Type,
});
switch (managedProperties.Type) {
switch (properties.Type) {
case CrOnc.Type.WI_FI:
if (managedProperties.WiFi) {
if (properties.WiFi) {
configProperties.WiFi = {
AutoConnect:
/** @type {boolean|undefined} */ (
CrOnc.getActiveValue(managedProperties.WiFi.AutoConnect)),
EAP: Object.assign(
{}, CrOnc.getActiveProperties(managedProperties.WiFi.EAP)),
Passphrase: /** @type {string|undefined} */ (
CrOnc.getActiveValue(managedProperties.WiFi.Passphrase)),
SSID: /** @type {string|undefined} */ (
CrOnc.getActiveValue(managedProperties.WiFi.SSID)),
Security: /** @type {string|undefined} */ (
CrOnc.getActiveValue(managedProperties.WiFi.Security))
AutoConnect: properties.WiFi.AutoConnect,
EAP: Object.assign({}, properties.WiFi.EAP),
Passphrase: properties.WiFi.Passphrase,
SSID: properties.WiFi.SSID,
Security: properties.WiFi.Security
};
} else {
configProperties.WiFi = {
@ -748,13 +720,11 @@ Polymer({
break;
case CrOnc.Type.ETHERNET:
configProperties.Ethernet = {
AutoConnect: !!CrOnc.getActiveValue(
/** @type {chrome.networkingPrivate.ManagedBoolean|undefined} */ (
this.get('Ethernet.AutoConnect', managedProperties)))
AutoConnect: !!this.get('Ethernet.AutoConnect', properties)
};
if (managedProperties.Ethernet && managedProperties.Ethernet.EAP) {
configProperties.Ethernet.EAP = Object.assign(
{}, CrOnc.getActiveProperties(managedProperties.Ethernet.EAP)),
if (properties.Ethernet && properties.Ethernet.EAP) {
configProperties.Ethernet.EAP =
Object.assign({}, properties.Ethernet.EAP),
configProperties.Ethernet.EAP.Outer =
configProperties.Ethernet.EAP.Outer || CrOnc.EAPType.LEAP;
}
@ -763,13 +733,10 @@ Polymer({
CrOnc.Security.NONE;
break;
case CrOnc.Type.WI_MAX:
if (managedProperties.WiMAX) {
if (properties.WiMAX) {
configProperties.WiMAX = {
AutoConnect:
/** @type {boolean|undefined} */ (
CrOnc.getActiveValue(managedProperties.WiMAX.AutoConnect)),
EAP: Object.assign(
{}, CrOnc.getActiveProperties(managedProperties.WiMAX.EAP)),
AutoConnect: properties.WiMAX.AutoConnect,
EAP: Object.assign({}, properties.WiMAX.EAP),
};
// WiMAX has no EAP.Outer property, only Identity and Password.
} else {
@ -780,30 +747,21 @@ Polymer({
this.security_ = CrOnc.Security.WPA_EAP;
break;
case CrOnc.Type.VPN:
if (managedProperties.VPN) {
if (properties.VPN) {
var vpn = {
Host: /** @type {string|undefined} */ (
CrOnc.getActiveValue(managedProperties.VPN.Host)),
Type: /** @type {string|undefined} */ (
CrOnc.getActiveValue(managedProperties.VPN.Type)),
Host: properties.VPN.Host,
Type: properties.VPN.Type,
};
if (vpn.Type == CrOnc.VPNType.L2TP_IPSEC) {
vpn.IPsec =
/** @type {chrome.networkingPrivate.IPSecProperties} */ (
Object.assign(
{AuthenticationType: CrOnc.IPsecAuthenticationType.PSK},
CrOnc.getActiveProperties(
managedProperties.VPN.IPsec)));
if (this.pskSavedUnknown_) {
this.set('IPsec.PSK', UNKNOWN_PSK, vpn);
}
vpn.L2TP = Object.assign(
{Username: ''},
CrOnc.getActiveProperties(managedProperties.VPN.L2TP));
properties.VPN.IPsec));
vpn.L2TP = Object.assign({Username: ''}, properties.VPN.L2TP);
} else {
assert(vpn.Type == CrOnc.VPNType.OPEN_VPN);
vpn.OpenVPN = Object.assign(
{}, CrOnc.getActiveProperties(managedProperties.VPN.OpenVPN));
vpn.OpenVPN = Object.assign({}, properties.VPN.OpenVPN);
}
configProperties.VPN = vpn;
} else {
@ -820,7 +778,7 @@ Polymer({
this.set('eapProperties_', this.getEap_(this.configProperties_));
if (!this.eapProperties_)
this.showEap_ = null;
if (managedProperties.Type == CrOnc.Type.VPN)
if (properties.Type == CrOnc.Type.VPN)
this.vpnType_ = this.getVpnTypeFromProperties_(this.configProperties_);
},
@ -959,28 +917,6 @@ Polymer({
this.set('eapProperties_', eapProperties);
},
/**
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* @return {?chrome.networkingPrivate.ManagedEAPProperties}
* @private
*/
getManagedEap_: function(managedProperties) {
var managedEap;
switch (managedProperties.Type) {
case CrOnc.Type.WI_FI:
managedEap = managedProperties.WiFi && managedProperties.WiFi.EAP;
break;
case CrOnc.Type.ETHERNET:
managedEap =
managedProperties.Ethernet && managedProperties.Ethernet.EAP;
break;
case CrOnc.Type.WI_MAX:
managedEap = managedProperties.WiMAX && managedProperties.WiMAX.EAP;
break;
}
return managedEap || null;
},
/**
* @param {!chrome.networkingPrivate.NetworkConfigProperties} properties
* @private
@ -1458,7 +1394,7 @@ Polymer({
this.propertiesSent_ = false;
return;
}
var connectState = this.managedProperties.ConnectionState;
var connectState = this.networkProperties.ConnectionState;
if (connect &&
(!connectState ||
connectState == CrOnc.ConnectionState.NOT_CONNECTED)) {
@ -1477,7 +1413,7 @@ Polymer({
this.setError_(this.getRuntimeError_());
if (this.error) {
console.error(
'createNetworkError, type: ' + this.managedProperties.Type + ': ' +
'createNetworkError, type: ' + this.networkProperties.Type + ': ' +
'error: ' + this.error);
this.propertiesSent_ = false;
return;
@ -1537,59 +1473,5 @@ Polymer({
setError_: function(error) {
this.error = error || '';
},
/**
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* @return {chrome.networkingPrivate.ManagedDOMString|undefined}
* @private
*/
getManagedSecurity_: function(managedProperties) {
var managedSecurity = undefined;
switch (managedProperties.Type) {
case CrOnc.Type.WI_FI:
managedSecurity =
managedProperties.WiFi && managedProperties.WiFi.Security;
break;
case CrOnc.Type.ETHERNET:
managedSecurity = managedProperties.Ethernet &&
managedProperties.Ethernet.Authentication;
break;
}
return managedSecurity;
},
/**
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* @return {!chrome.networkingPrivate.ManagedBoolean|undefined}
* @private
*/
getManagedVpnSaveCredentials_: function(managedProperties) {
return /** @type {chrome.networkingPrivate.ManagedBoolean|undefined} */ (
this.get('VPN.OpenVPN.SaveCredentials', managedProperties) ||
this.get('VPN.IPsec.SaveCredentials', managedProperties) ||
this.get('VPN.L2TP.SaveCredentials', managedProperties));
},
/**
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* @return {!chrome.networkingPrivate.ManagedDOMStringList|undefined}
* @private
*/
getManagedVpnServerCaRefs_: function(managedProperties) {
return /** @type {chrome.networkingPrivate.ManagedDOMStringList|undefined} */ (
this.get('VPN.OpenVPN.ServerCARefs', managedProperties) ||
this.get('VPN.IPsec.ServerCARefs', managedProperties));
},
/**
* @param {!chrome.networkingPrivate.ManagedProperties} managedProperties
* @return {!chrome.networkingPrivate.ManagedDOMString|undefined}
* @private
*/
getManagedVpnClientCertType_: function(managedProperties) {
return /** @type {chrome.networkingPrivate.ManagedDOMString|undefined} */ (
this.get('VPN.OpenVPN.ClientCertType', managedProperties) ||
this.get('VPN.IPsec.ClientCertType', managedProperties));
},
});
})();

2
ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.html

@ -1,2 +0,0 @@
<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html">
<script src="network_config_element_behavior.js"></script>

37
ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.js

@ -1,37 +0,0 @@
// Copyright 2018 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.
/**
* @fileoverview Behavior for network config elements.
*/
/** @polymerBehavior */
var NetworkConfigElementBehavior = {
properties: {
disabled: {
type: Boolean,
value: false,
reflectToAttribute: true,
},
/**
* Network managed property associated with the config element.
* @type {?CrOnc.ManagedProperty}
*/
property: {
type: Object,
value: null,
},
},
/**
* @param {boolean} disabled
* @param {?CrOnc.ManagedProperty} property
* @return {boolean} True if the element should be disabled.
* @private
*/
getDisabled_: function(disabled, property) {
return disabled || (!!property && this.isNetworkPolicyEnforced(property));
},
};

40
ui/webui/resources/cr_components/chromeos/network/network_config_input.html

@ -1,40 +0,0 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="network_config_element_behavior.html">
<link rel="import" href="network_shared_css.html">
<dom-module id="network-config-input">
<template>
<style include="network-shared">
#container {
align-items: center;
display: flex;
flex-direction: row;
}
cr-input {
width: 100%;
}
cr-policy-network-indicator {
--cr-tooltip-icon-margin-start: var(--cr-controlled-by-spacing);
}
</style>
<div id="container">
<cr-input label="[[label]]" value="{{value}}"
hidden="[[hidden]]" readonly="[[readonly]]"
disabled="[[getDisabled_(disabled, property)]]">
</cr-input>
<cr-policy-network-indicator
property="[[property]]" tooltip-position="left">
</cr-policy-network-indicator>
</div>
</template>
<script src="network_config_input.js"></script>
</dom-module>

35
ui/webui/resources/cr_components/chromeos/network/network_config_input.js

@ -1,35 +0,0 @@
// Copyright 2018 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.
/**
* @fileoverview Polymer element for network configuration input fields.
*/
Polymer({
is: 'network-config-input',
behaviors: [CrPolicyNetworkBehavior, NetworkConfigElementBehavior],
properties: {
label: String,
hidden: {
type: Boolean,
reflectToAttribute: true,
},
readonly: {
type: Boolean,
reflectToAttribute: true,
},
value: {
type: String,
notify: true,
},
},
focus: function() {
this.$$('cr-input').focus();
},
});

38
ui/webui/resources/cr_components/chromeos/network/network_config_select.html

@ -1,11 +1,7 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_tooltip_icon.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/md_select_css.html">
<link rel="import" href="network_config_element_behavior.html">
<link rel="import" href="network_shared_css.html">
<dom-module id="network-config-select">
@ -28,35 +24,19 @@
margin-bottom: var(--cr-form-field-bottom-spacing);
padding: 0;
}
#inner {
align-items: center;
display: flex;
flex-direction: row;
}
cr-policy-network-indicator {
--cr-tooltip-icon-margin-start: var(--cr-controlled-by-spacing);
}
</style>
<div id="outer">
<div id="label">[[label]]</div>
<div id="inner">
<select class="md-select"
disabled="[[getDisabled_(disabled, property)]]"
value="{{value::change}}" aria-label$="[[label]]">
<template is="dom-repeat" items="[[items]]">
<option value="[[getItemValue_(item)]]"
disabled="[[!getItemEnabled_(item)]]">
[[getItemLabel_(item, oncPrefix)]]
</option>
</template>
</select>
<cr-policy-network-indicator
property="[[property]]" tooltip-position="left">
</cr-policy-network-indicator>
</div>
<select class="md-select" disabled="[[disabled]]"
value="{{value::change}}" aria-label$="[[label]]">
<template is="dom-repeat" items="[[items]]">
<option value="[[getItemValue_(item)]]"
disabled="[[!getItemEnabled_(item)]]">
[[getItemLabel_(item, oncPrefix)]]
</option>
</template>
</select>
</div>
</template>

11
ui/webui/resources/cr_components/chromeos/network/network_config_select.js

@ -8,15 +8,16 @@
Polymer({
is: 'network-config-select',
behaviors: [
I18nBehavior,
CrPolicyNetworkBehavior,
NetworkConfigElementBehavior,
],
behaviors: [I18nBehavior],
properties: {
label: String,
disabled: {
type: Boolean,
reflectToAttribute: true,
},
/** Set to true if |items| is a list of certificates. */
certList: Boolean,

32
ui/webui/resources/cr_components/chromeos/network/network_config_toggle.html

@ -1,32 +0,0 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="network_config_element_behavior.html">
<link rel="import" href="network_shared_css.html">
<dom-module id="network-config-toggle">
<template>
<style include="network-shared">
cr-policy-network-indicator {
--cr-tooltip-icon-margin-start: var(--cr-controlled-by-spacing);
}
</style>
<div class="property-box">
<div class="start">
[[label]]
</div>
<cr-toggle checked="{{checked}}"
disabled="[[getDisabled_(disabled, property)]]"
aria-label$="[[label]]">
</cr-toggle>
<cr-policy-network-indicator
property="[[property]]" tooltip-position="left">
</cr-policy-network-indicator>
</div>
</template>
<script src="network_config_toggle.js"></script>
</dom-module>

23
ui/webui/resources/cr_components/chromeos/network/network_config_toggle.js

@ -1,23 +0,0 @@
// Copyright 2018 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.
/**
* @fileoverview Polymer element for network configuration toggle.
*/
Polymer({
is: 'network-config-toggle',
behaviors: [CrPolicyNetworkBehavior, NetworkConfigElementBehavior],
properties: {
label: String,
checked: {
type: Boolean,
value: false,
reflectToAttribute: true,
notify: true,
},
},
});

44
ui/webui/resources/cr_components/chromeos/network/network_password_input.html

@ -1,51 +1,33 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
<link rel="import" href="network_config_element_behavior.html">
<link rel="import" href="network_shared_css.html">
<dom-module id="network-password-input">
<template>
<style include="network-shared">
#container {
align-items: center;
display: flex;
flex-direction: row;
}
cr-input {
width: 100%;
}
cr-policy-network-indicator {
--cr-tooltip-icon-margin-start: var(--cr-controlled-by-spacing);
paper-icon-button-light {
margin: 0;
width: var(--network-control-margin);
}
</style>
<div id="container">
<cr-input id="input" label="[[label]]" value="{{value}}"
disabled="[[getDisabled_(disabled, property)]]"
type="[[getInputType_(showPassword)]]" on-keypress="onInputKeypress_">
</cr-input>
<template is="dom-if" if="[[!getDisabled_(disabled, property)]]" restamp>
<paper-icon-button-light id="icon" slot="suffix"
class$="[[getIconClass_(showPassword)]]">
<button on-tap="onShowPasswordTap_"
title="[[getShowPasswordTitle_(showPassword)]]">
</button>
</paper-icon-button-light>
</template>
<template is="dom-if" if="[[getDisabled_(disabled, property)]]" restamp>
<cr-policy-network-indicator
property="[[property]]" tooltip-position="left">
</cr-policy-network-indicator>
</template>
</div>
<cr-input id="input" label="[[label]]" value="{{value}}"
disabled="[[disabled]]" type="[[getInputType_(showPassword)]]"
on-keypress="onInputKeypress_">
<paper-icon-button-light id="icon" slot="suffix"
class$="[[getIconClass_(showPassword)]]">
<button on-tap="onShowPasswordTap_"
title="[[getShowPasswordTitle_(showPassword)]]">
</button>
</paper-icon-button-light>
</cr-input>
</template>
<script src="network_password_input.js"></script>
</dom-module>

11
ui/webui/resources/cr_components/chromeos/network/network_password_input.js

@ -8,11 +8,7 @@
Polymer({
is: 'network-password-input',
behaviors: [
I18nBehavior,
CrPolicyNetworkBehavior,
NetworkConfigElementBehavior,
],
behaviors: [I18nBehavior],
properties: {
label: {
@ -20,6 +16,11 @@ Polymer({
reflectToAttribute: true,
},
disabled: {
type: Boolean,
reflectToAttribute: true,
},
value: {
type: String,
notify: true,

13
ui/webui/resources/cr_components/chromeos/network/network_proxy.js

@ -168,22 +168,23 @@ Polymer({
proxy.Type = /** @type {!CrOnc.ProxySettingsType} */ (
CrOnc.getActiveValue(proxySettings.Type));
if (proxySettings.Manual) {
proxy.Manual.HTTPProxy =
/** @type {!CrOnc.ProxyLocation|undefined} */ (
CrOnc.getActiveProperties(proxySettings.Manual.HTTPProxy)) ||
proxy.Manual.HTTPProxy = /** @type {!CrOnc.ProxyLocation|undefined} */ (
CrOnc.getSimpleActiveProperties(
proxySettings.Manual.HTTPProxy)) ||
{Host: '', Port: 80};
proxy.Manual.SecureHTTPProxy =
/** @type {!CrOnc.ProxyLocation|undefined} */ (
CrOnc.getActiveProperties(
CrOnc.getSimpleActiveProperties(
proxySettings.Manual.SecureHTTPProxy)) ||
{Host: '', Port: 80};
proxy.Manual.FTPProxy =
/** @type {!CrOnc.ProxyLocation|undefined} */ (
CrOnc.getActiveProperties(proxySettings.Manual.FTPProxy)) ||
CrOnc.getSimpleActiveProperties(
proxySettings.Manual.FTPProxy)) ||
{Host: '', Port: 80};
proxy.Manual.SOCKS =
/** @type {!CrOnc.ProxyLocation|undefined} */ (
CrOnc.getActiveProperties(proxySettings.Manual.SOCKS)) ||
CrOnc.getSimpleActiveProperties(proxySettings.Manual.SOCKS)) ||
{Host: '', Port: 80};
var jsonHttp = proxy.Manual.HTTPProxy;
this.useSameProxy_ =

38
ui/webui/resources/cr_elements/chromeos/network/cr_onc_types.js

@ -269,27 +269,15 @@ CrOnc.getStateOrActiveString = function(property) {
return /** @type {string} */ (CrOnc.getActiveValue(property));
};
/**
* Return if the property is simple, i.e. doesn't contain any nested
* dictionaries.
* @param property {!Object|undefined}
* @return {boolean}
*/
CrOnc.isSimpleProperty = function(property) {
for (var prop of ['Active', 'Effective', 'UserSetting', 'SharedSetting']) {
if (prop in property)
return true;
}
return false;
};
/**
* Converts a managed ONC dictionary into an unmanaged dictionary (i.e. a
* dictionary of active values).
* NOTE: This is not intended to be used with dictionaries that contain
* nested dictionaries. This will fail and return undefined in that case.
* @param {!Object|undefined} properties A managed ONC dictionary
* @return {!Object|undefined} An unmanaged version of |properties|.
*/
CrOnc.getActiveProperties = function(properties) {
CrOnc.getSimpleActiveProperties = function(properties) {
'use strict';
if (!properties)
return undefined;
@ -297,24 +285,14 @@ CrOnc.getActiveProperties = function(properties) {
var keys = Object.keys(properties);
for (var i = 0; i < keys.length; ++i) {
var k = keys[i];
var property = properties[k];
// Skip policy properties with no effective value.
// TODO(nikitapodguzov@ / raleksandrov@): Remove this when crbug.com/888959
// providing dummy values for password fields will be fixed.
if ('Effective' in property && !(property.Effective in property))
continue;
var propertyValue;
if (CrOnc.isSimpleProperty(property))
propertyValue = CrOnc.getActiveValue(property);
else
propertyValue = CrOnc.getActiveProperties(property);
if (propertyValue == undefined) {
var prop = CrOnc.getActiveValue(properties[k]);
if (prop == undefined) {
console.error(
'getActiveProperties called on invalid ONC object: ' +
'getSimpleActiveProperties called on invalid ONC object: ' +
JSON.stringify(properties));
return undefined;
}
result[k] = propertyValue;
result[k] = prop;
}
return result;
};
@ -346,7 +324,7 @@ CrOnc.getIPConfigForType = function(properties, type) {
var staticIpConfig =
/** @type {!CrOnc.IPConfigProperties|undefined} */ (
CrOnc.getActiveProperties(properties.StaticIPConfig));
CrOnc.getSimpleActiveProperties(properties.StaticIPConfig));
if (!staticIpConfig)
return ipConfig;

18
ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.html

@ -7,23 +7,9 @@
<dom-module id="cr-policy-network-indicator">
<template>
<style include="cr-hidden-style">
/* This field is used for controlling margin of icon outside the indicator
* element (i.e. in the element which uses indicator itself). It's useful
* when we don't want to add margin to indicator if it's hidden and also
* don't want to move/duplicate logic about showing indicator and margin
* outside of indicator element. */
:host {
--cr-tooltip-icon-margin-start: 0;
}
cr-tooltip-icon {
margin-inline-start: var(--cr-tooltip-icon-margin-start);
}
</style>
<style include="cr-hidden-style"></style>
<cr-tooltip-icon hidden$="[[!indicatorVisible]]"
tooltip-text="[[indicatorTooltip_]]" icon-class="[[indicatorIcon]]"
tooltip-position="[[tooltipPosition]]">
tooltip-text="[[indicatorTooltip_]]" icon-class="[[indicatorIcon]]">
</cr-tooltip-icon>
</template>
<script src="cr_policy_network_indicator.js"></script>

7
ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js

@ -15,13 +15,10 @@ Polymer({
properties: {
/**
* Network property associated with the indicator.
* @type {?CrOnc.ManagedProperty|undefined}
* @type {!CrOnc.ManagedProperty|undefined}
*/
property: Object,
/** Position of tooltip popup related to the policy indicator. */
tooltipPosition: String,
/**
* Recommended value for non enforced properties.
* @private {!CrOnc.NetworkPropertyType|undefined}
@ -40,7 +37,7 @@ Polymer({
/** @private */
propertyChanged_: function() {
var property = this.property;
if (property == null || !this.isControlled(property)) {
if (!this.isControlled(property)) {
this.indicatorType = CrPolicyIndicatorType.NONE;
return;
}

2
ui/webui/resources/cr_elements/policy/cr_tooltip_icon.html

@ -23,7 +23,7 @@
</style>
<iron-icon id="indicator" tabindex="0" aria-label$="[[iconAriaLabel]]"
aria-describedby="tooltip" icon="[[iconClass]]"></iron-icon>
<paper-tooltip id="tooltip" for="indicator" position="[[tooltipPosition]]"
<paper-tooltip id="tooltip" for="indicator" position="top"
fit-to-visible-bounds>
[[tooltipText]]
</paper-tooltip>

9
ui/webui/resources/cr_elements/policy/cr_tooltip_icon.js

@ -4,19 +4,10 @@
Polymer({
is: 'cr-tooltip-icon',
properties: {
iconAriaLabel: String,
iconClass: String,
tooltipText: String,
/** Position of tooltip popup related to the icon. */
tooltipPosition: {
type: String,
value: 'top',
}
},
/** @return {!Element} */