metasploit_data_models 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e3831b7d870ff2f6137158b6b3834424a60d6e6
-  data.tar.gz: 203a3c40853109a9c1f2b66c45d278c1eb42345b
+  metadata.gz: d898095525d403883a5352fb14f2efff85903028
+  data.tar.gz: 434cff7ec8f7c9ee4193113c0a060bb3d4203679
 SHA512:
-  metadata.gz: 70986e57992f2d364bb3fc1ec81267f889529877f4a2795245af315ad3d12b339a353fab8d81e1f96104af9c6581037babbe50874f33289aee936e5b79b6a54d
-  data.tar.gz: b99e4c92772eaf4223d2a6e68c0693a675d99268382287a8eeaad21c818361b3e13b4d5421793abbd19badf589378a0c26871f629f815c6e4733dac3abdf2675
+  metadata.gz: e64b1d46d9ad49a17d9a54c2c0bf7f9f59f3a5e24f78792e35fe6d4c7c2f7ba1445b3a8672c10b19713f121705d3d4c04dbf5ccf17ee724be7fabc86a02292f3
+  data.tar.gz: e0740f66d27b750de959950aa422864c81d64f28aac7ec8b3d0cd13db31bb7e378e70d926b4c9ad6d1c8c811cf7215fe12ba00b317df2aa58df4026e77f70a3c

data/app/models/mdm/host.rb

@@ -61,6 +61,21 @@ class Mdm::Host < ActiveRecord::Base
       'unknown'
   ]
 
+  # Valid MAC address value
+  #hyphen-separated: 1a-2B-3c-4D-5e-6f
+  MAC_ADDRESS_HYPHEN_REGEX = /\A(?:[A-F0-9]{2}[-]){5}[A-F0-9]{2}\z/i
+
+  #colon-separated:  1a:2B:3c:4D:5e:6f
+  MAC_ADDRESS_COLON_REGEX  = /\A(?:[A-F0-9]{2}[:]){5}[A-F0-9]{2}\z/i
+
+  #XXX for now, allow en empty MAC so as not to break things that exist with
+  # empty MACs.
+  MAC_ADDRESS_EMPTY_REGEX  = /\A\z/
+
+  # 6-tuple of hex (case-insensitive) doublets (or empty)
+  MAC_ADDRESS_REGEX = Regexp.union(MAC_ADDRESS_HYPHEN_REGEX, MAC_ADDRESS_COLON_REGEX,
+          MAC_ADDRESS_EMPTY_REGEX)
+
   #
   # Aggregations
   #
@@ -474,6 +489,13 @@ class Mdm::Host < ActiveRecord::Base
             :inclusion => {
                 :in => ARCHITECTURES
             }
+
+  validates :mac,
+            :format => {
+                :with => MAC_ADDRESS_REGEX,
+                :message => 'must be a valid MAC address'
+            }
+
   validates :state,
             :allow_nil => true,
             :inclusion => {

data/lib/metasploit_data_models/version.rb

@@ -1,6 +1,6 @@
 module MetasploitDataModels
   # VERSION is managed by GemRelease
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   # @return [String]
   #

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

@@ -55,6 +55,29 @@ RSpec.describe Mdm::Host, type: :model do
     it { is_expected.to eq(0.84) }
   end
 
+  describe 'MAC address format validation' do
+    context 'when colon delimited' do
+      it 'is valid' do
+        host = FactoryGirl.build(:mdm_host, mac: '1a:2B:3c:4D:5e:6f')
+        expect(host).to be_valid
+      end
+    end
+
+    context 'when hyphen delimited' do
+      it 'is valid' do
+        host = FactoryGirl.build(:mdm_host, mac: '1a-2B-3c-4D-5e-6f')
+        expect(host).to be_valid
+      end
+    end
+
+    context 'when mixed colon-hyphen delimited ' do
+      it 'is invalid' do
+        host = FactoryGirl.build(:mdm_host, mac: '1a:2B:3c-4D:5e:6f')
+        expect(host).to be_invalid
+      end
+    end
+  end
+
   context '#destroy' do
     it 'should successfully destroy the object and the dependent objects' do
       host = FactoryGirl.create(:mdm_host)

data/spec/factories/mdm/hosts.rb

@@ -10,13 +10,13 @@ FactoryGirl.define do
     #
     address { generate :mdm_ipv4_address }
     name { generate :mdm_host_name }
+    mac { generate :mdm_host_mac }
 
     factory :full_mdm_host do
       arch { generate :mdm_host_arch }
       comm { generate :mdm_host_comm }
       comments { generate :mdm_host_comments }
       info { generate :mdm_host_info }
-      mac { generate :mdm_host_mac }
       os_flavor { generate :mdm_host_os_flavor }
       os_lang { generate :mdm_host_os_lang }
       os_name { generate :mdm_host_os_name }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Samuel Huckins
@@ -88,7 +88,7 @@ cert_chain:
   2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
   QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
   -----END CERTIFICATE-----
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard