From 0045fe66c02161f061dbb2bbab34ba5c9d1ffdb0 Mon Sep 17 00:00:00 2001
From: Francois van der Hoven <francoisvanderhoven@gmail.com>
Date: Fri, 9 Mar 2018 09:19:45 +1000
Subject: [PATCH] Update rack-protection and sinatra

---
 Gemfile      |  9 +++++----
 Gemfile.lock | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c04e0004..2365d22a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,8 +8,9 @@
 
 gem 'eventmachine'
 gem 'thin'
-gem 'sinatra'
-gem 'rack', '~> 1.6.5'
+gem 'sinatra', '~> 2.0.1'
+gem 'rack', '~> 2.0.4'
+gem 'rack-protection', '~>2.0.0'
 gem 'em-websocket' # WebSocket support
 gem 'uglifier'
 gem 'mime-types'
@@ -22,6 +23,8 @@ gem 'data_objects'
 gem 'rubyzip', '>= 1.2.1'
 gem 'espeak-ruby', '>= 1.0.4' # Text-to-Voice
 gem 'nokogiri', '>= 1.7'
+gem 'rake'
+
 
 if RUBY_PLATFORM.downcase.include?('linux')
   gem 'therubyracer', '~> 0.12.2', '<= 0.12.2'
@@ -71,7 +74,6 @@ group :ext_dns do
   gem 'rubydns', '~> 0.7.3'
   # rubydns requires rainbow
   # which requires rake, but doesn't specify rake as a dependency
-  gem 'rake'
 end
 
 # network extension
@@ -87,7 +89,6 @@ end
 # For running unit tests
 group :test do
 if ENV['BEEF_TEST']
-  gem 'rake'
   gem 'test-unit'
   gem 'test-unit-full'
   gem 'curb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 04db285f3..2caf51d8e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,6 +86,7 @@ GEM
     msgpack (1.1.0)
     multi_json (1.12.2)
     multipart-post (2.0.0)
+    mustermann (1.0.2)
     naught (1.1.0)
     netrc (0.11.0)
     nokogiri (1.8.1)
@@ -96,8 +97,8 @@ GEM
     qr4r (0.4.1)
       mojo_magick
       rqrcode
-    rack (1.6.8)
-    rack-protection (1.5.3)
+    rack (2.0.4)
+    rack-protection (2.0.1)
       rack
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
@@ -151,10 +152,11 @@ GEM
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     simple_oauth (0.3.1)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+    sinatra (2.0.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.1)
+      tilt (~> 2.0)
     slack-notifier (2.3.1)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
@@ -230,7 +232,8 @@ DEPENDENCIES
   nokogiri (>= 1.7)
   parseconfig
   qr4r
-  rack (~> 1.6.5)
+  rack (~> 2.0.4)
+  rack-protection (~> 2.0.0)
   rake
   rest-client (>= 2.0.1)
   rspec
@@ -239,7 +242,7 @@ DEPENDENCIES
   rushover
   selenium
   selenium-webdriver (~> 2.53.4)
-  sinatra
+  sinatra (~> 2.0.1)
   slack-notifier
   term-ansicolor
   test-unit