External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

adding 'start new connection' to Socket lib class

Browse Source 
for security purposes
This commit is contained in:
Jared Tabor
2014-10-27 14:18:20 -04:00
parent c6180d3928
commit 7b113f4924
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
awx/ui/static/lib/ansible/Socket.js
View File

@@ -27,7 +27,8 @@ angular.module('SocketIO', ['AuthService', 'Utilities'])
host = $location.host(), host = $location.host(),
endpoint = params.endpoint, endpoint = params.endpoint,
protocol = $location.protocol(), protocol = $location.protocol(),
config, socketPort, url; config, socketPort,
handshakeData, url;
// Since some pages are opened in a new tab, we might get here before AnsibleConfig is available. // Since some pages are opened in a new tab, we might get here before AnsibleConfig is available.
// In that case, load from local storage. // In that case, load from local storage.
@@ -61,23 +62,34 @@ angular.module('SocketIO', ['AuthService', 'Utilities'])
scope: scope, scope: scope,
url: url, url: url,
socket: null, socket: null,
init: function() { init: function() {
var self = this, var self = this,
token = Authorization.getToken(); token = Authorization.getToken();
if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) { if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) {
// We have a valid session token, so attmempt socket connection // We have a valid session token, so attempt socket connection
$log.debug('Socket connecting to: ' + url); $log.debug('Socket connecting to: ' + url);
self.scope.socket_url = url; self.scope.socket_url = url;
self.socket = io.connect(url, { headers: handshakeData = {
{ headers: {
'Authorization': 'Token ' + token, 'Authorization': 'Token ' + token,
'X-Auth-Token': 'Token ' + token 'X-Auth-Token': 'Token ' + token
}, }
}
self.socket = io.connect(url, {
// headers:
// {
// 'Authorization': 'Token ' + token,
// 'X-Auth-Token': 'Token ' + token
// },
'connect timeout': 3000, 'connect timeout': 3000,
'try multiple transports': false, 'try multiple transports': false,
'max reconneciton attemps': 3, 'max reconneciton attemps': 3,
'reconnection limit': 3000, 'reconnection limit': 3000,
'force new connection': true,
}); });
self.socket.on('connection', function() { self.socket.on('connection', function() {
$log.debug('Socket connecting...'); $log.debug('Socket connecting...');
self.scope.$apply(function () { self.scope.$apply(function () {
@@ -168,6 +180,19 @@ angular.module('SocketIO', ['AuthService', 'Utilities'])
}); });
}); });
}, },
disconnect: function(){
var self = this;
$rootScope.disconnect_timer = setInterval(function(){disconnectSocket()}, 1000);
function disconnectSocket() {
self.socket.socket.disconnect();
window.clearInterval($rootScope.disconnect_timer);
}
// self.scope.$apply(function () {
// });
},
emit: function (eventName, data, callback) { emit: function (eventName, data, callback) {
var self = this; var self = this;
self.socket.emit(eventName, data, function () { self.socket.emit(eventName, data, function () {