Updated introduction of public port settings

These settings are experimental

config.yaml

@@ -32,7 +32,7 @@ beef:
         port: "3000"
         # if running behind a nat set the public ip address here
         #public: ""
-        #public_port: ""
+        #public_port: "" # port setting is experimental
         dns: "localhost"
         panel_path: "/ui/panel"
         hook_file: "/hook.js"

core/main/console/banners.rb

@@ -92,6 +92,7 @@ module Banners
       
       self.interfaces.map do |host| # display the important URLs on each interface from the interfaces array
         print_success "running on network interface: #{host}"
+        beef_host = configuration.get("beef.http.public_port") || configuration.get("beef.http.port")
         data = "Hook URL: http://#{host}:#{configuration.get("beef.http.port")}#{configuration.get("beef.http.hook_file")}\n"
         data += "UI URL:   http://#{host}:#{configuration.get("beef.http.port")}#{configuration.get("beef.http.panel_path")}\n"
         

core/main/handlers/modules/beefjs.rb

@@ -49,11 +49,13 @@ module Modules
       end
       
       # @note if http_port <> public_port in config ini, use the public_port
-      if hook_session_config['beef_port'] != hook_session_config['beef_public_port']
-        hook_session_config['beef_port'] = hook_session_config['beef_public_port']
-        hook_session_config['beef_url'].sub!(/#{hook_session_config['beef_port']}/, hook_session_config['beef_public_port'])
-        if hook_session_config['beef_public_port'] == '443'
-          hook_session_config['beef_url'].sub!(/http:/, 'https:')
+      unless hook_session_config['beef_public_port'].nil?
+        if hook_session_config['beef_port'] != hook_session_config['beef_public_port']
+          hook_session_config['beef_port'] = hook_session_config['beef_public_port']
+          hook_session_config['beef_url'].sub!(/#{hook_session_config['beef_port']}/, hook_session_config['beef_public_port'])
+          if hook_session_config['beef_public_port'] == '443'
+            hook_session_config['beef_url'].sub!(/http:/, 'https:')
+          end
         end
       end
       

modules/debug/test_network_request/module.rb

@@ -24,7 +24,7 @@ class Test_network_request < BeEF::Core::Command
   def self.options
     @configuration = BeEF::Core::Configuration.instance
     beef_host = @configuration.get("beef.http.public") || @configuration.get("beef.http.host")
-    beef_port = @configuration.get("beef.http.port")
+    beef_port = @configuration.get("beef.http.public_port") || @configuration.get("beef.http.port")
 
     return [
         {'name' => 'scheme', 'ui_label'=>'Scheme', 'type' => 'text', 'width' => '400px', 'value' => 'http' },

modules/phonegap/phonegap_persistence/module.rb

@@ -22,7 +22,7 @@ class Phonegap_persistence < BeEF::Core::Command
 
     @configuration = BeEF::Core::Configuration.instance
     beef_host = @configuration.get("beef.http.public") || @configuration.get("beef.http.host")
-    beef_port = @configuration.get("beef.http.port")
+    beef_port = @configuration.get("beef.http.public_port") || @configuration.get("beef.http.port")
 
     return [{
       'name' => 'hook_url',