From a99fc10deb4568ef4110cf4626661a42d36d25eb Mon Sep 17 00:00:00 2001
From: "sussurro@happypacket.net"
 <sussurro@happypacket.net@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Thu, 11 Nov 2010 17:34:10 +0000
Subject: [PATCH] Added the ability to specify a public IP address that will be
 referenced by everything but the bind instruction in order to allow for
 things like EC2 natted hosts to work correctly.

git-svn-id: https://beef.googlecode.com/svn/trunk@508 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 lib/console/banner.rb        | 9 +++++----
 lib/server/httphookserver.rb | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/console/banner.rb b/lib/console/banner.rb
index a43cd5c47..4704fc3a6 100644
--- a/lib/console/banner.rb
+++ b/lib/console/banner.rb
@@ -10,15 +10,16 @@ module Console
 
       version = BeEF::Configuration.instance.get('beef_version')
 
-      hook_uri  = "http://#{@configuration.get("http_host")}:"
+      beef_host = @configuration.get("http_public") || @configuration.get("http_host") 
+      hook_uri  = "http://#{beef_host}:"
       hook_uri += "#{@configuration.get("http_port")}"
       hook_uri += "#{@configuration.get("hook_file")}"
 
-      ui_uri  = "http://#{@configuration.get("http_host")}:"
+      ui_uri  = "http://#{beef_host}:"
       ui_uri += "#{@configuration.get("http_port")}"
       ui_uri += "#{@configuration.get("http_panel_path")}"
       
-      demo_uri  = "http://#{@configuration.get("http_host")}:"
+      demo_uri  = "http://#{beef_host}:"
       demo_uri += "#{@configuration.get("http_port")}"
       demo_uri += "#{@configuration.get("http_demo_path")}"
       
@@ -36,4 +37,4 @@ module Console
   end
 
 end
-end
\ No newline at end of file
+end
diff --git a/lib/server/httphookserver.rb b/lib/server/httphookserver.rb
index 4730e923a..0442ccc45 100644
--- a/lib/server/httphookserver.rb
+++ b/lib/server/httphookserver.rb
@@ -14,7 +14,8 @@ module BeEF
     
     def initialize
       @configuration = BeEF::Configuration.instance
-      @url = "http://#{@configuration.get("http_host")}:#{@configuration.get("http_port")}"
+      beef_host = @configuration.get("http_public") || @configuration.get("http_host")
+      @url = "http://#{beef_host}:#{@configuration.get("http_port")}"
       @root_dir = File.expand_path('../../../', __FILE__)
       @command_urls = {}
     end