Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleans up web UI and fixes ACL token "stuckness" issue. #3245

Merged
merged 5 commits into from
Jul 9, 2017
Merged

Cleans up web UI and fixes ACL token "stuckness" issue. #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34bf5b1
Removes GitHub reference.
slackpad Jul 8, 2017
c810dc2
Doesn't display ACL token on the unauthorized page.
slackpad Jul 8, 2017
c953c79
Removes useless fetch for nodes and cleans up comments.
slackpad Jul 8, 2017
4641284
Proivides a path to reset the ACL token when it's invalid.
slackpad Jul 9, 2017
05f705e
Updates built-in web assets.
slackpad Jul 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions agent/bindata_assetfs.go
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,16 @@ <h2>JavaScript Required</h2>
{{#if controller.model.statusText }}
<p class="bold">HTTP error code from Consul: <code>{{controller.model.status}} {{controller.model.statusText}}</code></p>
{{/if}}
<p>This is an error page for the Consul web UI. You may have visited a URL that is loading an
unknown resource, so you can try going back to the <a href="#">root</a>.</p>
<p>Otherwise, please report any unexpected
issues on the <a href="https://github.com/hashicorp/consul">GitHub page</a>.</p>
{{#if controller.model.responseText }}
<p class="bold">Error message from Consul: <code>{{limit controller.model.responseText 255}}</code></p>
{{/if}}
<p>Consul returned an error. You may have visited a URL that is loading an unknown resource, so you
can try going back to the root. If your ACL token was not found you can reset it, and then you
will be redirected to the settings page to enter a new ACL token.</p>
<div class="form-group">
<button {{ action "resetToken" }} {{ bind-attr class=":btn :btn-danger" }}>Reset ACL Token</button>
<button {{ action "backHome" }} {{ bind-attr class=":btn :btn-default" }}>Go Back to Root</button>
</div>
</div>
</div>
</div>
Expand All @@ -70,13 +76,7 @@ <h2>JavaScript Required</h2>
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
<div class="text-center vertical-center">
<p class="bold">Access Denied</p>
{{#if aclToken}}
<p>Your ACL token, <code>{{aclToken}}</code>, does not
have the appropriate permissions to perform the expected action.</p>
{{else}}
<p>The default agent token does not
have the appropriate permissions to perform the expected action.</p>
{{/if}}
<p>Your ACL token does not have the appropriate permissions to perform the expected action.</p>
<p>Learn more in the <a href="https://www.consul.io/docs/guides/acl.html" target="_blank">ACL documentation</a>.</p>
</div>
</div>
Expand Down Expand Up @@ -759,14 +759,15 @@ <h3>Settings</h3>
<p>These settings allow you to configure your browser for the Consul Web UI. Everything is saved to localstorage,
and should persist through visits and browser usage.</p>
<p>Settings are automatically persisted upon modification, so no manual save is required.</p>
<h5>Access Token</h5>
<h5>ACL Token</h5>
<div class="form-group">
{{ input type="text" value=model.token class="form-control form-mono" placeholder="token"}}
<span class="help-block">The token is sent with requests as the <code>?token</code> parameter. This is used to control the ACL for the
web UI.</span>
</div>
<div class="form-group">
<button {{ action "reset" }} {{ bind-attr class=":btn :btn-danger" }}>Reset Defaults</button>
<button {{ action "close" }} {{ bind-attr class=":btn :btn-default" }}>Close</button>
</div>
</div>
</script>
Expand Down
17 changes: 17 additions & 0 deletions ui/javascripts/app/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,23 @@ App.SettingsController = Ember.ObjectController.extend({
notify('Settings reset', 3000);
this.set('isLoading', false);
}
},

close: function() {
this.transitionToRoute('index');
}
}
});

App.ErrorController = Ember.ObjectController.extend({
actions: {
resetToken: function() {
App.set('settings.token', '');
this.transitionToRoute('settings');
},

backHome: function() {
this.transitionToRoute('index');
}
}
});
Expand Down
6 changes: 5 additions & 1 deletion ui/javascripts/app/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ Ember.Handlebars.helper('aclName', function(name, id) {
}
});


Ember.Handlebars.helper('formatRules', function(rules) {
if (rules === "") {
return "No rules defined";
Expand All @@ -59,6 +58,11 @@ Ember.Handlebars.helper('formatRules', function(rules) {
}
});

Ember.Handlebars.helper('limit', function(str, limit) {
if (str.length > limit)
return str.substring(0, limit) + '...';
return str;
});

// We need to do this because of our global namespace properties. The
// service.Tags
Expand Down
8 changes: 5 additions & 3 deletions ui/javascripts/app/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,17 @@ App.Router.map(function() {

// Shows a page explaining that ACLs haven't been set-up
this.route("aclsdisabled", { path: "/aclsdisabled" });
// Shows a page explaining that the ACL key being used isn't

// Shows a page explaining that the ACL token being used isn't
// authorized
this.route("unauthorized", { path: "/unauthorized" });

this.resource("settings", { path: "/settings" });
});

// Shows a datacenter picker. If you only have one
// it just redirects you through.
this.route("index", { path: "/" });

// The settings page is global.
this.resource("settings", { path: "/settings" });
});

7 changes: 2 additions & 5 deletions ui/javascripts/app/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ App.NodesShowRoute = App.BaseRoute.extend({
max = 0;
}

// Return a promise hash of the node and nodes
// Return a promise hash of the node
return Ember.RSVP.hash({
dc: dc.dc,
token: token,
Expand All @@ -340,9 +340,6 @@ App.NodesShowRoute = App.BaseRoute.extend({
},
node: Ember.$.getJSON(formatUrl(consulHost + '/v1/internal/ui/node/' + params.name, dc.dc, token)).then(function(data) {
return App.Node.create(data);
}),
nodes: Ember.$.getJSON(formatUrl(consulHost + '/v1/internal/ui/node/' + params.name, dc.dc, token)).then(function(data) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned about this one because we're later setting it:

https://github.com/hashicorp/consul/blob/master/ui/javascripts/app/routes.js#L359-L364

That will currently be nil'd out. I assume if you test this and do:

  1. View the nodes index page
  2. Click a specific node

This will then be unnecessary, but did you try visiting a node directly? I would worry it wouldn't then populate the left column given this commit.

If even that works, we should likely remove the above linked set of this attribute.

return App.Node.create(data);
})
});
},
Expand Down Expand Up @@ -431,7 +428,7 @@ App.AclsShowRoute = App.BaseRoute.extend({
var dc = this.modelFor('dc').dc;
var token = App.get('settings.token');

// Return a promise hash of the node and nodes
// Return a promise hash of the ACLs
return Ember.RSVP.hash({
dc: dc,
acl: Ember.$.getJSON(formatUrl(consulHost + '/v1/acl/info/'+ params.id, dc, token)).then(function(data) {
Expand Down