pstream 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcfeaaadeb0f4dd7c655faeb065192ab22cb7277
-  data.tar.gz: 226952ccd0e896ca98b039c2e397748c14989914
+  metadata.gz: b4c84b815a88508509a869a3336d6ae0826dc0cc
+  data.tar.gz: 496049f3b1b1468d57ddd275a5ff8b4254722034
 SHA512:
-  metadata.gz: bb9d281c62201bff19cf97dd0c31a18302a77ef5541575953982f64150e9571fee5cfa7559b84fd31fb460dfa2ec770b3f35bfea0fe67d217444953542402f90
-  data.tar.gz: d9b70e10b47e98c444c77b43e9f1617244178f7b24aa31f290acac8379450ce71214132d61125f8c0d0a05c12f7173eb885571471dd7435d9ea9401000099dca
+  metadata.gz: 5226da6802ac5545c3f3c7316eb06422e111111a256d7cf807f5e4f459c5d90964174a9e2e267b7582a3087f50d3f012a285ecaabb975cd4f8e1037f7524042b
+  data.tar.gz: 4789cdf032ede02e64fc0286986d38b7ef1c76f46d2cbf09bd5938d2a338ba6b9097004e32ad8c57132caee0fd66e8bb6390d6648c832cc0ead96305881e896b

data/bin/pstream

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "colorize"
+require "hilighter"
 require "io/wait"
 require "optparse"
 require "pstream"
@@ -32,7 +32,7 @@ def parse(args)
 
         opts.on("", "DESCRIPTION")
 
-        info.scan(/\S.{0,#{76}}\S(?=\s|$)|\S+/).each do |line|
+        info.scan(/\S.{0,76}\S(?=\s|$)|\S+/).each do |line|
             opts.on("    #{line}")
         end
 
@@ -52,7 +52,7 @@ def parse(args)
         end
 
         opts.on("--nocolor", "Disable colorized output") do
-            String.disable_colorization = true
+            Hilighter.disable
         end
 
         opts.on("-s", "--stream=NUM", "Show specified stream") do |s|
@@ -104,10 +104,7 @@ end
 options = parse(ARGV)
 
 begin
-    pstream = PStream.new(
-        options["pcap"],
-        !String.disable_colorization
-    )
+    pstream = PStream.new(options["pcap"], !Hilighter.disable?)
 
     if (options["stream"])
         puts pstream.get_stream(

data/lib/pstream.rb

@@ -1,3 +1,4 @@
+require "hilighter"
 require "pathname"
 require "scoobydoo"
 
@@ -77,46 +78,6 @@ class PStream
         return negotiations.values
     end
 
-    def self.colorize?
-        @@colorize ||= false
-        return @@colorize
-    end
-
-    def colorize_cipher_suite(suite)
-        return suite if (!@@colorize)
-
-        case suite
-        when /Unknown/
-            # Unknown
-            return suite.light_yellow
-        when /NULL|MD5|RC4|anon/
-            # Bad cipher suites
-            return suite.light_red
-        when /E?(EC)?DHE?|AES_256/
-            # Great cipher suites
-            return  suite.light_green
-        else
-            # Maybe OK
-            return  suite.light_white
-        end
-    end
-
-    def colorize_header(header)
-        return header if (!@@colorize)
-        return header.light_cyan
-    end
-
-    def colorize_stream(stream)
-        if (!@@colorize)
-            return "#{stream.id} | #{stream.desc} | #{stream.frames}"
-        end
-        return [
-            "#{stream.id}".light_blue,
-            stream.desc.light_green,
-            stream.frames.light_white
-        ].join(" | ")
-    end
-
     def get_stream(stream, prot = "tcp")
         case prot
         when /^tcp$/i
@@ -172,12 +133,54 @@ class PStream
     end
     private :get_streams
 
-    def initialize(pcap, colorize = false)
+    def self.hilight?
+        @@hilight ||= false
+        return @@hilight
+    end
+
+    def hilight_cipher_suite(suite)
+        return suite if (!@@hilight)
+
+        case suite
+        when /Unknown/
+            # Unknown
+            return suite.light_yellow
+        when /NULL|MD5|RC4|anon/
+            # Bad cipher suites
+            return suite.light_red
+        when /E?(EC)?DHE?|AES_256/
+            # Great cipher suites
+            return  suite.light_green
+        else
+            # Maybe OK
+            return  suite.light_white
+        end
+    end
+
+    def hilight_header(header)
+        return header if (!@@hilight)
+        return header.light_cyan
+    end
+    private :hilight_header
+
+    def hilight_stream(stream)
+        if (!@@hilight)
+            return "#{stream.id} | #{stream.desc} | #{stream.frames}"
+        end
+        return [
+            "#{stream.id}".light_blue,
+            stream.desc.light_green,
+            stream.frames.light_white
+        ].join(" | ")
+    end
+    private :hilight_stream
+
+    def initialize(pcap, hilight = false)
         if (ScoobyDoo.where_are_you("tshark").nil?)
             raise PStream::Error::TsharkNotFound.new
         end
 
-        @@colorize = colorize
+        @@hilight = hilight
         @pcap = Pathname.new(pcap).expand_path
 
         if (!@pcap.exist?)
@@ -197,19 +200,19 @@ class PStream
 
         # List streams
         ["tcp", "udp"].each do |prot|
-            ret.push(colorize_header("#{prot.upcase} streams:"))
+            ret.push(hilight_header("#{prot.upcase} streams:"))
             @streams[prot].each do |stream|
-                ret.push(colorize_stream(stream))
+                ret.push(hilight_stream(stream))
             end
             ret.push("")
         end
 
         # List ciphers that were actually selected
-        ret.push(colorize_header("Ciphers in use:"))
+        ret.push(hilight_header("Ciphers in use:"))
         cipher_negotiations.map do |negotiation|
             negotiation.suite
         end.uniq.each do |suite|
-            ret.push(colorize_cipher_suite(suite))
+            ret.push(hilight_cipher_suite(suite))
         end
 
         return ret.join("\n")

data/lib/pstream/cipher_negotiation.rb

@@ -1,3 +1,5 @@
+require "hilighter"
+
 class PStream::CipherNegotiation
     attr_accessor :length
     attr_accessor :suite
@@ -8,23 +10,26 @@ class PStream::CipherNegotiation
     attr_reader :pstream
     attr_reader :src
 
-    def colorize_hosts(src, dst)
-        return "#{src} <-> #{dst}" if (!PStream.colorize?)
+    def hilight_hosts(src, dst)
+        return "#{src} <-> #{dst}" if (!PStream.hilight?)
         return "#{src} <-> #{dst}".light_cyan
     end
+    private :hilight_hosts
 
-    def colorize_ipv(ipv)
-        return "IPv#{ipv}" if (!PStream.colorize?)
+    def hilight_ipv(ipv)
+        return "IPv#{ipv}" if (!PStream.hilight?)
         return "IPv#{ipv}".light_cyan
     end
+    private :hilight_ipv
 
-    def colorize_selected_suite(suite)
+    def hilight_selected_suite(suite)
         return [
             "Selected".light_blue,
-            @pstream.colorize_cipher_suite(suite),
+            @pstream.hilight_cipher_suite(suite),
             "from:".light_blue
         ].join(" ")
     end
+    private :hilight_selected_suite
 
     def initialize(pstream, ipv, src, dst)
         @dst = dst
@@ -39,11 +44,11 @@ class PStream::CipherNegotiation
     def summary
         ret = Array.new
         ret.push(
-            "#{colorize_ipv(@ipv)} #{colorize_hosts(@src, @dst)}"
+            "#{hilight_ipv(@ipv)} #{hilight_hosts(@src, @dst)}"
         )
-        ret.push("    #{colorize_selected_suite(@suite)}") if (@suite)
+        ret.push("    #{hilight_selected_suite(@suite)}") if (@suite)
         @suites.each do |suite|
-            ret.push("    #{@pstream.colorize_cipher_suite(suite)}")
+            ret.push("    #{@pstream.hilight_cipher_suite(suite)}")
         end
 
         return ret.join("\n")

data/lib/pstream/stream.rb

@@ -1,23 +1,10 @@
+require "hilighter"
+
 class PStream::Stream
     attr_reader :desc
     attr_reader :frames
     attr_reader :id
 
-    def colorize_address(address)
-        return address if (!PStream.colorize?)
-        return address.light_blue
-    end
-
-    def colorize_ascii(ascii)
-        return ascii if (!PStream.colorize?)
-        return ascii.light_white
-    end
-
-    def colorize_hex(hex)
-        return hex if (!PStream.colorize?)
-        return hex.light_green
-    end
-
     def contents
         case @prot
         when /^tcp$/i
@@ -36,9 +23,9 @@ class PStream::Stream
             m = line.match(/([0-9A-Fa-f]{8}) (.*) (.{17})/)
             ret.push(
                 [
-                    colorize_address(m[1]),
-                    colorize_hex(m[2]),
-                    colorize_ascii(m[3])
+                    hilight_address(m[1]),
+                    hilight_hex(m[2]),
+                    hilight_ascii(m[3])
                 ].join(" ")
             )
         end
@@ -46,6 +33,24 @@ class PStream::Stream
         return ret.join("\n")
     end
 
+    def hilight_address(address)
+        return address if (!PStream.hilight?)
+        return address.light_blue
+    end
+    private :hilight_address
+
+    def hilight_ascii(ascii)
+        return ascii if (!PStream.hilight?)
+        return ascii.light_white
+    end
+    private :hilight_ascii
+
+    def hilight_hex(hex)
+        return hex if (!PStream.hilight?)
+        return hex.light_green
+    end
+    private :hilight_hex
+
     def initialize(pcap, prot, id, desc, frames)
         @desc = desc
         @frames = frames

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pstream
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -31,25 +31,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: hilighter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: scoobydoo
   requirement: !ruby/object:Gem::Requirement