packetgen 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81bd9bfad83fea7f710f36b3b063385612bd457c5e6f91c8dd58c4dafdc71c81
-  data.tar.gz: 9f12e1c56a87a4b01b5d0e228531d5de9f42a48f098253e72c07152d8adca14d
+  metadata.gz: df09d9bda17671562435fd055b6ab552aa3e19798251f953e1e260786bae168d
+  data.tar.gz: 79baa63b2cfa57534246b3806033dc6233ea9a2ae9da3c6aa0dc9dc803983d97
 SHA512:
-  metadata.gz: be77a1686d765dd1fc03cc40e4be495bf4f1719da3e7a54578783280d03be4e45d4e910208bd39d160ae4af2bf9aae0e7a645b330702496cb5e7f4e84096f8b1
-  data.tar.gz: 26da42851fdb12547c7744cbb52a325443c011c131b3e259b3c5cc111b0cf412bbd2b595ad5dca4c058299e82c99f4b9d87758fbeba873f81b7e03c4d02a88bd
+  metadata.gz: a6f3349f7d168b5b8391fa78e1ed90763295c7dc8db21bc0ee517195f96ca290172ad788c2c3fe4d2787809209fc502be4b05f00df6bc9f595709edf06136618
+  data.tar.gz: d218ba23d8c02253d75bd18f1ea552ce3aee8490895c0886504f443d87f18bbd0ed7c3e0ca13bc30f7bcf4db5fbb7abe7e4c0630bfc1f5fd36b750faa130e56c

data/lib/packetgen/header.rb

@@ -113,3 +113,4 @@ require_relative 'header/mldv2'
 require_relative 'header/ospfv2'
 require_relative 'header/ospfv3'
 require_relative 'header/netbios'
+require_relative 'header/mdns'

data/lib/packetgen/header/base.rb

@@ -288,6 +288,19 @@ module PacketGen
         raise FormatError, 'no IP or IPv6 header in packet' if iph.nil?
         iph
       end
+
+      # @api private
+      # Get link layer header from given header
+      # @param [Header] header
+      # @return [Header]
+      # @raise FormatError no link layer header in packet
+      # @raise FormatError +header+ not in a packet
+      def ll_header(header)
+        hid = header_id(header)
+        llh = packet.headers[0...hid].reverse.find { |h| h.is_a? Eth or h.is_a? Dot11 }
+        raise FormatError, 'no link layer header in packet' if llh.nil?
+        llh
+      end
     end
   end
 end

data/lib/packetgen/header/dns.rb

@@ -269,12 +269,6 @@ module PacketGen
         end
         str
       end
-
-      private
-
-      def boolean2integer(bool)
-        bool ? 1 : 0
-      end
     end
 
     self.add_class DNS

data/lib/packetgen/header/dns/name.rb

@@ -70,6 +70,8 @@ module PacketGen
               break if label.length == 0 or str[start..-1].length == 0
             end
           end
+          # force resolution of compressed names
+          name_from_pointer
           self
         end
 

data/lib/packetgen/header/dns/question.rb

@@ -32,6 +32,7 @@ module PacketGen
           'MX'       => 15,
           'TXT'      => 16,
           'AAAA'     => 28,
+          'SRV'      => 33,
           'NAPTR'    => 35,
           'KX'       => 36,
           'CERT'     => 37,
@@ -109,12 +110,21 @@ module PacketGen
         # Get human readable class
         # @return [String]
         def human_rrclass
-          self.class::CLASSES.key(self.rrclass) || "0x%04x" % self.rrclass
+          if self[:name].dns.is_a? MDNS
+            self.class::CLASSES.key(self.rrclass & 0x7fff) || "0x%04x" % (self.rrclass & 0x7fff)
+          else
+            self.class::CLASSES.key(self.rrclass) || "0x%04x" % self.rrclass
+          end
         end
 
         # @return [String]
         def to_human
-          "#{human_type} #{human_rrclass} #{name}"
+          if self[:name].dns.is_a? MDNS
+            unicast_bit = (self.rrclass & 0x8000 == 0x8000) ? 'QU' : 'QM'
+            "#{human_type} #{human_rrclass} #{unicast_bit} #{name}"
+          else
+            "#{human_type} #{human_rrclass} #{name}"
+          end
         end
       end
     end

data/lib/packetgen/header/dns/rr.rb

@@ -55,7 +55,8 @@ module PacketGen
         def human_rdata
           str = self[:rdata].inspect
 
-          if self.rrclass == CLASSES['IN']
+          # Need to mask: mDNS uses leftmost bit as a flag (CACHE FLUSH)
+          if self.rrclass & 0x7fff == CLASSES['IN']
             case type
             when TYPES['A'], TYPES['AAAA']
               str = IPAddr.new_ntoh(self[:rdata]).to_s
@@ -63,7 +64,7 @@ module PacketGen
           end
 
           name = Name.new
-          name.dns = @dns
+          name.dns = self[:name].dns
           case type
           when TYPES['NS'], TYPES['PTR'], TYPES['CNAME']
             str = name.read(self[:rdata]).to_human
@@ -81,11 +82,29 @@ module PacketGen
             pref = Types::Int16.new.read(self[:rdata][0, 2])
             exchange = name.read(self[:rdata][2..-1]).to_human
             str = '%u %s' % [pref.to_i, exchange]
+          when TYPES['SRV']
+            priority = Types::Int16.new.read(self[:rdata][0, 2])
+            weight = Types::Int16.new.read(self[:rdata][2, 2])
+            port = Types::Int16.new.read(self[:rdata][4, 2])
+            target = name.read(self[:rdata][6, self[:rdata].size]).to_human
+            str = "#{priority.to_i} #{weight.to_i} #{port.to_i} #{target}"
           end
 
           str
         end
 
+        def human_rrclass
+        # Get human readable class
+        # @return [String]
+          if self[:name].dns.is_a? MDNS
+            str = self.class::CLASSES.key(self.rrclass & 0x7fff) || "0x%04x" % (self.rrclass & 0x7fff)
+            str += ' CACHE-FLUSH' if self.rrclass & 0x8000 > 0
+            str
+          else
+            self.class::CLASSES.key(self.rrclass) || "0x%04x" % self.rrclass
+          end
+        end
+
         # @return [String]
         def to_human
           "#{human_type} #{human_rrclass} #{name} TTL #{ttl} #{human_rdata}"

data/lib/packetgen/header/http.rb

@@ -4,5 +4,6 @@
 # This program is published under MIT license.
 
 require_relative 'http/headers'
+require_relative 'http/verbs'
 require_relative 'http/response'
 require_relative 'http/request'

data/lib/packetgen/header/http/headers.rb

@@ -24,9 +24,10 @@ module PacketGen
           case s_or_h
           when String
             @data = s_or_h.split("\n").map do |h| 
+              next unless h.include?(":")
               k, v = h.split(":", 2)
               [k, v.strip] 
-            end.to_h
+            end.reject(&:nil?).to_h
           when Hash
             @data = s_or_h
           end
@@ -39,9 +40,7 @@ module PacketGen
           return "\r\n" if @data.nil? || @data.empty?
           d = []
           @data.map do |k, v|
-            str = ""
-            str << k << ": " << v
-            d << str
+            d << k + ": " + v
           end
           d.join("\r\n") << "\r\n\r\n"
         end

data/lib/packetgen/header/http/request.rb

@@ -8,7 +8,7 @@
 module PacketGen
   module Header
     module HTTP
-      # An HTTP/1.1 Request packet consits of:
+      # An HTTP/1.1 Request packet consists of:
       # * the http method ({Types::String}).
       # * the path ({Types::String}).
       # * the version ({Types::String}).
@@ -47,6 +47,9 @@ module PacketGen
         #   associated http/1.1 headers
         #   @return [HTTP::Headers]
         define_field :headers, HTTP::Headers 
+        # @!attribute body 
+        #   @return [Types::String]
+        define_field :body, Types::String
 
         # @param [Hash] options
         # @option options [String] :method
@@ -61,14 +64,23 @@ module PacketGen
         # Read in the HTTP portion of the packet, and parse it. 
         # @return [PacketGen::HTTP::Request]
         def read(str)
-          # prepare data to parse
-          str = str.split("\n").map(&:strip).reject(&:empty?)
+          str = str.bytes.map!(&:chr).join unless str.valid_encoding?
+          vrb = HTTP::VERBS.detect { |verb| str.include?(verb) }
+          str = vrb + str.split(vrb)[-1]
+          str = str.split("\n").map(&:chomp)
           first_line = str.shift.split
           self[:method]  = first_line[0]
           self[:path]    = first_line[1]
           self[:version] = first_line[2]
-          headers = str.join("\n")
+          # requests can sometimes have a payload
+          if data_index = str.find_index("")
+            data    = str[data_index+1..-1].join("\n")
+            headers = str[0..data_index-1].join("\n")
+          else
+            headers = str.join("\n")
+          end
           self[:headers].read(headers)
+          self[:body] = data
           self
         end
 
@@ -79,12 +91,12 @@ module PacketGen
           raise FormatError, "Missing #path."    if self.path.empty?
           raise FormatError, "Missing #version." if self.version.empty?
           str = "".dup # build 'dat string
-          str << self[:method] << " " << self[:path] << " " << self[:version] << "\r\n" << self[:headers].to_s
+          str << self[:method] << " " << self[:path] << " " << self[:version] << "\r\n" << self[:headers].to_s << self[:body]
         end
       end
     end
 
     self.add_class HTTP::Request 
-    TCP.bind_header HTTP::Request, body: ->(b) { /^(CONNECT|DELETE|GET|HEAD|OPTIONS|PATCH|POST|PUT)/ =~ b }
+    TCP.bind_header HTTP::Request, body: ->(b) { HTTP::REQUEST_REGEX =~ b.chars.select(&:valid_encoding?).join }
   end
 end

data/lib/packetgen/header/http/response.rb

@@ -8,7 +8,7 @@
 module PacketGen
   module Header
     module HTTP
-      # An HTTP/1.1 Response packet consits of:
+      # An HTTP/1.1 Response packet consists of:
       # * the version ({Types::String}).
       # * the status code ({Types::String}).
       # * the status message ({Types::String}).
@@ -67,7 +67,7 @@ module PacketGen
         # Read in the HTTP portion of the packet, and parse it. 
         # @return [PacketGen::HTTP::Response]
         def read(str)
-          # prepare data to parse
+          str = str.bytes.map!(&:chr).join unless str.valid_encoding?
           arr     = str.split("\r\n")
           headers = [] # header stream
           data    = [] # data stream
@@ -113,6 +113,6 @@ module PacketGen
     end
 
     self.add_class HTTP::Response
-    TCP.bind_header HTTP::Response, body: ->(b) { /^HTTP\/1\.1\s\d{3,}\s.+/ =~ b }
+    TCP.bind_header HTTP::Response, body: ->(b) { /^HTTP\/1\.1\s\d{3,}\s.+/ =~ b.chars.select(&:valid_encoding?).join }
   end
 end

data/lib/packetgen/header/http/verbs.rb

@@ -0,0 +1,22 @@
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
+module PacketGen
+  module Header
+    # @since 2.2.0
+    module HTTP 
+      # @abstract Collection of useful HTTP verbs.
+      # @author Kent 'picat' Gruber
+      
+      # Valid HTTP Verbs
+      VERBS = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'TRACE', 'PATCH'] 
+      
+      # Identifiable HTTP request regular expression.
+      REQUEST_REGEX = Regexp.new("(" + VERBS.dup.join("|") + ")" + '\s+\S+\s+HTTP/1.1')
+    end
+  end
+end

data/lib/packetgen/header/mdns.rb

@@ -0,0 +1,75 @@
+# coding: utf-8
+# This file is part of PacketGen
+# See https://github.com/sdaubert/packetgen for more informations
+# Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
+# This program is published under MIT license.
+
+# frozen_string_literal: true
+
+module PacketGen
+  module Header
+
+    # Multicast DNS.
+    #
+    # See {DNS} for header format.
+    # @author Sylvain Daubert
+    class MDNS < DNS
+      # Port number for mDNS over UDP
+      UDP_PORT = 5353
+      
+      # Fixup IP header according to RFC 6762:
+      # * set ethernet multicast address to +01:00:5E:00:00:FB+ (for IPv4)
+      #   or +33:33:00:00:00:FB+ (for IPv6),
+      # * set IPv4 address to 224.0.0.251 or IPv6 address to ff02::fb.
+      # This method may be called as:
+      #    # first way
+      #    pkt.mdns.mdnsize
+      #    # second way
+      #    pkt.mdnsize
+      def mdnsize
+        iph = ip_header(self)
+        case iph
+        when IP
+          iph.dst = '224.0.0.251'
+          llh = ll_header(self)
+          mac = case llh
+                when Eth
+                  llh[:dst]
+                when Dot11
+                  if llh.to_ds?
+                    llh[:mac3]
+                  else
+                    llh[:mac1]
+                  end
+                end
+          mac.from_human('01:00:5E:00:00:FB')
+        when IPv6
+          iph.dst = 'ff02::fb'
+          llh = ll_header(self)
+          mac = case llh
+                when Eth
+                  llh[:dst]
+                when Dot11
+                  if llh.to_ds?
+                    llh[:mac3]
+                  else
+                    llh[:mac1]
+                  end
+                end
+          mac.from_human('33:33:00:00:00:FB')
+        end
+      end
+      
+      # @api private
+      # @note This method is used internally by PacketGen and should not be
+      #       directly called
+      def added_to_packet(packet)
+        mdns_idx = packet.headers.size
+        packet.instance_eval "def mdnsize() @headers[#{mdns_idx}].mdnsize; end"
+      end
+    end
+    
+    self.add_class MDNS
+    UDP.bind_header MDNS, dport: MDNS::UDP_PORT, sport: MDNS::UDP_PORT
+  end
+end

data/lib/packetgen/header/snmp.rb

@@ -251,6 +251,19 @@ module PacketGen
 
       define_attributes :version, :community
 
+      # @param [Hash] options
+      # @option options [Integer,String] :version
+      # @option options [String] :community
+      # @option options [Integer] :chosen_pdu Set PDU type
+      # @option options [Hash] :pdu Set PDU content
+      def initialize(options={})
+        super
+        data.chosen = options[:chosen_pdu] if options[:chosen_pdu]
+        if options[:pdu]
+          data.root.value[data.chosen] = data.root.chosen_value.class.new(options[:pdu])
+        end
+      end
+
       # accessor to data payload
       # @return [GetRequest]
       def data

data/lib/packetgen/version.rb

@@ -10,5 +10,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = '2.5.2'
+  VERSION = '2.6.0'
 end

data/packetgen.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'pcaprub', '~>0.12.4'
   spec.add_dependency 'interfacez', '~>1.0'
-  spec.add_dependency 'rasn1', '~>0.5', '>= 0.6.0'
+  spec.add_dependency 'rasn1', '~>0.5', '>= 0.6.3'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
@@ -47,7 +47,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - lib/packetgen/header/http/headers.rb
 - lib/packetgen/header/http/request.rb
 - lib/packetgen/header/http/response.rb
+- lib/packetgen/header/http/verbs.rb
 - lib/packetgen/header/icmp.rb
 - lib/packetgen/header/icmpv6.rb
 - lib/packetgen/header/igmp.rb
@@ -217,6 +218,7 @@ files:
 - lib/packetgen/header/ipv6/extension.rb
 - lib/packetgen/header/ipv6/hop_by_hop.rb
 - lib/packetgen/header/llc.rb
+- lib/packetgen/header/mdns.rb
 - lib/packetgen/header/mld.rb
 - lib/packetgen/header/mldv2.rb
 - lib/packetgen/header/mldv2/mcast_address_record.rb