dnsutils 0.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c80e817d2c54f1e244125038d9e18993cc5d5a
-  data.tar.gz: 67348af902374c176dd947795bd2dc5c2a8ef752
+  metadata.gz: 24dbad9a1a131a3842e5d70b74b86d60cd1d728d
+  data.tar.gz: 5db0286584a47b840cc65350eff89618bfd62f99
 SHA512:
-  metadata.gz: 7093a62fa5f7bda31ee273524488ce83df92507c8a454b8cec28506984b580487be01ffb11e85b079afe782146311ff13a5264ff10bfc109f1fb6bd731f9b024
-  data.tar.gz: 9d76dd0cd7c4e4bd5f637e1aab6cdd187dc3ccebb8a88b9f93c96da5bbf4eca4b0b2beb3b110ea5cd7878083440b28ffe64efb1d764ab3d6d04319a29f49eb91
+  metadata.gz: 01e8e6a0e493718d70f04af4261435db657e2a9d6dceca62e1a63d62f2013393f3363991332c32ac7c5012b3be2eeace3adf7e6ee48819552c60d2223aeff84c
+  data.tar.gz: 9e5f19f0028d654f3c77462f30fbd5645ff500f15f664400a9a00585cc428c053c4b57c253fadb08fc698117cbb62d3f3d1cd2a1b8e9325f647b982c336585a3

data/README.md

@@ -1,8 +1,9 @@
 # Dnsutils
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dnsutils`. To experiment with that code, run `bin/console` for an interactive prompt.
+This package includes several handy DNS utilities that were written to
+demonstrate the DNS library I wrote, [Nesser](https://github.com/iagox86/nesser)!
 
-TODO: Delete this and the text above, and describe your gem
+See the Usage section below for details.
 
 ## Installation
 
@@ -22,15 +23,218 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+This currently comes with several different utilities, and will likely have more
+in the future!
+
+### dnslogger
+
+`dnslogger` is a simple DNS server that listens for queries, displays them, and
+responds with :NXDomain (domain not found) by default.
+
+The simplest usage is to run it without any arguments:
+
+    # dnslogger
+    Starting dnslogger (DnsUtils) 2.0.0 DNS server on 0.0.0.0:53
+
+Then to make requests, either directly:
+
+    $ dig @localhost -t A example.org
+    
+    ; <<>> DiG 9.10.3-P4-Ubuntu <<>> @localhost -t A example.org
+    ; (1 server found)
+    ;; global options: +cmd
+    ;; Got answer:
+    ;; ->>HEADER<<- opcode: QUERY, status: NXDOMAIN, id: 48472
+    ;; flags: qr rd ra; QUERY: 1, ANSWER: 0, AUTHORITY: 0, ADDITIONAL: 0
+    
+    ;; QUESTION SECTION:
+    ;example.org.                   IN      A
+    
+    ;; Query time: 1 msec
+    ;; SERVER: 127.0.0.1#53535(127.0.0.1)
+    ;; WHEN: Sun Jul 09 19:04:11 PDT 2017
+    ;; MSG SIZE  rcvd: 29
+
+Or, if you're on an authoritative server, indirectly:
+
+    $ dig -t A test.skullseclabs.org
+    
+    ; <<>> DiG 9.10.3-P4-Ubuntu <<>> -t A test.skullseclabs.org
+    ; (1 server found)
+    ;; global options: +cmd
+    ;; Got answer:
+    ;; ->>HEADER<<- opcode: QUERY, status: NXDOMAIN, id: 31731
+    ;; flags: qr rd ra; QUERY: 1, ANSWER: 0, AUTHORITY: 0, ADDITIONAL: 0
+    
+    ;; QUESTION SECTION:
+    ;test.skullseclabs.org.         IN      A
+    
+    ;; Query time: 0 msec
+    ;; SERVER: 127.0.0.1#53535(127.0.0.1)
+    ;; WHEN: Sun Jul 09 19:05:10 PDT 2017
+    ;; MSG SIZE  rcvd: 39
+
+You'll notice that in both cases, the status came back as NXDOMAIN (name not
+found), and no answers were given. That's expected! In the dnslogger window,
+you will see the requests:
+
+    IN: Request for example.org [A IN]
+    OUT: Response for example.org [A IN]: error: :NXDomain (RCODE_NAME_ERROR)
+    IN: Request for test.skullseclabs.org [A IN]
+    OUT: Response for test.skullseclabs.org [A IN]: error: :NXDomain (RCODE_NAME_ERROR)
+
+You can also provide records of various types that will always be returned (note
+that I'm running this on a non-privileged port now, so I don't have to use
+root):
+
+    $ dnslogger --port 53535 --A 1.2.3.4 --TXT 'this is txt'
+    Starting dnslogger (DnsUtils) 2.0.0 DNS server on 0.0.0.0:53535
+
+And that will be returned:
+
+    $ dig @localhost +short -t A -p 53535 test.com
+    1.2.3.4
+    $ dig @localhost +short -t ANY -p 53535 test.com
+    1.2.3.4
+    "this is txt"
+
+You can also provide a passthrough address, which will send all requests that
+don't match one of the records you handle upstream:
+
+    $ dnslogger --port 53535 --A 1.2.3.4 --passthrough 8.8.8.8:53
+    Starting dnslogger (DnsUtils) 2.0.0 DNS server on 0.0.0.0:53535
+
+And on the client:
+
+    $ dig @localhost +short -t A -p 53535 google.com
+    1.2.3.4
+    $ dig @localhost +short -t MX -p 53535 google.com
+    20 alt1.aspmx.l.google.com.
+    50 alt4.aspmx.l.google.com.
+    30 alt2.aspmx.l.google.com.
+    10 aspmx.l.google.com.
+    40 alt3.aspmx.l.google.com.
+
+That can be useful for stealth, although I kinda prefer using the :NXDomain
+approach, since it looks like literally nothing is there. :)
+
+Note that this only makes sense to use if you expect somebody to query you
+directly - you don't want to send your own authoritative requests upstream
+because that would cause an infinite loop. So definitely use passthrough
+sparingly. :)
+
+### dnstest
+
+`dnstest` is used to determine whether or not you're actually running on an
+authoritative DNS server for the domain you specify.
+
+This is done by generating a random subdomain, and prepending that in front of
+the domain name. That domain is sent to an upstream DNS server (8.8.8.8 by
+default), and we check if the request makes it back to us.
+
+Typically, you'll simply run it with `--domain` set to your domain name:
+
+    # dnstest --domain skullseclabs.org
+    This script determines if you hold the authoritative record for a domain by
+    sending a request for a random subdomain. If the request goes through, you hold
+    the record!
+    --
+    Starting dnstest (DnsUtils) 2.0.0 DNS server on 0.0.0.0:53...
+    
+    (Listening for yzpvshufndyqkhdd.skullseclabs.org)
+    (Requesting yzpvshufndyqkhdd.skullseclabs.org from 8.8.8.8:53)
+    Got a response from the DNS server, but didn't see the request... you probably don't have the authoritative server. :(
+    
+    DNS RESPONSE: id=0x50f1, opcode = OPCODE_QUERY, flags = RD|RA, rcode = :ServFail (RCODE_SERVER_FAILURE)
+    , qdcount = 0x0001, ancount = 0x0000
+        Question: yzpvshufndyqkhdd.skullseclabs.org [A IN]
+
+In that case, it failed because I'm not running on the authoritative server; in
+fact, nothing is running there, so the upstream DNS server returned :ServFail.
+
+If you try to request a domain that exists, but that you aren't the authority
+for, you get a similar error:
+
+    # dnstest --domain google.com
+    This script determines if you hold the authoritative record for a domain by
+    sending a request for a random subdomain. If the request goes through, you hold
+    the record!
+    --
+    Starting dnstest (DnsUtils) 2.0.0 DNS server on 0.0.0.0:53...
+    
+    (Listening for jqjvzkyhttbxoqlt.google.com)
+    (Requesting jqjvzkyhttbxoqlt.google.com from 8.8.8.8:53)
+    Got a response from the DNS server, but didn't see the request... you probably don't have the authoritative server. :(
+    
+    DNS RESPONSE: id=0x2ef4, opcode = OPCODE_QUERY, flags = RD|RA, rcode = :NXDomain (RCODE_NAME_ERROR), qd
+    count = 0x0001, ancount = 0x0000
+        Question: jqjvzkyhttbxoqlt.google.com [A IN]
+
+You'll notice that this time, the rcode was :NXDomain, aka, not found. And
+finally, if you ARE running on the authoritative server, you'll get a happy
+little message telling you so:
+
+    $ dnstest --domain skullseclabs.org
+    This script determines if you hold the authoritative record for a domain by
+    sending a request for a random subdomain. If the request goes through, you hold
+    the record!
+    --
+    Starting dnstest (DnsUtils) 2.0.0 DNS server on 0.0.0.0:53...
+    
+    (Listening for blyonrwrwjpyugvc.google.com)
+    (Requesting blyonrwrwjpyugvc.google.com from localhost:53535)
+    (Received: blyonrwrwjpyugvc.google.com [A IN])
+    You have the authoritative server!
+
+And that's pretty much all there is to it!
+
+### dnsmastermind
+
+`dnsmastermind` is a silly little game I wrote to demonstrate how DNS works.
+
+It's based on the classic Mastermind game, where the player guesses a sequence
+(in this case, of letters), and the server tells them how many are right, and
+how many of them are in the right place.
+
+I don't imagine any real-world use for it, so I'm not going to spend a lot of
+time talking about usage. It essentially works the same way as other scripts.
+
+I'll simply demonstrate it running locally on a non-privileged port (but it
+will, like other scripts, work just fine indirectly if you're on the
+authoritative server for the domain):
+
+    $ dnsmastermind --port 53535 --solution ABCD
+    Starting dnsmastermind (DnsUtils) 2.0.0 DNS server on 0.0.0.0:53535
+
+The players can simply send a TXT request to get the instructions:
+
+    $ dig @localhost +short -t TXT -p 53535 instructions.test.com
+    "Instructions: guess the 4-character string: dig -t txt [guess].test.com! 'O' = correct, 'X' = correct, but wrong position"
+
+And guess the solution the same way:
+
+    $ dig @localhost +short -p 53535 AAAA.test.com
+    "O"
+    $ dig @localhost +short -p 53535 AAAB.test.com
+    "OX"
+    $ dig @localhost +short -p 53535 ABCC.test.com
+    "OOO"
+    $ dig @localhost +short -p 53535 ABCD.test.com
+    "YOU WIN!!"
+
+An 'O' represents the right character in the right place, and an 'X' represents
+the right character in the wrong place.
 
-## Development
+## Contributing
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Bug reports and pull requests are welcome on GitHub at https://github.com/iagox86/dnsutils
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+I'm also happy to take requests on other simple DNS utilities that can be
+written with this library.
 
-## Contributing
+If you sent a pull request, please try to follow my style as much as possible!
+There are no tests for these utilities, so be warned. :)
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/dnsutils.
+## Version history / changelog
 
+* 2.0.0 - Initial port from the old DNS architecture

data/dnsutils.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dnsutils/version'
+require 'version'
 
 Gem::Specification.new do |spec|
   spec.name          = "dnsutils"
-  spec.version       = Dnsutils::VERSION
+  spec.version       = DnsUtils::VERSION
   spec.authors       = ["iagox86"]
   spec.email         = ["ron-git@skullsecurity.org"]
 

data/exe/dnslogger

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/dnslogger'

data/exe/dnsmastermind

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/dnsmastermind'

data/exe/dnstest

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/dnstest'

data/lib/dnslogger.rb

@@ -8,100 +8,148 @@
 # Implements a stupidly simple DNS server.
 ##
 
-$LOAD_PATH << File.dirname(__FILE__) # A hack to make this work on 1.8/1.9
-
+require 'nesser'
+require 'socket'
 require 'trollop'
-require '../server/libs/dnser'
 
-# version info
-NAME = "dnslogger"
-VERSION = "v1.0.0"
+require_relative 'version'
 
-Thread.abort_on_exception = true
+module DnsUtils
+  # version info
+  MY_NAME = "dnslogger (#{NAME}) #{VERSION}"
 
-# Options
-opts = Trollop::options do
-  version(NAME + " " + VERSION)
+  Thread.abort_on_exception = true
 
-  opt :version, "Get the #{NAME} version",      :type => :boolean, :default => false
-  opt :host,    "The ip address to listen on",  :type => :string,  :default => "0.0.0.0"
-  opt :port,    "The port to listen on",        :type => :integer, :default => 53
+  # Options
+  opts = Trollop::options do
+    version(MY_NAME)
 
-  opt :passthrough,   "Set to a host:port, and unanswered queries will be sent there", :type => :string, :default => nil
-  opt :packet_trace,  "If enabled, print details about the packets",                   :type => :boolean, :default => false
+    opt :version, "Get the #{MY_NAME} version (spoiler alert)", :type => :boolean, :default => false
+    opt :host, "The ip address to listen on", :type => :string, :default => "0.0.0.0"
+    opt :port, "The port to listen on", :type => :integer, :default => 53
 
-  opt :A,       "Response to send back for 'A' requests",     :type => :string,  :default => nil
-  opt :AAAA,    "Response to send back for 'AAAA' requests",  :type => :string,  :default => nil
-  opt :CNAME,   "Response to send back for 'CNAME' requests", :type => :string,  :default => nil
-  opt :TXT,     "Response to send back for 'TXT' requests",   :type => :string,  :default => nil
-  opt :MX,      "Response to send back for 'MX' requests",    :type => :string,  :default => nil
-  opt :MX_PREF, "The preference order for the MX record",     :type => :integer, :default => 10
-  opt :NS,      "Response to send back for 'NS' requests",    :type => :string,  :default => nil
+    opt :passthrough, "Set to a host:port, and unanswered queries will be sent there", :type => :string, :default => nil
+    opt :packet_trace, "If enabled, print details about the packets", :type => :boolean, :default => false
 
-  opt :ttl, "The TTL value to return", :type => :integer, :default => 60
-end
+    opt :A, "Response to send back for 'A' requests (must be a dotted ip address)", :type => :string, :default => nil
+    opt :AAAA, "Response to send back for 'AAAA' requests (must be an ipv6 address)", :type => :string, :default => nil
+    opt :CNAME, "Response to send back for 'CNAME' requests (must be a dotted domain name)", :type => :string, :default => nil
+    opt :TXT, "Response to send back for 'TXT' requests",:type => :string, :default => nil
+    opt :MX, "Response to send back for 'MX' requests (must be a dotted domain name)", :type => :string, :default => nil
+    opt :MX_PREF, "The preference order for the MX record (must be a number)", :type => :integer, :default => 10
+    opt :NS, "Response to send back for 'NS' requests (must be a dotted domain name)", :type => :string, :default => nil
 
-if(opts[:port] < 0 || opts[:port] > 65535)
-  Trollop::die :port, "must be a valid port (between 0 and 65535)"
-end
+    opt :ttl, "The TTL value to return", :type => :integer, :default => 60
+  end
 
-puts("Starting #{NAME} #{VERSION} DNS server on #{opts[:host]}:#{opts[:port]}")
+  if opts[:port] < 0 || opts[:port] > 65535
+    Trollop::die(:port, "must be a valid port (between 0 and 65535)")
+  end
 
-pt_host = pt_port = nil
-if(opts[:passthrough])
-  pt_host, pt_port = opts[:passthrough].split(/:/, 2)
-  pt_port = pt_port || 53
-  puts("Any queries without a specific answer will be sent to #{pt_host}:#{pt_port}")
-end
+  pt_host = pt_port = nil
+  if opts[:passthrough]
+    pt_host, pt_port = opts[:passthrough].split(/:/, 2)
+    if pt_port.nil?
+      pt_port = 53
+    else
+      pt_port = pt_port.to_i
+    end
+  end
 
-dnser = DNSer.new(opts[:host], opts[:port])
+  puts("Starting #{MY_NAME} DNS server on #{opts[:host]}:#{opts[:port]}")
 
-dnser.on_request() do |transaction|
-  request = transaction.request
+  s = UDPSocket.new()
+  nesser = Nesser::Nesser.new(s: s, host: opts[:host], port: opts[:port]) do |transaction|
+    request = transaction.request
 
-  if(request.questions.length < 1)
-    puts("The request didn't ask any questions!")
-    next
-  end
+    if(request.questions.length < 1)
+      puts("The request didn't ask any questions!")
+      next
+    end
 
-  if(request.questions.length > 1)
-    puts("The request asked multiple questions! This is super unusual, if you can reproduce, please report!")
-    next
-  end
+    if(request.questions.length > 1)
+      puts("The request asked multiple questions! This is super unusual, if you can reproduce, please report! I'd love to see an example of something that does this. :)")
+      next
+    end
 
-  question = request.questions[0]
+    question = request.questions[0]
 
-  puts(request.to_s(!opts[:packet_trace]))
+    # Display the long or short version of the request
+    puts("IN: " + request.to_s(brief: !opts[:packet_trace]))
 
-  # If they provided a way to handle it, to that
-  response = question.type_s ? opts[question.type_s.to_sym] : nil
-  if(response)
-    if(question.type == DNSer::Packet::TYPE_MX)
-      answer = question.answer(opts[:ttl], response, opts[:MX_PREF])
-    else
-      answer = question.answer(opts[:ttl], response)
+    # Get the type and class
+    type = Nesser::TYPES[question.type]
+
+    # If they provided a way to handle it, do that
+    rrs = []
+    if (type == 'A' || type == 'ANY') && opts[:A]
+      rrs << {
+        rr: Nesser::A.new(address: opts[:A]),
+        type: Nesser::TYPE_A,
+      }
     end
 
-    transaction.add_answer(answer)
-    puts(transaction.response.to_s(!opts[:packet_trace]))
-    transaction.reply!()
-  else
-    if(pt_host)
-      transaction.passthrough!(pt_host, pt_port, Proc.new() do |packet|
-        puts(packet.to_s(!opts[:packet_trace]))
-      end)
-      puts("OUT: (...forwarding upstream...)")
-    else
-      transaction.error!(DNSer::Packet::RCODE_NAME_ERROR)
-      puts(transaction.response.to_s(!opts[:packet_trace]))
+    if (type == 'AAAA' || type == 'ANY') && opts[:AAAA]
+      rrs << {
+        rr: Nesser::AAAA.new(address: opts[:AAAA]),
+        type: Nesser::TYPE_AAAA,
+      }
+    end
+
+    if (type == 'CNAME' || type == 'ANY') && opts[:CNAME]
+      rrs << {
+        rr: Nesser::CNAME.new(name: opts[:CNAME]),
+        type: Nesser::TYPE_CNAME,
+      }
+    end
+
+    if (type == 'TXT' || type == 'ANY') && opts[:TXT]
+      rrs << {
+        rr: Nesser::TXT.new(data: opts[:TXT]),
+        type: Nesser::TYPE_TXT,
+      }
+    end
+
+    if (type == 'MX' || type == 'ANY') && opts[:MX]
+      rrs << {
+        rr: Nesser::MX.new(name: opts[:MX], preference: opts[:MX_PREF]),
+        type: Nesser::TYPE_MX,
+      }
     end
-  end
 
-  if(!transaction.sent)
-    raise(StandardError, "Oops! We didn't send the response! Please file a bug")
+    if (type == 'NS' || type == 'ANY') && opts[:NS]
+      rrs << {
+        rr: Nesser::NS.new(name: opts[:NS]),
+        type: Nesser::TYPE_NS,
+      }
+    end
+
+    # Translate the resource records into actual answers
+    answers = rrs.map() do |rr_pair|
+      Nesser::Answer.new(
+        name: question.name,
+        type: rr_pair[:type],
+        cls: question.cls,
+        ttl: opts[:ttl],
+        rr: rr_pair[:rr],
+      )
+    end
+
+    # Send back either the responses or an error code
+    if answers.length > 0
+      transaction.answer!(answers)
+      puts("OUT: " + transaction.response.to_s(brief: !opts[:packet_trace]))
+    else
+      if pt_host
+        transaction.passthrough!(host: pt_host, port: pt_port)
+        puts("OUT: [sent to #{pt_host}:#{pt_port}]")
+      else
+        transaction.error!(Nesser::RCODE_NAME_ERROR)
+        puts("OUT: " + transaction.response.to_s(brief: !opts[:packet_trace]))
+      end
+    end
   end
 
+  # Wait for it to finish (never-ending, essentially)
+  nesser.wait()
 end
-
-# Wait for it to finish (never-ending, essentially)
-dnser.wait()

data/lib/dnsmastermind.rb

@@ -8,108 +8,110 @@
 # Simply checks if you're the authoritative server.
 ##
 
-$LOAD_PATH << File.dirname(__FILE__) # A hack to make this work on 1.8/1.9
-
+require 'nesser'
+require 'socket'
 require 'trollop'
-require '../server/libs/dnser'
 
-# version info
-NAME = "dnsmastermind"
-VERSION = "v1.0.0"
+require_relative 'version'
 
-Thread.abort_on_exception = true
+module DnsUtils
+  MY_NAME = "dnsmastermind (#{NAME}) #{VERSION}"
 
-# Options
-opts = Trollop::options do
-  version(NAME + " " + VERSION)
+  Thread.abort_on_exception = true
 
-  opt :version, "Get the #{NAME} version",                             :type => :boolean, :default => false
-  opt :host,    "The ip address to listen on",                         :type => :string,  :default => "0.0.0.0"
-  opt :port,    "The port to listen on",                               :type => :integer, :default => 53
-  opt :timeout, "The amount of time (seconds) to wait for a response", :type => :integer, :default => 10
-  opt :solution,"The answer; should be four letters, unless you're a jerk", :type => :string, :default => nil, :required => true
-  opt :win,     "The message to display to winners",                   :type => :string,  :default => "YOU WIN!!"
-end
+  # Options
+  opts = Trollop::options do
+    version(MY_NAME)
 
-if(opts[:port] < 0 || opts[:port] > 65535)
-  Trollop::die :port, "must be a valid port (between 0 and 65535)"
-end
+    opt :version, "Get the #{MY_NAME} version (spoiler alert!)", :type => :boolean, :default => false
+    opt :host, "The ip address to listen on", :type => :string, :default => "0.0.0.0"
+    opt :port, "The port to listen on", :type => :integer, :default => 53
+    opt :timeout, "The amount of time (seconds) to wait for a response", :type => :integer, :default => 10
+    opt :solution,"The answer; should be four letters, unless you're a jerk", :type => :string, :default => nil, :required => true
+    opt :win, "The message to display to winners", :type => :string, :default => "YOU WIN!!"
+  end
 
-if(opts[:solution].include?('.'))
-  Trollop::die :solution, "must not contain period; SHOULD only contain [a-z]{4} :)"
-end
-solution = opts[:solution].upcase()
+  if(opts[:port] < 0 || opts[:port] > 65535)
+    Trollop::die :port, "must be a valid port (between 0 and 65535)"
+  end
 
-puts("Starting #{NAME} #{VERSION} DNS server on #{opts[:host]}:#{opts[:port]}")
+  if(opts[:solution].include?('.'))
+    Trollop::die :solution, "must not contain period; SHOULD only contain [a-z]{4} :)"
+  end
+  solution = opts[:solution].upcase()
 
-dnser = DNSer.new(opts[:host], opts[:port])
+  puts("Starting #{MY_NAME} DNS server on #{opts[:host]}:#{opts[:port]}")
 
-dnser.on_request() do |transaction|
-  begin
-    request = transaction.request
+  s = UDPSocket.new()
+  nesser = Nesser::Nesser.new(s: s, host: opts[:host], port: opts[:port]) do |transaction|
+    begin
+      request = transaction.request
 
-    if(request.questions.length < 1)
-      puts("The request didn't ask any questions!")
-      next
-    end
+      if(request.questions.length < 1)
+        puts("The request didn't ask any questions!")
+        next
+      end
 
-    if(request.questions.length > 1)
-      puts("The request asked multiple questions! This is super unusual, if you can reproduce, please report!")
-      next
-    end
+      if(request.questions.length > 1)
+        puts("The request asked multiple questions! This is super unusual, if you can reproduce, please report!")
+        next
+      end
 
-    if(request.questions[0].type != DNSer::Packet::TYPE_TXT)
-      next
-    end
-    guess, domain = request.questions[0].name.split(/\./, 2)
-    guess.upcase!()
-
-    if(guess == solution)
-      puts("WINNER!!!")
-      answer = opts[:win]
-    elsif(guess.length == solution.length)
-      saved_guess = guess
-      tmp_solution = solution.chars.to_a()
-      guess = guess.chars.to_a()
-      answer = ""
-
-      0.upto(tmp_solution.length() - 1) do |i|
-        if(tmp_solution[i] == guess[i])
-          answer += "O"
-          tmp_solution[i] = ""
-          guess[i] = ""
+      guess, domain = request.questions[0].name.split(/\./, 2)
+      guess.upcase!()
+
+      if(guess == solution)
+        puts("WINNER!!!")
+        answer = opts[:win]
+      elsif(guess.length == solution.length)
+        saved_guess = guess
+        tmp_solution = solution.chars.to_a()
+        guess = guess.chars.to_a()
+        answer = ""
+
+        0.upto(tmp_solution.length() - 1) do |i|
+          if(tmp_solution[i] == guess[i])
+            answer += "O"
+            tmp_solution[i] = ""
+            guess[i] = ""
+          end
         end
-      end
 
-      guess.each do |c|
-        if(c == "")
-          next
+        guess.each do |c|
+          if(c == "")
+            next
+          end
+
+          if(tmp_solution.include?(c))
+            tmp_solution[tmp_solution.index(c)] = ""
+            answer += "X"
+          end
         end
 
-        if(tmp_solution.include?(c))
-          tmp_solution[tmp_solution.index(c)] = ""
-          answer += "X"
+        if(answer == "")
+          answer = "No correct character; keep trying!"
         end
-      end
 
-      if(answer == "")
-        answer = "No correct character; keep trying!"
+        puts("Guess: #{saved_guess} => #{answer}")
+      else
+        puts("Invalid; sending instructions: #{guess}")
+        answer = "Instructions: guess the #{solution.length}-character string: dig -t txt [guess].#{domain}! 'O' = correct, 'X' = correct, but wrong position"
       end
 
-      puts("Guess: #{saved_guess} => #{answer}")
-    else
-      puts("Invalid; sending instructions: #{guess}")
-      answer = "Instructions: guess the #{solution.length}-character string: dig -t txt [guess].#{domain}! 'O' = correct, 'X' = correct, but wrong position"
+      rr = Nesser::TXT.new(data: answer)
+      answer = Nesser::Answer.new(
+        name: request.questions[0].name,
+        type: Nesser::TYPE_TXT,
+        cls: Nesser::CLS_IN,
+        ttl: 10,
+        rr: rr,
+      )
+      transaction.answer!([answer])
+    rescue StandardError => e
+      puts("Error: #{e}")
+      puts(e.backtrace)
     end
-
-    answer = DNSer::Packet::Answer.new(request.questions[0], DNSer::Packet::TYPE_TXT, DNSer::Packet::CLS_IN, 100, DNSer::Packet::TXT.new(answer))
-
-    transaction.add_answer(answer)
-    transaction.reply!()
-  rescue StandardError => e
-    puts("Error: #{e}")
-    puts(e.backtrace)
   end
-end
 
-dnser.wait()
+  nesser.wait()
+end

data/lib/dnstest.rb

@@ -8,75 +8,111 @@
 # Simply checks if you're the authoritative server.
 ##
 
-$LOAD_PATH << File.dirname(__FILE__) # A hack to make this work on 1.8/1.9
-
+require 'nesser'
+require 'socket'
 require 'trollop'
-require '../server/libs/dnser'
 
-# version info
-NAME = "dnstest"
-VERSION = "v1.0.0"
+require_relative 'version'
 
 Thread.abort_on_exception = true
 
-# Options
-opts = Trollop::options do
-  version(NAME + " " + VERSION)
-
-  opt :version, "Get the #{NAME} version",                             :type => :boolean, :default => false
-  opt :host,    "The ip address to listen on",                         :type => :string,  :default => "0.0.0.0"
-  opt :port,    "The port to listen on",                               :type => :integer, :default => 53
-  opt :domain,  "The domain to check",                                 :type => :string,  :default => nil,      :required => true
-  opt :timeout, "The amount of time (seconds) to wait for a response", :type => :integer, :default => 10
-end
+puts <<EOS
+This script determines if you hold the authoritative record for a domain by
+sending a request for a random subdomain. If the request goes through, you hold
+the record!
+--
+EOS
+
+module DnsUtils
+  MY_NAME = "dnstest (#{NAME}) #{VERSION}"
+
+  # Options
+  opts = Trollop::options do
+    version(MY_NAME)
+
+    opt :version, "Get the #{MY_NAME} version (spoiler alert)", :type => :boolean, :default => false
+    opt :host, "The ip address to listen on", :type => :string, :default => "0.0.0.0"
+    opt :port, "The port to listen on", :type => :integer, :default => 53
+    opt :domain, "The domain to check", :type => :string, :default => nil, :required => true
+    opt :timeout, "The amount of time (seconds) to wait for a response", :type => :integer, :default => 10
+    opt :upstream, "The upstream DNS server to send requests to, host:port", :type => :string, :default => "8.8.8.8:53"
+  end
 
-if(opts[:port] < 0 || opts[:port] > 65535)
-  Trollop::die :port, "must be a valid port (between 0 and 65535)"
-end
+  if opts[:port] < 0 || opts[:port] > 65535
+    Trollop::die(:port, "must be a valid port (between 0 and 65535)")
+  end
 
-if(opts[:domain].nil?)
-  Trollop::die :domain, "Domain is required!"
-end
+  if opts[:domain].nil?
+    Trollop::die :domain, "Domain is required!"
+  end
 
-puts("Starting #{NAME} #{VERSION} DNS server on #{opts[:host]}:#{opts[:port]}")
+  upstream_host, upstream_port = opts[:upstream].split(/:/, 2)
+  if upstream_host.nil?
+    upstream_host = '8.8.8.8'
+  end
+  if upstream_port.nil?
+    upstream_port = 53
+  else
+    upstream_port = upstream_port.to_i
+  end
 
-domain = (0...16).map { ('a'..'z').to_a[rand(26)] }.join() + "." + opts[:domain]
+  puts("Starting #{MY_NAME} DNS server on #{opts[:host]}:#{opts[:port]}...")
+  puts()
 
-dnser = DNSer.new(opts[:host], opts[:port])
+  # Generate a random subdomain
+  domain = (0...16).map { ('a'..'z').to_a[rand(26)] }.join() + "." + opts[:domain]
 
-dnser.on_request() do |transaction|
-  request = transaction.request
+  s = UDPSocket.new()
 
-  if(request.questions.length < 1)
-    puts("The request didn't ask any questions!")
-    next
-  end
+  puts("(Listening for #{domain})")
+  Nesser::Nesser.new(s: s, host: opts[:host], port: opts[:port]) do |transaction|
+    request = transaction.request
 
-  if(request.questions.length > 1)
-    puts("The request asked multiple questions! This is super unusual, if you can reproduce, please report!")
-    next
-  end
+    if(request.questions.length < 1)
+      puts("The request didn't ask any questions!")
+      next
+    end
 
-  question = request.questions[0]
-  puts("Received: #{question}")
-  if(question.type == DNSer::Packet::TYPE_A && question.name == domain)
-    puts("You have the authoritative server!")
-    transaction.error!(DNSer::Packet::RCODE_NAME_ERROR)
-    exit()
-  else
-    puts("Received a different request: #{question}")
-  end
+    if(request.questions.length > 1)
+      puts("The request asked multiple questions! This is super unusual, if you can reproduce, please report!")
+      next
+    end
 
-  # Always respond with an error
-  transaction.error!(DNSer::Packet::RCODE_NAME_ERROR)
-end
+    question = request.questions[0]
+    puts("(Received: #{question})")
 
-puts("Sending: #{domain}!")
-DNSer.query(domain, { :type => DNSer::Packet::TYPE_A }) do |response|
-  # Do nothing
-end
+    # Check if it's the request that we sent
+    if(question.type == Nesser::TYPE_A && question.name == domain)
+      puts("You have the authoritative server!")
 
-sleep(opts[:timeout])
+      # Just sent back a name error
+      transaction.error!(Nesser::RCODE_NAME_ERROR)
+      exit()
+    else
+      puts("This is not the request we're looking for!")
+      transaction.error!(Nesser::RCODE_NAME_ERROR)
+    end
+  end
 
-puts("Request timed out... you probably don't have the authoritative server. :(")
-exit(0)
+  # Perform the request and ignore the result
+  puts("(Requesting #{domain} from #{upstream_host}:#{upstream_port})")
+
+  begin
+    result = Nesser::Nesser.query(
+      s: s,
+      hostname: domain,
+      server: upstream_host,
+      port: upstream_port,
+      type: Nesser::TYPE_A,
+      cls: Nesser::CLS_IN,
+      timeout: opts[:timeout],
+    )
+    puts("Got a response from the DNS server, but didn't see the request... you probably don't have the authoritative server. :(")
+    puts()
+    puts(result)
+  rescue Nesser::DnsException => e
+    puts("Request returned an error... you probably don't have the authoritative server. :(")
+    puts()
+    puts(e)
+  end
+end

data/lib/version.rb

@@ -0,0 +1,4 @@
+module DnsUtils
+  NAME = 'DnsUtils'
+  VERSION = '2.0.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsutils
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - iagox86
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,10 @@ dependencies:
 description: 
 email:
 - ron-git@skullsecurity.org
-executables: []
+executables:
+- dnslogger
+- dnsmastermind
+- dnstest
 extensions: []
 extra_rdoc_files: []
 files:
@@ -95,11 +98,13 @@ files:
 - bin/console
 - bin/setup
 - dnsutils.gemspec
+- exe/dnslogger
+- exe/dnsmastermind
+- exe/dnstest
 - lib/dnslogger.rb
 - lib/dnsmastermind.rb
 - lib/dnstest.rb
-- lib/dnsutils.rb
-- lib/dnsutils/version.rb
+- lib/version.rb
 homepage: https://github.com/iagox86/dnsutils
 licenses: []
 metadata: {}

data/lib/dnsutils.rb

@@ -1,5 +0,0 @@
-require "dnsutils/version"
-
-module Dnsutils
-  # Your code goes here...
-end

data/lib/dnsutils/version.rb

@@ -1,3 +0,0 @@
-module Dnsutils
-  VERSION = "0.0.1"
-end