Changeset 1477

Timestamp:

04/08/08 12:13:54 (5 months ago)

Author:

dbryson

Message:

—

Files:

• hive/trunk/data_webapp/test/functional/bee_controller_test.rb (modified) (4 diffs)
• hive/trunk/data_webapp/test/unit/bee_job_test.rb (modified) (1 diff)

hive/trunk/data_webapp/test/functional/bee_controller_test.rb

@@ -13 +13 @@
-    @response   = ActionController::TestResponse.new
-    
-
+ and cleaned
-    @client_data = {"status"=>"running", "os"=>{"name"=>"Default Windows XP SP2", "shortname"=>"Microsoft Windows", "version"=>"XP Professional", "os_applications"=>[{"shortname"=>"Internet Explorer", "manufacturer"=>"Microsoft", "version"=>6}]}, "start"=>"2008-03-25T11:25:00", "host"=>{"org"=>"MITRE", "ip"=>"172.16.164.108", "hostname"=>"honeyclient8.mitre.org"}, "cid"=>"2df4455a3b0aa690ef4f7da84b"}
-    @finger_data = {"os_processes"=>[{"name"=>"C:\\WINDOWS\\system32\\wbem\\wmiprvse.exe", "pid"=>1256, "process_files"=>[{"name"=>"C:\\WINDOWS\\PCHEALTH\\HELPCTR\\DataColl", "event"=>"Write", "file_content"=>{"size"=>-1, "mime_type"=>"UNKNOWN", "sha1"=>"C:\\WINDOWS\\PCHEALTH\\HELPCTR\\DataColl2008-03-25 11:58:05.13", "md5"=>"C:\\WINDOWS\\PCHEALTH\\HELPCTR\\DataColl2008-03-25 11:58:05.13"}, "time_at"=>"2008-03-25 11:58:05.13"}, {"name"=>"C:\\Documents and Settings", "event"=>"Write", "file_content"=>{"size"=>-1, "mime_type"=>"UNKNOWN", "sha1"=>"C:\\Documents and Settings2008-03-25 11:58:05.13", "md5"=>"C:\\Documents and Settings2008-03-25 11:58:05.13"}, "time_at"=>"2008-03-25 11:58:05.13"}, {"name"=>"C:\\Documents and Settings\\Default User", "event"=>"Write", "file_content"=>{"size"=>-1, "mime_type"=>"UNKNOWN", "sha1"=>"C:\\Documents and Settings\\Default User2008-03-25 11:58:05.13", "md5"=>"C:\\Documents and Settings\\Default User2008-03-25 11:58:05.13"}, "time_at"=>"2008-03-25 11:58:05.13"}, {"name"=>"C:\\Documents and Settings\\ALL USERS", "event"=>"Write", "file_content"=>{"size"=>-1, "mime_type"=>"UNKNOWN", "sha1"=>"C:\\Documents and Settings\\ALL USERS2008-03-25 11:58:05.13", "md5"=>"C:\\Documents and Settings\\ALL USERS2008-03-25 11:58:05.13"}, "time_at"=>"2008-03-25 11:58:05.13"}, {"name"=>"C:\\Documents and Settings\\Default User\\Start Menu\\Programs", "event"=>"Write", "file_content"=>{"size"=>-1, "mime_type"=>"UNKNOWN", "sha1"=>"C:\\Documents and Settings\\Default User\\Start Menu\\Programs2008-03-25 11:58:05.13", "md5"=>"C:\\Documents and Settings\\Default User\\Start Menu\\Programs2008-03-25 11:58:05.13"}, "time_at"=>"2008-03-25 11:58:05.13"}, {"name"=>"C:\\WINDOWS\\system32\\config\\systemprofile", "event"=>"Write", "file_content"=>{"size"=>-1, "mime_type"=>"UNKNOWN", "sha1"=>"C:\\WINDOWS\\system32\\config\\systemprofile2008-03-25 11:58:05.13", "md5"=>"C:\\WINDOWS\\system32\\config\\systemprofile2008-03-25 11:58:05.13"}, "time_at"=>"2008-03-25 11:58:05.13"}], "regkeys"=>[]}], "cid"=>"2df4455a3b0aa690ef4f7da84b"}
@@ -58 +58 @@
-    @request.env['HTTP_AUTHORIZATION'] = '1234'
-    post(:client, :data => encoded)
-0
+1
-    assert Client.find(:all).size == 1
-  end
@@ -71 +71 @@
-    
-    post(:fingerprint, :data => encoded)
-0
+1
-    nc = Client.find(c.id)
-    assert nc.fingerprint
@@ -86 +86 @@
-    assert c.save
-    post(:history, :data => encoded)
-0
+1
-    nc = Client.find(c.id)
-    assert nc.history_urls.size > 0 
-  end
+  
-end

hive/trunk/data_webapp/test/unit/bee_job_test.rb

@@ -3 +3 @@
-class BeeJobTest < ActiveSupport::TestCase
-  
+  # THIS TEST HAS BEEN MOVED TO HC FUNCTIONAL TESTS
-  def setup
-
-
-
+#
+#
+#
-  end
-  
-  def test_bee_to_hive
-    BeeJob.add_job("client",@client)
-    j = BeeJob.get_job
-    assert_not_nil j
-    assert_equal "client", j.job_type
-    data = j.job_data
-    assert_equal "honeyclient8.mitre.org", data["host"]["hostname"]
-    
-    indata = ActiveSupport::JSON.encode(data)
-    assert_not_nil indata
-    outdata = ActiveSupport::JSON.decode(indata)
-    
-    c = Client.new_from_hash(outdata)
-    assert c.save
-    assert_equal "2df4455a3b0aa690ef4f7da84b", c.cid
-    assert_equal "honeyclient8.mitre.org", c.host.hostname
-  end
-  
-  def test_fingerprint_to_hive
-    @fingerprint.delete("time_at")
-    BeeJob.add_job("fingerprint",@fingerprint)
-    j = BeeJob.get_job
-    assert_not_nil j
-    assert_equal "fingerprint", j.job_type
-    data = j.job_data
-    assert_equal 504, data["client_id"]
-    
-    indata = ActiveSupport::JSON.encode(data)
-    assert_not_nil indata
-    outdata = ActiveSupport::JSON.decode(indata)
-    
-    f = Fingerprint.new_from_hash(outdata)
-    assert f.save
-    assert f.os_processes.size > 0
-  end
-  
-  def history_to_hive
-  end
-
-end