Code cleanup
This commit is contained in:
@@ -6,9 +6,7 @@
|
||||
|
||||
module BeEF
|
||||
module Core
|
||||
|
||||
class Logger
|
||||
|
||||
include Singleton
|
||||
|
||||
# Constructor
|
||||
@@ -19,12 +17,15 @@ module Core
|
||||
# if notifications are enabled create a new instance
|
||||
@notifications = BeEF::Extension::Notifications::Notifications unless @config.get('beef.extension.notifications.enable') == false
|
||||
end
|
||||
|
||||
|
||||
#
|
||||
# Registers a new event in the logs
|
||||
# @param [String] from The origin of the event (i.e. Authentication, Hooked Browser)
|
||||
# @param [String] event The event description
|
||||
# @param [Integer] hb The id of the hooked browser affected (default = 0 if no HB)
|
||||
#
|
||||
# @return [Boolean] True if the register was successful
|
||||
#
|
||||
def register(from, event, hb = 0)
|
||||
# type conversion to enforce standards
|
||||
hb = hb.to_i
|
||||
@@ -33,24 +34,23 @@ module Core
|
||||
time_now = Time.now
|
||||
|
||||
# arguments type checking
|
||||
raise Exception::TypeError, '"from" needs to be a string' if not from.string?
|
||||
raise Exception::TypeError, '"event" needs to be a string' if not event.string?
|
||||
raise Exception::TypeError, '"Hooked Browser ID" needs to be an integer' if not hb.integer?
|
||||
raise Exception::TypeError, '"from" needs to be a string' unless from.string?
|
||||
raise Exception::TypeError, '"event" needs to be a string' unless event.string?
|
||||
raise Exception::TypeError, '"Hooked Browser ID" needs to be an integer' unless hb.integer?
|
||||
|
||||
# logging the new event into the database
|
||||
@logs.new(:type => "#{from}", :event => "#{event}", :date => time_now, :hooked_browser_id => hb).save
|
||||
@logs.new(:type => from.to_s, :event => event.to_s, :date => time_now, :hooked_browser_id => hb).save
|
||||
print_debug "Event: #{event}"
|
||||
# if notifications are enabled send the info there too
|
||||
if @notifications
|
||||
@notifications.new(from, event, time_now, hb)
|
||||
end
|
||||
|
||||
# return
|
||||
true
|
||||
end
|
||||
|
||||
|
||||
private
|
||||
@logs
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user