metasploit-model 4.0.2 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c118c000ede3f45f85912d2d16e03d9e978923a26b2f8ddd01bdc35dc33c011c
-  data.tar.gz: 322378979ef936415d463a869f47e0d0f50a48e4226d141c482d9a48d2faec0b
+  metadata.gz: 7b31bc4658a919c1518edede3a55ce7a248725a6092bbfc522b1f75d998b1cf5
+  data.tar.gz: ac9b1b17fd9099df515f4dfb214ba91cd4edbe45e93d012cfa5a55df0d8b129d
 SHA512:
-  metadata.gz: afc48d681d3317778a3b37ee3a7bad55ff6008cc9203777a861c853e975f5846e43e06521b95b179fcbfaf37b71ed3eaeca1ea988ea861a6fd587805143c4844
-  data.tar.gz: 0f288c14e55084e02d7d65249a61c047fca8ec55a07468f4245988c94a4e800722786b3e27544955267549028fd310d32ad1af3ffe10563678e19793799c74e9
+  metadata.gz: 3d9fdc24efd0c5975d72d63c5d08b6475cf714d637065eff3bb069d7576ad87b0bc7e1323669b7cf367c47aa534d66b6fe6fa6b8c4ef892a51168ec8f76b755d
+  data.tar.gz: 44780308cc675e3f0d615e3b230df4d3c40af27132deb4d74353785632fd702b6f4559e899a04ae7404c41204a1dbef45b2029e0d230eb42d98b67c156422671

data/.github/workflows/verify.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 40
 
     services:
@@ -30,10 +30,10 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
-          - 2.5
           - 2.6
           - 2.7
           - 3.0
+          - 3.1
 
     env:
       RAILS_ENV: test
@@ -46,24 +46,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - uses: actions/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup bundler
-        run: |
-          gem install bundler
-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: Test
         run: |
-          gem install bundler
           cp spec/dummy/config/database.yml.github_actions spec/dummy/config/database.yml
-          bundle install
           bundle exec rake --version
           bundle exec rake db:test:prepare
 

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in metasploit-model.gemspec
 gemspec
 
+group :development do
+  gem 'pry-byebug'
+end
+
 # used by dummy application
 group :development, :test do
   # supplies factories for producing model instance for specs

data/README.md

@@ -22,9 +22,26 @@ Or install it yourself as:
 
     $ gem install metasploit-model
 
-## Usage
+## Running tests
 
-TODO: Write usage instructions here
+Copy the database configuration and modify as appropriate:
+
+```
+cp spec/dummy/config/database.yml.github_actions spec/dummy/config/database.yml
+```
+
+Set up the database:
+
+```
+bundle exec rake db:test:prepare
+bundle exec rake db:migrate RAILS_ENV=test
+```
+
+Run the test suite:
+
+```
+bundle exec rspec
+```
 
 ## Contributing
 

data/lib/metasploit/model/login/status.rb

@@ -36,6 +36,10 @@ module Metasploit::Model::Login::Status
   # When `Metasploit::Credential::Login#service` reports that `Metasploit::Credential::Login#core` are not correct.
   INCORRECT = 'Incorrect'
 
+  # When `Metasploit::Credential::Login#service` reports that `Metasploit::Credential::Login#core` has a public part
+  # that is verified as being invalid.
+  INVALID_PUBLIC_PART = 'Invalid Public Part'
+
   # When `Metasploit::Credential::Login#service` reports that account tied to `Metasploit::Credential::Login#core`
   # has had too many incorrect credentials attempted for authorization, so it is locked out to prevent bruteforce
   # guessing
@@ -59,10 +63,11 @@ module Metasploit::Model::Login::Status
       DENIED_ACCESS,
       DISABLED,
       INCORRECT,
+      INVALID_PUBLIC_PART,
       LOCKED_OUT,
       NO_AUTH_REQUIRED,
       SUCCESSFUL,
       UNABLE_TO_CONNECT,
       UNTRIED
   ]
-end
+end

data/lib/metasploit/model/version.rb

@@ -1,7 +1,7 @@
 module Metasploit
   module Model
     # VERSION is managed by GemRelease
-    VERSION = '4.0.2'
+    VERSION = '4.0.5'
   
     # @return [String]
     #

data/spec/support/shared/examples/metasploit/model/search/operator/help.rb

@@ -32,14 +32,14 @@ RSpec.shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
         backend.send(:init_translations)
       end
 
-      translations_by_locale = I18n.backend.send(:translations)
+      translations_by_locale = I18n.backend.send(:translations).deep_dup
       english_translations = translations_by_locale.fetch(:en)
       metasploit_translations = english_translations.fetch(:metasploit)
-      @metasploit_model_translations = metasploit_translations.fetch(:model)
+      metasploit_model_translations = metasploit_translations.fetch(:model)
 
-      expect(@metasploit_model_translations).not_to have_key(:ancestors)
+      expect(metasploit_model_translations).not_to have_key(:ancestors)
 
-      @metasploit_model_translations[:ancestors] = {
+      metasploit_model_translations[:ancestors] = {
           klass.model_name.i18n_key => {
               search: {
                   operator: {
@@ -52,10 +52,8 @@ RSpec.shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
               }
           }
       }
-    end
 
-    after(:example) do
-      @metasploit_model_translations.delete(:ancestors)
+      allow(I18n.backend).to receive(:translations).and_return(translations_by_locale)
     end
 
     it 'should use #klass #i18n_scope to lookup translations specific to the #klass or one of its ancestors' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.5
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard