September 2012 - tor-commits - lists.torproject.org

[tor/master] Removed dependency on tor.spec. Removed tor.spec.in.
by nickm＠torproject.org 07 Sep '12

07 Sep '12

commit 43c86bbc70afb585a71948d8c36b26160d8039e0 Author: Ondrej Mikle <hiviah(a)torproject.org> Date: Fri Sep 7 16:44:37 2012 +0000 Removed dependency on tor.spec. Removed tor.spec.in. --- Makefile.am | 4 +- configure.ac | 1 - tor.spec.in | 360 ---------------------------------------------------------- 3 files changed, 1 insertions(+), 364 deletions(-) diff --git a/Makefile.am b/Makefile.am index 466eaf8..aa6f6c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,7 @@ EXTRA_DIST+= \ LICENSE \ Makefile.nmake \ README \ - ReleaseNotes \ - tor.spec \ - tor.spec.in + ReleaseNotes #install-data-local: # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor diff --git a/configure.ac b/configure.ac index dc1c249..06b1696 100644 --- a/configure.ac +++ b/configure.ac @@ -1316,7 +1316,6 @@ AC_CONFIG_FILES([ contrib/torctl contrib/torify src/config/torrc.sample - tor.spec ]) AC_OUTPUT diff --git a/tor.spec.in b/tor.spec.in deleted file mode 100644 index b452c9b..0000000 --- a/tor.spec.in +++ /dev/null @@ -1,360 +0,0 @@ -## NOTE: tor.spec is autogenerated from tor.spec.in . Edit the latter, -## not the former. - -## Things that need to be edited frequently -# -# This should be incremented whenever the spec file changes, but -# can drop back to zero at a new Tor version - -%define specver 1 - -## Things users may want to change -# -# User (and group) name under which the Tor daemon runs. - -%define toruser @TORUSER@ -%define torgroup @TORGROUP@ - -## Version song and dance -# -# This should be the Tor version number, as it appears on the tarball, -# including any "pre<x>" or "rc<y>" suffix. This gets massaged to -# create the RPM version number, in a way that depends on the Tor -# numbering scheme. -%define native_version @VERSION@ - -%define version %(echo %{native_version} | sed -e 's/-/./g') - -## Define output filename -# -# This creates filenames based upon the value of target_cpu defined above - -## Release and OS identification song and dance -# -# This identifies the lineage of the spec file. This file is the -# standard one that comes with Tor; various distributions may -# have their own ideas about the right ways to do things. -%define pkgspec tor - -# This spec is intended to build and install on multiple distributions -# (someday). Detect the distribution we're building on. - -%define is_rh %(test -e /etc/redhat-release && echo 1 || echo 0) -%define is_fc %(test -e /etc/fedora-release && echo 1 || echo 0) -%define is_mdk %(test -e /etc/mandrake-release && echo 1 || echo 0) -%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -%define is_rfl %(test -e /etc/redflag-release && echo 1 || echo 0) - -%if %{is_fc} -%define ostag %(sed -e 's/^.*release /fc/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/fedora-release) -%endif - -%if %{is_rh} -%define ostag %(sed -e 's/^.*release /rh/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/redhat-release) -%endif - -%if %{is_mdk} -%define ostag mdk -%endif - -%if %{is_suse} -%define ostag suse%(grep openSUSE /etc/SuSE-release | awk '{print $2}' | sed -e 's/\\./_/') -%endif - -%if %{is_rfl} -%define ostag %(sed -e 's/^.*Desktop /redflag/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/redflag-release) -%endif - -# Using the build date ensures that every build really does get -# a different release number. We use this trick for CVS versions. -# For release versions, we don't want or need it. -%define is_dev_version %(echo %{native_version} | grep 'dev' > /dev/null && echo 1 || echo 0) - -%if %{is_dev_version} -%define blddate %(date -u +"%Y%m%d%H%M") -%define release %{pkgspec}.%{specver}.%{ostag}.%{blddate} -%else -%define release %{pkgspec}.%{specver}.%{ostag} -%endif - -## General-purpose macros -# -# Some systems don't have some macros. If a macro doesn't seem -# to exist on your system, add it here... - -%if %{!?__make:1}%{?__make:0} -%define __make make -%endif - -%if %{!?make:1}%{?make:0} -%define make %{__make} -%endif - -%if %{!?_localstatedir:1}%{?_localstatedir:0} -%define _localstatedir @LOCALSTATEDIR@ -%endif - -## Package information -# -Name: tor -Version: %{version} -Release: %{release} - -Summary: Anonymizing overlay network for TCP (The onion router) -URL: https://www.torproject.org/ -Group: System Environment/Daemons - -License: 3-clause BSD -Vendor: The Tor Project (https://torproject.org) -Packager: Erinn Clark <erinn(a)torproject.org> - -Requires: openssl >= 0.9.7, libevent >= 1.4.13 -BuildRequires: openssl-devel >= 0.9.7, libevent-devel >= 1.4.13, asciidoc - -# Fedora 16 and RHEL 5 have following conflicting packages according to rpm search -%if %{is_rh} -Conflicts: tor-core, tor-lsb, tor-upstart -%endif - -Requires(pre): /usr/bin/id, /bin/date, /bin/sh -Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd - -Source0: https://www.torproject.org/dist/%{name}-%{native_version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -%description -Tor is a connection-based low-latency anonymous communication system. - -This package provides the "tor" program, which serves as both a client and -a relay node. Scripts will automatically create a "%{toruser}" user and -a "%{torgroup}" group, and set tor up to run as a daemon when the system -is rebooted. - -Applications connect to the local Tor proxy using the SOCKS -protocol. The tor client chooses a path through a set of relays, in -which each relay knows its predecessor and successor, but no -others. Traffic flowing down the circuit is unwrapped by a symmetric -key at each relay, which reveals the downstream relay. - -Warnings: Tor does no protocol cleaning. That means there is a danger -that application protocols and associated programs can be induced to -reveal information about the initiator. Tor depends on Privoxy or -similar protocol cleaners to solve this problem. This is alpha code, -and is even more likely than released code to have anonymity-spoiling -bugs. The present network is small -- this further reduces the -strength of the anonymity provided. Tor is not presently suitable -for high-stakes anonymity. - -%prep -%setup -q -n %{name}-%{native_version} - -%build -%if %{is_suse} -%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} --docdir=%{_docdir}/%{name} -%else -%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} -%endif -%make - -%install -%makeinstall - -# Install init script and control script -%__mkdir_p ${RPM_BUILD_ROOT}%{_initrddir} -%if %{is_suse} -%__install -p -m 755 contrib/suse/tor.sh ${RPM_BUILD_ROOT}%{_initrddir}/%{name} -%else -%__install -p -m 755 contrib/tor.sh ${RPM_BUILD_ROOT}%{_initrddir}/%{name} -%endif -%__install -p -m 755 contrib/torctl ${RPM_BUILD_ROOT}%{_bindir} - -# Set up config file; "sample" file implements a basic user node. -%__install -p -m 644 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/torrc.sample ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/torrc - -# Install the logrotate control file. -%__mkdir_p -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d -%__install -p -m 644 contrib/tor.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} - -# Directories that don't have any preinstalled files -%__mkdir_p -m 700 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name} -%__mkdir_p -m 755 ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name} -%__mkdir_p -m 755 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name} -%__mkdir_p -m 700 ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/%{name} - -%clean -[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} - -# These scripts are probably wrong for Mandrake or SuSE. They're certainly -# wrong for Debian, but what are you doing using RPM on Debian? - -%pre - -# If tor is already installed and running (whether installed by RPM -# or not), then kill it, but remember that it was running. -%__rm -f /%{_localstatedir}/tmp/${name}-was-running-%{version}-%{release} -if [ -f %{_initrddir}/%{name} ] && /sbin/service %{name} status ; then - /sbin/service %{name} stop - touch /%{_localstatedir}/tmp/${name}-was-running-%{version}-%{release} -fi - -# -# Create a user and group if need be -# -if [ ! -n "`/usr/bin/id -g %{torgroup} 2>/dev/null`" ]; then - # One would like to default the GID, but doing that properly would - # require thought. - %{_sbindir}/groupadd %{torgroup} 2> /dev/null -fi -if [ ! -n "`/usr/bin/id -u %{toruser} 2>/dev/null`" ]; then - # One would also like to default the UID, but doing that properly would - # also require thought. - if [ -x %{_sbindir}/nologin ]; then - %{_sbindir}/useradd -r -g %{torgroup} -d %{_localstatedir}/lib/%{name} -s %{_sbindir}/nologin %{toruser} 2> /dev/null - else - %{_sbindir}/useradd -r -g %{torgroup} -d %{_localstatedir}/lib/%{name} -s /bin/false %{toruser} 2> /dev/null - fi -fi -exit 0 - -%post - -# If this is a new installation, use chkconfig to put tor in the -# default set of runlevels. If it's an upgrade, leave the existing -# configuration alone. -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add %{name} - /sbin/chkconfig %{name} on -fi - -# Older tor RPMS used a different username for the tor daemon. -# Make sure the runtime data have the right ownership. -%__chown -R %{toruser}.%{torgroup} %{_localstatedir}/{lib,log,run}/%{name} - -if [ -f /%{_localstatedir}/tmp/${name}-was-running-%{version}-%{release} ]; then - /sbin/service %{name} start - %__rm -f /%{_localstatedir}/tmp/${name}-was-running-%{version}-%{release} -fi -exit 0 - -%preun - -# If no instances of tor will be installed when we're done, make -# sure that it gets killed. We *don't* want to kill it or delete -# any of its data on uninstall if it's being upgraded to a new -# version, because the new version will actually already have -# been installed and started before the uninstall script for -# the old version is run, and we'd end up hosing it. -if [ $1 -le 0 ]; then - if [ -f %{_initrddir}/%{name} ] && /sbin/service %{name} status ; then - /sbin/service %{name} stop - fi - %/sbin/chkconfig --del %{name} - %__rm -f ${_localstatedir}/lib/%{name}/cached-directory - %__rm -f ${_localstatedir}/lib/%{name}/bw_accounting - %__rm -f ${_localstatedir}/lib/%{name}/control_auth_cookie - %__rm -f ${_localstatedir}/lib/%{name}/router.desc - %__rm -f ${_localstatedir}/lib/%{name}/fingerprint -fi -exit 0 - -%files -%defattr(-,root,root) -%if %{is_suse} -%doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO doc/*html -%endif -%doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO -%{_mandir}/man*/* -%{_bindir}/tor -%{_bindir}/torctl -%{_bindir}/torify -%{_bindir}/tor-resolve -%{_bindir}/tor-gencert -%if %{is_suse} -%else -%{_docdir}/* -%endif -%{_datadir}/tor/geoip -%config %{_initrddir}/%{name} -%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} -%dir %attr(0755,root,%{torgroup}) %{_sysconfdir}/%{name}/ -%config(noreplace) %attr(0644,root,%{torgroup}) %{_sysconfdir}/%{name}/* -%attr(0700,%{toruser},%{torgroup}) %dir %{_localstatedir}/lib/%{name} -%attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/run/%{name} -%attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name} - -%changelog -* Thu Jun 21 2012 Ondrej Mikle <ondrej.mikle(a)gmail.com> -- fixed to work with both rpmbuild and mock on RHEL/Fedora -- removed unnecessary files from rpm such as .git repo -- fixed build dependencies and package conflicts -- fixed creating _tor user on Fedora 17 (ancient typo) -- added/updated build instructions for RPM creation -- confirmed to build and run on EL5, EL6, Fedora 16/17, OpenSuse 12.1 - -* Fri Aug 20 2010 Erinn Clark <erinn(a)torproject.org> -- add conflicts for Fedora packages -- add logic for SuSE since it requires special doc handling - -* Mon Feb 22 2010 Erinn Clark <erinn(a)torproject.org> -- remove AUTHORS from %doc line since it no longer exists upstream -- switch maintainers - -* Fri May 01 2009 Andrew Lewman <andrew(a)torproject.org> -- clean up distro detection and remove dead comment blocks - -* Sun Feb 22 2009 Andrew Lewman <andrew(a)torproject.org> -- update the description, vendor, and packager - -* Thu Sep 11 2008 Andrew Lewman <phobos(a)rootme.org> -- See r16867 -- http://archives.seul.org/or/cvs/Sep-2008/msg00156.html - -* Tue Feb 27 2007 Andrew Lewman <phobos(a)rootme.org> -- Fix a potential race condition in how we determine the running state of tor. Found by Stefan Nordhausen. -- see OR-CVS for details - -* Fri May 26 2006 Andrew Lewman <phobos(a)rootme.org> -- Add in a few "SUSEisms" to make dist-rpm actually work on suse -- Turn Tor "on" via chkconfig -- Update -mcpu to -mtune to make GCC happy -- see OR-CVS for details - -* Tue Mar 28 2006 Andrew Lewman <phobos(a)rootme.org> -- converted to build the specified target cpu and arch -- override related rpm macros to build correctly -- see OR-CVS for details - -* Mon Jan 17 2005 John Bashinski <jbash(a)velvet.com> -- Take runtime user and group names from configure system. Default - user/group names are now "_tor"; blame Roger... -- Make logrotate control file a separate file in the source distribution, - rather than creating it from the spec file. -- Properly handle the order in which RPM executes scriptlets on upgrade. - The old code would kill the daemon on upgrade. -- Start the tor daemon after installation if and only if it was - running before installation. Preserve runlevel setup on upgrade. -- Package the torctl script; the init script is now a wrapper around it. - -* Tue Nov 5 2004 John Bashinski <jbash(a)velvet.com> -- Add skeletal support for multiple distributions -- Even more ridiculous level of macro-ization -- Modify version numbers so RPM can determine when it has a newer version -- Return to including distribution name in package release number -- Sharply trim description -- Change user/group name from "tor" to "tordmn"; "tor" is a common - given name (reported by Marius Hjelle) -- Change group to "System Environment/Daemons" (suggested by Marius Hjelle) -- Create logrotate file (suggested by Marius Hjelle) -- Make Tor run as a user proxy by default (suggested by Marius Hjelle) -- Autogenerate spec file from GNU autotools data, substituting version - and whatnot -- Be perhaps excessively paranoid with config file and directory modes -- Remove auto-start and auto-stop at installation time; there's some kind - of weird race going on, and it's arguably a bad thing anyway. - -* Mon Jun 06 2004 Nick Mathewson <nickm(a)freehaven.net> 0.0.7-0.std.0.1.rc2 -- Make spec file more happy with fc2 packaging - -* Sat Jan 17 2004 John Bashinski <jbash(a)velvet.com> -- Basic spec file; tested with Red Hat 9.

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 07 Sep '12

07 Sep '12

commit 0083dd2c18c79bc40246972a979fed9f78b886db Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 7 16:45:06 2012 +0000 Update translations for orbot --- values-es_AR/strings.xml | 168 ++-------------------------------------------- 1 files changed, 6 insertions(+), 162 deletions(-) diff --git a/values-es_AR/strings.xml b/values-es_AR/strings.xml index bd92b9a..dc0d516 100644 --- a/values-es_AR/strings.xml +++ b/values-es_AR/strings.xml @@ -11,9 +11,7 @@ <string name="status_activated">Conectado a la red Tor</string> <string name="status_disabled">\"Orbot está Desactivado</string> <string name="status_shutting_down">Orbot se está apagando</string> - <string name="tor_process_starting">Starting Tor client...</string> - <string name="tor_process_complete">complete.</string> - <string name="tor_process_waiting">waiting.</string> + <string name="tor_process_complete">Completar</string> <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string> <string name="menu_home">Inicio</string> <string name="menu_browse">Navegar</string> @@ -31,184 +29,30 @@ <string name="button_clear_log">Borrar Registros</string> <string name="menu_verify">Chequear</string> <string name="menu_exit">Salir</string> - <string name="press_to_start">- long press to start -</string> <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string> <string name="pref_trans_proxy_title">Proxying Transparente</string> <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string> <string name="pref_transparent_all_title">Torear Todo</string> - <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> - <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> - <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">Port List</string> - <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> - <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> - <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> - <string name="title_error">Application Error</string> - <string name="wizard_title">Orbot</string> - <string name="wizard_btn_tell_me_more">About Orbot</string> - <string name="btn_next">Next</string> - <string name="btn_back">Back</string> - <string name="btn_finish">Finish</string> - <string name="btn_okay">Okay</string> - <string name="btn_cancel">Cancel</string> + <string name="btn_next">Siguiente</string> + <string name="btn_back">Atrás</string> + <string name="btn_finish">Finalizar</string> + <string name="btn_cancel">Cancelar</string>  - <string name="wizard_details">Some Orbot Details</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> - <string name="wizard_permissions_root">Permission Granted</string> - <string name="wizard_permissions_stock">Orbot Permissions</string> - <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> - <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> - <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> - <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> - <string name="wizard_permission_enable_root">Grant Root for Orbot</string> - <string name="wizard_configure">Configure Torification</string> - <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> - <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> - <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> - <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> - <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> - <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> + <string name="wizard_final">Orbot está listo!</string>  - <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> - <string name="pref_start_boot_title">Start Orbot on Boot</string> - <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>   - <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>  - <string name="wizard_warning_title">Warning</string> - <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>  - <string name="wizard_permissions_title">Permissions</string> - <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> - <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>   - <string name="wizard_transproxy_title">Transparent Proxying</string> - <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> - <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> - <string name="wizard_transproxy_none">None</string> - <string name="pref_transparent_tethering_title">Tor Tethering</string> - <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> - <string name="button_grant_superuser">Request Superuser Access</string> - <string name="pref_select_apps">Select Apps</string> - <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> - <string name="pref_node_configuration">Node Configuration</string> - <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> - <string name="pref_entrance_node">Entrance Nodes</string> - <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> - <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Outbound Proxy Host</string> - <string name="pref_proxy_host_summary">Proxy server hostname</string> - <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Outbound Proxy Port</string> - <string name="pref_proxy_port_summary">Proxy server port</string> - <string name="pref_proxy_port_dialog">Enter Proxy port</string> - <string name="status">Status</string> - <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> - <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> - <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> - <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> - <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> - <string name="transproxy_rules_cleared">TransProxy rules cleared</string> - <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> - <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> - <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> - <string name="bridge_error">Bridge Error</string> - <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> - <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> - <string name="error">Error</string> - <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> - <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> - <string name="exit_nodes">Exit Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> - <string name="enter_exit_nodes">Enter Exit Nodes</string> - <string name="exclude_nodes">Exclude Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> - <string name="enter_exclude_nodes">Enter Exclude Nodes</string> - <string name="strict_nodes">Strict Nodes</string> - <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> - <string name="bridges">Bridges</string> - <string name="use_bridges">Use Bridges</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> - <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> - <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> - <string name="enter_bridge_addresses">Enter Bridge Addresses</string> - <string name="relays">Relays</string> - <string name="relaying">Relaying</string> - <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> - <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> - <string name="enter_or_port">Enter OR port</string> - <string name="relay_nickname">Relay nickname</string> - <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> - <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> - <string name="reachable_addresses">Reachable Addresses</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> - <string name="reachable_ports">Reachable ports</string> - <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> - <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Hidden Service Hosting</string> - <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> - <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> - <string name="hidden_service_ports">Hidden Service Ports</string> - <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - <string name="project_home">Project Home(s): </string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> - <string name="the_tor_license">The Tor License</string> - <string name="https_torproject_org">https://torproject.org</string> - <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> - <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> - <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> - <string name="found_existing_tor_process">found existing Tor process...</string> - <string name="something_bad_happened">Something bad happened. Check the log</string> - <string name="hidden_service_on">hidden service on:</string> - <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> - <string name="unable_to_start_tor">Unable to start Tor:</string> - <string name="pref_use_sys_iptables_title">Use Default Iptables</string> - <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> - <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> - <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> - <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> - <string name="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> <string name="powered_by">potenciado por The Tor Project</string> - <string name="btn_save_settings">Save Settings</string> </resources>

1 0

[tor/master] Remove redundant declaration of find_transport_name_by_bridge_addrport().
by nickm＠torproject.org 07 Sep '12

07 Sep '12

commit 14f4a5da45b5c3f9fb616d49b75d0ed1f7db78c6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Sep 7 17:44:53 2012 +0300 Remove redundant declaration of find_transport_name_by_bridge_addrport(). --- src/or/circuitbuild.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 7083db1..55a7c72 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -137,8 +137,6 @@ const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, struct transport_t; int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const struct transport_t **transport); -const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, - uint16_t port); int validate_pluggable_transports_config(void);

1 0

[tor/master] Merge remote-tracking branch 'asn/bug6788'
by nickm＠torproject.org 07 Sep '12

07 Sep '12

commit 3fe2161d28f27e2f036991eb4d4b035a064d36b5 Merge: 78a3de1 14f4a5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 10:51:38 2012 -0400 Merge remote-tracking branch 'asn/bug6788' src/or/circuitbuild.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)

1 0

r25786: {website} Reorder a sentence on the rpm page (website/trunk/docs/en)
by Sebastian Hahn 07 Sep '12

07 Sep '12

Author: sebastian Date: 2012-09-07 13:46:24 +0000 (Fri, 07 Sep 2012) New Revision: 25786 Modified: website/trunk/docs/en/rpms.wml Log: Reorder a sentence on the rpm page Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2012-09-07 13:42:07 UTC (rev 25785) +++ website/trunk/docs/en/rpms.wml 2012-09-07 13:46:24 UTC (rev 25786) @@ -17,12 +17,13 @@ Do not use the packages in the native repositories. They are frequently out of date. That means you'll be missing stability and - security fixes. Repositories contain i686 and x86_64 builds. + security fixes. You'll need to set up our package repository before you can fetch - Tor. Assuming yum, in /etc/yum.repos.d/, create a file called + Tor. Repositories contain i686 and x86_64 builds. Assuming yum, in + /etc/yum.repos.d/, create a file called torproject.repo. Edit this file with the following information:

1 0

r25785: {website} Nicer formatting for RPM instructions (website/trunk/docs/en)
by Ondrej Mikle 07 Sep '12

07 Sep '12

Author: hiviah Date: 2012-09-07 13:42:07 +0000 (Fri, 07 Sep 2012) New Revision: 25785 Modified: website/trunk/docs/en/rpms.wml Log: Nicer formatting for RPM instructions Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2012-09-07 13:13:16 UTC (rev 25784) +++ website/trunk/docs/en/rpms.wml 2012-09-07 13:42:07 UTC (rev 25785) @@ -26,6 +26,8 @@ torproject.repo. Edit this file with the following information: + <h3>Fedora 16/17 and EL6 packages</h3> + For Fedora 16, Fedora 17, RHEL 6 (and clones), use following repo file - substitute DISTRIBUTION with one of the following: fc/16, fc/17 or el/6 according to your distribution. @@ -52,8 +54,10 @@ <pre>3B9E EEB9 7B1E 827B CF0A 0D96 8AF5 653C 5AC0 01F1</pre> + <h3>EL5 packages</h3> + Packages for RHEL 5 (and clones) are signed with different key due to - old rpm limitations, use this repo file: + old rpm limitations, put this repo file in /etc/yum.repos.d/ directory: <pre>[tor-experimental] @@ -76,12 +80,20 @@ <pre>9D27 0E2A 351C B4CB 6D95 78AF F8E7 95F8 B4D4 03EA</pre> + <h3>Package installation and running</h3> + - Then install Tor by running: + Once you have the repo file, install Tor using (yum will ask about the + key's fingerprint the first time): <pre>yum install tor</pre> + Start Tor using: + +<pre>service tor start</pre> + + Now Tor is installed and running. Move on to <a href="<page docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions.

1 0

r25784: {website} Updated RPM instructions for EL5 due to separate rpm signing (website/trunk/docs/en)
by Ondrej Mikle 07 Sep '12

07 Sep '12

Author: hiviah Date: 2012-09-07 13:13:16 +0000 (Fri, 07 Sep 2012) New Revision: 25784 Modified: website/trunk/docs/en/rpms.wml Log: Updated RPM instructions for EL5 due to separate rpm signing key Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2012-09-06 20:26:50 UTC (rev 25783) +++ website/trunk/docs/en/rpms.wml 2012-09-07 13:13:16 UTC (rev 25784) @@ -17,7 +17,7 @@ Do not use the packages in the native repositories. They are frequently out of date. That means you'll be missing stability and - security fixes. + security fixes. Repositories contain i686 and x86_64 builds. @@ -25,6 +25,12 @@ Tor. Assuming yum, in /etc/yum.repos.d/, create a file called torproject.repo. Edit this file with the following information: + + For Fedora 16, Fedora 17, RHEL 6 (and clones), use following repo file - + substitute DISTRIBUTION with one of the following: fc/16, fc/17 or el/6 + according to your distribution. + + <pre>[tor-experimental] name=Tor experimental repo enabled=1 @@ -41,17 +47,36 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.… </pre> - If you wish to track the experimental releases of Tor, you should substitute - DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17 - - - The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above, yum will ask about the fingerprint): <pre>3B9E EEB9 7B1E 827B CF0A 0D96 8AF5 653C 5AC0 01F1</pre> + Packages for RHEL 5 (and clones) are signed with different key due to + old rpm limitations, use this repo file: + + +<pre>[tor-experimental] +name=Tor experimental repo +enabled=1 +baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/$basearch/ +gpgcheck=1 +gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc + +[tor-experimental-source] +name=Tor experimental source repo +enabled=1 +autorefresh=0 +baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/SRPMS +gpgcheck=1 +gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc +</pre> + Fingerprint of RPM-GPG-KEY-torproject.org.EL5.asc key above should be: + +<pre>9D27 0E2A 351C B4CB 6D95 78AF F8E7 95F8 B4D4 03EA</pre> + + Then install Tor by running: <pre>yum install tor</pre>

1 0

[flashproxy/master] Comment WebSocketRequestHandler.
by dcf＠torproject.org 07 Sep '12

07 Sep '12

commit efc80968b2c8614739f38bbb5bfd3703d0eb82e9 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 03:05:37 2012 -0700 Comment WebSocketRequestHandler. Python doesn't give us a straightforward way to parse an HTTP request as a string, so we do it through a BaseHTTPRequestHandler. --- flashproxy-client | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index a8dcd15..daf710b 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -442,6 +442,8 @@ def format_peername(s): # to avoid Slowloris-like attacks. WEBSOCKET_REQUEST_TIMEOUT = 2.0 +# This subclass of BaseHTTPRequestHandler is essentially a means of parsing an +# HTTP request. class WebSocketRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): def __init__(self, request_text, fd): self.rfile = cStringIO.StringIO(request_text)

1 0

[flashproxy/master] Add tests for WebSocket request handling.
by dcf＠torproject.org 07 Sep '12

07 Sep '12

commit 0c1afe22b38596675f9aa06d75fbb754ea915638 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 05:04:53 2012 -0700 Add tests for WebSocket request handling. --- flashproxy-client-test | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/flashproxy-client-test b/flashproxy-client-test index 527093c..084a272 100755 --- a/flashproxy-client-test +++ b/flashproxy-client-test @@ -1,11 +1,20 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +import base64 +import cStringIO +import httplib import socket import subprocess import sys import unittest +try: + from hashlib import sha1 +except ImportError: + # Python 2.4 uses this name. + from sha import sha as sha1 + # Special tricks to load a module whose filename contains a dash and doesn't end # in ".py". import imp @@ -13,6 +22,7 @@ dont_write_bytecode = sys.dont_write_bytecode sys.dont_write_bytecode = True flashproxy = imp.load_source("flashproxy", "flashproxy-client") parse_socks_request = flashproxy.parse_socks_request +handle_websocket_request = flashproxy.handle_websocket_request WebSocketDecoder = flashproxy.WebSocketDecoder WebSocketEncoder = flashproxy.WebSocketEncoder sys.dont_write_bytecode = dont_write_bytecode @@ -40,6 +50,165 @@ class TestSocks(unittest.TestCase): def test_parse_socks_request_hostname(self): dest, port = parse_socks_request("\x04\x01\x99\x99\x00\x00\x00\x01userid\x00abc\x00") +class DummySocket(object): + def __init__(self, read_fd, write_fd): + self.read_fd = read_fd + self.write_fd = write_fd + self.readp = 0 + + def read(self, *args, **kwargs): + self.read_fd.seek(self.readp, 0) + data = self.read_fd.read(*args, **kwargs) + self.readp = self.read_fd.tell() + return data + + def readline(self, *args, **kwargs): + self.read_fd.seek(self.readp, 0) + data = self.read_fd.readline(*args, **kwargs) + self.readp = self.read_fd.tell() + return data + + def recv(self, size, *args, **kwargs): + return self.read(size) + + def write(self, data): + self.write_fd.seek(0, 2) + self.write_fd.write(data) + + def send(self, data, *args, **kwargs): + return self.write(data) + + def sendall(self, data, *args, **kwargs): + return self.write(data) + + def makefile(self, *args, **kwargs): + return self + +def dummy_socketpair(): + f1 = cStringIO.StringIO() + f2 = cStringIO.StringIO() + return (DummySocket(f1, f2), DummySocket(f2, f1)) + +class HTTPRequest(object): + def __init__(self): + self.method = "GET" + self.path = "/" + self.headers = {} + +def transact_http(req): + l, r = dummy_socketpair() + r.send("%s %s HTTP/1.0\r\n" % (req.method, req.path)) + for k, v in req.headers.items(): + r.send("%s: %s\r\n" % (k, v)) + r.send("\r\n") + protocols = handle_websocket_request(l) + + resp = httplib.HTTPResponse(r) + resp.begin() + return resp, protocols + +class TestHandleWebSocketRequest(unittest.TestCase): + DEFAULT_KEY = "0123456789ABCDEF" + DEFAULT_KEY_BASE64 = base64.b64encode(DEFAULT_KEY) + MAGIC_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" + + @staticmethod + def default_req(): + req = HTTPRequest() + req.method = "GET" + req.path = "/" + req.headers["Upgrade"] = "websocket" + req.headers["Connection"] = "Upgrade" + req.headers["Sec-WebSocket-Key"] = TestHandleWebSocketRequest.DEFAULT_KEY_BASE64 + req.headers["Sec-WebSocket-Version"] = "13" + + return req + + def assert_ok(self, req): + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(resp.getheader("Upgrade").lower(), "websocket") + self.assertEqual(resp.getheader("Connection").lower(), "upgrade") + self.assertEqual(resp.getheader("Sec-WebSocket-Accept"), base64.b64encode(sha1(self.DEFAULT_KEY_BASE64 + self.MAGIC_GUID).digest())) + self.assertEqual(protocols, []) + + def assert_not_ok(self, req): + resp, protocols = transact_http(req) + self.assertEqual(resp.status // 100, 4) + self.assertEqual(protocols, None) + + def test_default(self): + req = self.default_req() + self.assert_ok(req) + + def test_missing_upgrade(self): + req = self.default_req() + del req.headers["Upgrade"] + self.assert_not_ok(req) + + def test_missing_connection(self): + req = self.default_req() + del req.headers["Connection"] + self.assert_not_ok(req) + + def test_case_insensitivity(self): + """Test that the values of the Upgrade and Connection headers are + case-insensitive.""" + req = self.default_req() + req.headers["Upgrade"] = req.headers["Upgrade"].lower() + self.assert_ok(req) + req.headers["Upgrade"] = req.headers["Upgrade"].upper() + self.assert_ok(req) + req.headers["Connection"] = req.headers["Connection"].lower() + self.assert_ok(req) + req.headers["Connection"] = req.headers["Connection"].upper() + self.assert_ok(req) + + def test_bogus_key(self): + req = self.default_req() + req.headers["Sec-WebSocket-Key"] = base64.b64encode(self.DEFAULT_KEY[:-1]) + self.assert_not_ok(req) + + req.headers["Sec-WebSocket-Key"] = "///" + self.assert_not_ok(req) + + def test_versions(self): + req = self.default_req() + req.headers["Sec-WebSocket-Version"] = "13" + self.assert_ok(req) + req.headers["Sec-WebSocket-Version"] = "8" + self.assert_ok(req) + + req.headers["Sec-WebSocket-Version"] = "7" + self.assert_not_ok(req) + req.headers["Sec-WebSocket-Version"] = "9" + self.assert_not_ok(req) + + del req.headers["Sec-WebSocket-Version"] + self.assert_not_ok(req) + + def test_protocols(self): + req = self.default_req() + req.headers["Sec-WebSocket-Protocol"] = "base64" + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(protocols, ["base64"]) + self.assertEqual(resp.getheader("Sec-WebSocket-Protocol"), "base64") + + req = self.default_req() + req.headers["Sec-WebSocket-Protocol"] = "cat" + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(protocols, ["cat"]) + self.assertEqual(resp.getheader("Sec-WebSocket-Protocol"), None) + + req = self.default_req() + req.headers["Sec-WebSocket-Protocol"] = "cat, base64" + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(protocols, ["cat", "base64"]) + self.assertEqual(resp.getheader("Sec-WebSocket-Protocol"), "base64") + def read_frames(dec): frames = [] while True:

1 0

[flashproxy/master] Don't crash when the Upgrade or Connection headers are missing.
by dcf＠torproject.org 07 Sep '12

07 Sep '12

commit 508079f995abdc054ca153d8ae109f80bc6e344d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 05:05:14 2012 -0700 Don't crash when the Upgrade or Connection headers are missing. --- flashproxy-client | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index daf710b..dfe060f 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -485,13 +485,21 @@ def handle_websocket_request(fd): # 3. An |Upgrade| header field containing the value "websocket", treated as # an ASCII case-insensitive value. - if "websocket" not in [x.strip().lower() for x in headers.get("upgrade").split(",")]: + upgrade = headers.get("upgrade") + if upgrade is None: + handler.send_error(400) + return None + if "websocket" not in [x.strip().lower() for x in upgrade.split(",")]: handler.send_error(400) return None # 4. A |Connection| header field that includes the token "Upgrade", treated # as an ASCII case-insensitive value. - if "upgrade" not in [x.strip().lower() for x in headers.get("connection").split(",")]: + connection = headers.get("connection") + if connection is None: + handler.send_error(400) + return None + if "upgrade" not in [x.strip().lower() for x in connection.split(",")]: handler.send_error(400) return None

1 0