metasploit_data_models 0.19.4 → 0.19.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVlZmE2OTg5NzU3YmU2OTdiZWI0N2UwYjU5MTJhNTEzNzE4ZjhhNQ==
+    YjIzZmZkYmUxMzhmMjg5ZDA0Y2M1MmU2NTgyNjQ2YTRlYzc3OWZhYg==
   data.tar.gz: !binary |-
-    NWZiNzhiMDEyYjQ3ODdiZWE3NmQ3Njg5YjE5YjkyNTUxYTA0MmNlYQ==
+    NTc2M2QyZjZhOTZiMGQyNDJlOWRjNmEyMzdhY2E0NzQ2NTgwOGMzMg==
 SHA512:
   metadata.gz: !binary |-
-    MjBmZjA1Njg3MWRkMGRiMDM1NWFiMzUxYzQ3OWJiZTMzZWVjZWIxOTU0Mzc5
-    YWQ2NTg5MzMyZjczMjg4ZTIyOTBmNDRhZGJjMzg3YzA5Y2NkMDVjYTE3Y2Zm
-    ZThhN2FkNmMwODI5NzJmMzg5MTgzOTQ5ZGJmYzQwZGNiMWYxZDc=
+    NjQwNTdkNTBhZTdlNWZjZTJlYjc3ZjA2MTA1ODBkMTEyNDZlM2I5YjBlN2Qw
+    YWY4ZjZhZDA0ZmRiOWQ1MDY1NWEyZGY4MWFkMDc1YzhlYjRkNThjN2NhOGRk
+    MjJjMzEyM2U1MDU2ZmZmYjQzZGQyOGRiMTg3N2E4YjhlNDRiOWE=
   data.tar.gz: !binary |-
-    ZjM4MDllNmZkYzlkYmU5NmM3MmRjYmQ3Mzc4NGIwOTFlZjY5ZjlmZjZjZmQ4
-    NjVhYzdjMDMwN2I0OGRiYjMzNDgzNmIzMGQ0YmMzYWM3ODQyMGEzOTYzMDhk
-    YTdlOTEzYTg0ODFjMTU1ZjE2OGZkMzdmNmRlNWFkODRhZDJiMjI=
+    NTUzODYwOWJmMTliMzkzMjhjOGY2NTRmNGExNzgzNzc1YmJmODI2MDYyODZl
+    NjMwYmIyMWVkN2YxYTZiZjhhNzAwNDJhZDg3N2ZjYTdhZDQ4OWUyMjgxNWE4
+    NjhkZGE2YjU0MGFlYTY0OTM0NTdjOTMwYTZmNzE0Y2ZlMzFmMGQ=

data/app/models/mdm/host.rb

@@ -7,8 +7,13 @@ class Mdm::Host < ActiveRecord::Base
   # CONSTANTS
   #
 
-  # Either the CPU architecture for native code or the programming language name for exploits that run code in the
-  # programming language's  virtual machine.
+  # Special {#arch} value to indicate we should look at {#detected_arch}
+  # instead
+  UNKNOWN_ARCHITECTURE = 'Unknown'
+
+  # Either the CPU architecture for native code or the programming language
+  # name for exploits that run code in the programming language's virtual
+  # machine.
   ARCHITECTURES = [
       'armbe',
       'armle',
@@ -28,7 +33,9 @@ class Mdm::Host < ActiveRecord::Base
       # To be used for compatability with 'X86_64'
       'x64',
       'x86',
-      'x86_64'
+      'x86_64',
+      '',
+      UNKNOWN_ARCHITECTURE
   ]
 
   # Fields searched for the search scope
@@ -309,6 +316,12 @@ class Mdm::Host < ActiveRecord::Base
   #
   #   @return [Integer]
 
+  # @!attribute [rw] detected_arch
+  #   The architecture of the host's CPU as detected by `Recog`. If {#arch} is
+  #   not {UNKNOWN_ARCHITECTURE}, this is undefined.
+  #
+  #   @return [String] a free-form string most likely from network data
+
   # @!attribute [rw] exploit_attempt_count
   #   Counter cache for {#exploit_attempts}.
   #
@@ -406,6 +419,12 @@ class Mdm::Host < ActiveRecord::Base
   #
   #   @return [Integer]
 
+  #
+  # Callbacks
+  #
+
+  before_validation :normalize_arch
+
   #
   # Nested Attributes
   # @note Must be declared after relations being referenced.
@@ -541,6 +560,17 @@ class Mdm::Host < ActiveRecord::Base
     !!self.virtual_host
   end
 
+  private
+
+  def normalize_arch
+    if attribute_present?(:arch) && !ARCHITECTURES.include?(self.arch)
+      self.detected_arch = arch
+      self.arch = UNKNOWN_ARCHITECTURE
+    end
+  end
+
+  public
+
   Metasploit::Concern.run(self)
 end
 

data/db/migrate/20140905031549_add_detected_arch_to_host.rb

@@ -0,0 +1,5 @@
+class AddDetectedArchToHost < ActiveRecord::Migration
+  def change
+    add_column :hosts, :detected_arch, :string, { :null => true }
+  end
+end

data/lib/metasploit_data_models/version.rb

@@ -6,7 +6,7 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 19
     # The patch number, scoped to the {MINOR} version number.
-    PATCH = 4
+    PATCH = 7
 
     # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the `PRERELEASE` in the
     # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/spec/app/models/mdm/host_spec.rb

@@ -25,7 +25,8 @@ describe Mdm::Host do
         'x64',
         'x86',
         'x86_64',
-        ''
+        '',
+        'Unknown',
     ]
   end
 
@@ -268,6 +269,15 @@ describe Mdm::Host do
         architectures.should include('x86')
         architectures.should include('x86_64')
       end
+
+      it 'should include blank string to indicate no detection has happened' do
+        architectures.should include('')
+      end
+
+      it 'should include "Unknown" for failed detection attempts' do
+        architectures.should include('Unknown')
+      end
+
     end
 
 		context 'SEARCH_FIELDS' do
@@ -382,7 +392,24 @@ describe Mdm::Host do
       end
     end
 
-    it { should ensure_inclusion_of(:arch).in_array(architectures).allow_blank }
+    context 'arch' do
+      let(:workspace) { FactoryGirl.create(:mdm_workspace) }
+      let(:address) { '192.168.0.1' }
+      let(:host) { FactoryGirl.create(:mdm_host, :address => address, :workspace => workspace, :arch => arch) }
+      context 'with an unknown architecture' do
+        let(:arch) { "asdfasdf" }
+        it 'should normalize to Unknown' do
+          host.should be_valid
+          host.arch.should be described_class::UNKNOWN_ARCHITECTURE
+        end
+      end
+      described_class::ARCHITECTURES.each do |arch|
+        context "with known architecture '#{arch}'" do
+          let(:arch) { arch }
+          it { should be_valid }
+        end
+      end
+    end
     it { should ensure_inclusion_of(:state).in_array(states).allow_nil }
     it { should validate_presence_of(:workspace) }
   end
@@ -819,4 +846,4 @@ describe Mdm::Host do
     end
 
   end
-end
+end

data/spec/dummy/db/structure.sql

@@ -310,7 +310,8 @@ CREATE TABLE hosts (
     service_count integer DEFAULT 0,
     host_detail_count integer DEFAULT 0,
     exploit_attempt_count integer DEFAULT 0,
-    cred_count integer DEFAULT 0
+    cred_count integer DEFAULT 0,
+    detected_arch character varying(255)
 );
 
 
@@ -2984,6 +2985,8 @@ INSERT INTO schema_migrations (version) VALUES ('20130604145732');
 
 INSERT INTO schema_migrations (version) VALUES ('20130717150737');
 
+INSERT INTO schema_migrations (version) VALUES ('20140905031549');
+
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.19.7
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -364,6 +364,7 @@ files:
 - db/migrate/20130531144949_making_host_tags_a_real_ar_model.rb
 - db/migrate/20130604145732_create_task_sessions.rb
 - db/migrate/20130717150737_remove_pname_validation.rb
+- db/migrate/20140905031549_add_detected_arch_to_host.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb