Changeset 1628

Show
Ignore:
Timestamp:
06/14/08 21:10:11 (7 months ago)
Author:
kindlund
Message:

Added verbose time calculation support for email reports.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • hive/trunk/data_webapp/app/views/post_office/job_completed.text.plain.erb

    r1626 r1628  
    1 +---------------------------------+ 
    2 | MITRE Honeyclient System v1.2.1 | 
    3 +---------------------------------+ 
     1------------------------------- 
     2MITRE Honeyclient System v1.2.2 
     3------------------------------- 
    44Status:              <%= @status.to_s %> 
    55Job ID:              #<%= @job_id.to_s %> 
     
    1313(Note: All URLs below have the prefix of 'BLOCKED::' in order to disable automatic loading of URLs within email clients.) 
    1414 
    15 +-------------------------------+ 
    16 | Format: Status - URL          | 
    17 +-------------------------------+ 
     15Format: Status - URL (last visited) 
     16=================================== 
    1817<%- @history_urls.each do |h| -%> 
    19 <%= h.status.to_s %> - BLOCKED::<%= h.url.to_s %> 
     18<%= h.status.to_s %> - BLOCKED::<%= h.url.to_s %> (<%= h.time_at == 0 ? "never" : time_ago(h.time_at) %>) 
    2019<%- end -%> 
    21 --------------------------------- 
    2220 
    23 +------------+ 
    24 | DISCLAIMER | 
    25 +------------+ 
     21---------- 
     22DISCLAIMER 
     23---------- 
    2624 
    2725While the MITRE Honeyclient System has been extensively tested, and consistently detects new malware not detected by anti-virus scanners, there are some caveats inherent to this implementation.  Please keep in mind the following: 
     
    3331If you have any questions, please contact honeyclient@mitre.org. 
    3432 
    35 --------------------------------- 
    3633For more information about what this means, see the following: 
    3734http://www.honeyclient.org/trac/wiki/SummaryResults 
  • hive/trunk/data_webapp/app/views/post_office/job_submitted.text.plain.erb

    r1626 r1628  
    11<%= (@status.to_s != 'Error') ? 'Thanks!  Your request has been submitted to the MITRE Honeyclient System for analysis.  If you have submitted any lengthy URLs, please review the output below to make sure each URL has been parsed correctly.  When all URLs have been analyzed, you will receive another message with the results.  Do not reply to this message.  If you have any questions, please contact honeyclient@mitre.org.' : 'Unfortunately, we were unable to parse your request to the MITRE Honeyclient System.  Please review the output below to make sure at least one URL was parsed correctly.  If at least one URL was parsed correctly, then the system may be undergoing routine maintenance at this time -- please try your request again later.  Do not reply to this message.  If you have any questions, please contact honeyclient@mitre.org.' %> 
    22 
    3 +---------------------------------+ 
    4 | MITRE Honeyclient System v1.2.1 | 
    5 +---------------------------------+ 
     3------------------------------- 
     4MITRE Honeyclient System v1.2.2 
     5------------------------------- 
    66Status:                <%= @status.to_s %> 
    77Job ID:                #<%= @job_id.to_s %> 
     
    1010(Note: All URLs below have the prefix of 'BLOCKED::' in order to disable automatic loading of URLs within email clients.) 
    1111 
    12 URLs Parsed: 
    13 ============ 
     12Format: BLOCKED::URL (last visited)  
     13=================================== 
    1414<%- @queue_urls.each do |q| -%> 
    15 BLOCKED::<%= q.url.to_s %> 
     15BLOCKED::<%= q.url.to_s %> (<%= q.last_visited_at == 0 ? "never" : time_ago(q.last_visited_at) %>) 
    1616<%- end -%> 
  • hive/trunk/data_webapp/config/environment.rb

    r1380 r1628  
    9292 
    9393# Include your application configuration below 
    94 #include MicrosecondConverter 
    9594require 'microsecond_converter' 
    9695include MicrosecondConverter 
     
    9897require 'honeyclient_record' 
    9998include HoneyclientRecord 
     99 
     100require 'time_converter' 
     101include TimeConverter 
  • hive/trunk/data_webapp/lib/honeyclient_record.rb

    r1562 r1628  
    11# author: Matthew Briggs 
    2 #class HoneyclientRecord < ActiveRecord::Base 
    32module HoneyclientRecord 
    43  def new_or_existing(class_name,obj_hash)