trisulrp 2.2.8 → 3.1.1

data/trisulrp.gemspec

@@ -1,17 +1,17 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trisulrp 2.2.8 ruby lib
+# stub: trisulrp 3.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trisulrp"
-  s.version = "2.2.8"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["vivek"]
-  s.date = "2015-08-31"
+  s.date = "2016-08-02"
   s.description = "This gem deals about the trisul remote protocol"
   s.email = "vivek_rajagopal@yahoo.com"
   s.extra_rdoc_files = [
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
     "lib/trisulrp/protocol.rb",
     "lib/trisulrp/trp.pb.rb",
     "lib/trisulrp/trp.proto",
-    "lib/trisulrp/utils.rb",
     "test/Demo_Client.crt",
     "test/Demo_Client.key",
     "test/cginfo.rb",
@@ -50,30 +49,30 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/vivekrajan/trisulrp"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.5.1"
   s.summary = "trisul trp"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-protocol-buffers>, [">= 0"])
+      s.add_runtime_dependency(%q<protobuf>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<juwelier>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<ruby-protocol-buffers>, [">= 0"])
+      s.add_dependency(%q<protobuf>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<juwelier>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ruby-protocol-buffers>, [">= 0"])
+    s.add_dependency(%q<protobuf>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<juwelier>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: trisulrp
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 3.1.1
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-protocol-buffers
+  name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,6 @@ files:
 - lib/trisulrp/protocol.rb
 - lib/trisulrp/trp.pb.rb
 - lib/trisulrp/trp.proto
-- lib/trisulrp/utils.rb
 - test/Demo_Client.crt
 - test/Demo_Client.key
 - test/cginfo.rb
@@ -136,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: trisul trp

data/lib/trisulrp/utils.rb

@@ -1,215 +0,0 @@
-# = TrisulRP utility  methods 
-# 
-# == Contains utility to print objects like flows, alerts
-#    and to resolve keys etc
-#
-
-# ==== TrisulRP::Utils
-#
-# Utility methods to help with 
-# * retrieving and printing objects
-# * prints sessions / alerts if given an array of IDs
-# * helper to resolve a key 
-# 
-# 
-module TrisulRP::Utils
-
-  # Print session (flow) details 
-  #
-  # [conn]               active TRP connection opened earlier 
-  # [sessions]           an array of SessionIDs or 
-  # 					 an array of slice:sid strings 
-  #
-  # ==== Returns
-  # ==== Yields
-  # Nothing 
-  #
-  # Prints details about the list of sessions (flows) passed 
-  #
-  # ==== On error
-  def print_session_ids(conn,sessions)
-    all_sids = sessions.collect{ |ai| TRP::SessionID.new(
-                 :slice_id => ai.slice_id,
-                 :session_id => ai.session_id ) }
-
-    follow_up = TrisulRP::Protocol.mk_request(TRP::Message::Command::SESSION_ITEM_REQUEST,
-                      :session_ids => all_sids)
-
-    TrisulRP::Protocol.get_response(conn,follow_up) do |resp|
-      resp.items.each do |item|
-	  	print_session_details(item)
-      end
-    end
-  end
-
-
-  # Print a SessionDetails object 
-  #
-  # Use this to output session to screen 
-  #
-  # [sess]           a single SessionDetails object 
-  #
-  # ==== Returns
-  # ==== Yields
-  # Nothing 
-  #
-  # Pretty prints a single line session details 
-  #
-  # ==== On error
-  def print_session_details(sess)
-	print "#{sess.session_id.slice_id}:#{sess.session_id.session_id} ".ljust(12)
-	print "#{Time.at(sess.time_interval.from.tv_sec)} ".ljust(26)
-	print "#{sess.time_interval.to.tv_sec-sess.time_interval.from.tv_sec} ".rjust(8)
-	print "#{sess.key1A.label}".ljust(28)
-	print "#{sess.key2A.label}".ljust(11)
-	print "#{sess.key1Z.label}".ljust(28)
-	print "#{sess.key2Z.label}".ljust(11)
-	print "#{sess.az_bytes}".rjust(10)
-	print "#{sess.za_bytes}".rjust(10)
-	print "#{sess.az_payload}".rjust(10)
-	print "#{sess.za_payload}".rjust(10)
-	print "#{sess.setup_rtt}".rjust(10)
-	print "#{sess.retransmissions}".rjust(10)
-	print "#{sess.tags}".rjust(10)
-	print "\n"
-
-  end
-
-
-  # Print the header column for sess details 
-  #
-  # Use this to output session to screen 
-  #
-  #
-  # ==== Returns
-  # ==== Yields
-  # Nothing 
-  #
-  # Pretty prints a single line session details header w/ correct col widths
-  #
-  # ==== On error
-  def print_session_details_header
-	print "SID".ljust(12)
-	print "Start Time".ljust(26)
-	print "Dur ".rjust(8)
-	print "IP-A".ljust(28)
-	print "Port-A".ljust(11)
-	print "IP-Z".ljust(28)
-	print "Port-Z".ljust(11)
-	print "Fwd Bytes".rjust(10)
-	print "Rev Bytes".rjust(10)
-	print "Fwd Payld".rjust(10)
-	print "Rev Payld".rjust(10)
-	print "RTT".rjust(10)
-	print "Retrans".rjust(10)
-	print "Tags".rjust(10)
-	print "\n"
-
-	print "-"*11 + "+" 
-	print "-"*25 + "+" 
-	print "-"*7 + "+" 
-	print "-"*27 + "+" 
-	print "-"*10 + "+" 
-	print "-"*27 + "+" 
-	print "-"*10 + "+" 
-	print "-"*9 + "+" 
-	print "-"*9 + "+" 
-	print "-"*9 + "+" 
-	print "-"*9 + "+" 
-	print "-"*9 + "+" 
-	print "-"*9 + "+" 
-	print "-"*9 + "+" 
-	print "\n"
-  end
-
-
-
-  # Make key
-  #
-  # Convert an item into Trisul Key format. 
-  #
-  # Example 
-  #
-  # == Pass a hostname 
-  # mk_trisul_key(conn,GUID_HOSTS,"www.trisul.org") => "D0.D1.01.EA"
-  # mk_trisul_key(conn,GUID_APPS,"https") => "p-01BB"
-  #
-  # == Pass a IP 
-  # mk_trisul_key(conn,GUID_HOSTS,"192.168.1.5") => "C0.A8.01.05"
-  # mk_trisul_key(conn,GUID_APPS,"Port-443") => "p-01BB"
-  #
-  #
-  # [conn]           active TRP connection opened earlier 
-  # [guid]           counter group id (eg hosts, apps, countries)
-  # [str]        eg a resolved name (eg a host like www.blue.net)
-  #
-  # ==== Returns
-  # A string containing the key in Trisul format corresponding to the
-  # label passed in via ''str'' 
-  #
-  # ==== Yields
-  # Nothing 
-  #
-  # ==== On error
-  def mk_trisul_key(conn,guid,str)
-    req = TrisulRP::Protocol.mk_request(TRP::Message::Command::SEARCH_KEYS_REQUEST,
-                    :pattern => str,
-                    :counter_group => guid,
-                    :maxitems => 1)
-
-    resp = TrisulRP::Protocol.get_response(conn,req)
-
-    if resp.found_keys.size > 0 
-      resp.found_keys[0].key
-    else
-      TrisulRP::Keys::make_key(str)
-    end
-  end
-
-  # Print alert details 
-  #
-  # [conn]               active TRP connection opened earlier 
-  # [alerts]             an array of AlertIDs
-  #
-  # ==== Returns
-  # ==== Yields
-  # Nothing 
-  #
-  # Prints details about the list of alerts passed 
-  #
-  # ==== On error
-  def print_alert_details(conn, alerts)
-
-    return if alerts.empty?
-
-    # retrieve details of alerts from server 
-    follow_up = TrisulRP::Protocol.mk_request(TRP::Message::Command::ALERT_ITEM_REQUEST,
-      :alert_group  => TrisulRP::Guids::AG_IDS,
-        :alert_ids    => alerts.collect do |al| 
-                TRP::AlertID.new(:slice_id => al.slice_id, 
-                :alert_id => al.alert_id)
-               end
-    )
-
-
-
-    TrisulRP::Protocol.get_response(conn,follow_up) do | resp |
-           resolv_candidates = resp.items.collect { |item| [item.source_ip, item.source_port, item.destination_ip, item.destination_port,item.sigid]  }
-           resolv_arr = resolv_candidates.transpose
-           sip_names   = TrisulRP::Keys.get_labels_for_keys(conn,TrisulRP::Guids::CG_HOST, resolv_arr[0])
-           sport_names = TrisulRP::Keys.get_labels_for_keys(conn,TrisulRP::Guids::CG_APP,  resolv_arr[1])
-           dip_names   = TrisulRP::Keys.get_labels_for_keys(conn,TrisulRP::Guids::CG_HOST, resolv_arr[2])
-           dport_names = TrisulRP::Keys.get_labels_for_keys(conn,TrisulRP::Guids::CG_APP,  resolv_arr[3])
-           sigid_names = TrisulRP::Keys.get_labels_for_keys(conn,TrisulRP::Guids::CG_ALERT_SIGNATURES, resolv_arr[4])
-           resp.items.each do |item|
-             print "#{Time.at(item.time.tv_sec)} "
-             print "#{sip_names[item.source_ip]}".ljust(28)
-             print "#{sport_names[item.source_port]}".ljust(11)
-             print "#{dip_names[item.destination_ip]}".ljust(28)
-             print "#{dport_names[item.destination_port]}".ljust(11)
-             print "#{sigid_names[item.sigid]}".rjust(10)
-             print "\n"
-           end
-     end
-  end
-end