diff options
| -rw-r--r-- | .eslintignore | 1 | ||||
| -rw-r--r-- | css/settings-admin.scss | 3 | ||||
| -rw-r--r-- | js/admin/sha1.js | 23 | ||||
| -rw-r--r-- | js/admin/turn-server.js | 131 | ||||
| -rw-r--r-- | templates/settings/admin/turn-server.php | 1 |
5 files changed, 158 insertions, 1 deletions
diff --git a/.eslintignore b/.eslintignore index 9dc66ac33..3e64a96c7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,4 @@ +/js/admin/sha1.js /js/tests/* /js/vendor/* /js/simplewebrtc.js diff --git a/css/settings-admin.scss b/css/settings-admin.scss index 6d0b732a2..38201fcd7 100644 --- a/css/settings-admin.scss +++ b/css/settings-admin.scss @@ -10,6 +10,9 @@ .icon-delete, .icon-checkmark-color, + .icon-category-monitoring, + .icon-checkmark, + .icon-error, div.stun-server:last-child .icon-add, div.signaling-server:last-child .icon-add, div.turn-server:last-child .icon-add { diff --git a/js/admin/sha1.js b/js/admin/sha1.js new file mode 100644 index 000000000..e46e531cb --- /dev/null +++ b/js/admin/sha1.js @@ -0,0 +1,23 @@ +/* + A JavaScript implementation of the SHA family of hashes, as + defined in FIPS PUB 180-4 and FIPS PUB 202, as well as the corresponding + HMAC implementation as defined in FIPS PUB 198a + + Copyright 2008-2018 Brian Turek, 1998-2009 Paul Johnston & Contributors + Distributed under the BSD License + See http://caligatio.github.com/jsSHA/ for more information +*/ +'use strict';(function(G){function r(d,b,c){var h=0,a=[],f=0,g,m,k,e,l,p,q,t,w=!1,n=[],u=[],v,r=!1;c=c||{};g=c.encoding||"UTF8";v=c.numRounds||1;if(v!==parseInt(v,10)||1>v)throw Error("numRounds must a integer >= 1");if("SHA-1"===d)l=512,p=z,q=H,e=160,t=function(a){return a.slice()};else throw Error("Chosen SHA variant is not supported");k=A(b,g);m=x(d);this.setHMACKey=function(a,f,b){var c;if(!0===w)throw Error("HMAC key already set");if(!0===r)throw Error("Cannot set HMAC key after calling update"); +g=(b||{}).encoding||"UTF8";f=A(f,g)(a);a=f.binLen;f=f.value;c=l>>>3;b=c/4-1;if(c<a/8){for(f=q(f,a,0,x(d),e);f.length<=b;)f.push(0);f[b]&=4294967040}else if(c>a/8){for(;f.length<=b;)f.push(0);f[b]&=4294967040}for(a=0;a<=b;a+=1)n[a]=f[a]^909522486,u[a]=f[a]^1549556828;m=p(n,m);h=l;w=!0};this.update=function(b){var e,g,c,d=0,q=l>>>5;e=k(b,a,f);b=e.binLen;g=e.value;e=b>>>5;for(c=0;c<e;c+=q)d+l<=b&&(m=p(g.slice(c,c+q),m),d+=l);h+=d;a=g.slice(d>>>5);f=b%l;r=!0};this.getHash=function(b,g){var c,k,l,p;if(!0=== +w)throw Error("Cannot call getHash after setting HMAC key");l=B(g);switch(b){case "HEX":c=function(a){return C(a,e,l)};break;case "B64":c=function(a){return D(a,e,l)};break;case "BYTES":c=function(a){return E(a,e)};break;case "ARRAYBUFFER":try{k=new ArrayBuffer(0)}catch(I){throw Error("ARRAYBUFFER not supported by this environment");}c=function(a){return F(a,e)};break;default:throw Error("format must be HEX, B64, BYTES, or ARRAYBUFFER");}p=q(a.slice(),f,h,t(m),e);for(k=1;k<v;k+=1)p=q(p,e,0,x(d),e); +return c(p)};this.getHMAC=function(b,g){var c,k,n,r;if(!1===w)throw Error("Cannot call getHMAC without first setting HMAC key");n=B(g);switch(b){case "HEX":c=function(a){return C(a,e,n)};break;case "B64":c=function(a){return D(a,e,n)};break;case "BYTES":c=function(a){return E(a,e)};break;case "ARRAYBUFFER":try{c=new ArrayBuffer(0)}catch(I){throw Error("ARRAYBUFFER not supported by this environment");}c=function(a){return F(a,e)};break;default:throw Error("outputFormat must be HEX, B64, BYTES, or ARRAYBUFFER"); +}k=q(a.slice(),f,h,t(m),e);r=p(u,x(d));r=q(k,e,l,r,e);return c(r)}}function C(d,b,c){var h="";b/=8;var a,f;for(a=0;a<b;a+=1)f=d[a>>>2]>>>8*(3+a%4*-1),h+="0123456789abcdef".charAt(f>>>4&15)+"0123456789abcdef".charAt(f&15);return c.outputUpper?h.toUpperCase():h}function D(d,b,c){var h="",a=b/8,f,g,m;for(f=0;f<a;f+=3)for(g=f+1<a?d[f+1>>>2]:0,m=f+2<a?d[f+2>>>2]:0,m=(d[f>>>2]>>>8*(3+f%4*-1)&255)<<16|(g>>>8*(3+(f+1)%4*-1)&255)<<8|m>>>8*(3+(f+2)%4*-1)&255,g=0;4>g;g+=1)8*f+6*g<=b?h+="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(m>>> +6*(3-g)&63):h+=c.b64Pad;return h}function E(d,b){var c="",h=b/8,a,f;for(a=0;a<h;a+=1)f=d[a>>>2]>>>8*(3+a%4*-1)&255,c+=String.fromCharCode(f);return c}function F(d,b){var c=b/8,h,a=new ArrayBuffer(c),f;f=new Uint8Array(a);for(h=0;h<c;h+=1)f[h]=d[h>>>2]>>>8*(3+h%4*-1)&255;return a}function B(d){var b={outputUpper:!1,b64Pad:"=",shakeLen:-1};d=d||{};b.outputUpper=d.outputUpper||!1;!0===d.hasOwnProperty("b64Pad")&&(b.b64Pad=d.b64Pad);if("boolean"!==typeof b.outputUpper)throw Error("Invalid outputUpper formatting option"); +if("string"!==typeof b.b64Pad)throw Error("Invalid b64Pad formatting option");return b}function A(d,b){var c;switch(b){case "UTF8":case "UTF16BE":case "UTF16LE":break;default:throw Error("encoding must be UTF8, UTF16BE, or UTF16LE");}switch(d){case "HEX":c=function(b,a,f){var g=b.length,c,d,e,l,p;if(0!==g%2)throw Error("String of HEX type must be in byte increments");a=a||[0];f=f||0;p=f>>>3;for(c=0;c<g;c+=2){d=parseInt(b.substr(c,2),16);if(isNaN(d))throw Error("String of HEX type contains invalid characters"); +l=(c>>>1)+p;for(e=l>>>2;a.length<=e;)a.push(0);a[e]|=d<<8*(3+l%4*-1)}return{value:a,binLen:4*g+f}};break;case "TEXT":c=function(c,a,f){var g,d,k=0,e,l,p,q,t,n;a=a||[0];f=f||0;p=f>>>3;if("UTF8"===b)for(n=3,e=0;e<c.length;e+=1)for(g=c.charCodeAt(e),d=[],128>g?d.push(g):2048>g?(d.push(192|g>>>6),d.push(128|g&63)):55296>g||57344<=g?d.push(224|g>>>12,128|g>>>6&63,128|g&63):(e+=1,g=65536+((g&1023)<<10|c.charCodeAt(e)&1023),d.push(240|g>>>18,128|g>>>12&63,128|g>>>6&63,128|g&63)),l=0;l<d.length;l+=1){t=k+ +p;for(q=t>>>2;a.length<=q;)a.push(0);a[q]|=d[l]<<8*(n+t%4*-1);k+=1}else if("UTF16BE"===b||"UTF16LE"===b)for(n=2,d="UTF16LE"===b&&!0||"UTF16LE"!==b&&!1,e=0;e<c.length;e+=1){g=c.charCodeAt(e);!0===d&&(l=g&255,g=l<<8|g>>>8);t=k+p;for(q=t>>>2;a.length<=q;)a.push(0);a[q]|=g<<8*(n+t%4*-1);k+=2}return{value:a,binLen:8*k+f}};break;case "B64":c=function(b,a,f){var c=0,d,k,e,l,p,q,n;if(-1===b.search(/^[a-zA-Z0-9=+\/]+$/))throw Error("Invalid character in base-64 string");k=b.indexOf("=");b=b.replace(/\=/g, +"");if(-1!==k&&k<b.length)throw Error("Invalid '=' found in base-64 string");a=a||[0];f=f||0;q=f>>>3;for(k=0;k<b.length;k+=4){p=b.substr(k,4);for(e=l=0;e<p.length;e+=1)d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(p[e]),l|=d<<18-6*e;for(e=0;e<p.length-1;e+=1){n=c+q;for(d=n>>>2;a.length<=d;)a.push(0);a[d]|=(l>>>16-8*e&255)<<8*(3+n%4*-1);c+=1}}return{value:a,binLen:8*c+f}};break;case "BYTES":c=function(b,a,c){var d,m,k,e,l;a=a||[0];c=c||0;k=c>>>3;for(m=0;m<b.length;m+= +1)d=b.charCodeAt(m),l=m+k,e=l>>>2,a.length<=e&&a.push(0),a[e]|=d<<8*(3+l%4*-1);return{value:a,binLen:8*b.length+c}};break;case "ARRAYBUFFER":try{c=new ArrayBuffer(0)}catch(h){throw Error("ARRAYBUFFER not supported by this environment");}c=function(b,a,c){var d,m,k,e,l;a=a||[0];c=c||0;m=c>>>3;l=new Uint8Array(b);for(d=0;d<b.byteLength;d+=1)e=d+m,k=e>>>2,a.length<=k&&a.push(0),a[k]|=l[d]<<8*(3+e%4*-1);return{value:a,binLen:8*b.byteLength+c}};break;default:throw Error("format must be HEX, TEXT, B64, BYTES, or ARRAYBUFFER"); +}return c}function n(d,b){return d<<b|d>>>32-b}function u(d,b){var c=(d&65535)+(b&65535);return((d>>>16)+(b>>>16)+(c>>>16)&65535)<<16|c&65535}function y(d,b,c,h,a){var f=(d&65535)+(b&65535)+(c&65535)+(h&65535)+(a&65535);return((d>>>16)+(b>>>16)+(c>>>16)+(h>>>16)+(a>>>16)+(f>>>16)&65535)<<16|f&65535}function x(d){var b=[];if("SHA-1"===d)b=[1732584193,4023233417,2562383102,271733878,3285377520];else throw Error("No SHA variants supported");return b}function z(d,b){var c=[],h,a,f,g,m,k,e;h=b[0];a=b[1]; +f=b[2];g=b[3];m=b[4];for(e=0;80>e;e+=1)c[e]=16>e?d[e]:n(c[e-3]^c[e-8]^c[e-14]^c[e-16],1),k=20>e?y(n(h,5),a&f^~a&g,m,1518500249,c[e]):40>e?y(n(h,5),a^f^g,m,1859775393,c[e]):60>e?y(n(h,5),a&f^a&g^f&g,m,2400959708,c[e]):y(n(h,5),a^f^g,m,3395469782,c[e]),m=g,g=f,f=n(a,30),a=h,h=k;b[0]=u(h,b[0]);b[1]=u(a,b[1]);b[2]=u(f,b[2]);b[3]=u(g,b[3]);b[4]=u(m,b[4]);return b}function H(d,b,c,h){var a;for(a=(b+65>>>9<<4)+15;d.length<=a;)d.push(0);d[b>>>5]|=128<<24-b%32;b+=c;d[a]=b&4294967295;d[a-1]=b/4294967296|0; +b=d.length;for(a=0;a<b;a+=16)h=z(d.slice(a,a+16),h);return h}"function"===typeof define&&define.amd?define(function(){return r}):"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(module.exports=r),exports=r):G.jsSHA=r})(this); diff --git a/js/admin/turn-server.js b/js/admin/turn-server.js index d8efaf143..895c25001 100644 --- a/js/admin/turn-server.js +++ b/js/admin/turn-server.js @@ -1,4 +1,4 @@ -/* global OC, OCP, OCA, $, _, Handlebars */ +/* global OC, OCP, OCA, $, _, Handlebars, jsSHA */ (function(OC, OCP, OCA, $, _, Handlebars) { 'use strict'; @@ -17,6 +17,7 @@ ' <option value="tcp">' + t('spreed', 'TCP only') + '</option>' + ' {{/select}}' + ' </select>' + + ' <a class="icon icon-category-monitoring" title="' + t('spreed', 'Test server') + '"></a>' + ' <a class="icon icon-delete" title="' + t('spreed', 'Delete server') + '"></a>' + ' <a class="icon icon-add" title="' + t('spreed', 'Add new server') + '"></a>' + ' <span class="icon icon-checkmark-color hidden" title="' + t('spreed', 'Saved') + '"></span>' + @@ -72,6 +73,133 @@ } }, + notifyTurnResult: function($button, $candidates, $timeout) { + console.log("Received candidates", $candidates); + $button.removeClass('icon-loading'); + var $types = $candidates.map(function($cand) { + return $cand.type; + }); + var $class; + if ($types.indexOf('relay') === -1) { + $class = 'icon-error'; + } else { + $class = 'icon-checkmark'; + } + $button.addClass($class); + $button.removeClass('icon-category-monitoring'); + setTimeout(function() { + $button.removeClass($class); + $button.addClass('icon-category-monitoring'); + }, 7000); + clearTimeout($timeout); + }, + + // Parse a candidate:foo string into an object, for easier use by other methods. + parseCandidate: function($text) { + var $candidateStr = 'candidate:'; + var $pos = $text.indexOf($candidateStr) + $candidateStr.length; + var $parts = $text.substr($pos).split(' '); + var $foundation = $parts[0]; + var $component = $parts[1]; + var $protocol = $parts[2]; + var $priority = $parts[3]; + var $address = $parts[4]; + var $port = $parts[5]; + var $type = $parts[7]; + return { + 'component': $component, + 'type': $type, + 'foundation': $foundation, + 'protocol': $protocol, + 'address': $address, + 'port': $port, + 'priority': $priority + }; + }, + + iceCallback: function($pc, $button, $candidates, $timeout, e) { + if (e.candidate) { + $candidates.push(this.parseCandidate(e.candidate.candidate)); + } else if (!('onicegatheringstatechange' in RTCPeerConnection.prototype)) { + $pc.close(); + this.notifyTurnResult($button, $candidates, $timeout); + } + }, + + gatheringStateChange: function($pc, $button, $candidates, $timeout) { + if ($pc.iceGatheringState !== 'complete') { + return; + } + + $pc.close(); + this.notifyTurnResult($button, $candidates, $timeout); + }, + + testServer: function(e) { + e.stopPropagation(); + + var $button = $(e.currentTarget); + var $row = $button.parents('div.turn-server').first(); + var $server = $row.find('input.server').val(); + var $secret = $row.find('input.secret').val(); + var $protocols = $row.find('select.protocols').val().split(','); + if (!$server || !$secret || !$protocols.length) { + return; + } + + var $urls = []; + var i; + for (i = 0; i < $protocols.length; i++) { + $urls.push('turn:' + $server + '?transport=' + $protocols[i]); + } + + var $now = new Date(); + var $expires = Math.round($now.getTime() / 1000) + (5 * 60); + var $username = $expires + ':turn-test-user'; + var $hmac = new jsSHA("SHA-1", "TEXT"); + $hmac.setHMACKey($secret, "TEXT"); + $hmac.update($username); + var $password = $hmac.getHMAC("B64"); + var $iceServer = { + 'username': $username, + 'credential': $password, + 'urls': $urls + }; + + // Create a PeerConnection with no streams, but force a m=audio line. + var $config = { + iceServers: [ + $iceServer + ], + iceTransportPolicy: 'relay' + }; + var $offerOptions = { + offerToReceiveAudio: 1 + }; + console.log('Creating PeerConnection with', $config); + var $candidates = []; + $button.addClass('icon-loading'); + var $pc = new RTCPeerConnection($config); + var $timeout = setTimeout(function() { + this.notifyTurnResult($button, $candidates, $timeout); + $pc.close(); + }.bind(this), 10000); + $pc.onicecandidate = this.iceCallback.bind(this, $pc, $button, $candidates, $timeout); + $pc.onicegatheringstatechange = this.gatheringStateChange.bind(this, $pc, $button, $candidates, $timeout); + $pc.createOffer( + $offerOptions + ).then( + function(description) { + $pc.setLocalDescription(description); + }, + function(error) { + console.log("Error creating offer", error); + this.notifyTurnResult($button, $candidates, $timeout); + $pc.close(); + }.bind(this) + ); + }, + saveServers: function() { var servers = [], $error = [], @@ -140,6 +268,7 @@ $template.find('a.icon-add').on('click', this.addNewTemplate.bind(this)); $template.find('a.icon-delete').on('click', this.deleteServer.bind(this)); + $template.find('a.icon-category-monitoring').on('click', this.testServer.bind(this)); $template.find('input').on('change', this.saveServers.bind(this)); $template.find('select').on('change', this.saveServers.bind(this)); diff --git a/templates/settings/admin/turn-server.php b/templates/settings/admin/turn-server.php index 7903290f3..16255f12a 100644 --- a/templates/settings/admin/turn-server.php +++ b/templates/settings/admin/turn-server.php @@ -2,6 +2,7 @@ /** @var array $_ */ /** @var \OCP\IL10N $l */ script('spreed', ['admin/turn-server']); +script('spreed', ['admin/sha1']); style('spreed', ['settings-admin']); ?> |