Skip to content

Commit

Permalink
feat: management of API tokens via ACP
Browse files Browse the repository at this point in the history
  • Loading branch information
julianlam committed Oct 8, 2020
1 parent adcadbb commit 49652e6
Show file tree
Hide file tree
Showing 11 changed files with 135 additions and 4 deletions.
1 change: 1 addition & 0 deletions public/language/en-GB/admin/menu.json
Expand Up @@ -31,6 +31,7 @@
"settings/pagination": "Pagination",
"settings/tags": "Tags",
"settings/notifications": "Notifications",
"settings/api": "API Access",
"settings/sounds": "Sounds",
"settings/social": "Social",
"settings/cookies": "Cookies",
Expand Down
10 changes: 10 additions & 0 deletions public/language/en-GB/admin/settings/api.json
@@ -0,0 +1,10 @@
{
"tokens": "Tokens",
"lead-text": "From this page you can configure access to the Write API in NodeBB.",
"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
"docs": "Click here to access the full API specification",

"uid": "User ID",
"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
"description": "Description"
}
36 changes: 36 additions & 0 deletions public/src/admin/settings/api.js
@@ -0,0 +1,36 @@
'use strict';

define('admin/settings/api', ['settings'], function (settings) {
var ACP = {};

ACP.init = function () {
const saveEl = $('#save');
settings.load('core.api', $('.core-api-settings'));
saveEl.off('click'); // override settingsv1 handling
$('#save').on('click', saveSettings);

$(window).on('action:settings.sorted-list.loaded', (ev, { element }) => {
element.addEventListener('click', (ev) => {
if (ev.target.closest('input[readonly]')) {
// Select entire input text
ev.target.selectionStart = 0;
ev.target.selectionEnd = ev.target.value.length;
}
});
});
};

function saveSettings() {
settings.save('core.api', $('.core-api-settings'), function () {
app.alert({
type: 'success',
alert_id: 'core.api-saved',
title: 'Settings Saved',
timeout: 5000,
});
ajaxify.refresh();
});
}

return ACP;
});
1 change: 1 addition & 0 deletions public/src/modules/settings/sorted-list.js
Expand Up @@ -60,6 +60,7 @@ define('settings/sorted-list', ['benchpress', 'jqueryui'], function (benchpress)
});

$list.sortable().addClass('pointer');
$(window).trigger('action:settings.sorted-list.loaded', { element: $list.get(0) });
},
};

Expand Down
1 change: 0 additions & 1 deletion src/controllers/admin/settings.js
Expand Up @@ -17,7 +17,6 @@ settingsController.get = async function (req, res) {
res.render('admin/settings/' + term);
};


settingsController.email = async (req, res) => {
const emails = await emailer.getTemplates(meta.config);

Expand Down
2 changes: 2 additions & 0 deletions src/meta/settings.js
Expand Up @@ -47,6 +47,8 @@ Settings.set = async function (hash, values, quiet) {
}
}

({ plugin: hash, settings: values, quiet } = await plugins.fireHook('filter:settings.set', { plugin: hash, settings: values, quiet }));

if (sortedLists.length) {
await db.delete('settings:' + hash + ':sorted-lists');
await db.setAdd('settings:' + hash + ':sorted-lists', sortedLists);
Expand Down
23 changes: 23 additions & 0 deletions src/plugins/index.js
Expand Up @@ -10,6 +10,8 @@ const request = require('request-promise-native');

const user = require('../user');
const posts = require('../posts');
const utils = require('../utils');

const { pluginNamePattern, themeNamePattern, paths } = require('../constants');

var app;
Expand Down Expand Up @@ -121,6 +123,7 @@ Plugins.reload = async function () {
console.log('');
}

// Possibly put these in a different file...
Plugins.registerHook('core', {
hook: 'filter:parse.post',
method: async (data) => {
Expand All @@ -147,6 +150,26 @@ Plugins.reload = async function () {
},
});

Plugins.registerHook('core', {
hook: 'filter:settings.set',
method: async ({ plugin, settings, quiet }) => {
if (plugin === 'core.api' && Array.isArray(settings.tokens)) {
// Generate tokens if not present already
settings.tokens.forEach((set) => {
if (set.token === '') {
set.token = utils.generateUUID();
}

if (isNaN(parseInt(set.uid, 10))) {
set.uid = 0;
}
});
}

return { plugin, settings, quiet };
},
});

// Lower priority runs earlier
Object.keys(Plugins.loadedHooks).forEach(function (hook) {
Plugins.loadedHooks[hook].sort((a, b) => a.priority - b.priority);
Expand Down
13 changes: 10 additions & 3 deletions src/routes/authentication.js
Expand Up @@ -6,7 +6,7 @@ var passportLocal = require('passport-local').Strategy;
const BearerStrategy = require('passport-http-bearer').Strategy;
var winston = require('winston');

const db = require('../database');
const meta = require('../meta');
var controllers = require('../controllers');
var helpers = require('../controllers/helpers');
var plugins = require('../plugins');
Expand Down Expand Up @@ -51,9 +51,16 @@ Auth.getLoginStrategies = function () {
};

Auth.verifyToken = async function (token, done) {
const uid = await db.sortedSetScore('apiTokens', token);
let { tokens } = await meta.settings.get('core.api');
tokens = tokens.reduce((memo, cur) => {
memo[cur.token] = cur.uid;
return memo;
}, {});

if (uid !== null) {
const uid = tokens[token];

if (uid !== undefined) {
console.log('uid is', uid);
if (parseInt(uid, 10) > 0) {
done(null, {
uid: uid,
Expand Down
14 changes: 14 additions & 0 deletions src/views/admin/partials/api/sorted-list/form.tpl
@@ -0,0 +1,14 @@
<form>
<input type="hidden" name="token">
<div class="form-group">
<label for="uid">[[admin/settings/api:uid]]</label>
<input type="number" name="uid" class="form-control" placeholder="1" min="0" />
<p class="help-text">
[[admin/settings/api:uid-help-text]]
</p>
</div>
<div class="form-group">
<label for="description">[[admin/settings/api:description]]</label>
<input type="text" name="description" class="form-control" placeholder="Description" />
</div>
</form>
13 changes: 13 additions & 0 deletions src/views/admin/partials/api/sorted-list/item.tpl
@@ -0,0 +1,13 @@
<li data-type="item" class="list-group-item">
<div class="row">
<div class="col-xs-9">
<span class="label label-primary">{{{ if uid }}}uid {uid}{{{ else }}}master{{{ end }}}</span>
{{{ if token }}}<input type="text" readonly="readonly" value="{token}" size="32" />{{{ else }}}<em class="text-warning">Token will be generated once form is saved</em>{{{ end }}}<br />
<small>{description}</small>
</div>
<div class="col-xs-3 text-right">
<button type="button" data-type="edit" class="btn btn-info">Edit</button>
<button type="button" data-type="remove" class="btn btn-danger">Delete</button>
</div>
</div>
</li>
25 changes: 25 additions & 0 deletions src/views/admin/settings/api.tpl
@@ -0,0 +1,25 @@
<!-- IMPORT admin/partials/settings/header.tpl -->

<form role="form" class="core-api-settings">
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">[[admin/settings/api:tokens]]</div>
<div class="col-sm-10 col-xs-12">
<p class="lead">[[admin/settings/api:lead-text]]</p>
<p>[[admin/settings/api:intro]]</p>
<p>
<a href="https://docs.nodebb.org/api">
<i class="fa fa-external-link"></i>
[[admin/settings/api:docs]]
</a>
</p>

<div class="form-group" data-type="sorted-list" data-sorted-list="tokens" data-item-template="admin/partials/api/sorted-list/item" data-form-template="admin/partials/api/sorted-list/form">
<input hidden="text" name="tokens">
<ul data-type="list" class="list-group"></ul>
<button type="button" data-type="add" class="btn btn-info">Create Token</button>
</div>
</div>
</div>
</form>

<!-- IMPORT admin/partials/settings/footer.tpl -->

0 comments on commit 49652e6

Please sign in to comment.