Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 81fb32ae0b43
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60a550e102eb
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Oct 25, 2020

  1. metasploit: 5.0.90 -> 6.0.12

    @makefu
    makefu committed Oct 25, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    raboof Arnout Engelen
    GPG key ID: 061107B0F74A6DAA
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c79b3d View commit details

  2. metasploit: add passthru.updateScript

    @makefu
    makefu committed Oct 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f3fa188 View commit details

Commits on Nov 27, 2020

  1. Merge pull request #101687 from makefu/pkgs/metasploit/6.0.12

    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020
    Copy the full SHA
    60a550e View commit details
2 changes: 1 addition & 1 deletion pkgs/tools/security/metasploit/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"

gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.90"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12"
257 changes: 134 additions & 123 deletions pkgs/tools/security/metasploit/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 592eedc5584953fb94b01a9aae48ec04d2cf153a
ref: refs/tags/5.0.90
revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58
ref: refs/tags/6.0.12
specs:
metasploit-framework (5.0.90)
actionpack (~> 4.2.6)
activerecord (~> 4.2.6)
activesupport (~> 4.2.6)
metasploit-framework (6.0.12)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
aws-sdk-ec2
aws-sdk-iam
aws-sdk-s3
bcrypt (= 3.1.12)
bcrypt
bcrypt_pbkdf
bit-struct
bson
@@ -24,15 +24,16 @@ GIT
faye-websocket
filesize
hrr_rb_ssh (= 0.3.0.pre2)
irb
jsobfu
json
metasm
metasploit-concern (~> 2.0.0)
metasploit-credential (~> 3.0.0)
metasploit-model (~> 2.0.4)
metasploit-payloads (= 1.4.2)
metasploit_data_models (~> 3.0.10)
metasploit_payloads-mettle (= 0.5.21)
metasploit-concern
metasploit-credential
metasploit-model
metasploit-payloads (= 2.0.22)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.2)
mqtt
msgpack
nessus_rest
@@ -48,7 +49,7 @@ GIT
patch_finder
pcaprub
pdf-reader
pg (~> 0.20)
pg
railties
rb-readline
recog
@@ -72,7 +73,7 @@ GIT
rex-text
rex-zip
ruby-macho
ruby_smb
ruby_smb (~> 2.0)
rubyntlm
rubyzip
sinatra
@@ -90,109 +91,112 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.0.3)
actionpack (4.2.11.3)
actionview (= 4.2.11.3)
activesupport (= 4.2.11.3)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (5.2.4.4)
actionview (= 5.2.4.4)
activesupport (= 5.2.4.4)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.11.3)
activesupport (= 4.2.11.3)
actionview (5.2.4.4)
activesupport (= 5.2.4.4)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (4.2.11.3)
activesupport (= 4.2.11.3)
builder (~> 3.1)
activerecord (4.2.11.3)
activemodel (= 4.2.11.3)
activesupport (= 4.2.11.3)
arel (~> 6.0)
activesupport (4.2.11.3)
i18n (~> 0.7)
activemodel (5.2.4.4)
activesupport (= 5.2.4.4)
activerecord (5.2.4.4)
activemodel (= 5.2.4.4)
activesupport (= 5.2.4.4)
arel (>= 9.0)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
arel (6.0.4)
arel (9.0.0)
arel-helpers (2.11.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.0)
aws-partitions (1.319.0)
aws-sdk-core (3.96.1)
aws-partitions (1.385.0)
aws-sdk-core (3.109.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.162.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sdk-ec2 (1.202.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.37.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sdk-iam (1.46.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.31.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sdk-kms (1.39.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.66.0)
aws-sdk-core (~> 3, >= 3.96.1)
aws-sdk-s3 (1.83.1)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.3)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt (3.1.12)
aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bcrypt_pbkdf (1.0.1)
bindata (2.4.7)
bindata (2.4.8)
bit-struct (0.16)
bson (4.8.2)
bson (4.11.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)
crass (1.0.6)
daemons (1.3.1)
dnsruby (1.61.3)
addressable (~> 2.5)
dnsruby (1.61.4)
simpleidn (~> 0.1)
ed25519 (1.2.4)
em-http-request (1.1.5)
em-http-request (1.1.7)
addressable (>= 2.3.4)
cookiejar (!= 0.3.1)
em-socksify (>= 0.3)
eventmachine (>= 1.0.3)
http_parser.rb (>= 0.6.0)
em-socksify (0.3.2)
eventmachine (>= 1.0.0.beta.4)
erubis (2.7.0)
erubi (1.9.0)
eventmachine (1.2.7)
faker (2.2.1)
i18n (>= 0.8)
faraday (1.0.1)
faker (2.14.0)
i18n (>= 1.6, < 2)
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
faye-websocket (0.10.9)
ruby2_keywords
faye-websocket (0.11.0)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
filesize (0.2.0)
hashery (2.1.2)
hrr_rb_ssh (0.3.0.pre2)
ed25519 (~> 1.2)
http_parser.rb (0.6.0)
i18n (0.9.5)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
io-console (0.5.6)
irb (1.2.7)
reline (>= 0.1.5)
jmespath (1.4.0)
jsobfu (0.4.2)
rkelly-remix
json (2.3.0)
loofah (2.5.0)
json (2.3.1)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
metasm (1.0.4)
metasploit-concern (2.0.5)
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
railties (~> 4.2.6)
metasploit-credential (3.0.4)
metasploit-concern (3.0.0)
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
metasploit-credential (4.0.2)
metasploit-concern
metasploit-model
metasploit_data_models (>= 3.0.0)
@@ -202,79 +206,77 @@ GEM
rex-socket
rubyntlm
rubyzip
metasploit-model (2.0.4)
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
railties (~> 4.2.6)
metasploit-payloads (1.4.2)
metasploit_data_models (3.0.10)
activerecord (~> 4.2.6)
activesupport (~> 4.2.6)
metasploit-model (3.1.2)
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
metasploit-payloads (2.0.22)
metasploit_data_models (4.1.0)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
arel-helpers
metasploit-concern
metasploit-model
metasploit-model (>= 3.1)
pg
postgres_ext
railties (~> 4.2.6)
railties (~> 5.2.2)
recog (~> 2.0)
metasploit_payloads-mettle (0.5.21)
metasploit_payloads-mettle (1.0.2)
method_source (1.0.0)
mini_portile2 (2.4.0)
minitest (5.14.1)
minitest (5.14.2)
mqtt (0.5.0)
msgpack (1.3.3)
multipart-post (2.1.1)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nessus_rest (0.1.6)
net-ldap (0.16.2)
net-ssh (6.0.2)
net-ldap (0.16.3)
net-ssh (6.1.0)
network_interface (0.0.2)
nexpose (7.2.1)
nokogiri (1.10.9)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
octokit (4.18.0)
octokit (4.19.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
openssl-ccm (1.2.2)
openssl-cmac (2.0.1)
openvas-omp (0.0.4)
packetfu (1.1.13)
pcaprub
patch_finder (1.0.2)
pcaprub (0.13.0)
pdf-reader (2.4.0)
pdf-reader (2.4.1)
Ascii85 (~> 1.0.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (0.21.0)
pg_array_parser (0.0.9)
postgres_ext (3.0.1)
activerecord (~> 4.0)
arel (>= 4.0.1)
pg_array_parser (~> 0.0.9)
public_suffix (4.0.5)
rack (1.6.13)
rack-protection (1.5.5)
pg (1.2.3)
public_suffix (4.0.6)
rack (2.2.3)
rack-protection (2.1.0)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (4.2.11.3)
actionpack (= 4.2.11.3)
activesupport (= 4.2.11.3)
railties (5.2.4.4)
actionpack (= 5.2.4.4)
activesupport (= 5.2.4.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.19.0, < 2.0)
rake (13.0.1)
rb-readline (0.5.5)
recog (2.3.7)
recog (2.3.15)
nokogiri
redcarpet (3.5.0)
reline (0.1.6)
io-console (~> 0.5)
rex-arch (0.1.13)
rex-text
rex-bin_tools (0.1.6)
@@ -312,32 +314,38 @@ GEM
metasm
rex-core
rex-text
rex-socket (0.1.23)
rex-socket (0.1.24)
rex-core
rex-sslscan (0.1.5)
rex-core
rex-socket
rex-text
rex-struct2 (0.1.2)
rex-text (0.2.26)
rex-text (0.2.28)
rex-zip (0.1.3)
rex-text
rkelly-remix (0.0.7)
ruby-macho (2.2.0)
ruby-macho (2.3.0)
ruby-rc4 (0.1.5)
ruby_smb (1.1.0)
ruby2_keywords (0.0.2)
ruby_smb (2.0.6)
bindata
openssl-ccm
openssl-cmac
rubyntlm
windows_error
rubyntlm (0.6.2)
rubyzip (2.3.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
simpleidn (0.1.1)
unf (~> 0.1.4)
sinatra (2.1.0)
mustermann (~> 1.0)
rack (~> 2.2)
rack-protection (= 2.1.0)
tilt (~> 2.0)
sqlite3 (1.4.2)
sshkey (2.0.0)
thin (1.7.2)
@@ -350,17 +358,20 @@ GEM
ttfunk (1.6.2.1)
tzinfo (1.2.7)
thread_safe (~> 0.1)
tzinfo-data (1.2020.1)
tzinfo-data (1.2020.4)
tzinfo (>= 1.0.0)
warden (1.2.7)
rack (>= 1.0)
websocket-driver (0.7.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
warden (1.2.9)
rack (>= 2.0.9)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
windows_error (0.1.2)
xdr (2.0.0)
activemodel (>= 4.2.7)
activesupport (>= 4.2.7)
xdr (3.0.2)
activemodel (>= 4.2, < 7.0)
activesupport (>= 4.2, < 7.0)
xmlrpc (0.3.0)

PLATFORMS
16 changes: 5 additions & 11 deletions pkgs/tools/security/metasploit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }:

# Maintainer notes for updating:
# 1. increment version number in expression and in Gemfile
# 2. run $ nix-shell --command "bundler install && bundix"
# in metasploit in nixpkgs
# 3. run $ sed -i '/[ ]*dependencies =/d' gemset.nix
# 4. run $ nix-build -A metasploit ../../../../
# 5. update sha256sum in expression
# 6. run step 3 again

let
env = bundlerEnv {
inherit ruby;
@@ -17,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "5.0.90";
version = "6.0.12";

src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss";
sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
};

buildInputs = [ makeWrapper ];
@@ -45,6 +36,9 @@ in stdenv.mkDerivation rec {
'';

# run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit
passthru.updateScript = ./update.sh;

meta = with stdenv.lib; {
description = "Metasploit Framework - a collection of exploits";
homepage = "https://github.com/rapid7/metasploit-framework/wiki";
358 changes: 214 additions & 144 deletions pkgs/tools/security/metasploit/gemset.nix
View file

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions pkgs/tools/security/metasploit/update.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl bundix git libiconv libpcap libxml2 libxslt pkg-config postgresql ruby.devEnv sqlite xmlstarlet nix-update

set -eu -o pipefail
cd "$(dirname "$(readlink -f "$0")")"

latest=$(curl https://github.com/rapid7/metasploit-framework/releases.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1)
echo "Updating metasploit to $latest"

sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile

bundler install
bundix
sed -i '/[ ]*dependencies =/d' gemset.nix

cd "../../../../"
nix-update metasploit --version "$latest"