Changeset 1342

Timestamp:

03/07/08 14:32:21 (6 months ago)

Author:

kindlund

Message:

Fixing bug with YAML library, re: ticket #146

Files:

• hive/trunk/data_webapp/app/controllers/hc_database_controller.rb (modified) (8 diffs)

hive/trunk/data_webapp/app/controllers/hc_database_controller.rb

@@ -1 +1 @@
-require 'base64'
-
+rb
-
-class HcDatabaseController < ApplicationController
@@ -44 +44 @@
-      obj_hash = obj_str
-    else
-
+Rb
-    end
-    count = 0
@@ -63 +63 @@
-  # Removes all references from the queue.
-  def insert_history_urls(obj_str)
-
+Rb
-    cid = obj_hash.delete("client_id")
-    hid = Client.find(cid).host_id
@@ -104 +104 @@
-  # Insert fingerprints from a suspicious VM
-  def insert_fingerprint(obj_str)
-
+Rb
-
-    # Remove compromise time from fingerprint and use to update related client object
@@ -113 +113 @@
-
-  def insert_client(obj_str)
-
+Rb
-    insert(Client,obj_hash)
-  end
-
-  def set_client_compromised(id_str)
-
+Rb
-    Client.update(cid,{:status => "compromised"})
-  end
-
-  def set_client_suspended(id_str)
-
+Rb
-    Client.update(cid,{:status => "suspended"})
-  end
-
-  def set_client_running(id_str)
-
+Rb
-    Client.update(cid,{:status => "running"})
-  end
-  
-  def set_client_deleted(id_str)
-
+Rb
-    Client.update(cid,{:status => "deleted"})
-  end
-
-  def set_client_bug(id_str)
-
+Rb
-    Client.update(cid,{:status => "bug"})
-  end
-
-  def set_client_unknown(id_str)
-
+Rb
-    Client.update(cid,{:status => "unknown"})
-  end
@@ -149 +149 @@
-  # Input YAML encoded hash table of format {"client_id" => <int>, "compromise" => <timestamp>}
-  def set_client_suspicious(compromise_str)
-
+Rb
-    cid = compromise_hash.delete("client_id")
-    time = compromise_hash.delete("compromise")
@@ -197 +197 @@
-    # Return the urls as a hash table url/priority pairs (e.g. {"http://www.honeyclient.org" => 1})
-    url_hash = Hash[*urls.collect {|u| [u.url,u.priority]}.flatten]
-
+Rb
-  end
-
-  # Get the list of client IDs that have been marked as "bug" on a given host. 
-  def get_broken_clients(obj_str)
-
+Rb
-    hostname = obj_hash.delete("hostname")
-    hid = Host.find(:first, :conditions => { :hostname => hostname }).id
@@ -209 +209 @@
-    # Return the clients as a hash table cid/id pairs (e.g. {"xxxxxxxxxx" => 1})
-    clients_hash = Hash[*clients.collect {|c| [c.cid,c.id]}.flatten]
-
+Rb
-  end
-end