- tor-commits - lists.torproject.org

[torflow/master] Submodule.
by mikeperry＠torproject.org 25 Jun '11

25 Jun '11

commit adc78995ac912b559276e1817c19339e61ce1fbb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Jun 25 10:38:55 2011 -0700 Submodule. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index dc1cb9c..962d30c 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit dc1cb9ce39fd5c9c5ea50f542642130a44e71fee +Subproject commit 962d30c72ffc85c1df79270d6ac5b25f0336d2d2

1 0

[torflow/master] Update metatroller example to use new TorCtl.connect..
by mikeperry＠torproject.org 25 Jun '11

25 Jun '11

commit 07cbb7c90d1335043e7ce00d85102b18003ca1c9 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Jun 25 10:39:03 2011 -0700 Update metatroller example to use new TorCtl.connect.. --- metatroller.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/metatroller.py b/metatroller.py index dc6ff6c..3449249 100755 --- a/metatroller.py +++ b/metatroller.py @@ -305,11 +305,8 @@ def listenloop(c, h, f): srv.close() def startup(): - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((control_host,control_port)) - c = PathSupport.Connection(s) + c = TorCtl.connect(control_host, control_port, ConnClass=PathSupport.Connection) c.debug(file("control.log", "w", buffering=0)) - c.authenticate(control_pass) h = PathSupport.PathBuilder(c, __selmgr) # StatsHandler(c, __selmgr) c.set_event_handler(h)

1 0

[pytorctl/master] Allow TorCtl.connect() to specify alternate Connection classes.
by mikeperry＠torproject.org 25 Jun '11

25 Jun '11

commit 962d30c72ffc85c1df79270d6ac5b25f0336d2d2 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Jun 25 10:37:22 2011 -0700 Allow TorCtl.connect() to specify alternate Connection classes. Need to move it for that... --- TorCtl.py | 156 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 80 insertions(+), 76 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index ac49574..a110679 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -96,82 +96,6 @@ AUTH_TYPE = Enum2( INCORRECT_PASSWORD_MSG = "Provided passphrase was incorrect" -def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): - """ - Convenience function for quickly getting a TorCtl connection. This is very - handy for debugging or CLI setup, handling setup and prompting for a password - if necessary (if either none is provided as input or it fails). If any issues - arise this prints a description of the problem and returns None. - - Arguments: - controlAddr - ip address belonging to the controller - controlPort - port belonging to the controller - passphrase - authentication passphrase (if defined this is used rather - than prompting the user) - """ - - conn = None - try: - conn, authType, authValue = preauth_connect(controlAddr, controlPort) - - if authType == AUTH_TYPE.PASSWORD: - # password authentication, promting for the password if it wasn't provided - if passphrase: authValue = passphrase - else: - try: authValue = getpass.getpass() - except KeyboardInterrupt: return None - - conn.authenticate(authValue) - return conn - except Exception, exc: - if conn: conn.close() - - if passphrase and str(exc) == "Unable to authenticate: password incorrect": - # provide a warning that the provided password didn't work, then try - # again prompting for the user to enter it - print INCORRECT_PASSWORD_MSG - return connect(controlAddr, controlPort) - else: - print exc - return None - -def preauth_connect(controlAddr="127.0.0.1", controlPort=9051): - """ - Provides an uninitiated torctl connection components for the control port, - returning a tuple of the form... - (torctl connection, authType, authValue) - - The authValue corresponds to the cookie path if using an authentication - cookie, otherwise this is the empty string. This raises an IOError in case - of failure. - - Arguments: - controlAddr - ip address belonging to the controller - controlPort - port belonging to the controller - """ - - conn = None - try: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((controlAddr, controlPort)) - conn = Connection(s) - authType, authValue = conn.get_auth_type(), "" - - if authType == AUTH_TYPE.COOKIE: - authValue = conn.get_auth_cookie_path() - - return (conn, authType, authValue) - except socket.error, exc: - if conn: conn.close() - - if "Connection refused" in exc.args: - # most common case - tor control port isn't available - raise IOError("Connection refused. Is the ControlPort enabled?") - - raise IOError("Failed to establish socket: %s" % exc) - except Exception, exc: - if conn: conn.close() - raise IOError(exc) class TorCtlError(Exception): "Generic error raised by TorControl code." @@ -1903,3 +1827,83 @@ def parseHostAndPort(h): return host, port +def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, + ConnClass=Connection): + """ + Convenience function for quickly getting a TorCtl connection. This is very + handy for debugging or CLI setup, handling setup and prompting for a password + if necessary (if either none is provided as input or it fails). If any issues + arise this prints a description of the problem and returns None. + + Arguments: + controlAddr - ip address belonging to the controller + controlPort - port belonging to the controller + passphrase - authentication passphrase (if defined this is used rather + than prompting the user) + """ + + conn = None + try: + conn, authType, authValue = preauth_connect(controlAddr, controlPort, + ConnClass) + + if authType == AUTH_TYPE.PASSWORD: + # password authentication, promting for the password if it wasn't provided + if passphrase: authValue = passphrase + else: + try: authValue = getpass.getpass() + except KeyboardInterrupt: return None + + conn.authenticate(authValue) + return conn + except Exception, exc: + if conn: conn.close() + + if passphrase and str(exc) == "Unable to authenticate: password incorrect": + # provide a warning that the provided password didn't work, then try + # again prompting for the user to enter it + print INCORRECT_PASSWORD_MSG + return connect(controlAddr, controlPort) + else: + print exc + return None + +def preauth_connect(controlAddr="127.0.0.1", controlPort=9051, + ConnClass=Connection): + """ + Provides an uninitiated torctl connection components for the control port, + returning a tuple of the form... + (torctl connection, authType, authValue) + + The authValue corresponds to the cookie path if using an authentication + cookie, otherwise this is the empty string. This raises an IOError in case + of failure. + + Arguments: + controlAddr - ip address belonging to the controller + controlPort - port belonging to the controller + """ + + conn = None + try: + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((controlAddr, controlPort)) + conn = ConnClass(s) + authType, authValue = conn.get_auth_type(), "" + + if authType == AUTH_TYPE.COOKIE: + authValue = conn.get_auth_cookie_path() + + return (conn, authType, authValue) + except socket.error, exc: + if conn: conn.close() + + if "Connection refused" in exc.args: + # most common case - tor control port isn't available + raise IOError("Connection refused. Is the ControlPort enabled?") + + raise IOError("Failed to establish socket: %s" % exc) + except Exception, exc: + if conn: conn.close() + raise IOError(exc) +

1 0

r24840: {} add some files from ticket 3461. (in projects/misc/phobos: . TBB-cache-tests)
by Andrew Lewman 25 Jun '11

25 Jun '11

Author: phobos Date: 2011-06-25 13:40:24 +0000 (Sat, 25 Jun 2011) New Revision: 24840 Added: projects/misc/phobos/TBB-cache-tests/ projects/misc/phobos/TBB-cache-tests/default-TBB-settings-cache-data-leaking.pdf projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-data-leaks.pdf projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-noscript-settings.txt projects/misc/phobos/TBB-cache-tests/minor-tweaks-TBB-data-leaking.pdf Log: add some files from ticket 3461. Added: projects/misc/phobos/TBB-cache-tests/default-TBB-settings-cache-data-leaking.pdf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/TBB-cache-tests/default-TBB-settings-cache-data-leaking.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-data-leaks.pdf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-data-leaks.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-noscript-settings.txt =================================================================== --- projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-noscript-settings.txt (rev 0) +++ projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-noscript-settings.txt 2011-06-25 13:40:24 UTC (rev 24840) @@ -0,0 +1,275 @@ +{"prefs":{ +"logDNS":false, +"whitelistRegExp":"", +"secureCookiesExceptions":"", +"surrogate.popunder.exceptions":".meebo.com", +"doNotTrack.forced":"", +"forbidSilverlight":true, +"ignorePorts":true, +"autoAllow":2, +"surrogate.ab_binlayer.sources":"^http://view\\.binlay(?:er)\\.", +"allowBookmarks":true, +"showRecentlyBlocked":false, +"injectionCheckHTML":true, +"https.showInConsole":true, +"filterXExceptions":"^https?://([a-z]+)\\.google\\.(?:[a-z]{1,3}\\.)?[a-z]+/(?:search|custom|\\1)\\?\u000a^https?://([a-z]*)\\.?search\\.yahoo\\.com/search(?:\\?|/\\1\\b)\u000a^https?://[a-z]+\\.wikipedia\\.org/wiki/[^\"<>\\?%]+$\u000a^https?://translate\\.google\\.com/translate_t[^\"'<>\\?%]+$\u000a^https://secure\\.wikimedia\\.org/wikipedia/[a-z]+/wiki/[^\"<>\\?%]+$", +"siteInfoProvider":"http://noscript.net/about/%utf8%;%ace%", +"showDomain":false, +"surrogate.imdb.replacement":"addEventListener('DOMContentLoaded',function(ev){ad_utils.render_ad=function(w){w.location=w.location.href.replace(/.*\\bTRAILER=([^&]+).*/,'$1')}},true)", +"safeToplevel":true, +"surrogate.ab_bidvertiser.sources":"^http://bdv\\.bidvert", +"surrogate.debug":false, +"surrogate.amo.replacement":"addEventListener('click',function(e){if(e.button)return;var a=e.target.parentNode;var hash=a.getAttribute('data-hash');if(hash){var b=a.parentNode.parentNode;InstallTrigger.install({x:{URL:a.href,IconURL:b.getAttribute('data-icon'),Hash:hash,toString:function(){return a.href}}});e.preventDefault()}},false)", +"sound.block":"chrome://noscript/skin/block.wav", +"forbidXBL":1, +"lockPrivilegedUI":false, +"doNotTrack.exceptions":"", +"showAddress":false, +"forbidXSLT":true, +"hideOnUnloadRegExp":"video/.*", +"surrogate.qs.sources":"edge.quantserve.com", +"notify.hide":false, +"surrogate.adriver.replacement":"if(top!==self&&top.location.href===location.href)setTimeout('try{document.close();}catch(e){}',100)", +"doNotTrack.enabled":true, +"surrogate.ga.replacement":"(function(){var _0=function(){};with(window)urchinTracker=_0,_gaq={__noSuchMethod__:_0,_link:function(h){if(h)location.href=h},_linkByPost:function(){return true},_getLinkerUrl:function(u){return u},_trackEvent:_0},_gat={_getTracker:function(){return _gaq}}})()", +"globalwarning":true, +"allowPageLevel":0, +"stickyUI":true, +"ABE.notify.namedLoopback":false, +"surrogate.imagehaven.replacement":"['agreeCont','TransparentBlack'].forEach(function(id){var o=document.getElementById(id);if(o)o.style.display='none'})", +"hoverUI.delayStop":50, +"forbidWebGL":true, +"frameOptions.parentWhitelist":"https://mail.google.com/*", +"fixURI.exclude":"", +"compat.evernote":true, +"sound":false, +"surrogate.ab_mirando.sources":"^http://get\\.mirando\\.", +"nselNever":false, +"emulateFrameBreak":true, +"surrogate.revsci.sources":"js.revsci.net", +"allowedMimeRegExp":"", +"ABE.legacyPrompt":false, +"surrogate.ab.replacement":"window.watch('ab',function(o,a,b){return a===false&&typeof(b)==='string'?false:b})", +"fixLinks":true, +"asyncNetworking":true, +"surrogate.yieldman.replacement":"rmAddKey=rmAddCustomKey=rmShowAd=rmShowPop=rmShowInterstitial=rmGetQueryParameters=rmGetSize=rmGetWindowUrl=rmGetPubRedirect=rmGetClickUrl=rmReplace=rmTrim=rmUrlEncode=rmCanShowPop=rmCookieExists=rmWritePopFrequencyCookie=rmWritePopExpirationCookie=flashIntalledCookieExists=writeFlashInstalledCookie=flashDetection=rmGetCookie=function(){}", +"autoReload.allTabs":true, +"nosniff":true, +"surrogate.interstitialBox.sources":"@*.imagevenue.com", +"collapseObject":false, +"filterXExceptions.letitbit":true, +"notify.bottom":true, +"safeJSRx":"(?:window\\.)?close\\s*\$\$", +"hoverUI.excludeToggling":true, +"flashPatch":true, +"xss.notify.subframes":true, +"allowURLBarJS":false, +"filterXPost":true, +"ABE.disabledRulesetNames":"", +"surrogate.ab_adscale.replacement":"adscale={}", +"forbidMetaRefresh.remember":false, +"truncateTitleLen":255, +"showDistrust":false, +"untrustedGranularity":3, +"surrogate.nscookie.replacement":"document.cookie='noscript=; domain=.facebook.com; path=/; expires=Thu, 01-Jan-1970 00:00:01 GMT;'", +"injectionCheck":2, +"surrogate.ab.exceptions":"", +"forbidData":true, +"consoleLog":false, +"autoReload.onMultiContent":false, +"subscription.trustedURL":"", +"showTempToPerm":false, +"forbidMedia":true, +"filterXExceptions.zendesk":true, +"trustEV":false, +"surrogate.ab_mirago.replacement":"HLSysBannerUrl=''", +"surrogate.ab_adtiger.sources":"^http://ads\\.adtiger\\.", +"filterXGetRx":"<+(?=[^<>=\\-\\d\\. /\\(])|[\\\\\"\\x00-\\x07\\x09\\x0B\\x0C\\x0E-\\x1F\\x7F]", +"keys.toggle":"ctrl shift VK_BACK_SLASH.|", +"showAllowPage":false, +"notify":true, +"statusIcon":true, +"showUntrustedPlaceholder":true, +"surrogate.ab_bidvertiser.replacement":"report_error=function(){}", +"filterXExceptions.lycosmail":true, +"ABE.localExtras":"", +"forbidJava":true, +"stickyUI.onKeyboard":true, +"toolbarToggle":3, +"jsredirectIgnore":false, +"showTemp":true, +"contentBlocker":true, +"ABE.wanIpAsLocal":false, +"stickyUI.liveReload":false, +"surrogate.imagebam.replacement":"(function(){if(\"over18\" in window){var _do=doOpen;doOpen=function(){};over18();doOpen=_do}else{var e=document.getElementById(Array.slice(document.getElementsByTagName(\"script\")).filter(function(s){return !!s.innerHTML})[0].innerHTML.match(/over18[\\s\\S]*?'([^']+)/)[1]);e.style.display='none'}})()", +"ABE.siteEnabled":false, +"surrogate.ab_adscale.sources":"js.adscale.de", +"xss.trustTemp":true, +"alwaysBlockUntrustedContent":true, +"filterXGet":true, +"allowURLBarImports":false, +"policynames":"", +"injectionCheckPost":true, +"ABE.enabled":false, +"filterXExceptions.livejournal":true, +"subscription.lastCheck":-961470138, +"forbidImpliesUntrust":false, +"forbidIFramesParentTrustCheck":true, +"compat.gnotes":true, +"surrogate.ab_adtiger.replacement":"adspirit_pid={}", +"confirmUnsafeReload":true, +"global":false, +"utf7filter":true, +"ctxMenu":true, +"surrogate.revsci.replacement":"rsinetsegs=[];DM_addEncToLoc=DM_tag=function(){};", +"autoReload.embedders":1, +"secureCookies.recycle":false, +"tempGlobal":false, +"notify.hideDelay":5, +"inclusionTypeChecking":true, +"autoReload.allTabsOnPageAction":true, +"options.tabSelectedIndexes":"0,5,0", +"jsHack":"", +"truncateTitle":true, +"xss.notify":true, +"showBlankSources":false, +"xss.trustReloads":false, +"filterXGetUserRx":"", +"urivalid.aim":"\\w[^\\\\\\?&\\x00-\\x1f#]*(?:\\?[^\\\\\\x00-\\x1f#]*(?:#[\\w\\-\\.\\+@]{2,32})?)?", +"surrogate.googleThumbs.sources":"!^https?://www\\.google\\.[a-z]+/search", +"jsredirectFollow":false, +"recentlyBlockedLevel":0, +"badInstall":false, +"allowBookmarkletImports":true, +"clearClick.plugins":true, +"autoReload.global":true, +"firstRunRedirection":false, +"forbidMetaRefresh.notify":true, +"urivalid.mailto":"[^\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f]*", +"filterXExceptions.fbconnect":true, +"surrogate.ga.sources":"*.google-analytics.com", +"clearClick.debug":false, +"surrogate.enabled":true, +"placeholderLongTip":true, +"STS.enabled":true, +"surrogate.adriver.sources":"ad.adriver.ru/cgi-bin/erle.cgi", +"surrogate.ab_mirago.sources":"^http://intext\\.mirago\\.", +"gtemp":"", +"forbidMetaRefresh":false, +"allowClipboard":false, +"ABE.allowRulesetRedir":false, +"keys.ui":"ctrl shift S", +"forbidIFramesContext":3, +"forbidExtProtSubdocs":true, +"blockNSWB":true, +"surrogate.nscookie.sources":"@*.facebook.com", +"requireReloadRegExp":"application/x-vnd\\.moveplayer\\b.*", +"allowHttpsOnly":0, +"surrogate.ab.sources":"@http://", +"surrogate.ab_adsense.sources":"pagead2.googlesyndication.com", +"autoReload.allTabsOnGlobal":false, +"showTempAllowPage":true, +"autoReload.useHistory.exceptCurrent":true, +"frameOptions.enabled":true, +"jsHackRegExp":"", +"surrogate.ab_binlayer.replacement":"blLayer={}", +"showUntrusted":false, +"canonicalFQDN":false, +"surrogate.popunder.replacement":"(function(){var cookie=document.__proto__.__lookupGetter__('cookie');document.__proto__.__defineGetter__('cookie',function() {var c='; popunder=yes; popundr=yes; setover18=1';return (cookie.apply(this).replace(c,'')+c).replace(/^; /, '')});var fid='_FID_'+(Date.now().toString(16));var open=window.__proto__.open;window.__proto__.open=function(url,target,features){try{if(!(/^_(?:top|parent|self)$/i.test(target)||target in frames)){var suspSrc,suspCall,fr,ff=[];for(var f,ev,aa=arguments;aa.callee&&(f=aa.callee.caller)&&ff.indexOf(f)<0;ff.push(f)){aa=f.arguments;if(!aa)break;ev=aa[0];suspCall=f.name=='doPopUnder';if(!suspSrc)suspSrc=suspCall||/(?:\\bpopunde?r|\\bfocus\\b.*\\bblur|\\bblur\\b.*\\bfocus|[pP]uShown)\\b/.test(f.toSource());if(suspCall||ev&&typeof ev=='object'&&('type' in ev)&&ev.type=='click'&&ev.button===0&&(ev.currentTarget===document||('tagName' in ev.currentTarget)&&'body'==ev.currentTarget.tagName.toLowerCase())&&!(('href' in ev .target)&&ev.target.href&&(ev.target.href.indexOf(url)===0||url.indexOf(ev.target.href)===0))){if(suspSrc){fr=document.getElementById(fid)||document.body.appendChild(document.createElement('iframe'));fr.id=fid;fr.src='data:text/html,';fr.style.display='none';var w=fr.contentWindow;w.blur=function(){};return w;}}}}}catch(e){}return open.apply(null, arguments)}})()", +"sync.enabled":false, +"secureCookiesForced":"", +"confirmUnblock":true, +"sound.oncePerSite":true, +"surrogate.imagehaven.sources":"!(a)*.imagehaven.net", +"excaps":true, +"surrogate.imagebam.sources":"!(a)*.imagebam.com", +"ABE.migration":1, +"ef.enabled":false, +"forbidFonts":true, +"clearClick":3, +"docShellJSBlocking":1, +"allowLocalLinks":false, +"forbidBGRefresh.exceptions":".mozilla.org", +"ajaxFallback.enabled":true, +"forbidIFrames":false, +"ABE.wanIpCheckURL":"https://secure.informaction.com/ipecho/", +"forbidPlugins":true, +"showGlobal":false, +"showRevokeTemp":true, +"ABE.notify":false, +"xss.trustData":true, +"surrogate.glinks.sources":"@^https?://[^/]+google\\..*/search", +"forbidFlash":true, +"hoverUI.delayEnter":250, +"surrogate.ab_adsense.replacement":"gaGlobal={}", +"ABE.rulesets.SYSTEM":"# Prevent Internet sites from requesting LAN resources.\u000d\u000aSite LOCAL\u000d\u000aAccept from LOCAL\u000d\u000aDeny", +"surrogate.interstitialBox.replacement":"__defineSetter__('interstitialBox',function(){});__defineGetter__('interstitialBox',function(){return{}})", +"toggle.temp":true, +"forbidMixedFrames":true, +"placesPrefs":false, +"xss.trustExternal":true, +"showExternalFilters":true, +"recentlyBlockedCount":10, +"secureCookies.perTab":false, +"toStaticHTML":true, +"hoverUI.delayExit1":250, +"hoverUI":true, +"filterXExceptions.readability":true, +"jsredirectForceShow":false, +"surrogate.ab_mirando.replacement":"Mirando={}", +"surrogate.imdb.sources":"@*.imdb.com/video/*", +"nselForce":true, +"consoleDump":0, +"proxiedDNS":0, +"filterXExceptions.deviantart":true, +"surrogate.popunder.sources":"@^http:\\/\\/[\\w\\-\\.]+\\.[a-z]+ wyciwyg:", +"forbidActiveContentParentTrustCheck":true, +"nselNoMeta":true, +"clearClick.subexceptions":"^http://bit\\.ly/a/sidebar\\?u= http://*.uservoice.com/*/popin.html?* http://w.sharethis.com/share3x/lightbox.html?* http://disqus.com/embed/* *.disqus.com/*/reply.html?* http://www.feedly.com/mini abine:*", +"liveConnectInterception":true, +"noping":true, +"filterXExceptions.medicare":true, +"placeholderMinSize":32, +"hoverUI.delayExit2":300, +"statusLabel":false, +"httpsForced":"", +"inclusionTypeChecking.checkDynamic":false, +"silverlightPatch":true, +"opacizeObject":3, +"showBaseDomain":false, +"filterXExceptions.blogspot":true, +"ABE.rulesets.USER":"# User-defined rules. Feel free to experiment here.\u000d\u000a", +"forbidBookmarklets":false, +"surrogate.glinks.replacement":"(function(){x(\"focus\");x(\"mouseover\");function x(et){document.addEventListener(et, function(ev) { if (/\\bl\\b/.test(ev.target.className)) ev.target.removeAttribute(\"onmousedown\") }, true)}})()", +"ABE.skipBrowserRequests":true, +"clearClick.prompt":true, +"untrusted":"", +"surrogate.amo.sources":"!https://addons.mozilla.org/", +"forbidXHR":1, +"fixURI":true, +"clearClick.exceptions":".mail.yahoo.com *.ebay.com *.photobucket.com", +"showPermanent":true, +"oldStylePartial":false, +"inclusionTypeChecking.exceptions":"https://scache.vzw.com/ http://cache.vzw.com .sony-europe.com", +"autoReload":true, +"autoReload.useHistory":false, +"surrogate.ga.exceptions":"", +"STS.expertErrorUI":false, +"subscription.untrustedURL":"", +"notify.hidePermanent":true, +"forbidBGRefresh":1, +"surrogate.qs.replacement":"window.quantserve=function(){}", +"filterXExceptions.visa":true, +"cp.last":true, +"alwaysShowObjectSources":false, +"showPlaceholder":true, +"surrogate.googleThumbs.replacement":"(function(){var ss=document.getElementsByTagName('script');var s,t,m,id,i;for(var j=ss.length;j-->0;)if(((s=ss[j])&&(t=s.firstChild&&s.firstChild.nodeValue)&&(id=t.match(/\\w+thumb\\d+/))&&(m=t.match(/['\"](data:[^'\"]+)/)))&&(i=document.getElementById(id)))i.src=m[1].replace(/\\(u[0-9a-f]{4}|x[0-9a-f]{2})/ig,function(a,b){return String.fromCharCode(parseInt(b.substring(1), 16))})})()", +"forbidFrames":false, +"showBlockedObjects":true, +"surrogate.yieldman.sources":"*.yieldmanager.com", +"subscription.checkInterval":24, +"secureCookies":true, +"ABE.legacySupport":false}, +"whitelist":"addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: https://blog.torproject.org https://www.torproject.org resource:", +"V":"2.1.1.1" +} \ No newline at end of file Property changes on: projects/misc/phobos/TBB-cache-tests/medium-tweaks-TBB-noscript-settings.txt ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: projects/misc/phobos/TBB-cache-tests/minor-tweaks-TBB-data-leaking.pdf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/TBB-cache-tests/minor-tweaks-TBB-data-leaking.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[arm/master] Format option for getstr method
by atagar＠torproject.org 25 Jun '11

25 Jun '11

commit 9ffda70c2203630b41a9f799e754f7f55e70e9b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 08:51:20 2011 -0700 Format option for getstr method Allowing string input fetching to have text attributes. --- src/util/panel.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 3f0a98a..5cbeaee 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -573,7 +573,7 @@ class Panel(): baseMsg = "Unclosed formatting tag%s:" % ("s" if len(expectedCloseTags) > 1 else "") raise ValueError("%s: '%s'\n \"%s\"" % (baseMsg, "', '".join(expectedCloseTags), msg)) - def getstr(self, y, x, initialText = ""): + def getstr(self, y, x, initialText = "", format = None): """ Provides a text field where the user can input a string, blocking until they've done so and returning the result. If the user presses escape then @@ -584,8 +584,11 @@ class Panel(): y - vertical location x - horizontal location initialText - starting text in this field + format - format used for the text """ + if not format: format = curses.A_NORMAL + # makes cursor visible try: previousCursorState = curses.curs_set(1) except curses.error: previousCursorState = 0 @@ -595,7 +598,8 @@ class Panel(): inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) # prepopulates the initial text - if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1]) + if initialText: + inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1], format) # Displays the text field, blocking until the user's done. This closes the # text panel and returns userInput to the initial text if the user presses @@ -609,7 +613,9 @@ class Panel(): else: textbox = curses.textpad.Textbox(inputSubwindow) + textbox.win.attron(format) userInput = textbox.edit(lambda key: _textboxValidate(textbox, key)).strip() + textbox.win.attroff(format) if textbox.lastcmd == curses.ascii.BEL: userInput = None # reverts visability settings

1 0

[arm/master] Relay options page for the setup wizard
by atagar＠torproject.org 25 Jun '11

25 Jun '11

commit 2449cb349a24ab23872f415d0f192b25996f8588 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 24 20:05:25 2011 -0700 Relay options page for the setup wizard This has the display and navigation logic for the relay settings page of the wizard. The only bit missing is input validation of the text field inputs (for instance, checking that a bandwidth value will be recognized), but otherwise this part of the wizard is pretty much done. --- src/cli/wizard.py | 242 ++++++++++++++++++++++++++++++++++++++++++++--------- src/settings.cfg | 47 ++++++++--- 2 files changed, 237 insertions(+), 52 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index f9dd770..a3404b9 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -1,6 +1,6 @@ """ Provides user prompts for setting up a new relay. This autogenerates a torrc -that's used by arm to start its tor instance. +that's used by arm to run its own tor instance. """ import curses @@ -13,23 +13,124 @@ from util import enum, uiTools # basic configuration types we can run as RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") +# all options that can be configured +Options = enum.Enum("NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "STARTUP") +RelayOptions = (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, Options.BANDWIDTH, Options.LIMIT, Options.STARTUP) + # other options provided in the prompts -CANCEL, BACK = "Cancel", "Back" +CANCEL, NEXT, BACK = "Cancel", "Next", "Back" + +MSG_COLOR = "green" +OPTION_COLOR = "yellow" -CONFIG = {"wizard.role.message": "", - "wizard.role.option.label": {}, - "wizard.role.option.description": {}} +CONFIG = {"wizard.message.role": "", + "wizard.message.relay": "", + "wizard.toggle": {}, + "wizard.default": {}, + "wizard.label.general": {}, + "wizard.label.role": {}, + "wizard.label.opt": {}, + "wizard.description.general": {}, + "wizard.description.role": {}, + "wizard.description.opt": {}} def loadConfig(config): config.update(CONFIG) +class ConfigOption: + """ + Attributes of a configuraition option. + """ + + def __init__(self, key, group, default): + """ + Configuration option constructor. + + Arguments: + key - configuration option identifier used when querying attributes + group - configuration attribute group this belongs to + default - initial value, uses the config default if unset + """ + + self.key = key + self.group = group + self.descriptionCache = None + self.descriptionCacheArg = None + self.value = default + + def getKey(self): + return self.key + + def getValue(self): + return self.value + + def getDisplayValue(self): + return self.value + + def setValue(self, value): + self.value = value + + def getLabel(self, prefix = ""): + return prefix + CONFIG["wizard.label.%s" % self.group].get(self.key, "") + + def getDescription(self, width, prefix = ""): + if not self.descriptionCache or self.descriptionCacheArg != width: + optDescription = CONFIG["wizard.description.%s" % self.group].get(self.key, "") + self.descriptionCache = _splitStr(optDescription, width) + self.descriptionCacheArg = width + + return [prefix + line for line in self.descriptionCache] + +class ToggleConfigOption(ConfigOption): + def __init__(self, key, group, default, trueLabel, falseLabel): + ConfigOption.__init__(self, key, group, default) + self.trueLabel = trueLabel + self.falseLabel = falseLabel + + def getDisplayValue(self): + return self.trueLabel if self.value else self.falseLabel + + def toggle(self): + self.value = not self.value + def showWizard(): - myRelayType = promptRelayType() + relayType, config = None, {} + + for option in Options.values(): + toggleValues = CONFIG["wizard.toggle"].get(option) + default = CONFIG["wizard.default"].get(option, "") + + if toggleValues: + if "," in toggleValues: + trueLabel, falseLabel = toggleValues.split(",", 1) + else: trueLabel, falseLabel = toggleValues, "" + + isSet = default.lower() == "true" + config[option] = ToggleConfigOption(option, "opt", isSet, trueLabel.strip(), falseLabel.strip()) + else: config[option] = ConfigOption(option, "opt", default) + + while True: + if relayType == None: + selection = promptRelayType() + + if selection == CANCEL: break + else: relayType = selection + else: + if relayType == RelayType.RELAY: + selection = promptRelayOptions(config) + + if selection == BACK: relayType = None + elif selection == NEXT: break # TODO: implement next screen + else: + break # TODO: other catagories not yet implemented + + # redraws screen to clear away the dialog we just showed + cli.controller.getController().requestRedraw(True) def promptRelayType(): """ Provides a prompt for selecting the general role we'd like Tor to run with. - This returns a RelayType enumeration for the selection, or None if the + This returns a RelayType enumeration for the selection, or CANCEL if the dialog was canceled. """ @@ -37,66 +138,127 @@ def promptRelayType(): if not popup: return control = cli.controller.getController() key, selection = 0, 0 - - # constructs (enum, label, [description lines]) tuples for our options - options = [] - - for runType in RelayType.values() + [CANCEL]: - label = CONFIG["wizard.role.option.label"].get(runType, "") - descRemainder = CONFIG["wizard.role.option.description"].get(runType, "") - descLines = [] - - while descRemainder: - descLine, descRemainder = uiTools.cropStr(descRemainder, 52, None, endType = None, getRemainder = True) - descLines.append(descLine.strip()) - - options.append((runType, label, descLines)) + options = [ConfigOption(opt, "role", opt) for opt in RelayType.values()] + options.append(ConfigOption(CANCEL, "general", CANCEL)) try: popup.win.box() curses.cbreak() - format = uiTools.getColor("green") - y, msgRemainder = 1, CONFIG["wizard.role.message"] # provides the welcoming message - while msgRemainder: - msg, msgRemainder = uiTools.cropStr(msgRemainder, 54, None, endType = None, getRemainder = True) - popup.addstr(y, 2, msg.strip(), format | curses.A_BOLD) - y += 1 + topContent = _splitStr(CONFIG["wizard.message.role"], 54) + for i in range(len(topContent)): + popup.addstr(i + 1, 2, topContent[i], curses.A_BOLD | uiTools.getColor(MSG_COLOR)) - while not uiTools.isSelectionKey(key): - offset = 0 + while True: + y, offset = len(topContent) + 1, 0 for i in range(len(options)): - _, label, lines = options[i] - optionFormat = format | curses.A_STANDOUT if i == selection else format - - # appends an extra space to the start to provide nicer centering - label = " " + label - lines = [" " + line for line in lines] + optionFormat = uiTools.getColor(MSG_COLOR) + if i == selection: optionFormat |= curses.A_STANDOUT # Curses has a weird bug where there's a one-pixel alignment # difference between bold and regular text, so it looks better # to render the whitespace here as not being bold. offset += 1 + label = options[i].getLabel(" ") popup.addstr(y + offset, 2, label, optionFormat | curses.A_BOLD) popup.addstr(y + offset, 2 + len(label), " " * (54 - len(label)), optionFormat) offset += 1 - for line in lines: + for line in options[i].getDescription(52, " "): popup.addstr(y + offset, 2, uiTools.padStr(line, 54), optionFormat) offset += 1 popup.win.refresh() key = control.getScreen().getch() - if key == curses.KEY_UP: selection = max(0, selection - 1) - elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) + if key == curses.KEY_UP: selection = (selection - 1) % len(options) + elif key == curses.KEY_DOWN: selection = (selection + 1) % len(options) + elif uiTools.isSelectionKey(key): return options[selection].getValue() + elif key == 27: return CANCEL # esc - cancel + finally: + cli.popups.finalize() + +def promptRelayOptions(config): + """ + Prompts the user for the configuration of an internal relay. + """ + + popup, _, _ = cli.popups.init(23, 58) + if not popup: return + control = cli.controller.getController() + options = [config[opt] for opt in RelayOptions] + options.append(ConfigOption(BACK, "general", "(to role selection)")) + options.append(ConfigOption(NEXT, "general", "(to confirm options)")) + key, selection = 0, 0 + + try: + curses.cbreak() + + while True: + popup.win.erase() + popup.win.box() + + # provides the description for internal relays + topContent = _splitStr(CONFIG["wizard.message.relay"], 54) + for i in range(len(topContent)): + popup.addstr(i + 1, 2, topContent[i], curses.A_BOLD | uiTools.getColor(MSG_COLOR)) + + y, offset = len(topContent) + 1, 0 + for i in range(len(options)): + label = " %-30s%s" % (options[i].getLabel(), options[i].getDisplayValue()) + optionFormat = curses.A_BOLD | uiTools.getColor(OPTION_COLOR) + if i == selection: optionFormat |= curses.A_STANDOUT + + offset += 1 + popup.addstr(y + offset, 2, uiTools.padStr(label, 54), optionFormat) + + # extra space to divide options/navigation + if i == len(options) - 3: offset += 1 + + # divider between the options and description + offset += 2 + popup.addch(y + offset, 0, curses.ACS_LTEE) + popup.addch(y + offset, popup.getWidth() - 1, curses.ACS_RTEE) + popup.hline(y + offset, 1, popup.getWidth() - 2) + + # description for the currently selected option + for line in options[selection].getDescription(54, " "): + offset += 1 + popup.addstr(y + offset, 1, line, uiTools.getColor(MSG_COLOR)) + + popup.win.refresh() + key = control.getScreen().getch() + + if key == curses.KEY_UP: selection = (selection - 1) % len(options) + elif key == curses.KEY_DOWN: selection = (selection + 1) % len(options) + elif uiTools.isSelectionKey(key): + if selection == len(options) - 2: return BACK # selected back + elif selection == len(options) - 1: return NEXT # selected next + elif isinstance(options[selection], ToggleConfigOption): + options[selection].toggle() + else: + newValue = popup.getstr(y + selection + 1, 33, options[selection].getValue(), curses.A_STANDOUT | uiTools.getColor(OPTION_COLOR), 23) + if newValue: options[selection].setValue(newValue.strip()) elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel finally: cli.popups.finalize() + +def _splitStr(msg, width): + """ + Splits a string into substrings of a given length. + + Arguments: + msg - string to be broken up + width - max length of any returned substring + """ + + results = [] + while msg: + msgSegment, msg = uiTools.cropStr(msg, width, None, endType = None, getRemainder = True) + results.append(msgSegment.strip()) - selectedOption = options[selection][0] - return None if selectedOption == CANCEL else selectedOption + return results diff --git a/src/settings.cfg b/src/settings.cfg index 2ad2784..94ff9c1 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -340,20 +340,43 @@ msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps -# descriptions used in the relay setup wizard -wizard.role.message Welcome to the Tor network! This will step you through the configuration process for being a part of it. To start with, what role would you like to have? +# configuration option attributes used in the relay setup wizard +wizard.message.role Welcome to the Tor network! This will step you through the configuration process for becoming a part of it. To start with, what role would you like to have? +wizard.message.relay Internal relays provide connections within the Tor network. Since you will only be connecting to Tor users and relays this is an easy, hassle free way of helping to make the network better. -wizard.role.option.label Relay => Internal Relay -wizard.role.option.label Exit => Exit Relay -wizard.role.option.label Bridge => Bridge -wizard.role.option.label Client => Client -wizard.role.option.label Cancel => Cancel +wizard.toggle Notify => Yes, No +wizard.toggle Startup => Yes, No -wizard.role.option.description Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. -wizard.role.option.description Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. -wizard.role.option.description Bridge => Non-public relay specifically for helping censored users. -wizard.role.option.description Client => Use the network without contributing to it. -wizard.role.option.description Cancel => Close without starting Tor. +wizard.default Nickname => Unnamed +wizard.default Notify => true +wizard.default Bandwidth => 5 MB/s +wizard.default Startup => true + +wizard.label.general Cancel => Cancel +wizard.label.general Back => Previous +wizard.label.general Next => Next +wizard.label.role Relay => Internal Relay +wizard.label.role Exit => Exit Relay +wizard.label.role Bridge => Bridge +wizard.label.role Client => Client +wizard.label.opt Nickname => Nickname +wizard.label.opt Contact => Contact Information +wizard.label.opt Notify => Issue Notification +wizard.label.opt Bandwidth => Relay Speed +wizard.label.opt Limit => Monthly Limit +wizard.label.opt Startup => Run At Startup + +wizard.description.general Cancel => Close without starting Tor. +wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. +wizard.description.role Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. +wizard.description.role Bridge => Non-public relay specifically for helping censored users. +wizard.description.role Client => Use the network without contributing to it. +wizard.description.opt Nickname => Human friendly name for your relay. If this is unique then it's used instead of your fingerprint (a forty character hex string) when pages like TorStatus refer to you. +wizard.description.opt Contact => Address we can contact you at if there's a problem with your relay. This is public information so, if it looks like an email address, we'll obscure it a bit. +wizard.description.opt Notify => Sends automated email notifications to the above address if your relay is unreachable or out of date. This service is provided by Tor Weather (https://weather.torproject.org/) and will send you a confirmation email before it's started. +wizard.description.opt Bandwidth => Limit for the average rate at which you relay traffic. +wizard.description.opt Limit => Maximum amount of traffic to relay each month. Some ISPs, like Comcast, cap their customer's Internet usage so this is an easy way of staying below that limit. +wizard.description.opt Startup => Runs Tor in the background when the system starts. # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions

1 0

[arm/master] fix: clearing content in a getstr input field
by atagar＠torproject.org 25 Jun '11

25 Jun '11

commit 6fa3123d8ad9c669db3079d144f7de5117eabd2b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 09:03:31 2011 -0700 fix: clearing content in a getstr input field Any stray characters within the textbox is interpreted as part of the initial input. Clearing the input field when we make it and giving an option for limiting its size. --- src/util/panel.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 5cbeaee..59d2b13 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -573,18 +573,23 @@ class Panel(): baseMsg = "Unclosed formatting tag%s:" % ("s" if len(expectedCloseTags) > 1 else "") raise ValueError("%s: '%s'\n \"%s\"" % (baseMsg, "', '".join(expectedCloseTags), msg)) - def getstr(self, y, x, initialText = "", format = None): + def getstr(self, y, x, initialText = "", format = None, maxWidth = None): """ Provides a text field where the user can input a string, blocking until they've done so and returning the result. If the user presses escape then this terminates and provides back None. This should only be called from the context of a panel's draw method. + This blanks any content within the space that the input field is rendered + (otherwise stray characters would be interpreted as part of the initial + input). + Arguments: y - vertical location x - horizontal location initialText - starting text in this field format - format used for the text + maxWidth - maximum width for the text field """ if not format: format = curses.A_NORMAL @@ -595,8 +600,13 @@ class Panel(): # temporary subwindow for user input displayWidth = self.getPreferredSize()[1] + if maxWidth: displayWidth = min(displayWidth, maxWidth + x) inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) + # blanks the field's area, filling it with the font in case it's hilighting + inputSubwindow.clear() + inputSubwindow.bkgd(' ', format) + # prepopulates the initial text if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1], format)

1 0

r24839: {} add my presentation from the allied media conference today. (in projects/presentations: . images)
by Andrew Lewman 25 Jun '11

25 Jun '11

Author: phobos Date: 2011-06-25 03:01:12 +0000 (Sat, 25 Jun 2011) New Revision: 24839 Added: projects/presentations/2011-06-24-AlliedMediaconf.pdf projects/presentations/2011-06-24-AlliedMediaconf.tex projects/presentations/images/1984first.jpg projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn-crop.png projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn.png projects/presentations/images/2011-06-23-cnet-us-internet-censorship-voluntary.png projects/presentations/images/IPRC_Seized_2010_11.jpg projects/presentations/images/cropped-saudi-arabia-filter-message.png projects/presentations/images/innocent_or_not_history_judges.jpg Log: add my presentation from the allied media conference today. Added: projects/presentations/2011-06-24-AlliedMediaconf.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2011-06-24-AlliedMediaconf.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2011-06-24-AlliedMediaconf.tex =================================================================== --- projects/presentations/2011-06-24-AlliedMediaconf.tex (rev 0) +++ projects/presentations/2011-06-24-AlliedMediaconf.tex 2011-06-25 03:01:12 UTC (rev 24839) @@ -0,0 +1,138 @@ +\documentclass{beamer} +\mode<presentation> +%\usetheme{Boadilla} +\beamertemplatenavigationsymbolsempty +\title{Allied Media Conference} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{24 June 2011} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/1984first} + \par + \end{centering} +\end{frame} + +%\begin{frame} +%\frametitle{George Orwell was an optimist} +%\includegraphics[scale=0.3]{./images/1984first} +%\end{center} +%\end{frame} + +\begin{frame} +\frametitle{George Orwell was an optimist} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad Who controls the past, controls the future: who controls the present controls the past +\end{quotation} +\flushright --- George Orwell, Nineteen Eighty Four, 1949 +\end{frame} + +\begin{frame} +\frametitle{Internet Censorship Is Everywhere} +\includegraphics<1>[scale=0.5]{./images/youdontquestionme-inet-censorship-map-with-key} +\includegraphics<2>[scale=0.5]{./images/cropped-saudi-arabia-filter-message} +\includegraphics<3>[scale=0.5]{./security-part2-anon/jingjing} +\includegraphics<3>[scale=0.5]{./security-part2-anon/chacha} +\includegraphics<4>[scale=0.3]{./images/IPRC_Seized_2010_11} +\end{frame} + +\begin{frame} +\frametitle{Censoring the 'net is all the rage} +\begin{center} +\includegraphics[scale=.7]{./images/2011-06-08-china-net-censorship-piracy-porn-crop} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Censoring the 'net is all the rage} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad more than 700 pornographic and copyright infringing websites have been shut down +\end{quotation} +\end{frame} + +\begin{frame} +\frametitle{Censoring the 'net is all the rage} +\begin{center} +\includegraphics[scale=0.6]{./images/2011-06-23-cnet-us-internet-censorship-voluntary} +\end{center} +\end{frame} +\setbeamercolor{sidebar}{bg=black} +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/images_pic-large-27489-In_the_future} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{Internet Surveillance is getting more advanced} +\begin{center} +\includegraphics<1>[scale=0.5]{./images/procera-evolved-dpi} +\includegraphics<2>[scale=0.5]{./images/iran-ssl-dpi-26-seconds-to-death} +\includegraphics<3>[scale=0.6]{./images/2011-infoweek-comodo-hacker} +\includegraphics<4>[scale=0.6]{./images/al-jazeera-egypt-crackdown-US-co-ties} +\includegraphics<5>[scale=0.5]{./images/nsa-room} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/paco-primera-pagina-oleo-lienzo-110-x-150-cms-2008-red} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{The Tor Project, Inc.} +\begin{Large} +501(c)(3) non-profit organization dedicated to the research and development of technologies for online anonymity and privacy +\end{Large} +\begin{center} +\includegraphics[height=5cm]{./images/2009-oval_sticker_new} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Tor hides communication patterns by relaying data through volunteer servers} +\begin{center} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[width=9cm]{./images/tor-network}} +\only<2>{\includegraphics[width=9cm]{./images/tor-safe-selection}} +\only<3>{\includegraphics[width=9cm]{./images/tor-safe-path}} +\only<4>{\includegraphics[width=9cm]{./images/tor-keys1}} +\end{overlayarea} +\flushright +\tiny Diagram: Robert Watson +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Thanks!} +\begin{LARGE} +Visit \url{https://www.torproject.org/} for more information, links, and ideas. +\end{LARGE} +\end{frame} + +\begin{frame} +\frametitle{Copyright \& Sources} +\begin{itemize} +\begin{small} +\item Internet censorship is everywhere, first image: Reporters without Borders, http://www.rsf.org +\item censoring the 'net is all the rage, http://thenextweb.com/asia/2011/06/08/china-increases-internet-control-take… +\item censoring the 'net is all the rage, http://news.cnet.com/8301-31001\_3-20073522-261/exclusive-top-isps-poised-t… +\item Internet surveillance, second image: http://www.informationweek.com/news/security/attacks/229400850 +\item Internet surveillance, third image: Al Jazeera, February 2011 +\item spring is in the air, Paco Pomet, http://pacopomet.wordpress.com/ +\end{small} +\end{itemize} +\end{frame} + +\end{document} Property changes on: projects/presentations/2011-06-24-AlliedMediaconf.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex Added: projects/presentations/images/1984first.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/1984first.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn-crop.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn-crop.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/2011-06-23-cnet-us-internet-censorship-voluntary.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-06-23-cnet-us-internet-censorship-voluntary.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/IPRC_Seized_2010_11.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/IPRC_Seized_2010_11.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/cropped-saudi-arabia-filter-message.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/cropped-saudi-arabia-filter-message.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/innocent_or_not_history_judges.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/innocent_or_not_history_judges.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

[torbutton/master] Bug 3446: We're Firefox 5.0, we swear.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit b834e541cf975eeaa291a374b4b95222b36eebd6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 15:39:17 2011 -0700 Bug 3446: We're Firefox 5.0, we swear. --- src/defaults/preferences/preferences.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 10538e0..353ee32 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -205,7 +205,7 @@ pref("extensions.torbutton.appversion_override","5.0 (Windows)"); pref("extensions.torbutton.platform_override","Win32"); pref("extensions.torbutton.oscpu_override", "Windows NT 6.1"); -pref("extensions.torbutton.useragent_override", "Mozilla/5.0 (Windows NT 6.1; rv:2.0) Gecko/20100101 Firefox/4.0"); +pref("extensions.torbutton.useragent_override", "Mozilla/5.0 (Windows NT 6.1; rv:5.0) Gecko/20100101 Firefox/5.0"); pref("extensions.torbutton.productsub_override","20100101"); pref("extensions.torbutton.buildID_override","0");

1 0

[torbutton/master] Make DuckDuckGo the default Google Captcha redirect destination.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 63e6eeeea1ed61fc0e14f7abd0d8bde9778a5733 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 15:40:00 2011 -0700 Make DuckDuckGo the default Google Captcha redirect destination. The search results seem slightly better than ixquick, and the interface is a lot slicker. Plus, who wouldn't trust a duck with a bow-tie? He just wants to help you so bad. --- src/chrome/content/preferences.xul | 4 ++-- src/defaults/preferences/preferences.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index b4eb3d0..1795fc1 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -359,10 +359,10 @@ oncommand="torbutton_prefs_set_field_attributes(document)"/> <hbox class="indent" align="center"> <radiogroup align="center" orient="horizontal" id="torbutton_searchEngine"> - <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine5" label="&torbutton.prefs.engine5;" oncommand="torbutton_prefs_set_field_attributes(document)"/> + <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;" + oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine2" label="&torbutton.prefs.engine2;" oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine3" label="&torbutton.prefs.engine3;" diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 353ee32..6c874b6 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -189,7 +189,7 @@ pref("extensions.torbutton.regen_google_cookies", false); pref("extensions.torbutton.xfer_google_cookies", true); // Google redirect prefs -pref("extensions.torbutton.google_redir_url", 1); +pref("extensions.torbutton.google_redir_url", 5); pref("extensions.torbutton.dodge_google_captcha", true); pref("extensions.torbutton.asked_google_captcha", false); pref("extensions.torbutton.redir_url.1", "https://www.ixquick.com/do/metasearch.pl?query=");

1 0