s/DNS/Dns/g since that is the BeEF style convention.
This commit is contained in:
@@ -5,19 +5,19 @@
|
||||
#
|
||||
module BeEF
|
||||
module Extension
|
||||
module DNS
|
||||
module Dns
|
||||
module API
|
||||
|
||||
module NameserverHandler
|
||||
|
||||
BeEF::API::Registrar.instance.register(
|
||||
BeEF::Extension::DNS::API::NameserverHandler,
|
||||
BeEF::Extension::Dns::API::NameserverHandler,
|
||||
BeEF::API::Server,
|
||||
'pre_http_start'
|
||||
)
|
||||
|
||||
BeEF::API::Registrar.instance.register(
|
||||
BeEF::Extension::DNS::API::NameserverHandler,
|
||||
BeEF::Extension::Dns::API::NameserverHandler,
|
||||
BeEF::API::Server,
|
||||
'mount_handler'
|
||||
)
|
||||
@@ -30,7 +30,7 @@ module API
|
||||
port = config.get('beef.extension.dns.port')
|
||||
|
||||
Thread.new do
|
||||
dns = BeEF::Extension::DNS::Server.instance
|
||||
dns = BeEF::Extension::Dns::Server.instance
|
||||
dns.run_server(address, port)
|
||||
end
|
||||
|
||||
@@ -39,7 +39,7 @@ module API
|
||||
|
||||
# Mounts handler for processing RESTful API calls
|
||||
def self.mount_handler(beef_server)
|
||||
beef_server.mount('/api/dns', BeEF::Extension::DNS::DNSRest.new)
|
||||
beef_server.mount('/api/dns', BeEF::Extension::Dns::DnsRest.new)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
module BeEF
|
||||
module Extension
|
||||
module DNS
|
||||
module Dns
|
||||
|
||||
# This class is responsible for providing a DNS nameserver that can be dynamically
|
||||
# configured by other modules and extensions. It is particularly useful for
|
||||
@@ -38,7 +38,7 @@ module DNS
|
||||
EventMachine.next_tick do
|
||||
RubyDNS.run_server(:listen => [[:udp, address, port]]) do
|
||||
server = self
|
||||
BeEF::Extension::DNS::Server.instance.instance_eval { @server = server }
|
||||
BeEF::Extension::Dns::Server.instance.instance_eval { @server = server }
|
||||
|
||||
# Pass unmatched queries upstream to root nameservers
|
||||
otherwise do |transaction|
|
||||
@@ -54,7 +54,7 @@ module DNS
|
||||
#
|
||||
# @example Adds an A record for foobar.com with the value 1.2.3.4
|
||||
#
|
||||
# dns = BeEF::Extension::DNS::Server.instance
|
||||
# dns = BeEF::Extension::Dns::Server.instance
|
||||
#
|
||||
# id = dns.add_rule('foobar.com', Resolv::DNS::Resource::IN::A) do |transaction|
|
||||
# transaction.respond!('1.2.3.4')
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
module BeEF
|
||||
module Extension
|
||||
module DNS
|
||||
module Dns
|
||||
|
||||
extend BeEF::API::Extension
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
module BeEF
|
||||
module Core
|
||||
module Models
|
||||
module DNS
|
||||
module Dns
|
||||
|
||||
class Rule
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
#
|
||||
module BeEF
|
||||
module Extension
|
||||
module DNS
|
||||
module Dns
|
||||
|
||||
# This class handles the routing of RESTful API requests that query BeEF's DNS server
|
||||
class DNSRest < BeEF::Core::Router::Router
|
||||
class DnsRest < BeEF::Core::Router::Router
|
||||
|
||||
# Filters out bad requests before performing any routing
|
||||
before do
|
||||
@@ -27,7 +27,7 @@ module DNS
|
||||
# Returns the entire current DNS ruleset
|
||||
get '/rules' do
|
||||
result = {}
|
||||
result[:rules] = BeEF::Extension::DNS::Server.instance.get_ruleset
|
||||
result[:rules] = BeEF::Extension::Dns::Server.instance.get_ruleset
|
||||
result.to_json
|
||||
end
|
||||
|
||||
@@ -40,7 +40,7 @@ module DNS
|
||||
raise InvalidJsonError, 'Invalid id passed to endpoint /api/dns/rule/:id'
|
||||
end
|
||||
|
||||
result = BeEF::Extension::DNS::Server.instance.get_rule(id)
|
||||
result = BeEF::Extension::Dns::Server.instance.get_rule(id)
|
||||
result.to_json
|
||||
rescue InvalidJsonError => e
|
||||
print_error e.message
|
||||
@@ -87,7 +87,7 @@ module DNS
|
||||
block_src = format_response(type, response)
|
||||
|
||||
# Bypass #add_rule so that 'block_src' can be passed as a String
|
||||
BeEF::Extension::DNS::Server.instance.instance_eval do
|
||||
BeEF::Extension::Dns::Server.instance.instance_eval do
|
||||
id = @server.match(pattern, type_obj, block_src)
|
||||
end
|
||||
|
||||
@@ -114,7 +114,7 @@ module DNS
|
||||
raise InvalidJsonError, 'Invalid id passed to endpoint /api/dns/rule/:id'
|
||||
end
|
||||
|
||||
BeEF::Extension::DNS::Server.instance.remove_rule(id)
|
||||
BeEF::Extension::Dns::Server.instance.remove_rule(id)
|
||||
rescue InvalidJsonError => e
|
||||
print_error e.message
|
||||
halt 400
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
# identifiers to rules, rule removal, and more.
|
||||
#
|
||||
# The core functionality of BeEF's DNS server is implemented here, whereas
|
||||
# BeEF::Extension::DNS::Server is simply a small wrapper around it.
|
||||
# BeEF::Extension::Dns::Server is simply a small wrapper around it.
|
||||
#
|
||||
# @see http://rubydoc.info/gems/rubydns/frames
|
||||
module RubyDNS
|
||||
@@ -69,7 +69,7 @@ module RubyDNS
|
||||
end
|
||||
|
||||
# Break out and return id if rule is already present
|
||||
BeEF::Core::Models::DNS::Rule.each do |rule|
|
||||
BeEF::Core::Models::Dns::Rule.each do |rule|
|
||||
if pattern[0] == rule.pattern &&
|
||||
pattern[1] == rule.type &&
|
||||
block_src == rule.block
|
||||
@@ -89,7 +89,7 @@ module RubyDNS
|
||||
@rules << Rule.new(id, pattern, block)
|
||||
end
|
||||
|
||||
BeEF::Core::Models::DNS::Rule.create(
|
||||
BeEF::Core::Models::Dns::Rule.create(
|
||||
:id => id,
|
||||
:pattern => pattern[0],
|
||||
:type => pattern[1],
|
||||
@@ -114,7 +114,7 @@ module RubyDNS
|
||||
@rules.delete_if { |rule| rule.id == id }
|
||||
|
||||
begin
|
||||
BeEF::Core::Models::DNS::Rule.get!(id).destroy
|
||||
BeEF::Core::Models::Dns::Rule.get!(id).destroy
|
||||
rescue DataMapper::ObjectNotFoundError => e
|
||||
@logger.error(e.message)
|
||||
end
|
||||
@@ -122,7 +122,7 @@ module RubyDNS
|
||||
|
||||
# New method that loads all rules from the database at server startup
|
||||
def load_rules
|
||||
BeEF::Core::Models::DNS::Rule.each do |rule|
|
||||
BeEF::Core::Models::Dns::Rule.each do |rule|
|
||||
id = rule.id
|
||||
pattern = [rule.pattern, rule.type]
|
||||
block = eval rule.block
|
||||
@@ -135,7 +135,7 @@ module RubyDNS
|
||||
def get_ruleset
|
||||
result = []
|
||||
|
||||
BeEF::Core::Models::DNS::Rule.each do |rule|
|
||||
BeEF::Core::Models::Dns::Rule.each do |rule|
|
||||
element = {}
|
||||
|
||||
element[:id] = rule.id
|
||||
@@ -154,7 +154,7 @@ module RubyDNS
|
||||
result = {}
|
||||
|
||||
begin
|
||||
rule = BeEF::Core::Models::DNS::Rule.get!(id)
|
||||
rule = BeEF::Core::Models::Dns::Rule.get!(id)
|
||||
|
||||
result[:id] = rule.id
|
||||
result[:pattern] = rule.pattern
|
||||
@@ -175,7 +175,7 @@ module RubyDNS
|
||||
id = BeEF::Core::Crypto.secure_token.byteslice(0..6)
|
||||
|
||||
# Make sure id isn't already in use
|
||||
BeEF::Core::Models::DNS::Rule.each { |rule| throw StandardError if id == rule.id }
|
||||
BeEF::Core::Models::Dns::Rule.each { |rule| throw StandardError if id == rule.id }
|
||||
rescue StandardError
|
||||
retry
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user