bettercap 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d2a9962f1c08de2c9af91a1c8c2273374ac9693
-  data.tar.gz: 94787e76c7844106cc0004e810c1ce15ccbc6d91
+  metadata.gz: 31a820a7730bbf4c4b05afeffaa33bbdddd5c4a3
+  data.tar.gz: 6983bea70e9ed11c583aa03ed1eddf4a746a8363
 SHA512:
-  metadata.gz: ba0c1a5bf763233b64c5139b94e0a8887cb0bdfac942a6be1a7e3476f0cc7b07a4ae29af389c6144af9a6ba84b86de50af54575e86f7ea2efb33771738c0b143
-  data.tar.gz: 3e74e7d919ff117110c7be47a6632f7dedc94ed7ccae1f3558dc9b33cf02925086857fa7d5362f536ff35a983d41fea5ac4390978fe89851a647a1f2b97da284
+  metadata.gz: 222922d21c654249874b8c3de9fdad45844dc3bd31766d71ac930bcef3ea2620d54502654f4439636c92cd79b6da745669172bf30cffc3825ee0c698c468ee68
+  data.tar.gz: b70724787a5dc6f6979f1dd00aa367b605c7b30bde931d79695187a0880ae686e669dd2cf11394e6f801d5052b50db1c665bba86c8231874173f9a49887cb642

data/bin/bettercap

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 =begin
 

data/lib/bettercap.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 =begin
 

data/lib/bettercap/context.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/discovery/agents/arp.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/discovery/agents/base.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/discovery/agents/icmp.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/discovery/agents/udp.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/discovery/thread.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/error.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/factories/firewall.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/factories/parser.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/factories/spoofer.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/firewalls/base.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/firewalls/linux.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/firewalls/osx.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/firewalls/redirection.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/httpd/server.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/loader.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 BETTERCAP
 Author : Simone 'evilsocket' Margaritelli

data/lib/bettercap/logger.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -13,24 +14,27 @@ module BetterCap
 # Class responsible for console and file logging.
 module Logger
   class << self
-    @@ctx     = nil
-    @@queue   = Queue.new
-    @@debug   = false
-    @@silent  = false
-    @@logfile = nil
-    @@thread  = nil
+    @@ctx       = nil
+    @@queue     = Queue.new
+    @@debug     = false
+    @@timestamp = false
+    @@silent    = false
+    @@logfile   = nil
+    @@thread    = nil
 
     # Initialize the logging system.
     # If +debug+ is true, debug logging will be enabled.
     # If +logfile+ is not nil, every message will be saved to that file.
     # If +silent+ is true, all messages will be suppressed if they're not errors
     # or warnings.
-    def init( debug, logfile, silent )
-      @@debug   = debug
-      @@logfile = logfile
-      @@thread  = Thread.new { worker }
-      @@silent  = silent
-      @@ctx     = Context.get
+    # If +with_timestamp+ is true, a timestamp will be prepended to each line.
+    def init( debug, logfile, silent, with_timestamp )
+      @@debug     = debug
+      @@logfile   = logfile
+      @@thread    = Thread.new { worker }
+      @@silent    = silent
+      @@timestamp = with_timestamp
+      @@ctx       = Context.get
     end
 
     # Log an error +message+.
@@ -57,7 +61,7 @@ module Logger
 
     # Log a +message+ as it is.
     def raw(message)
-      @@queue.push( message )
+      @@queue.push( formatted_message( message, nil ) )
     end
 
     # Wait for the messages queue to be empty.
@@ -95,7 +99,18 @@ module Logger
 
     # Format +message+ for the given +message_type+.
     def formatted_message(message, message_type)
-      "[#{message_type}] #{message}"
+      # raw message?
+      if message_type.nil?
+        if @@timestamp and !message.strip.empty?
+          "[#{Time.now}] #{message}"
+        else
+          message
+        end
+      elsif @@timestamp
+        "[#{Time.now}] [#{message_type}] #{message}"
+      else
+        "[#{message_type}] #{message}"
+      end
     end
   end
 end

data/lib/bettercap/monkey/packetfu/utils.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -69,8 +70,10 @@ module PacketFu
             ret[:ip4_obj] = IPAddr.new($1)
             ret[:ip4_obj] = ret[:ip4_obj].mask($3) if $3
           when /inet6 [a-z]+:[\s]*([0-9a-fA-F:\x2f]+)/
-            ret[:ip6_saddr] = $1
-            ret[:ip6_obj] = IPAddr.new($1)
+            begin
+              ret[:ip6_saddr] = $1
+              ret[:ip6_obj] = IPAddr.new($1)
+            rescue; end
           when /ether[\s]+([0-9a-fA-F:]{17})/i
             ret[:eth_saddr] = $1.downcase
             ret[:eth_src] = EthHeader.mac2str(ret[:eth_saddr])

data/lib/bettercap/network/arp_reader.rb

@@ -1,9 +1,14 @@
+# encoding: UTF-8
 =begin
+
 BETTERCAP
+
 Author : Simone 'evilsocket' Margaritelli
 Email  : evilsocket@gmail.com
 Blog   : http://www.evilsocket.net/
+
 This project is released under the GPL 3 license.
+
 =end
 require 'bettercap/error'
 

data/lib/bettercap/network/network.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/network/packet_queue.rb

@@ -1,9 +1,14 @@
+# encoding: UTF-8
 =begin
+
 BETTERCAP
+
 Author : Simone 'evilsocket' Margaritelli
 Email  : evilsocket@gmail.com
 Blog   : http://www.evilsocket.net/
+
 This project is released under the GPL 3 license.
+
 =end
 require 'bettercap/error'
 

data/lib/bettercap/network/target.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/options.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -26,6 +27,8 @@ class Options
   attr_accessor :target
   # Log file name.
   attr_accessor :logfile
+  # If true the Logger will prepend timestamps to each line.
+  attr_accessor :log_timestamp
   # If true will suppress every log message which is not an error or a warning.
   attr_accessor :silent
   # If true will enable debug messages.
@@ -100,6 +103,7 @@ class Options
     @half_duplex = false
     @target = nil
     @logfile = nil
+    @log_timestamp = false
     @silent = false
     @debug = false
     @arpcache = false
@@ -177,6 +181,10 @@ class Options
         ctx.options.logfile = v
       end
 
+      opts.on( '--log-timestamp', 'Enable logging with timestamps for each line, disabled by default.' ) do
+        ctx.options.log_timestamp = true
+      end
+
       opts.on( '-D', '--debug', 'Enable debug logging.' ) do
         ctx.options.debug = true
       end
@@ -328,7 +336,7 @@ class Options
       end
     end.parse!
 
-    Logger.init( ctx.options.debug, ctx.options.logfile, ctx.options.silent )
+    Logger.init( ctx.options.debug, ctx.options.logfile, ctx.options.silent, ctx.options.log_timestamp )
 
     if ctx.options.check_updates
       UpdateChecker.check
@@ -520,8 +528,8 @@ class Options
 
   # Print the starting status message.
   def starting_message
-    on = 'on'.green
-    off = 'off'.red
+    on = '✔'.green
+    off = '✘'.red
     status = {
       'spoofing'    => if has_spoofer? then on else off end,
       'discovery'   => if !target.nil? or arpcache then off else on end,

data/lib/bettercap/proxy/certstore.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/module.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/modules/injectcss.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/modules/injecthtml.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/modules/injectjs.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/proxy.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -132,8 +133,8 @@ class Proxy
 
     rescue Exception => e
       if request.host
-        Logger.warn "Error while serving #{request.host}#{request.url}: #{e.inspect}"
-        Logger.warn e.backtrace.join("\n")
+        Logger.warn "Error while serving #{request.host}#{request.url}: #{e.message}"
+        Logger.debug e.backtrace.join("\n")
       end
     end
 

data/lib/bettercap/proxy/request.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/response.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/sslstrip/cookiemonitor.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/sslstrip/strip.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/sslstrip/urlmonitor.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -25,7 +26,7 @@ class URLMonitor
   def was_stripped?( client, url )
     @urls.include?([client, url])
   end
- 
+
   # Add the object (client, url) to this list.
   def add!( client, url )
     unless was_stripped?(client, url)

data/lib/bettercap/proxy/stream_logger.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/streamer.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/proxy/thread_pool.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/shell.rb

@@ -1,9 +1,14 @@
+# encoding: UTF-8
 =begin
+
 BETTERCAP
+
 Author : Simone 'evilsocket' Margaritelli
 Email  : evilsocket@gmail.com
 Blog   : http://www.evilsocket.net/
+
 This project is released under the GPL 3 license.
+
 =end
 require 'bettercap/error'
 

data/lib/bettercap/sniffer/parsers/base.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/sniffer/parsers/custom.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/sniffer/parsers/dict.rb

@@ -0,0 +1,38 @@
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+require 'bettercap/sniffer/parsers/base'
+
+module BetterCap
+module Parsers
+# DICT authentication parser.
+class Dict < Base
+  def initialize
+    @name = 'DICT'
+  end
+  def on_packet( pkt )
+    begin
+      if pkt.tcp_dst == 2628
+        lines = pkt.to_s.split(/\r?\n/)
+        lines.each do |line|
+          if line =~ /AUTH\s+(.+)\s+(.+)$/
+            user = $1
+            pass = $2
+            StreamLogger.log_raw( pkt, @name, "username=#{user} password=#{pass}" )
+          end
+        end
+      end
+    rescue
+    end
+  end
+end
+end
+end

data/lib/bettercap/sniffer/parsers/ftp.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/sniffer/parsers/httpauth.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -15,7 +16,7 @@ require 'base64'
 
 module BetterCap
 module Parsers
-# HTTP basic and digest authentication parser.  
+# HTTP basic and digest authentication parser.
 class Httpauth < Base
   def on_packet( pkt )
     lines = pkt.to_s.split("\n")

data/lib/bettercap/sniffer/parsers/https.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -15,7 +16,7 @@ require 'resolv'
 
 module BetterCap
 module Parsers
-# HTTPS connections parser.    
+# HTTPS connections parser.
 class Https < Base
   @@prev = nil
 

data/lib/bettercap/sniffer/parsers/irc.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/sniffer/parsers/mail.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -13,7 +14,7 @@ require 'bettercap/sniffer/parsers/base'
 
 module BetterCap
 module Parsers
-# POP/IMAP authentication parser.  
+# POP/IMAP authentication parser.
 class Mail < Base
   def initialize
     @filters = [ /(\d+ )?(auth|authenticate) ([a-z\-_0-9]+)/i ]

data/lib/bettercap/sniffer/parsers/mpd.rb

@@ -0,0 +1,37 @@
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+require 'bettercap/sniffer/parsers/base'
+
+module BetterCap
+module Parsers
+# Music Player Daemon (MPD) authentication parser.
+class Mpd < Base
+  def initialize
+    @name = 'MPD'
+  end
+  def on_packet( pkt )
+    begin
+      if pkt.tcp_dst == 6600
+        lines = pkt.to_s.split(/\r?\n/)
+        lines.each do |line|
+          if line =~ /password\s+(.+)$/
+            pass = $1
+            StreamLogger.log_raw( pkt, @name, "password=#{pass}" )
+          end
+        end
+      end
+    rescue
+    end
+  end
+end
+end
+end

data/lib/bettercap/sniffer/parsers/nntp.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/sniffer/parsers/ntlmss.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/sniffer/parsers/post.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/sniffer/parsers/redis.rb

@@ -0,0 +1,40 @@
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+require 'bettercap/sniffer/parsers/base'
+
+module BetterCap
+module Parsers
+# Redis authentication parser.
+class Redis < Base
+  def initialize
+    @name = 'REDIS'
+  end
+  def on_packet( pkt )
+    begin
+      if pkt.tcp_dst == 6379
+        lines = pkt.to_s.split(/\r?\n/)
+        lines.each do |line|
+          if line =~ /config\s+set\s+requirepass\s+(.+)$/i
+            pass = "#{$1}"
+            StreamLogger.log_raw( pkt, @name, "password=#{pass}" )
+          elsif line =~ /AUTH\s+(.+)$/i
+            pass = "#{$1}"
+            StreamLogger.log_raw( pkt, @name, "password=#{pass}" )
+          end
+        end
+      end
+    rescue
+    end
+  end
+end
+end
+end

data/lib/bettercap/sniffer/parsers/rlogin.rb

@@ -0,0 +1,46 @@
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+require 'bettercap/sniffer/parsers/base'
+
+module BetterCap
+module Parsers
+# BSD rlogin authentication parser.
+class Rlogin < Base
+  def initialize
+    @name = 'RLOGIN'
+  end
+  def on_packet( pkt )
+    begin
+      if pkt.tcp_dst == 513
+        # rlogin packet data = 0x00[client-username]0x00<server-username>0x00<terminal/speed>0x00
+
+        # if client username, server username and terminal/speed were supplied...
+        # regex starts at client username as the first null byte is stripped from pkt.payload.to_s
+        if pkt.payload.to_s =~ /\A([a-z0-9_-]+)\x00([a-z0-9_-]+)\x00([a-z0-9_-]+\/[0-9]+)\x00\Z/i
+          client_user = $1
+          server_user = $2
+          terminal = $3
+          StreamLogger.log_raw( pkt, @name, "client-username=#{client_user} server-username=#{server_user} terminal=#{terminal}" )
+        # else, if only server username and terminal/speed were supplied...
+        # regex starts at 0x00 as the first null byte is stripped from pkt.payload.to_s and the client username is empty
+        elsif pkt.payload.to_s =~ /\A\x00([a-z0-9_-]+)\x00([a-z0-9_-]+\/[0-9]+)\x00\Z/i
+          server_user = $1
+          terminal = $2
+          StreamLogger.log_raw( pkt, @name, "server-username=#{server_user} terminal=#{terminal}" )
+        end
+      end
+    rescue
+    end
+  end
+end
+end
+end

data/lib/bettercap/sniffer/parsers/snpp.rb

@@ -0,0 +1,38 @@
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+require 'bettercap/sniffer/parsers/base'
+
+module BetterCap
+module Parsers
+# Simple Network Paging Protocol (SNPP) authentication parser.
+class Snpp < Base
+  def initialize
+    @name = 'SNPP'
+  end
+  def on_packet( pkt )
+    begin
+      if pkt.tcp_dst == 444
+        lines = pkt.to_s.split(/\r?\n/)
+        lines.each do |line|
+          if line =~ /LOGIn\s+(.+)\s+(.+)$/
+            user = $1
+            pass = $2
+            StreamLogger.log_raw( pkt, @name, "username=#{user} password=#{pass}" )
+          end
+        end
+      end
+    rescue
+    end
+  end
+end
+end
+end

data/lib/bettercap/sniffer/parsers/url.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -14,7 +15,7 @@ require 'colorize'
 
 module BetterCap
 module Parsers
-# HTTP GET requests parser.  
+# HTTP GET requests parser.
 class Url < Base
   def on_packet( pkt )
     s = pkt.to_s

data/lib/bettercap/sniffer/sniffer.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/spoofers/arp.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/spoofers/base.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/spoofers/icmp.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/spoofers/none.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/update_checker.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP

data/lib/bettercap/version.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 =begin
 
 BETTERCAP
@@ -11,7 +12,7 @@ This project is released under the GPL 3 license.
 =end
 module BetterCap
   # Current version of bettercap.
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
   # Program banner.
   BANNER = File.read( File.dirname(__FILE__) + '/banner' ).gsub( '#VERSION#', "v#{VERSION}")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bettercap
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Simone Margaritelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -143,14 +143,19 @@ files:
 - lib/bettercap/shell.rb
 - lib/bettercap/sniffer/parsers/base.rb
 - lib/bettercap/sniffer/parsers/custom.rb
+- lib/bettercap/sniffer/parsers/dict.rb
 - lib/bettercap/sniffer/parsers/ftp.rb
 - lib/bettercap/sniffer/parsers/httpauth.rb
 - lib/bettercap/sniffer/parsers/https.rb
 - lib/bettercap/sniffer/parsers/irc.rb
 - lib/bettercap/sniffer/parsers/mail.rb
+- lib/bettercap/sniffer/parsers/mpd.rb
 - lib/bettercap/sniffer/parsers/nntp.rb
 - lib/bettercap/sniffer/parsers/ntlmss.rb
 - lib/bettercap/sniffer/parsers/post.rb
+- lib/bettercap/sniffer/parsers/redis.rb
+- lib/bettercap/sniffer/parsers/rlogin.rb
+- lib/bettercap/sniffer/parsers/snpp.rb
 - lib/bettercap/sniffer/parsers/url.rb
 - lib/bettercap/sniffer/sniffer.rb
 - lib/bettercap/spoofers/arp.rb