Fix issue 675 (added erubis parsing for Websocket config options)

This commit is contained in:
antisnatchor
2012-05-11 11:45:13 +01:00
parent 256ef0f2e8
commit 96a16fa683
3 changed files with 16 additions and 6 deletions

View File

@@ -44,6 +44,7 @@ beef:
enable: true
secure: false # use WebSocketSecure
port: 11989
alive_timer: 5000 # poll BeEF every 5 seconds
# Imitate a specified web server (default root page, 404 default error page, 'Server' HTTP response header)
web_server_imitation:

View File

@@ -20,19 +20,22 @@
beef.websocket = {
socket:null,
alive_timer:5000,
alive_timer:<%= @websocket_timer %>,
init:function () {
var webSocketServer = beef.net.host;
var webSocketPort = 11989;
var webSocketPort = <%= @websocket_port %>;
var webSocketSecure = <%= @websocket_secure %>;
var protocol = "ws://";
if(webSocketSecure)
protocol = "wss://";
if (beef.browser.isFF() && !!window.MozWebSocket) {
beef.websocket.socket = new MozWebSocket("ws://" + webSocketServer + ":" + webSocketPort + "/");
beef.websocket.socket = new MozWebSocket(protocol + webSocketServer + ":" + webSocketPort + "/");
} else {
beef.websocket.socket = new WebSocket("ws://" + webSocketServer + ":" + webSocketPort + "/");
beef.websocket.socket = new WebSocket(protocol + webSocketServer + ":" + webSocketPort + "/");
}
},

View File

@@ -64,6 +64,12 @@ module Modules
end
end
end
if config.get("beef.http.websocket.enable")
hook_session_config['websocket_secure'] = config.get("beef.http.websocket.secure")
hook_session_config['websocket_port'] = config.get("beef.http.websocket.port")
hook_session_config['websocket_timer'] = config.get("beef.http.websocket.alive_timer")
end
# @note populate place holders in the beefjs string and set the response body
eruby = Erubis::FastEruby.new(beefjs)