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

Code cleanup & resolve some minor TODO's in dropfile gen

This commit is contained in:
Bryan Ashby 2018-12-09 01:01:55 -07:00
parent a8604ece54
commit 8652b35b46
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/door.js
View File

@ -9,7 +9,6 @@ const pty = require('node-pty');
const decode = require('iconv-lite').decode; const decode = require('iconv-lite').decode;
const createServer = require('net').createServer; const createServer = require('net').createServer;
const paths = require('path'); const paths = require('path');
const sanatizeFilename = require('sanitize-filename');
module.exports = class Door { module.exports = class Door {
constructor(client) { constructor(client) {
@ -64,7 +63,7 @@ module.exports = class Door {
node : exeInfo.node.toString(), node : exeInfo.node.toString(),
srvPort : this.sockServer ? this.sockServer.address().port.toString() : '-1', srvPort : this.sockServer ? this.sockServer.address().port.toString() : '-1',
userId : this.client.user.userId.toString(), userId : this.client.user.userId.toString(),
userName : sanatizeFilename(this.client.user.username) || `user${this.client.user.userId.toString()}`, userName : this.client.user.getSanitizedName(),
userNameRaw : this.client.user.username, userNameRaw : this.client.user.username,
cwd : cwd, cwd : cwd,
}; };

33
core/dropfile.js
View File

@ -5,6 +5,7 @@
const Config = require('./config.js').get; const Config = require('./config.js').get;
const StatLog = require('./stat_log.js'); const StatLog = require('./stat_log.js');
const UserProps = require('./user_property.js'); const UserProps = require('./user_property.js');
const SysProps = require('./system_property.js');
// deps // deps
const fs = require('graceful-fs'); const fs = require('graceful-fs');
@ -86,9 +87,14 @@ module.exports = class DropFile {
const prop = this.client.user.properties; const prop = this.client.user.properties;
const now = moment(); const now = moment();
const secLevel = this.client.user.getLegacySecurityLevel().toString(); const secLevel = this.client.user.getLegacySecurityLevel().toString();
const fullName = prop[UserProps.RealName] || this.client.user.username; const fullName = this.client.user.getSanitizedName('real');
const bd = moment(prop[UserProps.Birthdate]).format('MM/DD/YY'); const bd = moment(prop[UserProps.Birthdate]).format('MM/DD/YY');
const upK = Math.floor((parseInt(prop[UserProps.FileUlTotalBytes]) || 0) / 1024);
const downK = Math.floor((parseInt(prop[UserProps.FileDlTotalBytes]) || 0) / 1024);
const timeOfCall = moment(prop[UserProps.LastLoginTs] || moment()).format('hh:mm');
// :TODO: fix time remaining // :TODO: fix time remaining
// :TODO: fix default protocol -- user prop: transfer_protocol // :TODO: fix default protocol -- user prop: transfer_protocol
return iconv.encode( [ return iconv.encode( [
@ -127,8 +133,8 @@ module.exports = class DropFile {
bd, // "Caller's Birthdate" bd, // "Caller's Birthdate"
'X:\\MAIN\\', // "Path to the MAIN directory (where User File is)" 'X:\\MAIN\\', // "Path to the MAIN directory (where User File is)"
'X:\\GEN\\', // "Path to the GEN directory" 'X:\\GEN\\', // "Path to the GEN directory"
StatLog.getSystemStat('sysop_username'), // "Sysop's Name (name BBS refers to Sysop as)" StatLog.getSystemStat(SysProps.SysOpUsername), // "Sysop's Name (name BBS refers to Sysop as)"
this.client.user.username, // "Alias name" this.client.user.getSanitizedName(), // "Alias name"
'00:05', // "Event time (hh:mm)" (note: wat?) '00:05', // "Event time (hh:mm)" (note: wat?)
'Y', // "If its an error correcting connection (Y/N)" 'Y', // "If its an error correcting connection (Y/N)"
'Y', // "ANSI supported & caller using NG mode (Y/N)" 'Y', // "ANSI supported & caller using NG mode (Y/N)"
@ -137,18 +143,15 @@ module.exports = class DropFile {
// :TODO: fix minutes here also: // :TODO: fix minutes here also:
'256', // "Time Credits In Minutes (positive/negative)" '256', // "Time Credits In Minutes (positive/negative)"
'07/07/90', // "Last New Files Scan Date (mm/dd/yy)" '07/07/90', // "Last New Files Scan Date (mm/dd/yy)"
// :TODO: fix last vs now times: timeOfCall, // "Time of This Call"
now.format('hh:mm'), // "Time of This Call" timeOfCall, // "Time of Last Call (hh:mm)"
now.format('hh:mm'), // "Time of Last Call (hh:mm)"
'9999', // "Maximum daily files available" '9999', // "Maximum daily files available"
// :TODO: fix these stats: '0', // "Files d/led so far today"
'0', // "Files d/led so far today" upK.toString(), // "Total "K" Bytes Uploaded"
'0', // "Total "K" Bytes Uploaded" downK.toString(), // "Total "K" Bytes Downloaded"
'0', // "Total "K" Bytes Downloaded"
prop[UserProps.UserComment] || 'None', // "User Comment" prop[UserProps.UserComment] || 'None', // "User Comment"
'0', // "Total Doors Opened" '0', // "Total Doors Opened"
'0', // "Total Messages Left" '0', // "Total Messages Left"
].join('\r\n') + '\r\n', 'cp437'); ].join('\r\n') + '\r\n', 'cp437');
} }
@ -173,8 +176,8 @@ module.exports = class DropFile {
'115200', '115200',
Config().general.boardName, Config().general.boardName,
this.client.user.userId.toString(), this.client.user.userId.toString(),
this.client.user.properties[UserProps.RealName] || this.client.user.username, this.client.user.getSanitizedName('real'),
this.client.user.username, this.client.user.getSanitizedName(),
this.client.user.getLegacySecurityLevel().toString(), this.client.user.getLegacySecurityLevel().toString(),
'546', // :TODO: Minutes left! '546', // :TODO: Minutes left!
'1', // ANSI '1', // ANSI
@ -191,8 +194,8 @@ module.exports = class DropFile {
// //
// Note that usernames are just used for first/last names here // Note that usernames are just used for first/last names here
// //
const opUserName = /[^\s]*/.exec(StatLog.getSystemStat('sysop_username'))[0]; const opUserName = /[^\s]*/.exec(StatLog.getSystemStat(SysProps.SysOpUsername))[0];
const userName = /[^\s]*/.exec(this.client.user.username)[0]; const userName = /[^\s]*/.exec(this.client.user.getSanitizedName())[0];
const secLevel = this.client.user.getLegacySecurityLevel().toString(); const secLevel = this.client.user.getLegacySecurityLevel().toString();
const location = this.client.user.properties[UserProps.Location]; const location = this.client.user.properties[UserProps.Location];

16
core/user.js
View File

@ -15,11 +15,12 @@ const Log = require('./logger.js').log;
const StatLog = require('./stat_log.js'); const StatLog = require('./stat_log.js');
// deps // deps
const crypto = require('crypto'); const crypto = require('crypto');
const assert = require('assert'); const assert = require('assert');
const async = require('async'); const async = require('async');
const _ = require('lodash'); const _ = require('lodash');
const moment = require('moment'); const moment = require('moment');
const sanatizeFilename = require('sanitize-filename');
exports.isRootUserId = function(id) { return 1 === id; }; exports.isRootUserId = function(id) { return 1 === id; };
@ -114,6 +115,11 @@ module.exports = class User {
return isMember; return isMember;
} }
getSanitizedName(type='username') {
const name = 'real' === type ? this.getProperty(UserProps.RealName) : this.username;
return sanatizeFilename(name) || `user${this.userId.toString()}`;
}
getLegacySecurityLevel() { getLegacySecurityLevel() {
if(this.isRoot() || this.isGroupMember('sysops')) { if(this.isRoot() || this.isGroupMember('sysops')) {
return 100; return 100;