April 2016 - tor-commits - lists.torproject.org

[snowflake/master] Feature detect with Modernizr
by arlo＠torproject.org 06 Apr '16

06 Apr '16

commit d567e2312f45165ff41ec7c66e18f265cbae378b Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Apr 5 10:27:41 2016 -0700 Feature detect with Modernizr * A start on #34 --- proxy/Cakefile | 19 +++++++++---------- proxy/coffee-snowflake.html | 1 + proxy/lib/modernizr.js | 3 +++ proxy/modernizr-config.json | 11 +++++++++++ proxy/package.json | 11 ++++++----- proxy/shims.coffee | 22 ++++++++++++++-------- proxy/snowflake.coffee | 14 +++++--------- proxy/spec/snowflake.spec.coffee | 2 +- proxy/static/embed.html | 1 + proxy/static/snowflake.html | 1 + 10 files changed, 52 insertions(+), 33 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index 045468f..513d446 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -19,32 +19,31 @@ FILES_SPEC = [ 'spec/snowflake.spec.coffee' ] FILES_ALL = FILES.concat FILES_SPEC -OUTFILE = 'build/snowflake.coffee' +OUTFILE = 'build/snowflake.js' STATIC = 'static' -concatCoffeeFiles = -> exec 'cat ' + FILES.join(' ') + ' | cat > ' + OUTFILE - -copyStaticFiles = -> exec 'cp ' + STATIC + '/* build/' +copyStaticFiles = -> + exec 'cp ' + STATIC + '/* build/' + exec 'cp lib/modernizr.js build/' compileCoffee = -> - exec 'coffee -o build -cb ' + OUTFILE, (err, stdout, stderr) -> + exec 'cat ' + FILES.join(' ') + ' | coffee -cs > ' + OUTFILE, (err, stdout, stderr) -> throw err if err task 'test', 'snowflake unit tests', -> - exec 'mkdir -p build' + exec 'mkdir -p test' exec 'jasmine init >&-' # Simply concat all the files because we're not using node exports. - jasmineFiles = FILES.concat FILES_SPEC - outFile = 'build/bundle.spec.coffee' + jasmineFiles = FILES_ALL + outFile = 'test/bundle.spec.coffee' exec 'cat ' + jasmineFiles.join(' ') + ' | cat > ' + outFile execSync 'coffee -cb ' + outFile - spawn 'jasmine', ['build/bundle.spec.js'], { + spawn 'jasmine', ['test/bundle.spec.js'], { stdio: 'inherit' } task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' - concatCoffeeFiles() copyStaticFiles() compileCoffee() console.log 'Snowflake prepared.' diff --git a/proxy/coffee-snowflake.html b/proxy/coffee-snowflake.html index f1f5f90..5f7672c 100644 --- a/proxy/coffee-snowflake.html +++ b/proxy/coffee-snowflake.html @@ -3,6 +3,7 @@ <head> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> <script type="text/javascript" src="lib/coffee-script.js"></script> + <script type="text/javascript" src="lib/modernizr.js"></script> <script type="text/coffeescript" src="snowflake.coffee"></script> <style> * { diff --git a/proxy/lib/modernizr.js b/proxy/lib/modernizr.js new file mode 100644 index 0000000..8c77f81 --- /dev/null +++ b/proxy/lib/modernizr.js @@ -0,0 +1,3 @@ +/*! modernizr 3.3.1 (Custom Build) | MIT * + * http://modernizr.com/download/?-datachannel-peerconnection-websockets-prefi… !*/ +!function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in h)if(h.hasOwnProperty(f)){if(e=[],n=h[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++)s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),C.push((o?"":"no-")+a.join("-"))}}function i(e,n){return!!~(""+e).indexOf(n)}function s(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function a(){var e=n.body;return e||(e=s(x?"svg":"body"),e.fake=!0),e}function f(e,t,r,o){var i,f,u,l,d="modernizr",p=s("div"),c=a();if(parseInt(r,10))for(;r--;)u=s("div"),u.id=o?o[r ]:d+(r+1),p.appendChild(u);return i=s("style"),i.type="text/css",i.id="s"+d,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=d,c.fake&&(c.style.background="",c.style.overflow="hidden",l=S.style.overflow,S.style.overflow="hidden",S.appendChild(c)),f=t(p,e),c.fake?(c.parentNode.removeChild(c),S.style.overflow=l,S.offsetHeight):p.parentNode.removeChild(p),!!f}function u(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function l(n,r){var o=n.length;if("CSS"in e&&"supports"in e.CSS){for(;o--;)if(e.CSS.supports(u(n[o]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var i=[];o--;)i.push("("+u(n[o])+":"+r+")");return i=i.join(" or "),f("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function d(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^ -/,"")}function p(e,n,o,a){function f(){p&&(delete T.style,delete T.modElem)}if(a=r(a,"undefined")?!1:a,!r(o,"undefined")){var u=l(e,o);if(!r(u,"undefined"))return u}for(var p,c,m,v,h,y=["modernizr","tspan"];!T.style;)p=!0,T.modElem=s(y.shift()),T.style=T.modElem.style;for(m=e.length,c=0;m>c;c++)if(v=e[c],h=T.style[v],i(v,"-")&&(v=d(v)),T.style[v]!==t){if(a||r(o,"undefined"))return f(),"pfx"==n?v:!0;try{T.style[v]=o}catch(C){}if(T.style[v]!=h)return f(),"pfx"==n?v:!0}return f(),!1}function c(e,n){return function(){return e.apply(n,arguments)}}function m(e,n,t){var o;for(var i in e)if(e[i]in n)return t===!1?e[i]:(o=n[e[i]],r(o,"function")?c(o,t||n):o);return!1}function v(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+w.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?p(a,n,o,i):(a=(e+" "+b.join(s+" ")+s).split(" "),m(a,n,t))}var h=[],y={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){h.push({name:e,fn:n,options:t})},addAsyncTest:function(e){h.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=y,Modernizr=new Modernizr;var C=[],g="Moz O ms Webkit",w=y._config.usePrefixes?g.split(" "):[];y._cssomPrefixes=w;var S=n.documentElement,x="svg"===S.nodeName.toLowerCase(),_={elem:s("modernizr")};Modernizr._q.push(function(){delete _.elem});var T={style:_.elem.style};Modernizr._q.unshift(function(){delete T.style});var b=y._config.usePrefixes?g.toLowerCase().split(" "):[];y._domPrefixes=b,y.testAllProps=v;var E=function(n){var r,o=prefixes.length,i=e.CSSRule;if("undefined"==typeof i)return t;if(!n)return!1;if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in i)return"@"+n;for(var s=0;o>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in i)return"@-"+a.toLowerCase()+"-"+n}return!1};y.atRule=E;var P=y.prefixed=function(e,n,t){return 0===e.indexOf("@")?E(e):(-1!=e.inde xOf("-")&&(e=d(e)),n?v(e,n,t):v(e,"pfx"))};Modernizr.addTest("websockets","WebSocket"in e&&2===e.WebSocket.CLOSING),Modernizr.addTest("peerconnection",!!P("RTCPeerConnection",e)),Modernizr.addTest("datachannel",function(){if(!Modernizr.peerconnection)return!1;for(var n=0,t=b.length;t>n;n++){var r=e[b[n]+"RTCPeerConnection"];if(r){var o=new r({iceServers:[{url:"stun:0"}]});return"createDataChannel"in o}}return!1}),o(),delete y.addTest,delete y.addAsyncTest;for(var k=0;k<Modernizr._q.length;k++)Modernizr._q[k]();e.Modernizr=Modernizr}(window,document); \ No newline at end of file diff --git a/proxy/modernizr-config.json b/proxy/modernizr-config.json new file mode 100644 index 0000000..1cad4d3 --- /dev/null +++ b/proxy/modernizr-config.json @@ -0,0 +1,11 @@ +{ + "minify": true, + "options": [ + "prefixed" + ], + "feature-detects": [ + "test/websockets", + "test/webrtc/datachannel", + "test/webrtc/peerconnection" + ] +} \ No newline at end of file diff --git a/proxy/package.json b/proxy/package.json index b7e44df..d276472 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -9,15 +9,16 @@ "scripts": { "test": "cake test", "lint": "cake lint", - "build": "cake build" + "build": "cake build", + "clean": "cake clean", + "modern": "modernizr -c modernizr-config.json -d lib/" }, "author": "Serene Han", "license": "BSD-3-Clause", "devDependencies": { + "coffee-script": "^1.10.0", "coffeelint": "^1.15.0", - "jasmine": "^2.4.1" - }, - "dependencies": { - "coffee-script": "^1.10.0" + "jasmine": "^2.4.1", + "modernizr": "^3.3.1" } } diff --git a/proxy/shims.coffee b/proxy/shims.coffee index 9fc2fb4..ef5fbb5 100644 --- a/proxy/shims.coffee +++ b/proxy/shims.coffee @@ -2,13 +2,19 @@ WebrTC shims for multiple browsers. ### -if 'undefined' != typeof module && 'undefined' != typeof module.exports - console.log 'not in browser.' +if typeof module isnt 'undefined' and module.exports + window = {} else - window.PeerConnection = window.RTCPeerConnection || - window.mozRTCPeerConnection || - window.webkitRTCPeerConnection - window.RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate - window.RTCSessionDescription = window.RTCSessionDescription || - window.mozRTCSessionDescription + window = this + prop = Modernizr.prefixed 'RTCPeerConnection', window, false + if not prop + console.log 'webrtc feature not detected. shutting down' + return; + PeerConnection = window[prop] + + ### FIXME: push these upstream ### + IceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate + SessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription + +location = if window.location then window.location.search.substr(1) else "" diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index a96dbdf..f325d90 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -15,13 +15,9 @@ COPY_PASTE_ENABLED = false DEBUG = false silenceNotifications = false -query = null -if 'undefined' != typeof window && window.location - query = Query.parse(window.location.search.substr(1)) - DEBUG = Params.getBool(query, 'debug', false) - COPY_PASTE_ENABLED = Params.getBool(query, 'manual', false) -else - window = {} +query = Query.parse(location) +DEBUG = Params.getBool(query, 'debug', false) +COPY_PASTE_ENABLED = Params.getBool(query, 'manual', false) # Bytes per second. Set to undefined to disable limit. DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined @@ -129,7 +125,7 @@ class Snowflake try offer = JSON.parse desc dbg 'Received:\n\n' + offer.sdp + '\n' - sdp = new RTCSessionDescription offer + sdp = new SessionDescription offer @sendAnswer pair if pair.receiveWebRTCOffer sdp catch e log 'ERROR: Unable to receive Offer: ' + e @@ -230,4 +226,4 @@ window.onunload = -> pair.close() for pair in snowflake.proxyPairs null -window.onload = init if window +window.onload = init diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index 417b6e6..2865795 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -5,7 +5,7 @@ jasmine tests for Snowflake query = {} # Fake browser functionality: class PeerConnection -class RTCSessionDescription +class SessionDescription type: 'offer' class WebSocket OPEN: 1 diff --git a/proxy/static/embed.html b/proxy/static/embed.html index 5d68576..2557e58 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -2,6 +2,7 @@ <html> <head> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <script type="text/javascript" src="modernizr.js"></script> <script type="text/javascript" src="snowflake.js"></script> <style> * { diff --git a/proxy/static/snowflake.html b/proxy/static/snowflake.html index b6d984a..c2bcef5 100644 --- a/proxy/static/snowflake.html +++ b/proxy/static/snowflake.html @@ -2,6 +2,7 @@ <html> <head> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <script type="text/javascript" src="modernizr.js"></script> <script type="text/javascript" src="snowflake.js"></script> <style> * {

1 0

[nyx/master] Correct copyright years
by atagar＠torproject.org 06 Apr '16

06 Apr '16

commit 190d48f5ed7b37fcff884d1f0f1e272305339951 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 10:39:44 2016 -0700 Correct copyright years Turns out 'git log --follow <path>' gives us an easy method for getting when files were created, following renames. In a few cases took a little extra digging. --- nyx/__init__.py | 2 +- nyx/arguments.py | 2 +- nyx/controller.py | 2 +- nyx/curses.py | 2 +- nyx/demo_glyphs.py | 2 +- nyx/log.py | 2 +- nyx/menu.py | 2 +- nyx/panel/__init__.py | 2 +- nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 2 +- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- nyx/popups.py | 2 +- nyx/starter.py | 2 +- nyx/tracker.py | 2 +- nyx/uninstall | 2 +- run_nyx | 2 +- run_tests.py | 2 +- setup.py | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index fbd765b..f2c62f4 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/arguments.py b/nyx/arguments.py index a01ebb9..e70278b 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/controller.py b/nyx/controller.py index c4ccc15..3336837 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/curses.py b/nyx/curses.py index 95d9dda..ebe5eef 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/demo_glyphs.py b/nyx/demo_glyphs.py index 7ca68ee..2978873 100755 --- a/nyx/demo_glyphs.py +++ b/nyx/demo_glyphs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2014-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/log.py b/nyx/log.py index f461937..ec09c3f 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2014-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/menu.py b/nyx/menu.py index 1b6b6bf..697dfac 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2011-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 0ae3fdb..9b616e5 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 1b991b6..bb432b2 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 709cf52..e7e80f5 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2011-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 7c53675..401c079 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 7e83501..c6627c2 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/log.py b/nyx/panel/log.py index dc26dc3..a18b2ce 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 23c86d3..2943807 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/popups.py b/nyx/popups.py index 70d996a..01a5215 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2011-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/starter.py b/nyx/starter.py index b13190f..2ddfff0 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/tracker.py b/nyx/tracker.py index a5a4f00..6376584 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -1,4 +1,4 @@ -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/uninstall b/nyx/uninstall index 5f72d4d..c65344c 100755 --- a/nyx/uninstall +++ b/nyx/uninstall @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information files="/usr/bin/nyx /usr/share/man/man1/nyx.1.gz /usr/share/nyx" diff --git a/run_nyx b/run_nyx index b6c7b94..29c6be5 100755 --- a/run_nyx +++ b/run_nyx @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information import nyx diff --git a/run_tests.py b/run_tests.py index 1c52132..101b77e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016, Damian Johnson and The Tor Project +# Copyright 2013-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/setup.py b/setup.py index d83c8aa..bfcdefa 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015, Damian Johnson and The Tor Project +# Copyright 2010-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information import gzip

1 0

[nyx/master] Mock static screen size in tests
by atagar＠torproject.org 06 Apr '16

06 Apr '16

commit 12be6c891d8ff84246152bb940f7a99d94080508 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 10:45:38 2016 -0700 Mock static screen size in tests Our unit tests fail on smaller minitors (like my netbook) since the popup dimensions are smaller than expected. Mocking a static size to make these more reliable. --- test/popups.py | 68 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/test/popups.py b/test/popups.py index 34ff587..0394003 100644 --- a/test/popups.py +++ b/test/popups.py @@ -163,38 +163,40 @@ Consensus Descriptor:----------+ """.strip() EXPECTED_DESCRIPTOR = """ -Consensus Descriptor (29787760145CD1A473552A2FC64C72A9A130820E):---------------------------------------------------+ -| 1 Consensus: | -| 2 | -| 3 r cyberphunk KXh3YBRc0aRzVSovxkxyqaEwgg4 VjdJThHuYj0jDY2tkkDJkCa8s1s 2016-04-04 19:03:16 94.23.150.191 8080 0 | -| 4 s Fast Guard Running Stable Valid | -| 5 w Bandwidth=8410 | -| 6 p reject 1-65535 | -| 7 | -| 8 Server Descriptor: | -| 9 | -| 10 router cyberphunk 94.23.150.191 8080 0 0 | -| 11 platform Tor 0.2.4.27 on Linux | -| 12 protocols Link 1 2 Circuit 1 | -| 13 published 2016-04-04 19:03:16 | -| 14 fingerprint 2978 7760 145C D1A4 7355 2A2F C64C 72A9 A130 820E | -| 15 uptime 3899791 | -| 16 bandwidth 10240000 10444800 6482376 | -| 17 extra-info-digest 9DC532664DDFD238A4119D623D30F136A3B851BF | -| 18 reject *:* | -| 19 router-signature | -| 20 -----BEGIN SIGNATURE----- | -| 21 EUFm38gONCoDuY7ZWHyJtBKuvk6Xi1MPuKuecS5frP3fX0wiZSrOVcpX0X8J+4Hr | -| 22 Fb5i+yuMIAXeEn6UhtjqhhZBbY9PW9GdZOMTH8hJpG+evURyr+10PZq6UElg86rA | -| 23 NCGI042p6+7UgCVT1x3WcLnq3ScV//s1wXHrUXa7vi0= | -| 24 -----END SIGNATURE----- | -+------------------------------------------------------------------------------------------------------------------+ +Consensus Descriptor (29787760145CD1A473552A2FC64C72A9A130820E):---------------+ +| 1 Consensus: | +| 2 | +| 3 r cyberphunk KXh3YBRc0aRzVSovxkxyqaEwgg4 VjdJThHuYj0jDY2tkkDJkCa8s1s | +| 2016-04-04 19:03:16 94.23.150.191 8080 0 | +| 4 s Fast Guard Running Stable Valid | +| 5 w Bandwidth=8410 | +| 6 p reject 1-65535 | +| 7 | +| 8 Server Descriptor: | +| 9 | +| 10 router cyberphunk 94.23.150.191 8080 0 0 | +| 11 platform Tor 0.2.4.27 on Linux | +| 12 protocols Link 1 2 Circuit 1 | +| 13 published 2016-04-04 19:03:16 | +| 14 fingerprint 2978 7760 145C D1A4 7355 2A2F C64C 72A9 A130 820E | +| 15 uptime 3899791 | +| 16 bandwidth 10240000 10444800 6482376 | +| 17 extra-info-digest 9DC532664DDFD238A4119D623D30F136A3B851BF | +| 18 reject *:* | +| 19 router-signature | +| 20 -----BEGIN SIGNATURE----- | +| 21 EUFm38gONCoDuY7ZWHyJtBKuvk6Xi1MPuKuecS5frP3fX0wiZSrOVcpX0X8J+4Hr | +| 22 Fb5i+yuMIAXeEn6UhtjqhhZBbY9PW9GdZOMTH8hJpG+evURyr+10PZq6UElg86rA | +| 23 NCGI042p6+7UgCVT1x3WcLnq3ScV//s1wXHrUXa7vi0= | +| 24 -----END SIGNATURE----- | ++------------------------------------------------------------------------------+ """.strip() class TestPopups(unittest.TestCase): - @patch('nyx.controller.get_controller') @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) + @patch('nyx.controller.get_controller') def test_help(self, get_controller_mock): header_panel = Mock() @@ -229,16 +231,19 @@ class TestPopups(unittest.TestCase): self.assertEqual(EXPECTED_HELP_POPUP, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_about(self): rendered = test.render(nyx.popups.show_about) self.assertEqual(EXPECTED_ABOUT_POPUP, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_counts_when_empty(self): rendered = test.render(nyx.popups.show_counts, 'Client Locales', {}) self.assertEqual(EXPECTED_EMPTY_COUNTS, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_counts(self): clients = { 'fr': 5, @@ -252,6 +257,7 @@ class TestPopups(unittest.TestCase): self.assertEqual(EXPECTED_COUNTS, rendered.content) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_select_from_list(self): options = ['each second', '5 seconds', '30 seconds', 'minutely', '15 minute', '30 minute', 'hourly', 'daily'] rendered = test.render(nyx.popups.select_from_list, 'Update Interval:', options, 'each second') @@ -259,6 +265,7 @@ class TestPopups(unittest.TestCase): self.assertEqual('each second', rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_select_sort_order(self): previous_order = ['Man Page Entry', 'Name', 'Is Set'] options = ['Name', 'Value', 'Value Type', 'Category', 'Usage', 'Summary', 'Description', 'Man Page Entry', 'Is Set'] @@ -268,6 +275,7 @@ class TestPopups(unittest.TestCase): self.assertEqual(None, rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_select_sort_order_usage(self): # Use the dialog to make a selection. At the end we render two options as # being selected (rather than three) because the act of selecing the third @@ -292,6 +300,7 @@ class TestPopups(unittest.TestCase): self.assertEqual(['Name', 'Summary', 'Description'], rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.controller.input_prompt', Mock(return_value = None)) def test_select_event_types_when_canceled(self): rendered = test.render(nyx.popups.select_event_types) @@ -299,14 +308,15 @@ class TestPopups(unittest.TestCase): self.assertEqual(None, rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.controller.input_prompt', Mock(return_value = '2bwe')) def test_select_event_types_with_input(self): rendered = test.render(nyx.popups.select_event_types) self.assertEqual(EXPECTED_EVENT_SELECTOR, rendered.content) self.assertEqual(set(['NYX_INFO', 'ERR', 'WARN', 'BW', 'NYX_ERR', 'NYX_WARN', 'NYX_NOTICE']), rendered.return_value) - @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_confirm_save_torrc(self): rendered = test.render(nyx.popups.confirm_save_torrc, TORRC) self.assertEqual(EXPECTED_SAVE_TORRC_CONFIRMATION, rendered.content) @@ -321,12 +331,14 @@ class TestPopups(unittest.TestCase): self.assertEqual(True, rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) def test_descriptor_without_fingerprint(self): rendered = test.render(nyx.popups.show_descriptor, None, nyx.curses.Color.RED, lambda key: key.match('esc')) self.assertEqual(EXPECTED_DESCRIPTOR_WITHOUT_FINGERPRINT, rendered.content) self.assertEqual(nyx.curses.KeyInput(27), rendered.return_value) @patch('nyx.popups._top', Mock(return_value = 0)) + @patch('nyx.curses.screen_size', Mock(return_value = nyx.curses.Dimensions(80, 60))) @patch('nyx.popups._descriptor_text', Mock(return_value = DESCRIPTOR_TEXT)) def test_descriptor(self): rendered = test.render(nyx.popups.show_descriptor, '29787760145CD1A473552A2FC64C72A9A130820E', nyx.curses.Color.RED, lambda key: key.match('esc'))

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 4026745f323793f3b658bb5fdbb0a13e841a2f48 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 14:45:15 2016 +0000 Update translations for whisperback_completed --- zh_HK/zh_HK.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index aae98ce..5ccdeab 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -5,13 +5,14 @@ # Translators: # kythk <a5177958(a)drdrb.net>, 2014 # Christian Chung <alphachungys(a)gmail.com>, 2016 +# Kin Kwok, 2016 # kythk <a5177958(a)drdrb.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-04-05 10:04+0000\n" +"PO-Revision-Date: 2016-04-06 14:41+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgstr "無效的電郵地址：%s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "無效的連略OpenPGP鎖匙：%s" +msgstr "無效的連絡OpenPGP鎖匙：%s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" @@ -156,7 +157,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和／或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3 或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途之默示責任擔保。\n請參閱GNU通用公共許可證瞭解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" +msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和╱或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途的默示責任擔保。\n請參閱GNU通用公共授權了解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" #: ../data/whisperback.ui.h:20 msgid ""

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 5f8f3818f864bc579ba5679f0ba632d1cb063310 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 14:45:12 2016 +0000 Update translations for whisperback --- zh_HK/zh_HK.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index aae98ce..5ccdeab 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -5,13 +5,14 @@ # Translators: # kythk <a5177958(a)drdrb.net>, 2014 # Christian Chung <alphachungys(a)gmail.com>, 2016 +# Kin Kwok, 2016 # kythk <a5177958(a)drdrb.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-04-05 10:04+0000\n" +"PO-Revision-Date: 2016-04-06 14:41+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgstr "無效的電郵地址：%s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "無效的連略OpenPGP鎖匙：%s" +msgstr "無效的連絡OpenPGP鎖匙：%s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" @@ -156,7 +157,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和／或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3 或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途之默示責任擔保。\n請參閱GNU通用公共許可證瞭解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" +msgstr "WhisperBack - 使用加密電郵來傳送意見反映。\nCopyright (C) 2009-2012 Tails 開發人員<tails(a)boum.org>\n\n此程式為自由軟件，你可以隨意轉發和╱或修改。\n使用免費軟體基金會所發佈的GNU通用公共授權條款授權，\n授權版本3或(由你選擇)任何較新的版本。\n\n轉發此程式時希望它有用，\n但沒有任何擔保責任；沒有適合某特定用途的默示責任擔保。\n請參閱GNU通用公共授權了解更多詳細資料。\n\n隨此軟件應該收到GNU通用公共授權副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" #: ../data/whisperback.ui.h:20 msgid ""

1 0

[depictor/master] Sort flags in the big relay table #18712
by tom＠torproject.org 06 Apr '16

06 Apr '16

commit bbc61f0a16692bc66cfc0da6aa15239609a0fa39 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Apr 6 08:58:29 2016 -0500 Sort flags in the big relay table #18712 --- website.py | 1 + 1 file changed, 1 insertion(+) diff --git a/website.py b/website.py index 668f6eb..84d7d98 100755 --- a/website.py +++ b/website.py @@ -906,6 +906,7 @@ class WebsiteWriter: consensusFlags = self.consensus.routers[relay_fp].flags relevantFlags.update(consensusFlags) + relevantFlags = sorted(list(relevantFlags)) for dirauth_nickname in self.votes: vote = self.votes[dirauth_nickname] if relay_fp in vote.routers:

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 92836ede68095d6db4804b20274caa2ead2644ac Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 13:16:26 2016 +0000 Update translations for tor-messenger-conversationsproperties_completed --- zh_HK/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/conversations.properties b/zh_HK/conversations.properties index 460b698..d19d36d 100644 --- a/zh_HK/conversations.properties +++ b/zh_HK/conversations.properties @@ -26,7 +26,7 @@ statusChangedFromUnknownWithStatusText=%1$S就是%2$S: %3$S。 # special case of the previous 2 strings for when an account has just # been reconnected, so the status is now known. These 2 strings should not # mislead the user into thinking the person's status has just changed. -statusKnown=你的帳戶已重新連接((%1$S就是%2$S)。 +statusKnown=你的帳戶已重新連接(%1$S就是%2$S)。 statusKnownWithStatusText=你的帳戶已重新連接(%1$S就是%2$S: %3$S)。 # LOCALIZATION NOTE (statusUnknown): # %S is the display name of the contact. @@ -51,7 +51,7 @@ topicSet=%1$S的討論主題是：%2$S topicNotSet=%S沒有主題。 # LOCALIZATION NOTE (topicChanged): # %1$S is the user who changed the topic, %2$S is the new topic. -topicChanged=%1$S以將主題更改為：%2$S +topicChanged=%1$S已將主題更改為：%2$S # LOCALIZATION NOTE (topicCleared): # %1$S is the user who cleared the topic. topicCleared=%1$S已經清除主題。

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 94d764e4507babbb15f1bd7fe6d0a9ce2d3b2362 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 13:16:22 2016 +0000 Update translations for tor-messenger-conversationsproperties --- zh_HK/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/conversations.properties b/zh_HK/conversations.properties index 460b698..d19d36d 100644 --- a/zh_HK/conversations.properties +++ b/zh_HK/conversations.properties @@ -26,7 +26,7 @@ statusChangedFromUnknownWithStatusText=%1$S就是%2$S: %3$S。 # special case of the previous 2 strings for when an account has just # been reconnected, so the status is now known. These 2 strings should not # mislead the user into thinking the person's status has just changed. -statusKnown=你的帳戶已重新連接((%1$S就是%2$S)。 +statusKnown=你的帳戶已重新連接(%1$S就是%2$S)。 statusKnownWithStatusText=你的帳戶已重新連接(%1$S就是%2$S: %3$S)。 # LOCALIZATION NOTE (statusUnknown): # %S is the display name of the contact. @@ -51,7 +51,7 @@ topicSet=%1$S的討論主題是：%2$S topicNotSet=%S沒有主題。 # LOCALIZATION NOTE (topicChanged): # %1$S is the user who changed the topic, %2$S is the new topic. -topicChanged=%1$S以將主題更改為：%2$S +topicChanged=%1$S已將主題更改為：%2$S # LOCALIZATION NOTE (topicCleared): # %1$S is the user who cleared the topic. topicCleared=%1$S已經清除主題。

1 0

[translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit caede796b2dfee9abfc07e6033c4ada78156b4dd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 12:46:15 2016 +0000 Update translations for tor-messenger-authdtd_completed --- zh_HK/auth.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/auth.dtd b/zh_HK/auth.dtd index 750006e..381db02 100644 --- a/zh_HK/auth.dtd +++ b/zh_HK/auth.dtd @@ -13,8 +13,8 @@ <!ENTITY authDialog.manualInstruction "驗證數碼指紋，可於物質世界聯絡對方，例如經電話連線交換數碼指紋資料。若數碼指紋吻合，請於下方話匣選取「已經驗證」。"> <!ENTITY authDialog.choose "選取"> <!ENTITY authDialog.how "如何驗證連絡人的身份？"> -<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回復的答案或問題不吻合，則表示對方是假冒。"> -<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等待對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回覆的答案或問題不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等候對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> <!ENTITY authDialog.question "請輸入問題："> <!ENTITY authDialog.answer "請在此輸入答案(大小楷寫視為不同)："> <!ENTITY authDialog.secret "請輸入秘密：">

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 6b455922f568816c97b7c31223da90899d333f5d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 12:46:12 2016 +0000 Update translations for tor-messenger-authdtd --- zh_HK/auth.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/auth.dtd b/zh_HK/auth.dtd index 750006e..381db02 100644 --- a/zh_HK/auth.dtd +++ b/zh_HK/auth.dtd @@ -13,8 +13,8 @@ <!ENTITY authDialog.manualInstruction "驗證數碼指紋，可於物質世界聯絡對方，例如經電話連線交換數碼指紋資料。若數碼指紋吻合，請於下方話匣選取「已經驗證」。"> <!ENTITY authDialog.choose "選取"> <!ENTITY authDialog.how "如何驗證連絡人的身份？"> -<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回復的答案或問題不吻合，則表示對方是假冒。"> -<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等待對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.qaInstruction "驗證他們身份，請選一個只有你和對方知道答案的問題，輸入該問題或其答案二擇其一，並等候對方輸入相應的回覆，若對方回覆的答案或問題不吻合，則表示對方是假冒。"> +<!ENTITY authDialog.secretInstruction "驗證他們身份，請選一個只有你和對方知道的秘密，輸入此祕密並等候對方也輸入該秘密，若雙方的秘密不吻合，則表示對方是假冒。"> <!ENTITY authDialog.question "請輸入問題："> <!ENTITY authDialog.answer "請在此輸入答案(大小楷寫視為不同)："> <!ENTITY authDialog.secret "請輸入秘密：">

1 0