Changeset 1344

Timestamp:

03/07/08 15:30:25 (6 months ago)

Author:

kindlund

Message:

Fixed regression, re: #146

Files:

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

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

@@ -1 +1 @@
-require 'base64'
+require 'yaml'
-require 'rbyaml'
-
@@ -44 +45 @@
-      obj_hash = obj_str
-    else
-Rb
+
-    end
-    count = 0
@@ -63 +64 @@
-  # 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 +105 @@
-  # 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 +114 @@
-
-  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 +150 @@
-  # 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")