Merge branch 'master' into bug/MSP-10963/realm-uniqueness

MSP-10963 Conflicts: lib/metasploit/credential/version.rb
rapid7 · Aug 1, 2014 · 4f88d5b · 4f88d5b
2 parents 39e14d2 + 7fe30b3
commit 4f88d5b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/lib/metasploit/credential/creation.rb b/lib/metasploit/credential/creation.rb
@@ -404,7 +404,8 @@ def create_credential_service(opts={})
         host_object    = Mdm::Host.where(address: address, workspace_id: workspace_id).first_or_create
         service_object = Mdm::Service.where(host_id: host_object.id, port: port, proto: protocol).first_or_initialize
 
-        service_object.name = service_name
+        service_object.name  = service_name
+        service_object.state = "open"
         service_object.save!
 
         service_object

diff --git a/lib/metasploit/credential/version.rb b/lib/metasploit/credential/version.rb
@@ -7,7 +7,7 @@ module Version
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 8
       # The patch number, scoped to the {MINOR} version number.
-      PATCH = 4
+      PATCH = 5
       # The pre-release version, scoped to the {MINOR} version number.
       PRERELEASE = 'realm-uniqueness'
 

diff --git a/spec/lib/metasploit/credential/creation_spec.rb b/spec/lib/metasploit/credential/creation_spec.rb
@@ -83,6 +83,23 @@
     end
   end
 
+  context "#create_credential_service" do
+    let(:opts) do
+      {
+        address: '192.168.172.3',
+        port: 445,
+        service_name: 'smb',
+        protocol: 'tcp',
+        workspace_id: workspace.id
+      }
+    end
+
+    it 'should create an Mdm::Service in state "open"' do
+      service = test_object.create_credential_service opts
+      service.state.should == "open"
+    end
+  end
+
   context '#create_credential_origin_service' do
     it 'creates a Metasploit::Credential::Origin object' do
       opts = {