trisulrp 1.2.6 → 1.2.7

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.7

data/lib/trisulrp/protocol.rb

@@ -247,6 +247,8 @@ module TrisulRP::Protocol
 		  req.counter_group_info_request = TRP::CounterGroupInfoRequest.new(params)
 		when TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST
 		  req.key_session_activity_request = TRP::KeySessionActivityRequest.new(params)
+		when TRP::Message::Command::GREP_REQUEST
+		  req.grep_request  = TRP::GrepRequest.new(params)
 		else
 			raise "Unknown TRP command ID"
 		end

data/lib/trisulrp/trp.pb.rb

@@ -63,6 +63,8 @@ module TRP
   class ResourceGroupResponse < ::ProtocolBuffers::Message; end
   class KeyLookupRequest < ::ProtocolBuffers::Message; end
   class KeyLookupResponse < ::ProtocolBuffers::Message; end
+  class GrepRequest < ::ProtocolBuffers::Message; end
+  class GrepResponse < ::ProtocolBuffers::Message; end
 
   # enums
   module AuthLevel
@@ -216,6 +218,8 @@ module TRP
       RESOURCE_GROUP_RESPONSE = 49
       KEY_LOOKUP_REQUEST = 50
       KEY_LOOKUP_RESPONSE = 51
+      GREP_REQUEST = 60
+      GREP_RESPONSE = 61
     end
 
     required ::TRP::Message::Command, :trp_command, 1
@@ -263,6 +267,8 @@ module TRP
     optional ::TRP::ResourceGroupResponse, :resource_group_response, 48
     optional ::TRP::KeyLookupRequest, :key_lookup_request, 49
     optional ::TRP::KeyLookupResponse, :key_lookup_response, 50
+    optional ::TRP::GrepRequest, :grep_request, 51
+    optional ::TRP::GrepResponse, :grep_response, 52
 
     gen_methods! # new fields ignored after this point
   end
@@ -731,4 +737,22 @@ module TRP
     gen_methods! # new fields ignored after this point
   end
 
+  class GrepRequest < ::ProtocolBuffers::Message
+    optional :int64, :context, 1, :default => 0
+    optional :string, :session_group, 2, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"
+    required ::TRP::TimeInterval, :time_interval, 3
+    optional :int64, :maxitems, 4, :default => 500
+    required :string, :pattern, 5
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class GrepResponse < ::ProtocolBuffers::Message
+    optional :int64, :context, 1
+    optional :string, :session_group, 2, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"
+    repeated ::TRP::SessionID, :sessions, 3
+
+    gen_methods! # new fields ignored after this point
+  end
+
 end

data/lib/trisulrp/trp.proto

@@ -126,6 +126,8 @@ message Message {
                     RESOURCE_GROUP_RESPONSE=49;
                     KEY_LOOKUP_REQUEST=50;
                     KEY_LOOKUP_RESPONSE=51;
+					GREP_REQUEST=60;
+					GREP_RESPONSE=61;
     }
 
     required Command    trp_command=1;
@@ -173,6 +175,8 @@ message Message {
     optional ResourceGroupResponse resource_group_response=48;
     optional KeyLookupRequest key_lookup_request=49;
     optional KeyLookupResponse key_lookup_response=50;
+    optional GrepRequest  grep_request=51;
+    optional GrepResponse  grep_response=52;
 }
 
 ///////////////////////////////
@@ -617,3 +621,21 @@ message KeyLookupResponse {
     repeated KeyDetails     key_details=3;
 }
 
+////////////////////////////////////
+// GrepRequest
+message GrepRequest {
+    optional int64          context=1[default=0];            
+    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
+    required TimeInterval   time_interval=3;
+    optional int64          maxitems=4 [default=500];
+    required string         pattern=5;
+}
+
+/////////////////////////////////////
+// GrepResponse  
+message GrepResponse  {
+    optional int64          context=1;
+    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
+    repeated SessionID      sessions=3;
+}
+

data/test/helper.rb

@@ -15,4 +15,46 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'trisulrp'
 
 class Test::Unit::TestCase
+
+  # helper function to get session info and print in a table 
+  def print_session_details(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.session_item_response.items.each do |item|
+            print "#{item.session_id.slice_id},#{item.session_id.session_id} "
+            print "#{Time.at(item.time_interval.from.tv_sec)} "
+            print "#{item.time_interval.to.tv_sec-item.time_interval.from.tv_sec} ".rjust(8)
+            print "#{item.key1A.label}".ljust(28)
+            print "#{item.key2A.label}".ljust(11)
+            print "#{item.key1Z.label}".ljust(28)
+            print "#{item.key2Z.label}".ljust(11)
+            print "#{item.az_bytes}".rjust(10)
+            print "#{item.za_bytes}".rjust(10)
+            print "\n"
+          end
+        end
+  end
+
+  # convert a string to a key
+  def mk_trisul_key(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.search_keys_response.found_keys.size > 0 
+		resp.search_keys_response.found_keys[0].key
+	else
+		str
+	end
+  end
+
 end

data/test/test_grep.rb

@@ -0,0 +1,31 @@
+
+# Trisul Remote Protocol TRP Demo script
+require 'rubygems'
+require './helper'
+include TrisulRP::Protocol
+include TrisulRP::Keys
+
+class TestTrisulrp < Test::Unit::TestCase
+
+  def test_grep
+
+	
+    conn=TrisulRP::Protocol.connect("127.0.0.1", 12001,"Demo_Client.crt","Demo_Client.key")
+	
+	avail_tm  = TrisulRP::Protocol.get_available_time(conn)
+
+    req = TrisulRP::Protocol.mk_request(TRP::Message::Command::GREP_REQUEST,
+										:time_interval => mk_time_interval(avail_tm),
+										:maxitems => 4,
+										:pattern => "HELO footballbat2.usma.bluenet")
+
+
+    TrisulRP::Protocol.get_response(conn,req) do |resp|
+
+		print_session_details(conn,resp.grep_response.sessions)
+
+    end
+
+  end
+end
+

data/test/test_key_flows.rb

@@ -4,41 +4,52 @@
 require 'rubygems'
 require './helper'
 include TrisulRP::Protocol
-require guidmap
+include TrisulRP::Guids
 
 class TestTrisulrp < Test::Unit::TestCase
-  def test_flows_for_host
+
+  def setup
+    @conn = TrisulRP::Protocol.connect("127.0.0.1",12001,"Demo_Client.crt","Demo_Client.key") 
+  end
+
+  def teardown
+  end
+
+  def atest_flows_for_host
 
     target_key =  "0A.01.3C.BB"
-		TrisulRP::Protocol.connect("127.0.0.1",12001,"Demo_Client.crt","Demo_Client.key") do |conn|
-      
-      tmarr  = TrisulRP::Protocol.get_available_time(conn)
-
-      req = TrisulRP::Protocol.mk_request(TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST,
-        :key => target_key ,:time_interval =>TrisulRP::Protocol.mk_time_interval(tmarr))
-      TrisulRP::Protocol.get_response(conn,req) do |resp|
-        all_sids = resp.key_session_activity_response.sessions.collect{ |ai| TRP::SessionID.new(
-                     :slice_id => ai.slice_id,
-                     :session_id => ai.session_id ) }
-
-        follow_up = TrisulRP::Protocol.mk_request(:session_ids => all_sids)
-        TrisulRP::Protocol.get_response(conn,follow_up) do |resp|
-          resp.session_item_response.items.each do |item|
-            print "#{item.state} "
-            print "#{Time.at(item.time_interval.from.tv_sec)} "
-            print "#{item.time_interval.to.tv_sec-item.time_interval.from.tv_sec} ".rjust(8)
-            print "#{item.key1A.label}".ljust(28)
-            print "#{item.key2A.label}".ljust(11)
-            print "#{item.key1Z.label}".ljust(28)
-            print "#{item.key2Z.label}".ljust(11)
-            print "#{item.az_bytes}".rjust(10)
-            print "#{item.za_bytes}".rjust(10)
-            print "\n"
-          end
-        end
-      end
+	
+    tmarr  = TrisulRP::Protocol.get_available_time(@conn)
+
+    req = TrisulRP::Protocol.mk_request(TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST,
+        								  :key => target_key ,
+										  :time_interval => mk_time_interval(tmarr))
+
+    TrisulRP::Protocol.get_response(@conn,req) do |resp|
+		print_session_details(@conn,resp.key_session_activity_response.sessions)
+    end
+
+  end
+
+  # test flows for ssh
+  # note we need to convert the "ssh" into a key first
+  def test_flows_for_appname
+
+    target  =  "ssh"
+	target_key =  mk_trisul_key(CG_APP,target)
+	
+    tmarr  = TrisulRP::Protocol.get_available_time(@conn)
+
+    req = TrisulRP::Protocol.mk_request(TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST,
+        								  :key => target_key ,
+										  :time_interval => mk_time_interval(tmarr))
+
+    TrisulRP::Protocol.get_response(@conn,req) do |resp|
+		print_session_details(@conn,resp.key_session_activity_response.sessions)
     end
+
   end
+
 end
 
 

data/trisulrp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trisulrp}
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-02-17}
   s.description = %q{This gem deals about the trisul remote protocol}
   s.email = %q{vivek_rajagopal@yahoo.com}
   s.extra_rdoc_files = [
@@ -35,6 +35,8 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_alerts.rb",
     "test/test_cap.rb",
+    "test/test_grep.rb",
+    "test/test_key.rb",
     "test/test_key_flows.rb",
     "test/test_resources.rb",
     "test/test_trisulrp.rb",
@@ -50,6 +52,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_alerts.rb",
     "test/test_cap.rb",
+    "test/test_grep.rb",
     "test/test_key.rb",
     "test/test_key_flows.rb",
     "test/test_resources.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - vivek
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +05:30
+date: 2011-02-17 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,11 +131,12 @@ files:
 - test/helper.rb
 - test/test_alerts.rb
 - test/test_cap.rb
+- test/test_grep.rb
+- test/test_key.rb
 - test/test_key_flows.rb
 - test/test_resources.rb
 - test/test_trisulrp.rb
 - trisulrp.gemspec
-- test/test_key.rb
 has_rdoc: true
 homepage: http://github.com/vivekrajan/trisulrp
 licenses: 
@@ -150,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -636582125
+      hash: -1049257823
       segments: 
       - 0
       version: "0"
@@ -174,6 +175,7 @@ test_files:
 - test/helper.rb
 - test/test_alerts.rb
 - test/test_cap.rb
+- test/test_grep.rb
 - test/test_key.rb
 - test/test_key_flows.rb
 - test/test_resources.rb