honeycomb 0.0.2 → 0.0.3

data/README.rdoc

@@ -22,7 +22,7 @@ http://dionaea.carnivore.it/
   
   require 'honeycomb'
 
-  all_pots = Honeycomb::Interact.new
+  all_pots = Honeycomb::Honeypot::Manage.new
 
   all_pots.check_diskspace
 
@@ -31,7 +31,7 @@ http://dionaea.carnivore.it/
 
   require 'honeycomb'
 
-  all_pots = Honeycomb::Interact.new
+  all_pots = Honeycomb::Database::Interact.new
 
   all_pots.all{Honeycomb::Download.all(:download_md5_hash => "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")}
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/etc/config.yml.example

@@ -2,10 +2,10 @@ honey_config:
    servers:  ['honeypot1', 'honeypot2']
    username: 'r00t'
    key:      'path/to/key'
-   password: 'sekret'
+   password: 'sekret' # Not used at the moment, need to implement
    path:     'path/to/dionaea'
    # Uncomment to following to change default directory of 
-   # honeycomb/data/binaries
-   # honeycomb/data/logsql
-   #download_binaries: 'where/to/store/binaries'
-   #download_databases: 'where/to/store/databases'
+   # download_binaries - install_path/honeycomb/data/binaries
+   # download_databases - install_path/honeycomb/data/logsql
+   #download_binaries: '/where/to/store/binaries/'
+   #download_databases: '/where/to/store/databases/'

data/lib/honeycomb/database.rb

@@ -1 +1,20 @@
+#    honeycomb - Tool to manage and analyze data from the Dionaea Honeypot 
+#                Project
+#    Josh Grunzweig
+#    Copyright (C) 2011 Trustwave Holdings
+#
+#    This program is free software: you can redistribute it and/or modify it 
+#    under the terms of the GNU General Public License as published by the 
+#    Free Software Foundation, either version 3 of the License, or (at your
+#    option) any later version.
+#
+#    This program is distributed in the hope that it will be useful, but 
+#    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+#    for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
 require 'honeycomb/database/interact'

data/lib/honeycomb/database/interact.rb

@@ -26,9 +26,9 @@ module Honeycomb
       def all(&block)
         all_values = []
         ::DataMapper::Repository.adapters.each do |repo|
-          if repo[0] == :default
-            next
-          end
+          next if repo[0] == :default 
+          next if repo[0] == :"0"
+          
           begin
             response = DataMapper.repository(repo[0]) {yield}
             if response.kind_of?(DataMapper::Collection)
@@ -39,7 +39,7 @@ module Honeycomb
               all_values << response if response
             end
           rescue Exception => e
-            #puts e.message
+            #p e.message
           end
         end
         all_values
@@ -58,7 +58,7 @@ module Honeycomb
             all_values << response if response
           end
         rescue Exception => e
-          #puts e.message
+          #p e.message
         end
         all_values
       end

data/lib/honeycomb/default_setup.rb

@@ -18,8 +18,11 @@
 #
 
 require 'honeycomb'
-require 'honeycomb/model'
 
-Honeycomb::Env.read_config
-Honeycomb::Model.setup!
+if Honeycomb::Env::CONFIG["honey_config"]["download_databases"]
+  Honeycomb::Model.setup!(Honeycomb::Env::CONFIG["honey_config"]["download_databases"])
+else
+  Honeycomb::Model.setup!
+end
+
 

data/lib/honeycomb/honeypot.rb

@@ -1 +1,20 @@
+#    honeycomb - Tool to manage and analyze data from the Dionaea Honeypot 
+#                Project
+#    Josh Grunzweig
+#    Copyright (C) 2011 Trustwave Holdings
+#
+#    This program is free software: you can redistribute it and/or modify it 
+#    under the terms of the GNU General Public License as published by the 
+#    Free Software Foundation, either version 3 of the License, or (at your
+#    option) any later version.
+#
+#    This program is distributed in the hope that it will be useful, but 
+#    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+#    for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
 require 'honeycomb/honeypot/manage'

data/lib/honeycomb/honeypot/manage.rb

@@ -41,10 +41,10 @@ module Honeycomb
       #   installation instructions: /opt/dionaea)
       def initialize(db_path = nil, bin_path = nil, username = nil, key = nil, 
                      servers = nil, base_path = nil)
-        self.db_path = Honeycomb::Env::CONFIG[:download_databases] ||
+        self.db_path = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
           self.db_path = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s ||
             db_path
-        self.bin_path = Honeycomb::Env::CONFIG[:download_binaries] ||
+        self.bin_path = Honeycomb::Env::CONFIG["honey_config"]["download_binaries"] ||
           self.bin_path = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('binaries/').to_s ||
             bin_path
         self.username = Honeycomb::Env::CONFIG["honey_config"]["username"] || 

data/lib/honeycomb/model.rb

@@ -36,6 +36,8 @@ module Honeycomb
       end
     end
 
+    Honeycomb::Env.read_config
+
     require 'honeycomb/model/connections'
     require 'honeycomb/model/logins'
     require 'honeycomb/model/dcerpcbinds'
@@ -63,11 +65,11 @@ module Honeycomb
     # Sets up the model using with the currently configured db_conn 
     # configuration.
     def self.setup!(dir = Pathname.new(__FILE__).dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
-      num = 1
+      num = 0
       # Don't plan on ever using the default database, but DataMapper complains
       # if you don't specify one. A necessary evil. 
       DataMapper.setup(:default, "sqlite:///#{dir}honeypot.sqlite")
-      self.all_databases.each do |database|
+      self.all_databases(dir).each do |database|
         DataMapper.setup(num.to_s.to_sym, "sqlite:///#{dir}#{database}") 
         num = num + 1
       end  

data/lib/honeycomb/model/connections.rb

@@ -17,14 +17,13 @@
 #    with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'honeycomb/model'
-
 module Honeycomb
   class Connections
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/dcerpcbinds.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/dcerpcrequests.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/dcerpcserviceops.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/dcerpcservices.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/downloads.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/emu_profiles.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/emu_services.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/logins.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/mssql_commands.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/mssql_fingerprints.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/offers.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/p0fs.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/resolves.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/virustotals.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

data/lib/honeycomb/model/virustotalscans.rb

@@ -22,7 +22,8 @@ module Honeycomb
     include DataMapper::Resource
     include Model::FixtureTable
 
-    def self.all_databases(dir = Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
+    def self.all_databases(dir = Honeycomb::Env::CONFIG["honey_config"]["download_databases"] ||
+                            Pathname.new(__FILE__).dirname.dirname.dirname.dirname.expand_path.join('data').join('logsql/').to_s)
       ret = Dir.entries(dir)
       ret.delete_if {|x| x =~ /^\./}
       ret

metadata

@@ -2,7 +2,7 @@
 name: honeycomb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Josh Grunzweig
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 -05:00
+date: 2011-07-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -220,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4172282462216369784
+      hash: -293782617342564056
       segments: 
       - 0
       version: "0"