nfqueue 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3665707fbf433eb685f566b9bffc521b066e6d67
-  data.tar.gz: ddb59d9dd9094b3720dc052ea8a60a5e0368733b
+  metadata.gz: 0e5269527d84dec2eac0a07da9f1dff4b70b8a41
+  data.tar.gz: 5cebd45b959d5cc698bad49c7ae4e5116f2d1c89
 SHA512:
-  metadata.gz: 3b7d4d82ecf55fc514b779c08e38313bfa69511c80715baba78e1dd372b967c1dbf6b070142c97b6851a3f48a6f4c5eedaa877709c28fa3653530f37dfbe1918
-  data.tar.gz: f83e2aaa2ed7f1d3054fea5a6c39ae17145d51284aab1255122e5eaeaec264eb4f4e9ac9fb4806952b71c1bf3e40a16e5feb445b4f1ecdac560a8e22d1925329
+  metadata.gz: be8d86d168625c3b2b2d4606188c2ffb9ca2fe3d9b4c930628448bf0460d7233e9c390ca2501a44c6de4753489f1af8a719018f3ef82ff9d66bb9919bff1359e
+  data.tar.gz: bb5504db4774eade02d99c475322a029c3fe1803ed811b17933afa67561ba2c45b55b8af682ce4d8ced035ea05598b9433fec559eb64f95bb8113f99465b08c9

data/README.md

@@ -0,0 +1,38 @@
+Description of nfqueue
+----------------------
+
+nfqueue is a tiny wrapper around libnetfilter\_queue. It allows you to do some packet filtering very simply in a Ruby environment.
+
+For example, plugging on the #0 queue:
+
+```ruby
+require 'nfqueue'
+
+Netfilter::Queue.create(0) do |packet|
+  puts "Inspecting packet ##{packet.id}"
+
+  p packet.data
+  Netfilter::Packet::ACCEPT
+end
+```
+
+Setting up iptables
+-------------------
+
+This is an example for intercepting outgoing HTTP traffic:
+
+```
+iptables -A OUTPUT -p tcp --dport 80 -j NFQUEUE --queue-num 0 --queue-bypass
+```
+
+Dependencies
+------------
+
+You need to have kernel support for NFQUEUE and libnetfilter\_queue installed to get it working.
+nfqueue depends on nfnetlink and ffi (https://github.com/ffi/ffi/wiki/)
+
+
+Contact
+-------
+
+Guillaume Delugré, guillaume at security-labs dot org

data/lib/nfqueue.rb

@@ -62,15 +62,25 @@ module Netfilter
         STOP    = 5
 
         attr_reader :id
+        attr_reader :protocol
         attr_writer :data
 
-        def initialize(nfad) #:nodoc:
+        def initialize(queue, nfad) #:nodoc:
+            @queue = queue
             @nfad = nfad
 
             phdr = Queue.nfq_get_msg_packet_hdr(nfad)
             hdr = Header.new(phdr)
 
             @id = [ hdr[:packet_id] ].pack("N").unpack("V")[0]
+            @protocol = [ hdr[:hw_protocol] ].pack('n').unpack("v")[0]
+        end
+
+        #
+        # The netfilter mark.
+        #
+        def nfmark
+            Queue.nfq_get_nfmark(@nfad)
         end
 
         #
@@ -178,7 +188,7 @@ module Netfilter
         private
 
         def get_interface_name(index)
-            iface = Netfilter::Netlink.interfaces[index]
+            iface = @queue.net_interfaces[index]
             if iface
                 iface[:name]
             end
@@ -232,10 +242,16 @@ module Netfilter
           PACKET = 2
         end
 
+        attr_reader :queue_number
+        attr_reader :net_interfaces
+
         #
         # Creates a new Queue at slot _qnumber_.
         #
         def initialize(qnumber, mode = CopyMode::PACKET)
+            @queue_number = qnumber
+            @net_interfaces = Netfilter::Netlink.interfaces
+
             @conn_handle = Queue.nfq_open
             raise QueueError, "nfq_open has failed" if @conn_handle.null?
 
@@ -290,8 +306,14 @@ module Netfilter
             raise QueueError, "nfq_fd has failed" if fd < 0
 
             io = IO.new(fd)
-            while data = io.sysread(4096)
-                Queue.nfq_handle_packet(@conn_handle, data, data.size)
+            io.autoclose = false
+
+            begin
+                while data = io.sysread(4096)
+                    Queue.nfq_handle_packet(@conn_handle, data, data.size)
+                end
+            ensure
+                io.close
             end
         end
 
@@ -309,14 +331,18 @@ module Netfilter
         #
         def self.create(qnumber, mode = CopyMode::PACKET, &callback)
             queue = self.new(qnumber, mode)
-            queue.process(&callback)
-            queue.destroy
+
+            begin
+                queue.process(&callback)
+            ensure
+                queue.destroy
+            end
         end
 
         private
 
         def callback_handler(qhandler, nfmsg, nfad, data) #:nodoc:
-            packet = Packet.new(nfad)
+            packet = Packet.new(self, nfad)
             verdict = @callback[packet]
       
             data = packet.data

data/samples/packetdump.rb

@@ -1,3 +1,4 @@
+
 #!/usr/bin/env ruby
 
 require 'nfqueue'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nfqueue
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Guillaume Delugré
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -46,10 +46,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - COPYING
-- README
+- README.md
 - lib/nfqueue.rb
 - samples/packetdump.rb
-homepage: http://code.google.com/p/ruby-nfqueue
+homepage: http://github.com/gdelugre/ruby-nfqueue
 licenses:
 - GPL
 metadata: {}

data/README

@@ -1,32 +0,0 @@
----
-
-* Description of nfqueue
-
-nfqueue is a tiny wrapper around libnetfilter_queue. It allows you to do some packet filtering very simply in a Ruby environment.
-
-For example, plugging on the #0 queue:
-
-require 'nfqueue'
-
-system('sudo iptables -A OUTPUT -p tcp --dport 80 -j NFQUEUE --queue-num 0')
-
-Netfilter::Queue.create(0) do |packet|
-  puts "Inspecting packet ##{packet.id}"
-
-  p packet.data
-  Netfilter::Packet::ACCEPT
-end
-
-
-You basically need to have kernel support for NFQUEUE and libnetfilter_queue installed to get it working.
-
-
-* Dependencies
-
-nfqueue depends on ffi (https://github.com/ffi/ffi/wiki/)
-
-
-* Contact
-
-Guillaume Delugré, guillaume at security-labs dot org
-