metasploit_data_models 0.19.4-java → 0.19.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6d17408ff12f5c425ec48ec37f3aa032c60e92
-  data.tar.gz: 8a444cb3f6618b2783a7ded1d69d52cb47a74588
+  metadata.gz: 1e158d00aaeb03ffb1a8d5ca4aeafc94125f602b
+  data.tar.gz: 96880062623265e7dc16102766156f4bb04cc891
 SHA512:
-  metadata.gz: 2182b0b0fa86f7c2f2bc5e5055b2da9cf6954799762e6e187daee9982d9657863b5286c3c3830d2a745876da22d605bdd6422485f4f9c1c7113d8ce702bf649f
-  data.tar.gz: d6fc50178926110ad3fd954c6871e691248ec63798f4205c7bcd14e3f00bfa14157f1d0a8fb235740285f54c4df9d295e24263e779c2db56d5f0671651de3c5e
+  metadata.gz: f1a3bfeca77e9da5544e8a16d9d8587ffdc2358969083050b702504a1efbd5964f4629f486e86e9db95da25f3e940b910bc06c6afb931ac264f2ccdb40134c97
+  data.tar.gz: c6214b7c6e8d58c427db6ef6945d5521d69fe4e243e24643e9bbe7d906d1f9430052ae0e5c039cf0d0742bd8eaf688b8d7e3e4c6bf1f42975fb446b6916cbc45

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: java
 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
@@ -377,6 +377,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
@@ -584,7 +585,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Database code for MSF and Metasploit Pro