Browse Source

Incorporate browser int local key generation.

pull/28/head
Simon Eisenmann 12 years ago
parent
commit
0384256826
  1. 7
      static/js/services/mediastream.js

7
static/js/services/mediastream.js

@ -21,12 +21,13 @@
define([ define([
'jquery', 'jquery',
'underscore', 'underscore',
'ua-parser',
'mediastream/connector', 'mediastream/connector',
'mediastream/api', 'mediastream/api',
'mediastream/webrtc', 'mediastream/webrtc',
'mediastream/tokens' 'mediastream/tokens'
], function($, _, Connector, Api, WebRTC, tokens) { ], function($, _, uaparser, Connector, Api, WebRTC, tokens) {
return ["globalContext", "$route", "$location", "$window", "visibility", "alertify", "$http", "safeApply", "$timeout", "$sce", function(context, $route, $location, $window, visibility, alertify, $http, safeApply, $timeout, $sce) { return ["globalContext", "$route", "$location", "$window", "visibility", "alertify", "$http", "safeApply", "$timeout", "$sce", function(context, $route, $location, $window, visibility, alertify, $http, safeApply, $timeout, $sce) {
@ -40,8 +41,8 @@ define([
var api = new Api(connector); var api = new Api(connector);
var webrtc = new WebRTC(api); var webrtc = new WebRTC(api);
// TODO(longsleep): Add client side part into this key. // Create encryption key from server token and browser name.
var secureKey = context.Cfg.Token; var secureKey = sjcl.codec.base64.fromBits(sjcl.hash.sha256.hash(context.Cfg.Token + uaparser().browser.name));
var mediaStream = { var mediaStream = {
version: version, version: version,

Loading…
Cancel
Save