diff --git a/data/exploits/psnuffle/pop3.rb b/data/exploits/psnuffle/pop3.rb index 60032ba88036..53e2e180a9a4 100755 --- a/data/exploits/psnuffle/pop3.rb +++ b/data/exploits/psnuffle/pop3.rb @@ -38,6 +38,10 @@ def parse(pkt) case s[:last] when nil # Its the first +OK must include the banner, worst case its just +OK + + # Strip the banner, so that we don't need to do it multiple times + # We can improve the banner by removing the +OK part + s[:banner] = matches.strip s[:info] = matches s[:proto] = "tcp" s[:name] = "pop3" @@ -62,7 +66,7 @@ def parse(pkt) :proof => s[:extra], :status => Metasploit::Model::Login::Status::SUCCESSFUL ) - print_status("Successful POP3 Login: #{s[:session]} >> #{s[:user]} / #{s[:pass]} (#{s[:banner].strip})") + print_status("Successful POP3 Login: #{s[:session]} >> #{s[:user]} / #{s[:pass]} (#{s[:banner]})") # Remove it form the session objects so freeup sessions.delete(s[:session]) @@ -91,7 +95,7 @@ def parse(pkt) :proof => s[:extra], :status => Metasploit::Model::Login::Status::INCORRECT ) - print_status("Invalid POP3 Login: #{s[:session]} >> #{s[:user]} / #{s[:pass]} (#{s[:banner].strip})") + print_status("Invalid POP3 Login: #{s[:session]} >> #{s[:user]} / #{s[:pass]} (#{s[:banner]})") s[:pass]="" end when nil