From c2c00fca7dccb6e512a0f01bc87db129538765ef Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Wed, 7 Aug 2019 22:33:23 +0200 Subject: Add access token ui and rest api --- frontend/css/style.css | 9 +++++++++ frontend/index.html | 16 ++++++++++++++++ frontend/js/app.js | 44 +++++++++++++++++++++++++++++++++++++++++++- server.js | 3 +++ src/auth.js | 37 ++++++++++++++++++++++++++++++++++--- 5 files changed, 105 insertions(+), 4 deletions(-) diff --git a/frontend/css/style.css b/frontend/css/style.css index 901de34..b43d6fe 100644 --- a/frontend/css/style.css +++ b/frontend/css/style.css @@ -89,3 +89,12 @@ a:hover, a:focus { align-items: center; justify-content: center; } + +.access-token-input { + padding: 5px 0; + width: 450px; +} + +.access-token-input > input, .access-token-input i { + cursor: copy !important; +} diff --git a/frontend/index.html b/frontend/index.html index 2d97e1c..20154da 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -36,6 +36,21 @@ + + Tokens can be used with the surfer cli tool or using the Api directly. + They are shared between all users. +
+
+
+
+ + +
+
+
+ Create Access Token + +
@@ -66,6 +81,7 @@ WebDAV Endpoint {{ origin }}/_webdav/ + Access Tokens About Logout diff --git a/frontend/js/app.js b/frontend/js/app.js index d99a840..05cbe9c 100644 --- a/frontend/js/app.js +++ b/frontend/js/app.js @@ -43,6 +43,8 @@ function initWithToken(accessToken) { app.folderListingEnabled = !!result.body.folderListingEnabled; loadDirectory(decode(window.location.hash.slice(1))); + + app.refreshAccessTokens(); }); }); } @@ -278,7 +280,9 @@ var app = new Vue({ password: '', busy: false }, - entries: [] + entries: [], + accessTokens: [], + accessTokensDialogVisible: false }, methods: { onLogin: function () { @@ -312,6 +316,8 @@ var app = new Vue({ }).then(function () {}).catch(function () {}); } else if (command === 'logout') { logout(); + } else if (command === 'apiAccess') { + this.accessTokensDialogVisible = true; } }, onDownload: function (entry) { @@ -415,6 +421,42 @@ var app = new Vue({ }); }).catch(function () {}); }, + refreshAccessTokens: function () { + var that = this; + + superagent.get('/api/tokens').query({ access_token: localStorage.accessToken }).end(function (error, result) { + if (error && !result) return that.$message.error(error.message); + + that.accessTokens = result.body.accessTokens; + }); + }, + onCopyAccessToken: function (event) { + event.target.select(); + document.execCommand('copy'); + + this.$message({ type: 'success', message: 'Access token copied to clipboard' }); + }, + onCreateAccessToken: function () { + var that = this; + + superagent.post('/api/tokens').query({ access_token: localStorage.accessToken }).end(function (error, result) { + if (error && !result) return that.$message.error(error.message); + + that.refreshAccessTokens(); + }); + }, + onDeleteAccessToken: function (token) { + var that = this; + + this.$confirm('All actions from apps using this token will fail!', 'Really delete this access token?', { confirmButtonText: 'Yes Delete', cancelButtonText: 'No' }).then(function () { + superagent.delete('/api/tokens/' + token).query({ access_token: localStorage.accessToken }).end(function (error, result) { + if (error && !result) return that.$message.error(error.message); + + that.refreshAccessTokens(); + }); + }).catch(function () {}); + + }, prettyDate: function (row, column, cellValue, index) { var date = new Date(cellValue), diff = (((new Date()).getTime() - date.getTime()) / 1000), diff --git a/server.js b/server.js index d3e4c6c..4c9df2d 100755 --- a/server.js +++ b/server.js @@ -77,6 +77,9 @@ router.post ('/api/login', auth.login); router.post ('/api/logout', auth.verify, auth.logout); router.get ('/api/settings', auth.verify, getSettings); router.put ('/api/settings', auth.verify, setSettings); +router.get ('/api/tokens', auth.verify, auth.getTokens); +router.post ('/api/tokens', auth.verify, auth.createToken); +router.delete('/api/tokens/:token', auth.verify, auth.delToken); router.get ('/api/profile', auth.verify, auth.getProfile); router.get ('/api/files/*', auth.verify, files.get); router.post ('/api/files/*', auth.verify, multipart, files.post); diff --git a/src/auth.js b/src/auth.js index 2532688..a885d49 100644 --- a/src/auth.js +++ b/src/auth.js @@ -15,6 +15,8 @@ const LDAP_USERS_BASE_DN = process.env.CLOUDRON_LDAP_USERS_BASE_DN; const LOCAL_AUTH_FILE = path.resolve(process.env.LOCAL_AUTH_FILE || './.users.json'); const TOKENSTORE_FILE = path.resolve(process.env.TOKENSTORE_FILE || './.tokens.json'); const AUTH_METHOD = (LDAP_URL && LDAP_USERS_BASE_DN) ? 'ldap' : 'local'; +const LOGIN_TOKEN_PREFIX = 'login-'; +const API_TOKEN_PREFIX = 'api-'; if (AUTH_METHOD === 'ldap') { console.log('Use ldap auth'); @@ -34,8 +36,11 @@ var tokenStore = { get: function (token, callback) { callback(tokenStore.data[token] ? null : 'not found', tokenStore.data[token]); }, - set: function (token, data, callback) { - tokenStore.data[token] = data; + getApiTokens: function (callback) { + callback(null, Object.keys(tokenStore.data).filter(function (t) { return t.indexOf(API_TOKEN_PREFIX) === 0; })) + }, + set: function (token, user, callback) { + tokenStore.data[token] = user; tokenStore.save(); callback(null); }, @@ -102,7 +107,7 @@ exports.login = function (req, res, next) { verifyUser(req.body.username, req.body.password, function (error, user) { if (error) return next(new HttpError(401, 'Invalid credentials')); - var accessToken = uuid(); + var accessToken = LOGIN_TOKEN_PREFIX + uuid(); tokenStore.set(accessToken, user, function (error) { if (error) return next(new HttpError(500, error)); @@ -139,6 +144,32 @@ exports.getProfile = function (req, res, next) { next(new HttpSuccess(200, { username: req.user.username })); }; +exports.getTokens = function (req, res, next) { + tokenStore.getApiTokens(function (error, result) { + if (error) return next(new HttpError(500, error)); + + next(new HttpSuccess(200, { accessTokens: result })); + }); +}; + +exports.createToken = function (req, res, next) { + var accessToken = API_TOKEN_PREFIX + uuid(); + + tokenStore.set(accessToken, req.user, function (error) { + if (error) return next(new HttpError(500, error)); + + next(new HttpSuccess(201, { accessToken: accessToken })); + }); +}; + +exports.delToken = function (req, res, next) { + tokenStore.del(req.params.token, function (error) { + if (error) console.error(error); + + next(new HttpSuccess(200, {})); + }); +}; + // webdav usermanager exports.WebdavUserManager = WebdavUserManager; -- cgit v1.2.3