Merge branch 'beefproject:master' into ntfy-extension

Gemfile

@@ -16,7 +16,7 @@ gem 'rack-protection', '~> 3.0.5'
 gem 'em-websocket', '~> 0.5.3' # WebSocket support
 gem 'uglifier', '~> 4.2'
 gem 'mime-types', '~> 3.4', '>= 3.4.1'
-gem 'execjs', '~> 2.8', '>= 2.8.1'
+gem 'execjs', '~> 2.9'
 gem 'ansi', '~> 1.5'
 gem 'term-ansicolor', :require => 'term/ansicolor'
 gem 'rubyzip', '~> 2.3'
@@ -37,7 +37,7 @@ gem 'erubis', '~> 2.7'
 # Metasploit Integration extension
 group :ext_msf do
   gem 'msfrpc-client', '~> 1.1', '>= 1.1.2'
-  gem 'xmlrpc', '~> 0.3.2'
+  gem 'xmlrpc', '~> 0.3.3'
 end
 
 # Notifications extension

Gemfile.lock

@@ -53,7 +53,7 @@ GEM
     espeak-ruby (1.1.0)
     event_emitter (0.2.6)
     eventmachine (1.2.7)
-    execjs (2.8.1)
+    execjs (2.9.1)
     fiber-local (1.0.0)
     geckodriver-helper (0.24.0)
       archive-zip (~> 0.7)
@@ -89,7 +89,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.8)
@@ -207,7 +207,7 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     tilt (2.1.0)
-    timeout (0.3.2)
+    timeout (0.4.0)
     timers (4.3.5)
     tins (1.32.1)
       sync
@@ -243,7 +243,7 @@ DEPENDENCIES
   erubis (~> 2.7)
   espeak-ruby (~> 1.1.0)
   eventmachine (~> 1.2, >= 1.2.7)
-  execjs (~> 2.8, >= 2.8.1)
+  execjs (~> 2.9)
   geckodriver-helper (~> 0.24.0)
   irb (~> 1.8)
   json

install

@@ -89,7 +89,7 @@ install_linux() {
 		DISTRO_ID=$(grep ID= /etc/os-release | grep -v "BUILD" | grep -v "IMAGE" | cut -d= -f2-)
 		if [ "${DISTRO_ID}" = 'kali' ]; then
 			Distro='Kali'
-		elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ]; then
+		elif [ "${DISTRO_ID}" = 'arch' ] || [ "${DISTRO_ID}" = 'garuda' ] || [ "${DISTRO_ID}" = 'artix' ] || [ "${DISTRO_ID}" = 'manjaro' ] || [ "${DISTRO_ID}" = 'blackarch' ] || [ "${DISTRO_ID}" = 'arcolinux' ] || [ "${DISTRO_ID}" = 'endeavouros' ]; then
 			Distro='Arch'
 		elif grep -Eqi '^ID.*suse' /etc/os-release; then
 			Distro='SuSE'

spec/beef/extensions/websocket_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe 'BeEF Extension WebSockets' do
     expect(wss).to be_a_kind_of(BeEF::Core::Websocket::Websocket)
   end
 
-  it 'confirms that a websocket client can connect to the BeEF Websocket Server' do
+  xit 'confirms that a websocket client can connect to the BeEF Websocket Server' do
     sleep(3)
     client = WebSocket::Client::Simple.connect "ws://127.0.0.1:#{@port}"
     sleep(1)