moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy

This commit is contained in:
Bryan Ashby 2023-01-06 14:17:16 -07:00
parent 7380ef571a
commit 41867c73d5
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/logger.js
View File

@ -65,9 +65,10 @@ module.exports = class Log {
// //
return JSON.parse( return JSON.parse(
JSON.stringify(obj).replace( JSON.stringify(obj).replace(
/"(password|passwordConfirm|key|authCode|private_key_main)"\s?:\s?"([^"]+)"/, // note that we match against key names here
(match, valueName) => { /"(password|passwordConfirm|key|authCode)"\s?:\s?"([^"]+)"/,
return `"${valueName}":"********"`; (match, keyName) => {
return `"${keyName}":"********"`;
} }
) )
); );

14
core/user.js
View File

@ -469,7 +469,7 @@ module.exports = class User {
function createUserRec(trans, callback) { function createUserRec(trans, callback) {
trans.run( trans.run(
`INSERT INTO user (user_name) `INSERT INTO user (user_name)
VALUES (?);`, VALUES (?);`,
[self.username], [self.username],
function inserted(err) { function inserted(err) {
// use classic function for |this| // use classic function for |this|
@ -503,6 +503,11 @@ module.exports = class User {
} }
); );
}, },
function setKeyPair(trans, callback) {
self.updateMainKeyPairProperties(err => {
return callback(err, trans);
});
},
function setInitialGroupMembership(trans, callback) { function setInitialGroupMembership(trans, callback) {
// Assign initial groups. Must perform a clone: #235 - All users are sysops (and I can't un-sysop them) // Assign initial groups. Must perform a clone: #235 - All users are sysops (and I can't un-sysop them)
self.groups = [...config.users.defaultGroups]; self.groups = [...config.users.defaultGroups];
@ -547,11 +552,6 @@ module.exports = class User {
async.series( async.series(
[ [
function setKeyPair(callback) {
self.generateMainKeyPair(err => {
return callback(err);
});
},
function saveProps(callback) { function saveProps(callback) {
self.persistProperties(self.properties, trans, err => { self.persistProperties(self.properties, trans, err => {
return callback(err); return callback(err);
@ -643,7 +643,7 @@ module.exports = class User {
); );
} }
generateMainKeyPair(cb) { updateMainKeyPairProperties(cb) {
crypto.generateKeyPair( crypto.generateKeyPair(
'rsa', 'rsa',
{ {

5
core/user_property.js
View File

@ -66,6 +66,7 @@ module.exports = {
AuthFactor2OTP: 'auth_factor2_otp', // If present, OTP type for 2FA. See OTPTypes AuthFactor2OTP: 'auth_factor2_otp', // If present, OTP type for 2FA. See OTPTypes
AuthFactor2OTPSecret: 'auth_factor2_otp_secret', // Secret used in conjunction with OTP 2FA AuthFactor2OTPSecret: 'auth_factor2_otp_secret', // Secret used in conjunction with OTP 2FA
AuthFactor2OTPBackupCodes: 'auth_factor2_otp_backup', // JSON array of backup codes AuthFactor2OTPBackupCodes: 'auth_factor2_otp_backup', // JSON array of backup codes
PublicKeyMain: 'public_key_main', // RSA public key for user
PrivateKeyMain: 'private_key_main', // RSA private key (corresponding to PublicKeyMain) PublicKeyMain: 'public_key_main_rsa_2048', // RSA public key for user
PrivateKeyMain: 'private_key_main_rsa_2048', // RSA private key (corresponding to PublicKeyMain)
}; };