From d13bccca05b5ca8bd9aff86b9f62b331d8bc1bb1 Mon Sep 17 00:00:00 2001
From: h00die <michaeltcyr@gmail.com>
Date: Thu, 28 Nov 2024 20:24:25 -0500
Subject: [PATCH] peer review

---
 .../linux/misc/asterisk_ami_originate_auth_rce.md     |  2 +-
 lib/msf/core/exploit/remote/asterisk.rb               |  7 ++-----
 .../linux/misc/asterisk_ami_originate_auth_rce.rb     | 11 -----------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/documentation/modules/exploit/linux/misc/asterisk_ami_originate_auth_rce.md b/documentation/modules/exploit/linux/misc/asterisk_ami_originate_auth_rce.md
index 4e5b959fa4..5607a45a3d 100644
--- a/documentation/modules/exploit/linux/misc/asterisk_ami_originate_auth_rce.md
+++ b/documentation/modules/exploit/linux/misc/asterisk_ami_originate_auth_rce.md
@@ -41,7 +41,7 @@ Default parking lot is called "Default lot" in the website interface, however it
 
 1. Install the application
 1. Start msfconsole
-1. Do: `use exploit/linux/misc/asterisk_ami_originate_auth_rce `
+1. Do: `use exploit/linux/misc/asterisk_ami_originate_auth_rce`
 1. Do: `set rhosts <rhost>`
 1. Do: `set lhost <lhost>`
 1. Do: `set username <username>`
diff --git a/lib/msf/core/exploit/remote/asterisk.rb b/lib/msf/core/exploit/remote/asterisk.rb
index adff4b70dd..367f86bf09 100644
--- a/lib/msf/core/exploit/remote/asterisk.rb
+++ b/lib/msf/core/exploit/remote/asterisk.rb
@@ -35,11 +35,8 @@ module Msf
       res
     rescue Timeout::Error
       print_error "Timeout (#{timeout} seconds)"
-    rescue StandardError
-      # unsure why but getting no implicit conversion of nil into String with the following code
-      # this can be tested with successful exploitation of asterisk_ami_originate_auth_rce module
-      # print_error e.message
-      print_error('Unknown exception')
+    rescue StandardError => e
+      print_error e.message
     end
 
     #
diff --git a/modules/exploits/linux/misc/asterisk_ami_originate_auth_rce.rb b/modules/exploits/linux/misc/asterisk_ami_originate_auth_rce.rb
index 82a1d9a900..29f4a13ef3 100644
--- a/modules/exploits/linux/misc/asterisk_ami_originate_auth_rce.rb
+++ b/modules/exploits/linux/misc/asterisk_ami_originate_auth_rce.rb
@@ -201,15 +201,4 @@ class MetasploitModule < Msf::Exploit::Remote
     super
     print_good("!!!Don't forget to clean evidence from #{datastore['CONF']}!!!")
   end
-
-  private
-
-  def username
-    datastore['USERNAME']
-  end
-
-  def password
-    datastore['PASSWORD']
-  end
-
 end