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

Use authInfo obj vs weird params. auth factor 1: factor 2 for 2FA, etc.

Browse Source
This commit is contained in:
Bryan Ashby
2019-02-22 22:51:12 -07:00
parent 57938e761e
commit 23779c3abe
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/servers/content/nntp.js
View File

@@ -141,7 +141,7 @@ class NNTPServer extends NNTPServerBase {
return new Promise( resolve => {
const user = new User();
user.authenticate(username, password, err => {
user.authenticateFactor1({ type : User.AuthFactor1Types.Password, username, password }, err => {
if(err) {
// :TODO: Log IP address
this.log.debug( { username, reason : err.message }, 'Authentication failure');

7
core/servers/login/ssh.js
View File

@@ -23,7 +23,6 @@ const fs = require('graceful-fs');
const util = require('util');
const _ = require('lodash');
const assert = require('assert');
const crypto = require('crypto');
const ModuleInfo = exports.moduleInfo = {
name : 'SSH',
@@ -108,7 +107,7 @@ function SSHClient(clientConn) {
};
const authWithPasswordOrPubKey = (authType) => {
if('pubKey' !== authType || !self.user.isAuthenticated() || !ctx.signature) {
if(User.AuthFactor1Types.PubKey !== authType || !self.user.isAuthenticated() || !ctx.signature) {
// step 1: login/auth using PubKey
userLogin(self, ctx.username, ctx.password, { authType, ctx }, (err) => {
if(err) {
@@ -188,11 +187,11 @@ function SSHClient(clientConn) {
switch(ctx.method) {
case 'password' :
return authWithPasswordOrPubKey('password');
return authWithPasswordOrPubKey(User.AuthFactor1Types.Password);
//return authWithPassword();
case 'publickey' :
return authWithPasswordOrPubKey('pubKey');
return authWithPasswordOrPubKey(User.AuthFactor1Types.PubKey);
//return authWithPubKey();
case 'keyboard-interactive' :