packetgen 3.1.1 → 3.1.6

data/lib/packetgen/header/eap/fast.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     class EAP

data/lib/packetgen/header/eap/md5.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     class EAP

data/lib/packetgen/header/eap/tls.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     class EAP

data/lib/packetgen/header/eap/ttls.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     class EAP

data/lib/packetgen/header/eth.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     # An Ethernet header consists of:
@@ -33,6 +33,8 @@ module PacketGen
       # Ethernet MAC address, as a group of 6 bytes
       # @author Sylvain Daubert
       class MacAddr < Types::Fields
+        include Types::Fieldable
+
         # @!attribute a0
         #  @return [Integer] first byte from MacAddr
         define_field :a0, Types::Int8
@@ -61,12 +63,9 @@ module PacketGen
           bytes = str.split(/:/)
           raise ArgumentError, 'not a MAC address' unless bytes.size == 6
 
-          self[:a0].read(bytes[0].to_i(16))
-          self[:a1].read(bytes[1].to_i(16))
-          self[:a2].read(bytes[2].to_i(16))
-          self[:a3].read(bytes[3].to_i(16))
-          self[:a4].read(bytes[4].to_i(16))
-          self[:a5].read(bytes[5].to_i(16))
+          6.times do |i|
+            self["a#{i}".to_sym].read(bytes[i].to_i(16))
+          end
           self
         end
 
@@ -75,6 +74,11 @@ module PacketGen
         def to_human
           fields.map { |m| '%02x' % self[m] }.join(':')
         end
+
+        def ==(other)
+          other.is_a?(self.class) &&
+            fields.all? { |attr| self[attr].value == other[attr].value }
+        end
       end
 
       # @!attribute dst
@@ -94,9 +98,7 @@ module PacketGen
       # @param [String] iface interface name
       # @return [void]
       def to_w(iface)
-        pcap = PCAPRUB::Pcap.open_live(iface, PCAP_SNAPLEN, PCAP_PROMISC, PCAP_TIMEOUT)
-        pcap.inject self.to_s
-        pcap.close
+        Inject.inject(iface: iface, data: self)
       end
 
       # Invert destination and source addresses

data/lib/packetgen/header/gre.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     # Generic Routing Encapsulation (RFC 2784 and 2890)

data/lib/packetgen/header/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is part of PacketGen
 # See https://github.com/sdaubert/packetgen for more informations
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
@@ -12,13 +12,15 @@ module PacketGen
       # @abstract Base class for HTTP headers.
       # @author Kent 'picat' Gruber
       class Headers
+        include Types::Fieldable
+
         # Underlying Headers data (or nil).
         # @return [Hash, nil]
         attr_reader :data
         alias to_h data
 
         def initialize
-          @data = nil
+          @data = {}
         end
 
         # Populate object from a string or directly from a hash.
@@ -46,7 +48,7 @@ module PacketGen
 
           d = []
           @data.map do |k, v|
-            d << k + ': ' + v
+            d << "#{k}: #{v}"
           end
           d.join("\r\n") << "\r\n\r\n"
         end

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     module HTTP
@@ -39,7 +39,7 @@ module PacketGen
         # @!attribute verb
         #   @return [Types::String]
         #   @since 3.1.0
-        define_field :verb,  Types::String
+        define_field :verb, Types::String
         # @!attribute path
         #   @return [Types::String]
         define_field :path,    Types::String
@@ -67,35 +67,50 @@ module PacketGen
         # Read in the HTTP portion of the packet, and parse it.
         # @return [PacketGen::HTTP::Request]
         def read(str)
-          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[:verb].read first_line[0]
-          self[:path].read first_line[1]
-          self[:version].read first_line[2]
+          lines = lines(str)
+          first_line_words = lines.shift.split
+          self[:verb].read first_line_words[0]
+          self[:path].read first_line_words[1]
+          self[:version].read first_line_words[2]
+
           # 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
+          headers, data = headers_and_payload_from_lines(lines)
           self[:headers].read(headers)
-          self[:body].read data
+          self[:body].read(data)
+
           self
         end
 
         # String representation of data.
         # @return [String]
         def to_s
-          raise FormatError, 'Missing #verb.'  if self.verb.empty?
+          raise FormatError, 'Missing #verb.' if self.verb.empty?
           raise FormatError, 'Missing #path.'    if self.path.empty?
           raise FormatError, 'Missing #version.' if self.version.empty?
 
-          str = ''.dup # build 'dat string
-          str << self[:verb] << ' ' << self[:path] << ' ' << self[:version] << "\r\n" << self[:headers].to_s << self[:body]
+          "#{self.verb.dup} #{self.path} #{self.version}\r\n#{self[:headers]}#{self.body}"
+        end
+
+        private
+
+        # @todo check verb is correct or raise a ParseError
+        def lines(str)
+          str = str.bytes.map!(&:chr).join unless str.valid_encoding?
+          # vrb = HTTP::VERBS.detect { |verb| str.include?(verb) }
+
+          str.split("\r\n").map(&:chomp)
+        end
+
+        def headers_and_payload_from_lines(lines)
+          if (data_index = lines.find_index(''))
+            data    = lines[data_index + 1..-1].join("\n")
+            headers = lines[0..data_index - 1].join("\n")
+          else
+            headers = lines.join("\n")
+            data = nil
+          end
+
+          [headers, data]
         end
       end
     end

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     module HTTP
@@ -68,10 +68,10 @@ module PacketGen
         # @return [PacketGen::HTTP::Response]
         def read(str)
           str = str.bytes.map!(&:chr).join unless str.valid_encoding?
-          arr     = str.split("\r\n")
+          arr = str.split("\r\n")
           headers = [] # header stream
-          data    = [] # data stream
-          switch  = false
+          data = [] # data stream
+          switch = false
           arr.each do |line|
             if line.empty?
               data << line if switch # already done
@@ -103,8 +103,8 @@ module PacketGen
           raise FormatError, 'Missing #status_mesg.' if self.status_mesg.empty?
           raise FormatError, 'Missing #version.'     if self.version.empty?
 
-          str = ''.dup # build 'dat string
-          str << self[:version] << ' ' << self[:status_code] << ' ' << self[:status_mesg] << "\r\n"
+          str = +''
+          str << self.version << ' ' << self.status_code << ' ' << self.status_mesg << "\r\n"
           str << self[:headers].to_s if self[:headers].given?
           str << self.body
         end

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
@@ -16,7 +16,7 @@ module PacketGen
       VERBS = %w[GET HEAD POST PUT DELETE CONNECT OPTIONS TRACE PATCH].freeze
 
       # Identifiable HTTP request regular expression.
-      REQUEST_REGEX = Regexp.new('(' + VERBS.dup.join('|') + ')' + '\s+\S+\s+HTTP/1.1')
+      REQUEST_REGEX = Regexp.new("(#{VERBS.dup.join('|')})\\s+\\S+\\s+HTTP/1.1")
     end
   end
 end

data/lib/packetgen/header/icmp.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     # ICMP header ({https://tools.ietf.org/html/rfc792 RFC 792})

data/lib/packetgen/header/icmpv6.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     # ICMPv6 header ({https://tools.ietf.org/html/rfc4443 RFC 4443})

data/lib/packetgen/header/igmp.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     # This class supports IGMPv2 (RFC 2236).
@@ -46,10 +46,10 @@ module PacketGen
 
       # Known types
       TYPES = {
-        'MembershipQuery'    => 0x11,
+        'MembershipQuery' => 0x11,
         'MembershipReportv1' => 0x12,
         'MembershipReportv2' => 0x16,
-        'LeaveGroup'         => 0x17,
+        'LeaveGroup' => 0x17,
       }.freeze
 
       # @!attribute type

data/lib/packetgen/header/igmpv3.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     # This class supports IGMPv3 (RFC3376).
@@ -66,7 +66,7 @@ module PacketGen
     class IGMPv3 < IGMP
       # Known types
       TYPES = {
-        'MembershipQuery'  => 0x11,
+        'MembershipQuery' => 0x11,
         'MembershipReport' => 0x22,
       }.freeze
 

data/lib/packetgen/header/igmpv3/group_record.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     class IGMPv3
@@ -40,14 +40,16 @@ module PacketGen
       #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       # @author Sylvain Daubert
       class GroupRecord < Types::Fields
+        include Types::Fieldable
+
         # Known record types
         RECORD_TYPES = {
-          'MODE_IS_INCLUDE'        => 1,
-          'MODE_IS_EXCLUDE'        => 2,
+          'MODE_IS_INCLUDE' => 1,
+          'MODE_IS_EXCLUDE' => 2,
           'CHANGE_TO_INCLUDE_MODE' => 3,
           'CHANGE_TO_EXCLUDE_MODE' => 4,
-          'ALLOW_NEW_SOURCES'      => 5,
-          'BLOCK_OLD_SOURCES'      => 6
+          'ALLOW_NEW_SOURCES' => 5,
+          'BLOCK_OLD_SOURCES' => 6
         }.freeze
 
         # @!attribute type

data/lib/packetgen/header/igmpv3/mq.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # 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
     class IGMPv3