Unverified Commit 86d6b891 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

metasploit: bump dependencies, add versionTest (#359998)

parents 2e0989bc 5ce06a7a
Loading
Loading
Loading
Loading
+93 −92
Original line number Diff line number Diff line
@@ -120,79 +120,79 @@ GEM
    aarch64 (2.1.0)
      racc (~> 1.6)
    abbrev (0.1.2)
    actionpack (7.0.8.3)
      actionview (= 7.0.8.3)
      activesupport (= 7.0.8.3)
    actionpack (7.0.8.6)
      actionview (= 7.0.8.6)
      activesupport (= 7.0.8.6)
      rack (~> 2.0, >= 2.2.4)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
    actionview (7.0.8.3)
      activesupport (= 7.0.8.3)
    actionview (7.0.8.6)
      activesupport (= 7.0.8.6)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    activemodel (7.0.8.3)
      activesupport (= 7.0.8.3)
    activerecord (7.0.8.3)
      activemodel (= 7.0.8.3)
      activesupport (= 7.0.8.3)
    activesupport (7.0.8.3)
    activemodel (7.0.8.6)
      activesupport (= 7.0.8.6)
    activerecord (7.0.8.6)
      activemodel (= 7.0.8.6)
      activesupport (= 7.0.8.6)
    activesupport (7.0.8.6)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
    addressable (2.8.6)
      public_suffix (>= 2.0.2, < 6.0)
    addressable (2.8.7)
      public_suffix (>= 2.0.2, < 7.0)
    afm (0.2.2)
    arel-helpers (2.14.0)
    arel-helpers (2.15.0)
      activerecord (>= 3.1.0, < 8)
    aws-eventstream (1.3.0)
    aws-partitions (1.933.0)
    aws-sdk-core (3.196.1)
    aws-partitions (1.999.0)
    aws-sdk-core (3.211.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.8)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
      jmespath (~> 1, >= 1.6.1)
    aws-sdk-ec2 (1.457.1)
      aws-sdk-core (~> 3, >= 3.193.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ec2instanceconnect (1.40.0)
      aws-sdk-core (~> 3, >= 3.193.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-iam (1.98.0)
      aws-sdk-core (~> 3, >= 3.193.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-kms (1.82.0)
      aws-sdk-core (~> 3, >= 3.193.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-s3 (1.151.0)
      aws-sdk-core (~> 3, >= 3.194.0)
    aws-sdk-ec2 (1.486.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sigv4 (~> 1.5)
    aws-sdk-ec2instanceconnect (1.52.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sigv4 (~> 1.5)
    aws-sdk-iam (1.112.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sigv4 (~> 1.5)
    aws-sdk-kms (1.95.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sigv4 (~> 1.5)
    aws-sdk-s3 (1.169.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.8)
    aws-sdk-ssm (1.169.0)
      aws-sdk-core (~> 3, >= 3.193.0)
      aws-sigv4 (~> 1.1)
    aws-sigv4 (1.8.0)
      aws-sigv4 (~> 1.5)
    aws-sdk-ssm (1.183.0)
      aws-sdk-core (~> 3, >= 3.210.0)
      aws-sigv4 (~> 1.5)
    aws-sigv4 (1.10.1)
      aws-eventstream (~> 1, >= 1.0.2)
    base64 (0.2.0)
    bcrypt (3.1.20)
    bcrypt_pbkdf (1.1.1)
    bigdecimal (3.1.8)
    bindata (2.4.15)
    bootsnap (1.18.3)
    bootsnap (1.18.4)
      msgpack (~> 1.2)
    bson (5.0.0)
    builder (3.2.4)
    bson (5.0.1)
    builder (3.3.0)
    chunky_png (1.4.0)
    concurrent-ruby (1.2.3)
    concurrent-ruby (1.3.4)
    cookiejar (0.3.4)
    crass (1.0.6)
    csv (3.3.0)
    daemons (1.4.1)
    date (3.3.4)
    dnsruby (1.72.1)
    dnsruby (1.72.2)
      simpleidn (~> 0.2.1)
    domain_name (0.6.20240107)
    drb (2.2.1)
@@ -205,11 +205,12 @@ GEM
      em-socksify (>= 0.3)
      eventmachine (>= 1.0.3)
      http_parser.rb (>= 0.6.0)
    em-socksify (0.3.2)
    em-socksify (0.3.3)
      base64
      eventmachine (>= 1.0.0.beta.4)
    erubi (1.12.0)
    erubi (1.13.0)
    eventmachine (1.2.7)
    faker (3.3.1)
    faker (3.5.1)
      i18n (>= 1.8.11, < 2)
    faraday (2.7.11)
      base64
@@ -234,11 +235,11 @@ GEM
    hrr_rb_ssh-ed25519 (0.4.2)
      ed25519 (~> 1.2)
      hrr_rb_ssh (>= 0.4)
    http-cookie (1.0.5)
    http-cookie (1.0.7)
      domain_name (~> 0.5)
    http_parser.rb (0.8.0)
    httpclient (2.8.3)
    i18n (1.14.5)
    i18n (1.14.6)
      concurrent-ruby (~> 1.0)
    io-console (0.7.2)
    irb (1.7.4)
@@ -246,21 +247,21 @@ GEM
    jmespath (1.6.2)
    jsobfu (0.4.2)
      rkelly-remix
    json (2.7.2)
    json (2.7.5)
    little-plugger (1.1.4)
    logging (2.3.1)
    logging (2.4.0)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    loofah (2.22.0)
    loofah (2.23.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    metasm (1.0.5)
    metasploit-concern (5.0.2)
    metasploit-concern (5.0.3)
      activemodel (~> 7.0)
      activesupport (~> 7.0)
      railties (~> 7.0)
      zeitwerk
    metasploit-credential (6.0.9)
    metasploit-credential (6.0.11)
      metasploit-concern
      metasploit-model
      metasploit_data_models (>= 5.0.0)
@@ -275,7 +276,7 @@ GEM
      activesupport (~> 7.0)
      railties (~> 7.0)
    metasploit-payloads (2.0.187)
    metasploit_data_models (6.0.3)
    metasploit_data_models (6.0.5)
      activerecord (~> 7.0)
      activesupport (~> 7.0)
      arel-helpers
@@ -287,16 +288,16 @@ GEM
      webrick
    metasploit_payloads-mettle (1.0.35)
    method_source (1.1.0)
    mini_portile2 (2.8.6)
    minitest (5.23.1)
    mini_portile2 (2.8.7)
    minitest (5.25.1)
    mqtt (0.6.0)
    msgpack (1.6.1)
    multi_json (1.15.0)
    mustermann (3.0.0)
    mustermann (3.0.3)
      ruby2_keywords (~> 0.0.1)
    mutex_m (0.2.0)
    nessus_rest (0.1.6)
    net-imap (0.4.11)
    net-imap (0.5.0)
      date
      net-protocol
    net-ldap (0.19.0)
@@ -306,14 +307,14 @@ GEM
      net-ssh (>= 5.0.0, < 8.0.0)
    net-smtp (0.5.0)
      net-protocol
    net-ssh (7.2.3)
    net-ssh (7.3.0)
    network_interface (0.0.4)
    nexpose (7.3.0)
    nio4r (2.7.3)
    nokogiri (1.14.5)
      mini_portile2 (~> 2.8.0)
    nio4r (2.7.4)
    nokogiri (1.16.7)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
    nori (2.7.0)
    nori (2.7.1)
      bigdecimal
    octokit (4.25.1)
      faraday (>= 1, < 3)
@@ -324,19 +325,19 @@ GEM
    packetfu (2.0.0)
      pcaprub (~> 0.13.1)
    patch_finder (1.0.2)
    pcaprub (0.13.2)
    pcaprub (0.13.3)
    pdf-reader (2.12.0)
      Ascii85 (~> 1.0)
      afm (~> 0.2.1)
      hashery (~> 2.0)
      ruby-rc4
      ttfunk
    pg (1.5.6)
    public_suffix (5.0.5)
    puma (6.4.2)
    pg (1.5.9)
    public_suffix (6.0.1)
    puma (6.4.3)
      nio4r (~> 2.0)
    racc (1.8.0)
    rack (2.2.9)
    racc (1.8.1)
    rack (2.2.10)
    rack-protection (3.2.0)
      base64 (>= 0.1.0)
      rack (~> 2.2, >= 2.2.4)
@@ -349,9 +350,9 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
    railties (7.0.8.3)
      actionpack (= 7.0.8.3)
      activesupport (= 7.0.8.3)
    railties (7.0.8.6)
      actionpack (= 7.0.8.6)
      activesupport (= 7.0.8.6)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@@ -360,12 +361,12 @@ GEM
    rasn1 (0.13.0)
      strptime (~> 0.2.5)
    rb-readline (0.5.5)
    recog (3.1.5)
    recog (3.1.11)
      nokogiri
    redcarpet (3.6.0)
    reline (0.5.7)
    reline (0.5.10)
      io-console (~> 0.5)
    rex-arch (0.1.15)
    rex-arch (0.1.16)
      rex-text
    rex-bin_tools (0.1.9)
      metasm
@@ -378,7 +379,7 @@ GEM
      metasm
      rex-arch
      rex-text
    rex-exploitation (0.1.39)
    rex-exploitation (0.1.40)
      jsobfu
      metasm
      rex-arch
@@ -392,11 +393,11 @@ GEM
      rex-arch
    rex-ole (0.1.8)
      rex-text
    rex-powershell (0.1.99)
    rex-powershell (0.1.100)
      rex-random_identifier
      rex-text
      ruby-rc4
    rex-random_identifier (0.1.12)
    rex-random_identifier (0.1.13)
      rex-text
    rex-registry (0.1.5)
    rex-rop_builder (0.1.5)
@@ -410,23 +411,23 @@ GEM
      rex-socket
      rex-text
    rex-struct2 (0.1.4)
    rex-text (0.2.58)
    rex-text (0.2.59)
    rex-zip (0.1.5)
      rex-text
    rexml (3.2.8)
      strscan (>= 3.0.9)
    rexml (3.3.9)
    rkelly-remix (0.0.7)
    ruby-macho (4.0.1)
    ruby-macho (4.1.0)
    ruby-mysql (4.1.0)
    ruby-rc4 (0.1.5)
    ruby2_keywords (0.0.5)
    ruby_smb (3.3.8)
    ruby_smb (3.3.11)
      bindata (= 2.4.15)
      openssl-ccm
      openssl-cmac
      rubyntlm
      rubyntlm (>= 0.6.5)
      windows_error (>= 0.1.4)
    rubyntlm (0.6.3)
    rubyntlm (0.6.5)
      base64
    rubyzip (2.3.2)
    sawyer (0.9.2)
      addressable (>= 2.3.5)
@@ -441,45 +442,45 @@ GEM
      mini_portile2 (~> 2.8.0)
    sshkey (3.0.0)
    strptime (0.2.5)
    strscan (3.1.0)
    swagger-blocks (3.0.0)
    thin (1.8.2)
      daemons (~> 1.0, >= 1.0.9)
      eventmachine (~> 1.0, >= 1.0.4)
      rack (>= 1, < 3)
    thor (1.3.1)
    tilt (2.3.0)
    thor (1.3.2)
    tilt (2.4.0)
    timeout (0.4.1)
    ttfunk (1.8.0)
      bigdecimal (~> 3.1)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    tzinfo-data (1.2024.1)
    tzinfo-data (1.2024.2)
      tzinfo (>= 1.0.0)
    unix-crypt (1.3.1)
    warden (1.2.9)
      rack (>= 2.0.9)
    webrick (1.8.1)
    webrick (1.8.2)
    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    win32api (0.1.0)
    windows_error (0.1.5)
    winrm (2.3.6)
    winrm (2.3.9)
      builder (>= 2.1.2)
      erubi (~> 1.8)
      gssapi (~> 1.2)
      gyoku (~> 1.0)
      httpclient (~> 2.2, >= 2.2.0.2)
      logging (>= 1.6.1, < 3.0)
      nori (~> 2.0)
      nori (~> 2.0, >= 2.7.1)
      rexml (~> 3.0)
      rubyntlm (~> 0.6.0, >= 0.6.3)
    xdr (3.0.3)
      activemodel (>= 4.2, < 8.0)
      activesupport (>= 4.2, < 8.0)
    xmlrpc (0.3.3)
      webrick
    zeitwerk (2.6.14)
    zeitwerk (2.6.18)

PLATFORMS
  ruby
+28 −11
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, ruby
, bundlerEnv
, python3
{
  lib,
  stdenv,
  fetchFromGitHub,
  makeWrapper,
  ruby,
  bundlerEnv,
  testers,
  python3,
}:

let
@@ -13,14 +15,15 @@ let
    name = "metasploit-bundler-env";
    gemdir = ./.;
  };
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation (finalAttrs: {
  pname = "metasploit-framework";
  version = "6.4.37";

  src = fetchFromGitHub {
    owner = "rapid7";
    repo = "metasploit-framework";
    rev = "refs/tags/${version}";
    rev = "refs/tags/${finalAttrs.version}";
    hash = "sha256-/c0F/5bbuQYkNB2tzjK2NGoTr3OD4fAUUEjiJVybKFM=";
  };

@@ -35,6 +38,8 @@ in stdenv.mkDerivation rec {
  dontPatchELF = true; # stay away from exploit executables

  installPhase = ''
    runHook preInstall

    mkdir -p $out/{bin,share/msf}

    cp -r * $out/share/msf
@@ -54,8 +59,17 @@ in stdenv.mkDerivation rec {

    makeWrapper ${env}/bin/bundle $out/bin/msf-pattern_offset \
      --add-flags "exec ${ruby}/bin/ruby $out/share/msf/tools/exploit/pattern_offset.rb"

    runHook postInstall
  '';

  passthru.tests = {
    msfconsole-version = testers.testVersion {
      package = finalAttrs.finalPackage;
      command = "HOME=/tmp msfconsole -q -x 'version;exit'";
    };
  };

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

@@ -64,7 +78,10 @@ in stdenv.mkDerivation rec {
    homepage = "https://docs.metasploit.com/";
    platforms = platforms.unix;
    license = licenses.bsd3;
    maintainers = with maintainers; [ fab makefu ];
    maintainers = with maintainers; [
      fab
      makefu
    ];
    mainProgram = "msfconsole";
  };
}
})
+212 −138

File changed.

Preview size limit exceeded, changes collapsed.