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

Merge pull request #3699 from jaredevantabor/secure-socket

Browse Source 
switching websocket to secure websocket (wss://) dpending on protocol
This commit is contained in:
Jared Tabor
2016-10-11 14:25:58 -07:00
committed by GitHub
parent ddf67ed915 9274b90b9b
commit 1fe783f63c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/shared/socket/socket.service.js
View File

@@ -13,7 +13,17 @@ export default
init: function() { init: function() {
var self = this, var self = this,
host = window.location.host, host = window.location.host,
url = "ws://" + host + "/websocket/"; protocol,
url;
if($location.protocol() === 'http'){
protocol = 'ws';
}
if($location.protocol() === 'https'){
protocol = 'wss';
}
url = `${protocol}://${host}/websocket/`;
if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) { if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) {
// We have a valid session token, so attempt socket connection // We have a valid session token, so attempt socket connection
$log.debug('Socket connecting to: ' + url); $log.debug('Socket connecting to: ' + url);
@@ -83,7 +93,7 @@ export default
// The naming scheme is "ws" then a // The naming scheme is "ws" then a
// dash (-) and the group_name, then the job ID // dash (-) and the group_name, then the job ID
// ex: 'ws-jobs-<jobId>' // ex: 'ws-jobs-<jobId>'
str = `ws-${data.group_name}-${data.job}` str = `ws-${data.group_name}-${data.job}`;
} }
else if(data.group_name==="ad_hoc_command_events"){ else if(data.group_name==="ad_hoc_command_events"){
// The naming scheme is "ws" then a // The naming scheme is "ws" then a
@@ -194,7 +204,7 @@ export default
// This function is used for add a state resolve to all states, // This function is used for add a state resolve to all states,
// socket-enabled AND socket-disabled, and whether the $state // socket-enabled AND socket-disabled, and whether the $state
// requires a subscribe or an unsubscribe // requires a subscribe or an unsubscribe
self = this; var self = this;
socketPromise.promise.then(function(){ socketPromise.promise.then(function(){
if(!state.socket){ if(!state.socket){
state.socket = {groups: {}}; state.socket = {groups: {}};