Merge pull request #28 from rapid7/master

asasasas

Author: Pedro Ribeiro

.github/label-actions.yml

@@ -99,7 +99,10 @@ pulls:
 
 issues:
   actions:
+    # Termux issues are usually user error. However they may describe issues within modules/framework itself,
+    # and for this reason they are not closed automatically.
     termux:
+      close: false
       comment: |
         Termux is not officially supported. https://github.com/rapid7/metasploit-framework/issues/11023
 
@@ -110,17 +113,40 @@ issues:
         * https://wiki.termux.com/wiki/Metasploit_Framework
         * termux/termux-packages/issues/715
 
+    # Used for issues that have had low effort applied, haven't followed the issue template, and there's not enough
+    # information to warrant staying open
     needs-issue-template:
       close: true
       comment: |
-        When creating an issue, please ensure that the default issue template has been updated with the required details.
+        When creating an issue, please ensure that the default issue template has been updated with the required details:
+        https://github.com/rapid7/metasploit-framework/issues/new/choose
 
         Closing this issue. If you believe this issue has been closed in error, please provide any relevant output and logs which may be useful in diagnosing the issue.
 
+    # Used for issues that have attempted to provide some details, but more information is required. This can be
+    # useful for older issues, or issues that have been raised without following the issue template fully and have
+    # useful comments present that stop it from being closed outright.
+    needs-more-information:
+      close: false
+      comment: |
+        It looks like there's not enough information to replicate this issue. Please provide any relevant output and logs which may be useful in diagnosing the issue.
+
+        This includes:
+
+        - All of the item points within this [tempate](https://github.com/rapid7/metasploit-framework/blob/master/.github/ISSUE_TEMPLATE/bug_report.md)
+        - The result of the `debug` command in your Metasploit console
+        - Screenshots showing the issues you're having
+        - Exact replication steps
+
+        The easier it is for us to replicate and debug an issue means there's a higher chance of this issue being resolved.
+
+    # Used for issues that have zero effort applied, potentially bot related
+    # https://github.com/rapid7/metasploit-framework/pull/13280#issuecomment-616842090
     potato:
       close: true
       comment: |
-        When creating an issue, please ensure that the default issue template has been updated with the required details.
+        When creating an issue, please ensure that the default issue template has been updated with the required details:
+        https://github.com/rapid7/metasploit-framework/issues/new/choose
 
         Closing this issue. If you believe this issue has been closed in error, please provide any relevant output and logs which may be useful in diagnosing the issue.
 

.github/workflows/verify.yml

@@ -67,6 +67,10 @@ jobs:
 
       - name: Checkout code
         uses: actions/checkout@v2
+        # Required to checkout HEAD^ for the msftidy script
+        # https://github.com/actions/checkout/tree/5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f#checkout-head
+        with:
+          fetch-depth: 2
 
       - uses: actions/setup-ruby@v1
         with:
@@ -90,7 +94,7 @@ jobs:
         env:
           BUNDLER_WITHOUT: coverage development pcap
 
-      - name: Setup mstidy
+      - name: Setup msftidy
         run: |
           ln -sf ../../tools/dev/pre-commit-hook.rb ./.git/hooks/post-merge
           ls -la ./.git/hooks

Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 #   spec.add_runtime_dependency '<name>', [<version requirements>]
 gemspec name: 'metasploit-framework'
 
-gem 'sqlite3', '~>1.3.0'
-
 # separate from test as simplecov is not run on travis-ci
 group :coverage do
   # code coverage for tests

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (6.0.28)
+    metasploit-framework (6.0.30)
       actionpack (~> 5.2.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -29,9 +29,9 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.27)
+      metasploit-payloads (= 2.0.28)
       metasploit_data_models
-      metasploit_payloads-mettle (= 1.0.5)
+      metasploit_payloads-mettle (= 1.0.6)
       mqtt
       msgpack
       nessus_rest
@@ -90,7 +90,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.0.3)
+    Ascii85 (1.1.0)
     actionpack (5.2.4.4)
       actionview (= 5.2.4.4)
       activesupport (= 5.2.4.4)
@@ -121,25 +121,25 @@ GEM
     arel (9.0.0)
     arel-helpers (2.12.0)
       activerecord (>= 3.1.0, < 7)
-    ast (2.4.1)
+    ast (2.4.2)
     aws-eventstream (1.1.0)
-    aws-partitions (1.417.0)
-    aws-sdk-core (3.111.2)
+    aws-partitions (1.422.0)
+    aws-sdk-core (3.112.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.220.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ec2 (1.223.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-iam (1.47.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.87.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.88.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
@@ -192,7 +192,7 @@ GEM
     hrr_rb_ssh (0.3.0.pre2)
       ed25519 (~> 1.2)
     http_parser.rb (0.6.0)
-    i18n (1.8.7)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     io-console (0.5.7)
     irb (1.3.2)
@@ -224,7 +224,7 @@ GEM
       activemodel (~> 5.2.2)
       activesupport (~> 5.2.2)
       railties (~> 5.2.2)
-    metasploit-payloads (2.0.27)
+    metasploit-payloads (2.0.28)
     metasploit_data_models (4.1.1)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -234,12 +234,12 @@ GEM
       pg
       railties (~> 5.2.2)
       recog (~> 2.0)
-    metasploit_payloads-mettle (1.0.5)
+    metasploit_payloads-mettle (1.0.6)
     method_source (1.0.0)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
     mqtt (0.5.0)
-    msgpack (1.3.3)
+    msgpack (1.4.2)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -265,8 +265,8 @@ GEM
       ast (~> 2.4.1)
     patch_finder (1.0.2)
     pcaprub (0.13.0)
-    pdf-reader (2.4.1)
-      Ascii85 (~> 1.0.0)
+    pdf-reader (2.4.2)
+      Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
@@ -279,7 +279,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    puma (5.1.1)
+    puma (5.2.0)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -315,7 +315,7 @@ GEM
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.14)
+    rex-core (0.1.15)
     rex-encoder (0.1.5)
       metasm
       rex-arch
@@ -365,7 +365,7 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-rails (4.0.2)
@@ -378,8 +378,8 @@ GEM
       rspec-support (~> 3.10)
     rspec-rerun (1.1.0)
       rspec (~> 3.0)
-    rspec-support (3.10.1)
-    rubocop (1.8.1)
+    rspec-support (3.10.2)
+    rubocop (1.9.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -388,7 +388,7 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-macho (2.5.0)
     ruby-prof (1.4.2)
@@ -401,7 +401,7 @@ GEM
       openssl-cmac
       rubyntlm
       windows_error
-    rubyntlm (0.6.2)
+    rubyntlm (0.6.3)
     rubyzip (2.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
@@ -417,7 +417,7 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.2)
     sshkey (2.0.0)
     swagger-blocks (3.0.0)
     thin (1.8.0)
@@ -431,7 +431,7 @@ GEM
     ttfunk (1.7.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2020.6)
+    tzinfo-data (1.2021.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -467,7 +467,6 @@ DEPENDENCIES
   rubocop
   ruby-prof
   simplecov (= 0.18.2)
-  sqlite3 (~> 1.3.0)
   swagger-blocks
   timecop
   yard