Add support for session traps; make mfa challenge session trap; remove DMZ middleware
This commit is contained in:
@@ -3,34 +3,49 @@ const { Middleware } = require('libflitter')
|
||||
class TrapUtility {
|
||||
constructor(req, res, configs) {
|
||||
this.request = req
|
||||
this.session = req.session
|
||||
this.response = res
|
||||
this.user = req.user
|
||||
this.configs = configs
|
||||
}
|
||||
|
||||
async begin(trap_name) {
|
||||
this.user.trap = trap_name
|
||||
this.request.trust.assume()
|
||||
await this.user.save()
|
||||
async begin(trap_name, { session_only = false }) {
|
||||
if ( session_only || !this.user ) {
|
||||
this.session.trap = trap_name
|
||||
} else {
|
||||
this.user.trap = trap_name
|
||||
await this.user.save()
|
||||
}
|
||||
|
||||
if ( this.config().assume_trust )
|
||||
this.request.trust.assume()
|
||||
}
|
||||
|
||||
redirect() {
|
||||
this.request.trust.assume()
|
||||
if ( this.config().assume_trust )
|
||||
this.request.trust.assume()
|
||||
return this.response.redirect(this.config().redirect_to)
|
||||
}
|
||||
|
||||
async end() {
|
||||
this.user.trap = ''
|
||||
this.request.trust.unassume()
|
||||
await this.user.save()
|
||||
if ( this.config().assume_trust )
|
||||
this.request.trust.unassume()
|
||||
if ( this.user ) {
|
||||
this.user.trap = ''
|
||||
await this.user.save()
|
||||
}
|
||||
this.session.trap = ''
|
||||
}
|
||||
|
||||
has_trap() {
|
||||
return !!this.user.trap
|
||||
has_trap(name = '') {
|
||||
if ( name )
|
||||
return (this.user && this.user.trap === name) || this.session.trap === name
|
||||
return (this.user && this.user.trap) || this.session.trap
|
||||
}
|
||||
|
||||
get_trap() {
|
||||
return this.user.trap
|
||||
if ( this.session.trap ) return this.session.trap
|
||||
else if ( this.user ) return this.user.trap
|
||||
}
|
||||
|
||||
config() {
|
||||
@@ -49,7 +64,6 @@ class TrapsMiddleware extends Middleware {
|
||||
}
|
||||
|
||||
async test(req, res, next, args = {}) {
|
||||
if ( !req?.user ) return next()
|
||||
req.trap = new TrapUtility(req, res, this.configs.get('traps.types'))
|
||||
|
||||
if ( !req.trap.has_trap() ) return next()
|
||||
|
||||
Reference in New Issue
Block a user