updates ruby to a modern version

Author: BuffaloWill

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.3
+FROM ruby:2.6.3
 MAINTAINER Serpico
 
 ENV SRP_ROOT /Serpico

Gemfile

@@ -1,18 +1,18 @@
 source 'https://rubygems.org'
 
-ruby "2.3.3"
+ruby "2.6.3"
 
 gem 'sinatra'
 gem 'haml'
 gem 'rubyzip'
 gem 'net-ldap', '~> 0.11'
 gem 'json'
-gem 'nokogiri' , '1.8.1'
+gem 'nokogiri'
 gem 'do_sqlite3', '0.10.17'
 gem 'data_mapper', '1.2.0'
 gem 'dm-sqlite-adapter', '1.2.0'
 gem 'msfrpc-client', '1.1.1'
 gem 'odle'
-gem 'rack', '2.0.3'
+gem 'rack'
 
 

Gemfile.lock

@@ -64,20 +64,20 @@ GEM
     json (1.8.6)
     json_pure (1.8.6)
     metasm (1.0.4)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     msfrpc-client (1.1.1)
       msgpack (~> 1)
       rex (~> 2)
-    msgpack (1.3.1)
+    msgpack (1.3.3)
     multi_json (1.14.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     net-ldap (0.16.2)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
     odle (0.0.8)
     public_suffix (4.0.3)
-    rack (2.0.3)
+    rack (2.1.2)
     rack-protection (2.0.8.1)
       rack
     rb-readline (0.5.5)
@@ -91,8 +91,8 @@ GEM
       robots
     rkelly-remix (0.0.7)
     robots (0.10.1)
-    ruby2_keywords (0.0.1)
-    rubyzip (1.3.0)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.2.0)
     sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
@@ -114,14 +114,14 @@ DEPENDENCIES
   json
   msfrpc-client (= 1.1.1)
   net-ldap (~> 0.11)
-  nokogiri (= 1.8.1)
+  nokogiri
   odle
-  rack (= 2.0.3)
+  rack
   rubyzip
   sinatra
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.6.3p62
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

scripts/serpicoInstall.sh

@@ -28,10 +28,10 @@ apt-get install -y libssl1.0-dev
 rvm get master
 
 # Install and use Ruby 2.1.5, the version used by Serpico
-rvm install 2.3.3
+rvm install 2.6.3
 
 source /etc/profile.d/rvm.sh
-rvm use 2.3.3
+rvm use 2.6.3
 
 # Serpico Dependencies
 apt-get -y install libsqlite3-dev libxslt-dev libxml2-dev zlib1g-dev gcc
@@ -42,9 +42,6 @@ cd /opt/Serpico-Dev/
 
 gem install bundler
 
-# The Gemfile has an issue during installation, run the below to preemptively resolve it
-gem install msfrpc-client -v 1.0.3
-
 bundle install
 
 # Initialize the findings database

views/import_scan_data.haml

@@ -14,7 +14,7 @@
 
 %form{ :method => "post", :action => "/report/#{@report.id}/import_scan_data", :enctype => "multipart/form-data" }
   .form-group.row
-    %label.col-lg-2.col-form-label{ :for => "auth_type" } Authorization Type
+    %label.col-lg-2.col-form-label{ :for => "auth_type" } Data Type
     .col-lg-4
       %select#type.custom-select{ :name => "type"}
         - %w[\  Nessus BurpV1 Metasploit NMap].each do |type|