From 6ce3581ae52d3d33535faa0a5744295a1736329a Mon Sep 17 00:00:00 2001
From: Marc Wickenden <marc@offensivecoder.com>
Date: Tue, 24 Jul 2012 19:51:03 +0100
Subject: [PATCH 1/3] add Gemfile.lock. I'm not sure this is a good idea

---
 Gemfile.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..3524494b1
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,66 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.8)
+    ansi (1.4.3)
+    daemons (1.1.8)
+    data_objects (0.10.8)
+      addressable (~> 2.1)
+    dm-core (1.2.0)
+      addressable (~> 2.2.6)
+    dm-do-adapter (1.2.0)
+      data_objects (~> 0.10.6)
+      dm-core (~> 1.2.0)
+    dm-migrations (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-sqlite-adapter (1.2.0)
+      dm-do-adapter (~> 1.2.0)
+      do_sqlite3 (~> 0.10.6)
+    do_sqlite3 (0.10.8)
+      data_objects (= 0.10.8)
+    em-websocket (0.3.8)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
+    erubis (2.7.0)
+    eventmachine (0.12.10)
+    jsmin (1.0.1)
+    json (1.7.3)
+    librex (0.0.68)
+    msfrpc-client (1.0.1)
+      librex (>= 0.0.32)
+      msgpack (>= 0.4.5)
+    msgpack (0.4.7)
+    parseconfig (1.0.2)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    term-ansicolor (1.0.7)
+    thin (1.4.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    tilt (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ansi
+  data_objects
+  dm-core
+  dm-migrations
+  dm-sqlite-adapter
+  em-websocket (~> 0.3.6)
+  erubis
+  eventmachine (= 0.12.10)
+  jsmin (~> 1.0.1)
+  json
+  msfrpc-client
+  parseconfig
+  sinatra (= 1.3.2)
+  term-ansicolor
+  thin

From c708a60bddafd1011d5218ed71916aa08537d5bc Mon Sep 17 00:00:00 2001
From: Marc Wickenden <marc@offensivecoder.com>
Date: Tue, 24 Jul 2012 20:05:45 +0100
Subject: [PATCH 2/3] new it wasn't

---
 Gemfile.lock | 66 ----------------------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 3524494b1..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,66 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.8)
-    ansi (1.4.3)
-    daemons (1.1.8)
-    data_objects (0.10.8)
-      addressable (~> 2.1)
-    dm-core (1.2.0)
-      addressable (~> 2.2.6)
-    dm-do-adapter (1.2.0)
-      data_objects (~> 0.10.6)
-      dm-core (~> 1.2.0)
-    dm-migrations (1.2.0)
-      dm-core (~> 1.2.0)
-    dm-sqlite-adapter (1.2.0)
-      dm-do-adapter (~> 1.2.0)
-      do_sqlite3 (~> 0.10.6)
-    do_sqlite3 (0.10.8)
-      data_objects (= 0.10.8)
-    em-websocket (0.3.8)
-      addressable (>= 2.1.1)
-      eventmachine (>= 0.12.9)
-    erubis (2.7.0)
-    eventmachine (0.12.10)
-    jsmin (1.0.1)
-    json (1.7.3)
-    librex (0.0.68)
-    msfrpc-client (1.0.1)
-      librex (>= 0.0.32)
-      msgpack (>= 0.4.5)
-    msgpack (0.4.7)
-    parseconfig (1.0.2)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    term-ansicolor (1.0.7)
-    thin (1.4.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ansi
-  data_objects
-  dm-core
-  dm-migrations
-  dm-sqlite-adapter
-  em-websocket (~> 0.3.6)
-  erubis
-  eventmachine (= 0.12.10)
-  jsmin (~> 1.0.1)
-  json
-  msfrpc-client
-  parseconfig
-  sinatra (= 1.3.2)
-  term-ansicolor
-  thin

From f2ba3b55e8c32b0029e30fef451597b6f2295319 Mon Sep 17 00:00:00 2001
From: Marc Wickenden <marc.wickenden@7elements.co.uk>
Date: Sun, 24 Nov 2013 00:20:08 +0000
Subject: [PATCH 3/3] require version 5 of the twitter gem due to removal of
 Twitter.configure method

---
 Gemfile                                    | 2 +-
 extensions/notifications/channels/tweet.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index f3dcf01d0..beb38f7ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem "msfrpc-client"
 gem "rubyzip", "~> 1.0.0"
 
 # notifications
-gem "twitter"
+gem "twitter", ">= 5.0.0"
 
 if ENV['BEEF_TEST']
 # for running unit tests
diff --git a/extensions/notifications/channels/tweet.rb b/extensions/notifications/channels/tweet.rb
index b436d840d..45e98ad17 100644
--- a/extensions/notifications/channels/tweet.rb
+++ b/extensions/notifications/channels/tweet.rb
@@ -21,7 +21,7 @@ module Channels
       @config = BeEF::Core::Configuration.instance
 
       # configure the Twitter client
-      Twitter.configure do |config|
+      client = Twitter::REST::Client.new do |config|
         config.consumer_key       = @config.get('beef.extension.notifications.twitter.consumer_key')
         config.consumer_secret    = @config.get('beef.extension.notifications.twitter.consumer_secret')
         config.oauth_token    = @config.get('beef.extension.notifications.twitter.oauth_token')
@@ -29,7 +29,7 @@ module Channels
       end
 
       begin
-        Twitter.direct_message_create(username, message)
+        client.direct_message_create(username, message)
       rescue
         print "Twitter send failed, verify tokens have Read/Write/DM acceess..\n"
       end