metasploit_data_models 0.16.7-java → 0.16.8-java

data/Gemfile

@@ -14,6 +14,8 @@ group :development, :test do
   # restrict from rails 4.0 as it requires protected_attributes gem and other changes for compatibility
   # @see https://www.pivotaltracker.com/story/show/52309083
   gem 'rails', '>= 3.2', '< 4.0.0'
+  # Used to create fake data
+  gem "faker"
 end
 
 group :test do

data/app/models/mdm/service.rb

@@ -131,6 +131,15 @@ class Mdm::Service < ActiveRecord::Base
           ])
   }
 
+  #
+  # Validations
+  #
+  validates :port,
+            numericality: {
+                only_integer: true
+            }
+  validates :proto, presence: true
+
   # {Mdm::Host::OperatingSystemNormalization#normalize_os Normalizes the host operating system} whenever {#info} has
   # changed.
   #

data/app/models/mdm/vuln.rb

@@ -128,6 +128,7 @@ class Mdm::Vuln < ActiveRecord::Base
   #
 
   validates :name, :presence => true
+  validates :name, length: {maximum: 255}
   validates_associated :refs
 
   private

data/lib/metasploit_data_models/version.rb

@@ -4,5 +4,5 @@ module MetasploitDataModels
   # metasploit-framework/data/sql/migrate to db/migrate in this project, not all models have specs that verify the
   # migrations (with have_db_column and have_db_index) and certain models may not be shared between metasploit-framework
   # and pro, so models may be removed in the future.  Because of the unstable API the version should remain below 1.0.0
-  VERSION = '0.16.7'
+  VERSION = '0.16.8'
 end

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

@@ -96,4 +96,45 @@ describe Mdm::Service do
     end
   end
 
+  context "validations" do
+    let(:mdm_service) do
+      mdm_service = FactoryGirl.build(:mdm_service)
+      mdm_service.valid?
+      mdm_service
+    end
+
+    context "invalid" do
+      it "should validate presence of :port" do
+        mdm_service.port = nil
+        mdm_service.valid?
+        mdm_service.errors[:port][0].should include "is not a number"
+      end
+
+      it "should validate presence of :proto" do
+        mdm_service.proto = nil
+        mdm_service.valid?
+        mdm_service.errors[:proto][0].should include "can't be blank"
+      end
+
+      it "should not allow non-numeric value for port" do
+        mdm_service.port = Faker::Lorem.characters(4)
+        mdm_service.valid?
+        mdm_service.errors[:port][0].should include "is not a number"
+      end
+    end
+
+    context "valid" do
+      it "should allow numeric value for port" do
+        mdm_service.port = Faker::Number.number(4)
+        mdm_service.valid?
+        mdm_service.should have(0).errors_on(:port)
+      end
+
+      it "should allow proto" do
+        mdm_service.proto = "tcp"
+        mdm_service.valid?
+        mdm_service.should have(0).errors_on(:proto)
+      end
+    end
+  end
 end

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

@@ -258,5 +258,18 @@ describe Mdm::Vuln do
 
   context 'validations' do
     it { should validate_presence_of :name }
+
+    context "invalid" do
+      let(:mdm_vuln) do
+        FactoryGirl.build(:mdm_vuln)
+      end
+
+      it "should not allow :name over 255 characters" do
+        str = Faker::Lorem.characters(256)
+        mdm_vuln.name = str
+        mdm_vuln.valid?
+        mdm_vuln.errors[:name][0].should include "is too long"
+      end
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.16.7
+  version: 0.16.8
 platform: java
 authors:
 - Samuel Huckins
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake