Add "Admin" tab to the registrar console

This tab will set the "allowedTlds", but might have other functionality in the
future.

It is based on (branches from) the security-settings tab, because I'm copying the functionality of the "whitelisted IPs" to the "allowed TLDs": they are both lists of "arbitrary" strings that you can remove from and add to.

There are a lot of moving parts in this CL, because of how all the different elements need to interact, and how intertwined they are (for example, we need to disable the admin-settings view for non admins both in the soy and in the JS code)

It's really time to refactor the console given all we've learned... :/

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220373443
This commit is contained in:
guyben 2018-11-06 16:23:46 -08:00 committed by jianglai
parent 9b10c116f3
commit 61a5cf307e
11 changed files with 274 additions and 4 deletions

View file

@ -24,6 +24,7 @@ closure_css_library(
closure_css_library( closure_css_library(
name = "registrar_lib", name = "registrar_lib",
srcs = [ srcs = [
"admin-settings.css",
"contact-settings.css", "contact-settings.css",
"contact-us.css", "contact-us.css",
"dashboard.css", "dashboard.css",

View file

@ -0,0 +1,58 @@
/** Admin Settings */
div#tlds div.tld {
width: 209px;
}
#newTld {
width: 187px;
margin-left: 0.5em;
}
div#tlds div.tld input,
div#tlds div.tld button[type=button] {
height: 27px;
line-height: 27px;
background: #ebebeb;
vertical-align: top;
border: none;
border-bottom: solid 3px white;
}
div#tlds div.tld input {
width: 169px;
margin: 0;
padding: 0;
color: #555;
padding-left: 5px ! important;
}
div#tlds.editing div.tld input[readonly] {
margin-left: 0.5em;
}
div#tlds.editing div.tld button[type=button] {
display: inline-block;
float: right;
margin-left: -2px;
width: 30px;
min-width: 30px;
height: 30px;
color: grey;
font-size: 1.1em;
}
div#tlds.editing div.tld button[type=button]:hover {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
div#tlds.editing div.tld button[type=button] i {
font-style: normal;
}
div#tlds.editing .kd-errormessage {
margin-left: 0.5em;
}

View file

@ -68,6 +68,7 @@ registry.json.Response.prototype.results;
// XXX: Might not need undefineds here. // XXX: Might not need undefineds here.
/** /**
* @typedef {{ * @typedef {{
* allowedTlds: !Array<string>,
* clientIdentifier: string, * clientIdentifier: string,
* clientCertificate: string?, * clientCertificate: string?,
* clientCertificateHash: string?, * clientCertificateHash: string?,

View file

@ -0,0 +1,106 @@
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
goog.provide('registry.registrar.AdminSettings');
goog.require('goog.array');
goog.require('goog.dom');
goog.require('goog.dom.classlist');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('goog.soy');
goog.require('registry.Resource');
goog.require('registry.ResourceComponent');
goog.require('registry.soy.registrar.admin');
goog.forwardDeclare('registry.registrar.Console');
/**
* Admin Settings page, such as allowed TLDs for this registrar.
* @param {!registry.registrar.Console} console
* @param {!registry.Resource} resource the RESTful resource for the registrar.
* @constructor
* @extends {registry.ResourceComponent}
* @final
*/
registry.registrar.AdminSettings = function(console, resource) {
registry.registrar.AdminSettings.base(
this, 'constructor', console, resource,
registry.soy.registrar.admin.settings, null);
};
goog.inherits(registry.registrar.AdminSettings, registry.ResourceComponent);
/** @override */
registry.registrar.AdminSettings.prototype.bindToDom = function(id) {
registry.registrar.AdminSettings.base(this, 'bindToDom', 'fake');
goog.dom.removeNode(goog.dom.getRequiredElement('reg-app-btn-back'));
};
/** @override */
registry.registrar.AdminSettings.prototype.setupEditor =
function(objArgs) {
goog.dom.classlist.add(goog.dom.getRequiredElement('tlds'),
goog.getCssName('editing'));
var tlds = goog.dom.getElementsByClass(goog.getCssName('tld'),
goog.dom.getRequiredElement('tlds'));
goog.array.forEach(tlds, function(tld) {
var remBtn = goog.dom.getChildren(tld)[0];
goog.events.listen(remBtn,
goog.events.EventType.CLICK,
goog.bind(this.onTldRemove_, this, remBtn));
}, this);
this.typeCounts['reg-tlds'] = objArgs.allowedTlds ?
objArgs.allowedTlds.length : 0;
goog.events.listen(goog.dom.getRequiredElement('btn-add-tld'),
goog.events.EventType.CLICK,
this.onTldAdd_,
false,
this);
};
/**
* Click handler for TLD add button.
* @private
*/
registry.registrar.AdminSettings.prototype.onTldAdd_ = function() {
const tldInputElt = goog.dom.getRequiredElement('newTld');
const tldElt = goog.soy.renderAsFragment(registry.soy.registrar.admin.tld, {
name: 'allowedTlds[' + this.typeCounts['reg-tlds'] + ']',
tld: tldInputElt.value,
});
goog.dom.appendChild(goog.dom.getRequiredElement('tlds'), tldElt);
var remBtn = goog.dom.getFirstElementChild(tldElt);
goog.dom.classlist.remove(remBtn, goog.getCssName('hidden'));
goog.events.listen(remBtn, goog.events.EventType.CLICK,
goog.bind(this.onTldRemove_, this, remBtn));
this.typeCounts['reg-tlds']++;
tldInputElt.value = '';
};
/**
* Click handler for TLD remove button.
* @param {!Element} remBtn The remove button.
* @private
*/
registry.registrar.AdminSettings.prototype.onTldRemove_ =
function(remBtn) {
goog.dom.removeNode(goog.dom.getParentElement(remBtn));
};

View file

@ -21,6 +21,7 @@ goog.require('goog.dom.classlist');
goog.require('goog.net.XhrIo'); goog.require('goog.net.XhrIo');
goog.require('registry.Console'); goog.require('registry.Console');
goog.require('registry.Resource'); goog.require('registry.Resource');
goog.require('registry.registrar.AdminSettings');
goog.require('registry.registrar.Contact'); goog.require('registry.registrar.Contact');
goog.require('registry.registrar.ContactSettings'); goog.require('registry.registrar.ContactSettings');
goog.require('registry.registrar.ContactUs'); goog.require('registry.registrar.ContactUs');
@ -76,20 +77,43 @@ registry.registrar.Console = function(params) {
this.lastActiveNavElt; this.lastActiveNavElt;
/** /**
* A map from the URL fragment to the component to show.
*
* @type {!Object.<string, function(new:registry.Component, * @type {!Object.<string, function(new:registry.Component,
* !registry.registrar.Console, * !registry.registrar.Console,
* !registry.Resource)>} * !registry.Resource)>}
*/ */
this.pageMap = {}; this.pageMap = {};
// Homepage. Displayed when there's no fragment, or when the fragment doesn't
// correspond to any view
this.pageMap[''] = registry.registrar.Dashboard;
// Updating the Registrar settings
this.pageMap['security-settings'] = registry.registrar.SecuritySettings; this.pageMap['security-settings'] = registry.registrar.SecuritySettings;
this.pageMap['contact-settings'] = registry.registrar.ContactSettings; this.pageMap['contact-settings'] = registry.registrar.ContactSettings;
this.pageMap['whois-settings'] = registry.registrar.WhoisSettings; this.pageMap['whois-settings'] = registry.registrar.WhoisSettings;
this.pageMap['contact-us'] = registry.registrar.ContactUs; this.pageMap['contact-us'] = registry.registrar.ContactUs;
this.pageMap['resources'] = registry.registrar.Resources; this.pageMap['resources'] = registry.registrar.Resources;
// For admin use. The relevant tab is only shown in Console.soy for admins,
// but we also need to remove it here, otherwise it'd still be accessible if
// the user manually puts '#admin-settings' in the URL.
//
// Both the Console.soy and here, the "hiding the admin console for non
// admins" is purely for "aesthetic / design" reasons and have NO security
// implications.
//
// The security implications are only in the backend where we make sure all
// changes are made by users with the correct access (in other words - we
// don't trust the client-side to secure our application anyway)
if (this.params.isAdmin) {
this.pageMap['admin-settings'] = registry.registrar.AdminSettings;
}
// sending EPPs through the console. Currently hidden (doesn't have a "tab")
// but still accessible if the user manually puts #domain (or other) in the
// fragment
this.pageMap['contact'] = registry.registrar.Contact; this.pageMap['contact'] = registry.registrar.Contact;
this.pageMap['domain'] = registry.registrar.Domain; this.pageMap['domain'] = registry.registrar.Domain;
this.pageMap['host'] = registry.registrar.Host; this.pageMap['host'] = registry.registrar.Host;
this.pageMap[''] = registry.registrar.Dashboard;
}; };
goog.inherits(registry.registrar.Console, registry.Console); goog.inherits(registry.registrar.Console, registry.Console);

View file

@ -28,6 +28,7 @@ goog.require('registry.registrar.Console');
* *
* @param {string} xsrfToken populated by server-side soy template. * @param {string} xsrfToken populated by server-side soy template.
* @param {string} clientId The registrar clientId. * @param {string} clientId The registrar clientId.
* @param {boolean} isAdmin
* @param {string} productName the product name displayed by the UI. * @param {string} productName the product name displayed by the UI.
* @param {string} integrationEmail * @param {string} integrationEmail
* @param {string} supportEmail * @param {string} supportEmail
@ -36,13 +37,14 @@ goog.require('registry.registrar.Console');
* @param {string} technicalDocsUrl * @param {string} technicalDocsUrl
* @export * @export
*/ */
registry.registrar.main = function(xsrfToken, clientId, productName, registry.registrar.main = function(xsrfToken, clientId, isAdmin, productName,
integrationEmail, supportEmail, integrationEmail, supportEmail,
announcementsEmail, supportPhoneNumber, announcementsEmail, supportPhoneNumber,
technicalDocsUrl) { technicalDocsUrl) {
new registry.registrar.Console({ new registry.registrar.Console({
xsrfToken: xsrfToken, xsrfToken: xsrfToken,
clientId: clientId, clientId: clientId,
isAdmin: isAdmin,
productName: productName, productName: productName,
integrationEmail: integrationEmail, integrationEmail: integrationEmail,
supportEmail: supportEmail, supportEmail: supportEmail,

View file

@ -103,5 +103,4 @@ registry.registrar.SecuritySettings.prototype.onIpAdd_ = function() {
registry.registrar.SecuritySettings.prototype.onIpRemove_ = registry.registrar.SecuritySettings.prototype.onIpRemove_ =
function(remBtn) { function(remBtn) {
goog.dom.removeNode(goog.dom.getParentElement(remBtn)); goog.dom.removeNode(goog.dom.getParentElement(remBtn));
this.typeCounts['reg-ips']--;
}; };

View file

@ -16,6 +16,7 @@ package google.registry.ui.server.registrar;
import static com.google.common.net.HttpHeaders.LOCATION; import static com.google.common.net.HttpHeaders.LOCATION;
import static com.google.common.net.HttpHeaders.X_FRAME_OPTIONS; import static com.google.common.net.HttpHeaders.X_FRAME_OPTIONS;
import static google.registry.ui.server.registrar.AuthenticatedRegistrarAccessor.Role.ADMIN;
import static google.registry.ui.server.registrar.RegistrarConsoleModule.PARAM_CLIENT_ID; import static google.registry.ui.server.registrar.RegistrarConsoleModule.PARAM_CLIENT_ID;
import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY;
@ -139,6 +140,7 @@ public final class ConsoleUiAction implements Runnable {
try { try {
clientId = paramClientId.orElse(registrarAccessor.guessClientId()); clientId = paramClientId.orElse(registrarAccessor.guessClientId());
data.put("clientId", clientId); data.put("clientId", clientId);
data.put("isAdmin", roleMap.containsEntry(clientId, ADMIN));
// We want to load the registrar even if we won't use it later (even if we remove the // We want to load the registrar even if we won't use it later (even if we remove the
// requireFeeExtension) - to make sure the user indeed has access to the guessed registrar. // requireFeeExtension) - to make sure the user indeed has access to the guessed registrar.

View file

@ -0,0 +1,69 @@
// Copyright 2018 The Nomulus Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
{namespace registry.soy.registrar.admin}
/** Registrar admin settings page for view and edit. */
{template .settings}
{@param clientId: string}
{@param allowedTlds: list<string>}
{@param readonly: bool}
<form name="item" class="{css('item')} {css('registrar')}">
<h1>Administrator settings for {$clientId}</h1>
{if $readonly}
<p>Use the 'Edit' button above to switch to enable editing the information below.
{/if}
<table>
<tr class="{css('kd-settings-pane-section')}">
<td>
<label class="{css('setting-label')}">Allowed TLDs</label>
<span class="{css('description')}">set or remove TLDs this
client is allowed access to.</span>
</td>
<td class="{css('setting')}">
<div class="{css('info')} {css('summary')}">
<div id="tlds">
{for $tld in $allowedTlds}
{call .tld}
{param name: 'allowedTlds[' + index($tld) + ']' /}
{param tld: $tld /}
{/call}
{/for}
</div>
<div class="{css('hidden')}">
<input id="newTld" value="" placeholder="Enter TLD"/>
<button id="btn-add-tld" type="button"
class="{css('kd-button')} {css('btn-add')}">Add</button>
</div>
</div>
</td>
</table>
</form>
{/template}
/** TLD form input. */
{template .tld}
{@param name: string}
{@param tld: string}
<div class="{css('tld')}">
<button type="button" class="{css('kd-button')} {css('btn-remove')} {css('hidden')}">
<i class="{css('icon-remove')} {css('edit')}">x</i>
</button>
<input name="{$name}" value="{$tld}" readonly>
</div>
{/template}

View file

@ -24,6 +24,7 @@
{@param xsrfToken: string} /** Security token. */ {@param xsrfToken: string} /** Security token. */
{@param clientId: string} /** Registrar client identifier. */ {@param clientId: string} /** Registrar client identifier. */
{@param allClientIds: list<string>} /** All registrar client identifiers for the user. */ {@param allClientIds: list<string>} /** All registrar client identifiers for the user. */
{@param isAdmin: bool}
{@param username: string} /** Arbitrary username to display. */ {@param username: string} /** Arbitrary username to display. */
{@param logoutUrl: string} /** Generated URL for logging out of Google. */ {@param logoutUrl: string} /** Generated URL for logging out of Google. */
{@param productName: string} /** Name to display for this software product. */ {@param productName: string} /** Name to display for this software product. */
@ -63,6 +64,7 @@
<script> <script>
registry.registrar.main({$xsrfToken}, registry.registrar.main({$xsrfToken},
{$clientId}, {$clientId},
{if $isAdmin}true{else}false{/if},
{$productName}, {$productName},
{$integrationEmail}, {$integrationEmail},
{$supportEmail}, {$supportEmail},
@ -78,6 +80,7 @@
{template .navbar_ visibility="private"} {template .navbar_ visibility="private"}
{@param clientId: string} /** Registrar client identifier. */ {@param clientId: string} /** Registrar client identifier. */
{@param allClientIds: list<string>} {@param allClientIds: list<string>}
{@param isAdmin: bool}
<div id="reg-nav" class="{css('kd-content-sidebar')}"> <div id="reg-nav" class="{css('kd-content-sidebar')}">
<form> <form>
@ -105,6 +108,10 @@
<a href="#security-settings">Security</a> <a href="#security-settings">Security</a>
<li> <li>
<a href="#contact-settings">Contact</a> <a href="#contact-settings">Contact</a>
{if $isAdmin}
<li>
<a href="#admin-settings">Admin</a>
{/if}
</ul> </ul>
<li> <li>
<a href="#contact-us">Contact us</a> <a href="#contact-us">Contact us</a>

View file

@ -60,7 +60,7 @@ registry.registrar.ConsoleTestUtil.renderConsoleMain = function(
xsrfToken: args.xsrfToken || 'ignore', xsrfToken: args.xsrfToken || 'ignore',
username: args.username || 'jart', username: args.username || 'jart',
logoutUrl: args.logoutUrl || 'https://logout.url.com', logoutUrl: args.logoutUrl || 'https://logout.url.com',
isAdmin: goog.isDefAndNotNull(args.isAdmin) ? args.isAdmin : true, isAdmin: !!args.isAdmin,
clientId: args.clientId || 'ignore', clientId: args.clientId || 'ignore',
allClientIds: args.allClientIds || ['clientId1', 'clientId2'], allClientIds: args.allClientIds || ['clientId1', 'clientId2'],
logoFilename: args.logoFilename || 'logo.png', logoFilename: args.logoFilename || 'logo.png',
@ -88,6 +88,7 @@ registry.registrar.ConsoleTestUtil.visit = function(
opt_args.path = opt_args.path || ''; opt_args.path = opt_args.path || '';
opt_args.clientId = opt_args.clientId || 'dummyRegistrarId'; opt_args.clientId = opt_args.clientId || 'dummyRegistrarId';
opt_args.xsrfToken = opt_args.xsrfToken || 'dummyXsrfToken'; opt_args.xsrfToken = opt_args.xsrfToken || 'dummyXsrfToken';
opt_args.isAdmin = !!opt_args.isAdmin;
if (opt_args.isEppLoggedIn === undefined) { if (opt_args.isEppLoggedIn === undefined) {
opt_args.isEppLoggedIn = true; opt_args.isEppLoggedIn = true;
} }