Move ACPP default port into Rex

jhart-r7 · jhart-r7 · commit 69f03f5c5dec · 2015-01-12T19:43:57.000-08:00
diff --git a/lib/metasploit/framework/login_scanner/acpp.rb b/lib/metasploit/framework/login_scanner/acpp.rb
@@ -17,8 +17,8 @@ class ACPP
         #
         # CONSTANTS
         #
-        DEFAULT_PORT         = 5009
-        LIKELY_PORTS         = [ 5009 ]
+        DEFAULT_PORT         = Rex::Proto::ACPP::DEFAULT_PORT
+        LIKELY_PORTS         = [ DEFAULT_PORT ]
         LIKELY_SERVICE_NAMES = [ 'acpp' ]
         PRIVATE_TYPES        = [ :password ]
         REALM_KEY            = nil
diff --git a/lib/rex/proto/acpp.rb b/lib/rex/proto/acpp.rb
@@ -7,3 +7,11 @@
 
 require 'rex/proto/acpp/client'
 require 'rex/proto/acpp/message'
+
+module Rex
+  module Proto
+    module ACPP
+      DEFAULT_PORT = 5009
+    end
+  end
+end
diff --git a/modules/auxiliary/scanner/acpp/login.rb b/modules/auxiliary/scanner/acpp/login.rb
@@ -34,7 +34,7 @@ def initialize
 
     register_options(
       [
-        Opt::RPORT(5009)
+        Opt::RPORT(Rex::Proto::ACPP::DEFAULT_PORT)
       ], self.class)
 
     deregister_options(

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ class ACPP`
`17`	`17`	`#`
`18`	`18`	`# CONSTANTS`
`19`	`19`	`#`
`20`		`- DEFAULT_PORT = 5009`
`21`		`- LIKELY_PORTS = [ 5009 ]`
	`20`	`+ DEFAULT_PORT = Rex::Proto::ACPP::DEFAULT_PORT`
	`21`	`+ LIKELY_PORTS = [ DEFAULT_PORT ]`
`22`	`22`	`LIKELY_SERVICE_NAMES = [ 'acpp' ]`
`23`	`23`	`PRIVATE_TYPES = [ :password ]`
`24`	`24`	`REALM_KEY = nil`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ def initialize`
`34`	`34`
`35`	`35`	`register_options(`
`36`	`36`	`[`
`37`		`- Opt::RPORT(5009)`
	`37`	`+ Opt::RPORT(Rex::Proto::ACPP::DEFAULT_PORT)`
`38`	`38`	`], self.class)`
`39`	`39`
`40`	`40`	`deregister_options(`