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

ACS changes in prep for checking from ie content servers such as NNTP

Browse Source 
* ACS now takes subject { client, user }
* ACS checks now consider client/user optional & checks fail (return false) if an object is not available
This commit is contained in:
Bryan Ashby
2018-12-28 10:39:41 -07:00
parent 8d46a305c5
commit 046550842b
4 changed files with 124 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/acs.js
View File

@@ -10,15 +10,15 @@ const assert = require('assert');
const _ = require('lodash');
class ACS {
constructor(client) {
this.client = client;
constructor(subject) {
this.subject = subject;
}
check(acs, scope, defaultAcs) {
acs = acs ? acs[scope] : defaultAcs;
acs = acs || defaultAcs;
try {
return checkAcs(acs, { client : this.client } );
return checkAcs(acs, { subject : this.subject } );
} catch(e) {
Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
return false;
@@ -57,7 +57,7 @@ class ACS {
return true; // no ACS check req.
}
try {
return checkAcs(acs, { client : this.client } );
return checkAcs(acs, { subject : this.subject } );
} catch(e) {
Log.warn( { exception : e, acs : acs }, 'Exception caught checking ACS');
return false;
@@ -75,7 +75,7 @@ class ACS {
const matchCond = condArray.find( cond => {
if(_.has(cond, 'acs')) {
try {
return checkAcs(cond.acs, { client : this.client } );
return checkAcs(cond.acs, { subject : this.subject } );
} catch(e) {
Log.warn( { exception : e, acs : cond }, 'Exception caught checking ACS');
return false;