From bc74900a4104362eabca049c91cbbee40096af0e Mon Sep 17 00:00:00 2001 From: Akkuman Date: Mon, 29 Jun 2020 15:07:33 +0800 Subject: [PATCH] :bug: fix #13781 set token from environment var --- lib/msf/core/web_services/json_rpc_app.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/msf/core/web_services/json_rpc_app.rb b/lib/msf/core/web_services/json_rpc_app.rb index 52d207eec8..8ed56dffb9 100644 --- a/lib/msf/core/web_services/json_rpc_app.rb +++ b/lib/msf/core/web_services/json_rpc_app.rb @@ -39,15 +39,15 @@ module Msf::WebServices before do db = get_db + @@auth_initialized = false if db_initialized(db) # store DBManager in request environment so that it is available to Warden request.env['msf.db_manager'] = db @@auth_initialized ||= get_db.users({}).count > 0 - elsif !settings.api_token.nil? + end + if !settings.api_token.nil? @@auth_initialized = true request.env['msf.api_token'] = settings.api_token - else - @@auth_initialized = false end # store flag indicating whether authentication is initialized in the request environment