jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

users: asyncify and merge userdb.del

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-06-26 09:57:07 -07:00
parent 147c8df6e3
commit e7d9af5aed
6 changed files with 80 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/test/apppasswords-test.js
View File

@@ -10,7 +10,8 @@ const appPasswords = require('../apppasswords.js'),
BoxError = require('../boxerror.js'),
common = require('./common.js'),
expect = require('expect.js'),
safe = require('safetydance');
safe = require('safetydance'),
users = require('../users.js');
describe('App passwords', function () {
const { setup, cleanup, ADMIN } = common;
@@ -18,7 +19,7 @@ describe('App passwords', function () {
before(setup);
after(cleanup);
let id;
let id, password;
it('cannot add bad app password', async function () {
const [error] = await safe(appPasswords.add(ADMIN.id, 'appid', 'x'.repeat(201)));
expect(error.reason).to.be(BoxError.BAD_FIELD);
@@ -29,6 +30,7 @@ describe('App passwords', function () {
expect(result.id).to.be.a('string');
expect(result.password).to.be.a('string');
id = result.id;
password = result.password;
});
it('can get app password', async function () {
@@ -51,10 +53,58 @@ describe('App passwords', function () {
expect(results[0].identifier).to.be('appid');
});
it('can verify app password', function (done) {
users.verify(ADMIN.id, password, 'appid', function (error, result) {
expect(error).to.not.be.ok();
expect(result).to.be.ok();
expect(result.appPassword).to.be(true);
done();
});
});
it('can verify non-app password', function (done) {
users.verify(ADMIN.id, ADMIN.password, 'appid', function (error, result) {
expect(error).to.not.be.ok();
expect(result).to.be.ok();
expect(result.appPassword).to.be(undefined);
done();
});
});
it('cannot verify bad password', function (done) {
users.verify(ADMIN.id, 'bad', 'appid', function (error, result) {
expect(error).to.be.ok();
expect(result).to.not.be.ok();
expect(error.reason).to.be(BoxError.INVALID_CREDENTIALS);
done();
});
});
it('cannot verify password for another app', function (done) {
users.verify(ADMIN.id, password, 'appid2', function (error, result) {
expect(error).to.be.ok();
expect(result).to.not.be.ok();
expect(error.reason).to.be(BoxError.INVALID_CREDENTIALS);
done();
});
});
it('can del app password', async function () {
await appPasswords.del(id);
});
it('cannot verify deleted app password', function (done) {
users.verify(ADMIN.id, password, 'appid', function (error) {
expect(error).to.be.ok();
done();
});
});
it('cannot del random app password', async function () {
const [error] = await safe(appPasswords.del('random'));
expect(error.reason).to.be(BoxError.NOT_FOUND);

106
src/test/users-test.js
View File

@@ -5,7 +5,7 @@
'use strict';
var async = require('async'),
const async = require('async'),
BoxError = require('../boxerror.js'),
database = require('../database.js'),
expect = require('expect.js'),
@@ -16,6 +16,7 @@ var async = require('async'),
mailer = require('../mailer.js'),
paths = require('../paths.js'),
provision = require('../provision.js'),
safe = require('safetydance'),
userdb = require('../userdb.js'),
users = require('../users.js'),
_ = require('underscore');
@@ -530,94 +531,6 @@ describe('User', function () {
});
});
describe('appPasswords', function () {
before(createOwner);
after(cleanupUsers);
let pwd;
it('can add app password', function (done) {
users.addAppPassword(userObject.id, 'appid', 'rpi', function (error, result) {
expect(error).to.be(null);
pwd = result;
done();
});
});
it('can get app passwords', function (done) {
users.getAppPasswords(userObject.id, function (error, result) {
expect(error).to.be(null);
expect(result.length).to.be(1);
expect(result[0].name).to.be('rpi');
expect(result[0].identifier).to.be('appid');
expect(result[0].hashedPassword).to.be(undefined);
done();
});
});
it('can get app password', function (done) {
users.getAppPassword(pwd.id, function (error, result) {
expect(error).to.be(null);
expect(result.name).to.be('rpi');
expect(result.identifier).to.be('appid');
expect(result.hashedPassword).to.be(undefined);
done();
});
});
it('can verify app password', function (done) {
users.verify(userObject.id, pwd.password, 'appid', function (error, result) {
expect(error).to.not.be.ok();
expect(result).to.be.ok();
expect(result.appPassword).to.be(true);
done();
});
});
it('can verify non-app password', function (done) {
users.verify(userObject.id, PASSWORD, 'appid', function (error, result) {
expect(error).to.not.be.ok();
expect(result).to.be.ok();
expect(result.appPassword).to.be(undefined);
done();
});
});
it('cannot verify bad password', function (done) {
users.verify(userObject.id, 'bad', 'appid', function (error, result) {
expect(error).to.be.ok();
expect(result).to.not.be.ok();
expect(error.reason).to.be(BoxError.INVALID_CREDENTIALS);
done();
});
});
it('cannot verify password for another app', function (done) {
users.verify(userObject.id, pwd.password, 'appid2', function (error, result) {
expect(error).to.be.ok();
expect(result).to.not.be.ok();
expect(error.reason).to.be(BoxError.INVALID_CREDENTIALS);
done();
});
});
it('can del app password', function (done) {
users.delAppPassword(pwd.id, function (error) {
if (error) return done(error);
// cannot verify anymore
users.verify(userObject.id, pwd.password, 'appid', function (error) {
expect(error).to.be.ok();
done();
});
});
});
});
describe('retrieving', function () {
before(createOwner);
after(cleanupUsers);
@@ -909,18 +822,13 @@ describe('User', function () {
before(createOwner);
after(cleanupUsers);
it('fails for unknown user', function (done) {
users.remove(_.extend({}, userObject, { id: 'unknown' }), AUDIT_SOURCE, function (error) {
expect(error.reason).to.be(BoxError.NOT_FOUND);
done();
});
it('fails for unknown user', async function () {
const [error] = await safe(users.del(_.extend({}, userObject, { id: 'unknown' }), AUDIT_SOURCE));
expect(error.reason).to.be(BoxError.NOT_FOUND);
});
it('can remove valid user', function (done) {
users.remove(userObject, AUDIT_SOURCE, function (error) {
expect(!error).to.be.ok();
done();
});
it('can remove valid user', async function () {
await users.del(userObject, AUDIT_SOURCE);
});
it('can re-create user after user was removed', createOwner);