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

[tor-messenger-build/master] Update logo.patch to remove extra spacing
by sukhbir＠torproject.org 21 Apr '15

21 Apr '15

commit 1a4200cbf6b0c5e9d8bf05677a4349b06ecc84b5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Apr 21 14:37:13 2015 -0400 Update logo.patch to remove extra spacing --- projects/tor-launcher/logo.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch index 0e5daa1..a67d1ab 100644 --- a/projects/tor-launcher/logo.patch +++ b/projects/tor-launcher/logo.patch @@ -1,13 +1,14 @@ diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css -index 331ae42..3331854 100644 +index 646baa6..e8f236f 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css -@@ -90,7 +90,7 @@ button.firstAnswer { +@@ -90,8 +90,7 @@ button.firstAnswer { .tbb-logo { list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); width: 115px; - height: 80px; +- margin-right: 20px; + height: 94px; - margin-right: 20px; } + wizard[tor_hide_browser_logo="true"] .tbb-logo,

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Apr '15

21 Apr '15

commit a406bfd547c7b028865110ece1c595cde338241b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 21 17:45:03 2015 +0000 Update translations for bridgedb --- ro/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po index b5a2d9c..057bf01 100644 --- a/ro/LC_MESSAGES/bridgedb.po +++ b/ro/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # Adda.17 <adrianatrifoi(a)gmail.com>, 2013 +# Ana <ana_maria_js(a)yahoo.com>, 2015 # axel_89 <axel_rap(a)yahoo.com>, 2015 # Isus Satanescu <isus(a)openmailbox.org>, 2014 # laura berindei <lauraagavriloae(a)yahoo.com>, 2014 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-21 17:33+0000\n" +"Last-Translator: Ana <ana_maria_js(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,7 +44,7 @@ msgstr "[ Acesta este un mesaj automat ; va rugam nu răspundeţi ]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "Acestea sînt punțile pentru dvs:" +msgstr "Acestea sunt punțile pentru dvs:" #: lib/bridgedb/strings.py:22 #, python-format

1 0

[tor-messenger-build/master] Move name.patch to branding directory
by sukhbir＠torproject.org 21 Apr '15

21 Apr '15

commit 7fc0b833eca44716d9310bc27aa7994d0174a6f6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Apr 21 11:49:05 2015 -0400 Move name.patch to branding directory --- projects/instantbird/branding/name.patch | 46 ++++++++++++++++++++++++++++++ projects/instantbird/name.patch | 46 ------------------------------ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/projects/instantbird/branding/name.patch b/projects/instantbird/branding/name.patch new file mode 100644 index 0000000..378c6db --- /dev/null +++ b/projects/instantbird/branding/name.patch @@ -0,0 +1,46 @@ +diff --git a/im/branding/messenger/branding.nsi b/im/branding/messenger/branding.nsi +index e5b5348..276722b 100755 +--- a/im/branding/messenger/branding.nsi ++++ b/im/branding/messenger/branding.nsi +@@ -6,8 +6,8 @@ + + # BrandFullNameInternal is used for some registry and file system values that + # should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.) +-!define BrandFullNameInternal "Instantbird" +-!define CompanyName "Instantbird" +-!define URLInfoAbout "http://www.instantbird.com/" +-!define URLUpdateInfo "http://www.instantbird.com/" ++!define BrandFullNameInternal "Tor Messenger" ++!define CompanyName "Tor Messenger" ++!define URLInfoAbout "https://www.torproject.org" ++!define URLUpdateInfo "https://www.torproject.org" + +diff --git a/im/branding/messenger/locales/en-US/brand.dtd b/im/branding/messenger/locales/en-US/brand.dtd +index c569ebb..2d6a5d8 100644 +--- a/im/branding/messenger/locales/en-US/brand.dtd ++++ b/im/branding/messenger/locales/en-US/brand.dtd +@@ -4,7 +4,7 @@ + +  + +-<!ENTITY brandShortName "Instantbird"> +-<!ENTITY brandFullName "Instantbird - Nightly"> ++<!ENTITY brandShortName "Tor Messenger"> ++<!ENTITY brandFullName "Tor Messenger - Alpha"> + <!ENTITY brandMotto "'Cause geeks can also do magic!"> +-<!ENTITY vendorShortName "Instantbird"> ++<!ENTITY vendorShortName "Tor Messenger"> +diff --git a/im/branding/messenger/locales/en-US/brand.properties b/im/branding/messenger/locales/en-US/brand.properties +index f949ced..93528a3 100644 +--- a/im/branding/messenger/locales/en-US/brand.properties ++++ b/im/branding/messenger/locales/en-US/brand.properties +@@ -2,6 +2,6 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-brandShortName=Instantbird +-brandFullName=Instantbird - Nightly +-vendorShortName=Instantbird ++brandShortName=Tor Messenger ++brandFullName=Tor Messenger - Alpha ++vendorShortName=Tor Messenger diff --git a/projects/instantbird/name.patch b/projects/instantbird/name.patch deleted file mode 100644 index 378c6db..0000000 --- a/projects/instantbird/name.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/im/branding/messenger/branding.nsi b/im/branding/messenger/branding.nsi -index e5b5348..276722b 100755 ---- a/im/branding/messenger/branding.nsi -+++ b/im/branding/messenger/branding.nsi -@@ -6,8 +6,8 @@ - - # BrandFullNameInternal is used for some registry and file system values that - # should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.) --!define BrandFullNameInternal "Instantbird" --!define CompanyName "Instantbird" --!define URLInfoAbout "http://www.instantbird.com/" --!define URLUpdateInfo "http://www.instantbird.com/" -+!define BrandFullNameInternal "Tor Messenger" -+!define CompanyName "Tor Messenger" -+!define URLInfoAbout "https://www.torproject.org" -+!define URLUpdateInfo "https://www.torproject.org" - -diff --git a/im/branding/messenger/locales/en-US/brand.dtd b/im/branding/messenger/locales/en-US/brand.dtd -index c569ebb..2d6a5d8 100644 ---- a/im/branding/messenger/locales/en-US/brand.dtd -+++ b/im/branding/messenger/locales/en-US/brand.dtd -@@ -4,7 +4,7 @@ - -  - --<!ENTITY brandShortName "Instantbird"> --<!ENTITY brandFullName "Instantbird - Nightly"> -+<!ENTITY brandShortName "Tor Messenger"> -+<!ENTITY brandFullName "Tor Messenger - Alpha"> - <!ENTITY brandMotto "'Cause geeks can also do magic!"> --<!ENTITY vendorShortName "Instantbird"> -+<!ENTITY vendorShortName "Tor Messenger"> -diff --git a/im/branding/messenger/locales/en-US/brand.properties b/im/branding/messenger/locales/en-US/brand.properties -index f949ced..93528a3 100644 ---- a/im/branding/messenger/locales/en-US/brand.properties -+++ b/im/branding/messenger/locales/en-US/brand.properties -@@ -2,6 +2,6 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --brandShortName=Instantbird --brandFullName=Instantbird - Nightly --vendorShortName=Instantbird -+brandShortName=Tor Messenger -+brandFullName=Tor Messenger - Alpha -+vendorShortName=Tor Messenger

1 0

[tor-messenger-build/master] Add patch for setting Tor Messenger as the brand name
by sukhbir＠torproject.org 21 Apr '15

21 Apr '15

commit f70ecf4ba62cbbb5c31feba50c7225dce54dd650 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Apr 21 11:28:11 2015 -0400 Add patch for setting Tor Messenger as the brand name --- projects/instantbird/config | 1 + projects/instantbird/name.patch | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index d8443db..0edbf91 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -68,6 +68,7 @@ input_files: - filename: theme-extension-update.patch - filename: installer.patch - filename: cert_override.txt + - filename: branding/name.patch - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' diff --git a/projects/instantbird/name.patch b/projects/instantbird/name.patch new file mode 100644 index 0000000..378c6db --- /dev/null +++ b/projects/instantbird/name.patch @@ -0,0 +1,46 @@ +diff --git a/im/branding/messenger/branding.nsi b/im/branding/messenger/branding.nsi +index e5b5348..276722b 100755 +--- a/im/branding/messenger/branding.nsi ++++ b/im/branding/messenger/branding.nsi +@@ -6,8 +6,8 @@ + + # BrandFullNameInternal is used for some registry and file system values that + # should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.) +-!define BrandFullNameInternal "Instantbird" +-!define CompanyName "Instantbird" +-!define URLInfoAbout "http://www.instantbird.com/" +-!define URLUpdateInfo "http://www.instantbird.com/" ++!define BrandFullNameInternal "Tor Messenger" ++!define CompanyName "Tor Messenger" ++!define URLInfoAbout "https://www.torproject.org" ++!define URLUpdateInfo "https://www.torproject.org" + +diff --git a/im/branding/messenger/locales/en-US/brand.dtd b/im/branding/messenger/locales/en-US/brand.dtd +index c569ebb..2d6a5d8 100644 +--- a/im/branding/messenger/locales/en-US/brand.dtd ++++ b/im/branding/messenger/locales/en-US/brand.dtd +@@ -4,7 +4,7 @@ + +  + +-<!ENTITY brandShortName "Instantbird"> +-<!ENTITY brandFullName "Instantbird - Nightly"> ++<!ENTITY brandShortName "Tor Messenger"> ++<!ENTITY brandFullName "Tor Messenger - Alpha"> + <!ENTITY brandMotto "'Cause geeks can also do magic!"> +-<!ENTITY vendorShortName "Instantbird"> ++<!ENTITY vendorShortName "Tor Messenger"> +diff --git a/im/branding/messenger/locales/en-US/brand.properties b/im/branding/messenger/locales/en-US/brand.properties +index f949ced..93528a3 100644 +--- a/im/branding/messenger/locales/en-US/brand.properties ++++ b/im/branding/messenger/locales/en-US/brand.properties +@@ -2,6 +2,6 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-brandShortName=Instantbird +-brandFullName=Instantbird - Nightly +-vendorShortName=Instantbird ++brandShortName=Tor Messenger ++brandFullName=Tor Messenger - Alpha ++vendorShortName=Tor Messenger

1 0

[tor-browser-bundle/master] fixup! Bug 15689: Switch back to HTTPS-E git repository
by gk＠torproject.org 21 Apr '15

21 Apr '15

commit c5e0b0b7517e5e1e2dfe23506db2d9b7b0939ef1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 21 11:29:28 2015 +0000 fixup! Bug 15689: Switch back to HTTPS-E git repository Since 5.0.2 a .xpi for AMO is built, too. We don't need it. --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f5ad824..455fc89 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -101,6 +101,8 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh + # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. + rm ./pkg/*-amo.xpi cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 7945f5e..61a024b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -109,6 +109,8 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh + # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. + rm ./pkg/*-amo.xpi cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index d089e0d..92b9382 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -88,6 +88,8 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh + # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. + rm ./pkg/*-amo.xpi cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. #

1 0

[tor-browser-bundle/master] Merge branch 'bug_15689_v3'
by gk＠torproject.org 21 Apr '15

21 Apr '15

commit b1a683d04ffd9054e2807013c5bc35fed8604b20 Merge: a73cdf8 713cf60 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 21 08:33:10 2015 +0000 Merge branch 'bug_15689_v3' gitian/descriptors/linux/gitian-bundle.yml | 15 ++++++++------- gitian/descriptors/mac/gitian-bundle.yml | 15 ++++++++------- gitian/descriptors/windows/gitian-bundle.yml | 15 ++++++++------- gitian/fetch-inputs.sh | 4 +--- gitian/gpg/https-everywhere.gpg | Bin 83382 -> 112546 bytes gitian/verify-tags.sh | 4 ++-- gitian/versions | 6 +----- gitian/versions.alpha | 6 +----- gitian/versions.beta | 6 +----- gitian/versions.nightly | 4 ---- 10 files changed, 30 insertions(+), 45 deletions(-)

1 0

[tor-browser-bundle/master] Bug 15689: Switch back to HTTPS-E git repository
by gk＠torproject.org 21 Apr '15

21 Apr '15

commit c04aaaf3d147ae9f46e046e47579c9c3979f3c45 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 17 05:15:32 2015 +0000 Bug 15689: Switch back to HTTPS-E git repository Now that bug 11630 got fixed for HTTPS-Everywhere 5.0 and the latter is shipped in Tor Browser stable we can switch back to using the HTTPS-Everywhere git repository and its signed tags. --- gitian/descriptors/linux/gitian-bundle.yml | 15 ++++++++------- gitian/descriptors/mac/gitian-bundle.yml | 15 ++++++++------- gitian/descriptors/windows/gitian-bundle.yml | 15 ++++++++------- gitian/fetch-inputs.sh | 4 +--- gitian/verify-tags.sh | 4 ++-- gitian/versions | 6 +----- gitian/versions.alpha | 6 +----- gitian/versions.beta | 6 +----- gitian/versions.nightly | 4 ---- 9 files changed, 30 insertions(+), 45 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index b6a4a26..f5ad824 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -9,8 +9,10 @@ packages: - "faketime" - "unzip" - "zip" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +# These three packages are needed for assembling the HTTPS-Everywhere rules +# since 5.0. - "libxslt1.1" +- "libxml2-utils" - "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -41,7 +43,6 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" @@ -95,13 +96,13 @@ script: | ~/build/dzip.sh ../../../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - #cd https-everywhere + cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - #rm -f .git/refs/heads/master - #./makexpi.sh - #cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - #cd .. + rm -f .git/refs/heads/master + ./makexpi.sh + cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + cd .. # cp *.xpi tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 1cf75e9..7945f5e 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -8,8 +8,10 @@ packages: - "faketime" - "unzip" - "zip" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +# These three packages are needed for assembling the HTTPS-Everywhere rules +# since 5.0. - "python-lxml" +- "libxml2-utils" - "sqlite3" # Needed for the .dmgs - "genisoimage" @@ -42,7 +44,6 @@ files: - "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "ddmg.sh" - "background-plist.py" @@ -103,13 +104,13 @@ script: | ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - # cd https-everywhere + cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - # rm -f .git/refs/heads/master - # ./makexpi.sh - # cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - # cd .. + rm -f .git/refs/heads/master + ./makexpi.sh + cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + cd .. # cp *.xpi ./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 76f5c67..d089e0d 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -9,8 +9,10 @@ packages: - "unzip" - "zip" - "nsis" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +# These three packages are needed for assembling the HTTPS-Everywhere rules +# since 5.0. - "python-lxml" +- "libxml2-utils" - "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -35,7 +37,6 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" @@ -82,13 +83,13 @@ script: | ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - #cd https-everywhere + cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - #rm -f .git/refs/heads/master - #./makexpi.sh - #cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - #cd .. + rm -f .git/refs/heads/master + ./makexpi.sh + cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 188c702..63460e8 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -164,11 +164,10 @@ done # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} -wget -U "" -N ${HTTPSE_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -204,7 +203,6 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi -ln -sf "$HTTPSE_PACKAGE" https-everywhere(a)eff.org.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 846b575..5c1d552 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -102,8 +102,8 @@ flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG +https-everywhere https-everywhere.gpg $HTTPSE_TAG EOF -#https-everywhere https-everywhere.gpg $HTTPSE_TAG while read dir commit; do check_git_hash "$dir" "$commit" @@ -141,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index a2f7817..3b74f27 100755 --- a/gitian/versions +++ b/gitian/versions @@ -12,7 +12,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.1 -HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -47,14 +47,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0.1 GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.3-sm+fn+fx.xpi -HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -82,7 +80,6 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a -HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -105,7 +102,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0077361..718019b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -12,7 +12,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 TOR_TAG=tor-0.2.6.6 TORLAUNCHER_TAG=0.2.7.3 TORBUTTON_TAG=1.9.1.0 -HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -52,14 +52,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0 GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.19-fx+fn+sm.xpi -HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -87,7 +85,6 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad -HTTPSE_HASH=059b6141b200c18f5903550d0ee6bdec1e1b874b7e069d246466e77bf3a436c2 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -110,7 +107,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.beta b/gitian/versions.beta index 673b2e5..854e422 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -12,7 +12,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -46,14 +46,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi -HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -82,7 +80,6 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -105,7 +102,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… -HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 73bb2ad..5a8eb91 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -55,14 +55,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0.2 GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.21-sm+fn+fx.xpi -HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -90,7 +88,6 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c -HTTPSE_HASH=a600ad019c982c8c90b8c5022dbf56722974bc1143f49c0db77704986f1b2ced MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -113,7 +110,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC…

1 0

[tor-browser-bundle/master] Adding jsha's key to the HTTPS-E signing key
by gk＠torproject.org 21 Apr '15

21 Apr '15

commit 713cf60037bf2582d4f290e78780ee00bf461aa8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 16 11:01:09 2015 +0000 Adding jsha's key to the HTTPS-E signing key --- gitian/gpg/https-everywhere.gpg | Bin 83382 -> 112546 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index ced373f..96a2f45 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[stem/master] Fixed twitter example to work with twitter API version 1.1
by atagar＠torproject.org 21 Apr '15

21 Apr '15

commit cdcde6a479fba4910eecb676a71bbc43cff697ac Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Apr 18 12:17:20 2015 +0530 Fixed twitter example to work with twitter API version 1.1 --- docs/tutorials/to_russia_with_love.rst | 66 ++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/docs/tutorials/to_russia_with_love.rst b/docs/tutorials/to_russia_with_love.rst index 75f9735..7d91f4b 100644 --- a/docs/tutorials/to_russia_with_love.rst +++ b/docs/tutorials/to_russia_with_love.rst @@ -121,33 +121,91 @@ Besides SocksiPy, you can also use `PycURL <http://pycurl.sourceforge.net/>`_ to Reading Twitter --------------- -Now lets do somthing a little more interesting, and read a Twitter feed over Tor. This can be easily done `using thier API <https://dev.twitter.com/docs/api/1/get/statuses/user_timeline>`_ (**warning: Twitter has deprecated the API that this example uses,** :trac:`9003`)... +Now lets do somthing a little more interesting, and read a Twitter feed over Tor. This can be easily done `using thier API <https://dev.twitter.com/rest/reference/get/statuses/user_timeline>`_ :: import json import socket import urllib + import urllib2 + import time + import binascii + import hmac + from hashlib import sha1, md5 import socks # SockiPy module import stem.process SOCKS_PORT = 7000 - TWITTER_API_URL = "http://api.twitter.com/1/statuses/user_timeline.json?screen_name=%s&count=%…" + KEY_DICT = dict() + TWITTER_API_URL = "https://api.twitter.com/1.1/statuses/user_timeline.json" + CONSUMER_KEY = "" + CONSUMER_SECRET = "" + ACCESS_TOKEN = "" + ACCESS_TOKEN_SECRET = "" + HTTP_METHOD = "GET" + OAUTH_VERSION = "1.0" socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, '127.0.0.1', SOCKS_PORT) socket.socket = socks.socksocket + def init_key_dict(): + """ + Initializes KEY_DICT + """ + + global KEY_DICT + KEY_DICT['oauth_consumer_key'] = urllib.quote(CONSUMER_KEY, '') + KEY_DICT['oauth_nonce'] = urllib.quote(md5(str(time.time())).hexdigest(), '') + KEY_DICT['oauth_signature_method'] = urllib.quote("HMAC-SHA1", '') + KEY_DICT['oauth_timestamp'] = urllib.quote(str(int(time.time())), '') + KEY_DICT['oauth_token'] = urllib.quote(ACCESS_TOKEN, '') + KEY_DICT['oauth_version'] = urllib.quote(OAUTH_VERSION, '') + + def get_signature(values): + """ + Generates KEY_DICT['oauth_signature'] + """ + for value in values: + KEY_DICT[value] = urllib.quote(values[value], '') + fin_key = "" + for key in sorted(KEY_DICT.keys()): + fin_key += key + "=" + KEY_DICT[key] + "&" + fin_key = fin_key[:-1] + fin_key = HTTP_METHOD + "&" + urllib.quote(TWITTER_API_URL, '') + "&" + urllib.quote(fin_key, '') + key = urllib.quote(CONSUMER_SECRET, '') + "&" + urllib.quote(ACCESS_TOKEN_SECRET, '') + hashed = hmac.new(key, fin_key, sha1) + fin_key = binascii.b2a_base64(hashed.digest())[:-1] + KEY_DICT['oauth_signature'] = urllib.quote(fin_key, '') + + def get_header_string(): + """ + Returns the header string + """ + ret = "OAuth " + key_list =['oauth_consumer_key', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method', 'oauth_timestamp', 'oauth_token', 'oauth_version'] + for key in key_list: + ret = ret + key + "=\"" + KEY_DICT[key] + "\", " + ret = ret[:-2] + return ret + def poll_twitter_feed(user_id, tweet_count): """ Polls Twitter for the tweets from a given user. """ - api_url = TWITTER_API_URL % (user_id, tweet_count) + init_key_dict() + values = {'screen_name': user_id, 'count': str(tweet_count), 'include_rts': '1'} + api_url = TWITTER_API_URL + get_signature(values) + headers = {'Authorization': get_header_string()} + data = urllib.urlencode(values) + api_request = urllib2.Request(api_url + "?" + data, headers= headers) try: - api_response = urllib.urlopen(api_url).read() + api_response = urllib2.urlopen(api_request).read() except: raise IOError("Unable to reach %s" % api_url)

1 0

[stem/master] Simplifying twitter example
by atagar＠torproject.org 21 Apr '15

21 Apr '15

commit d293eb8b52a1bf23e9ac1767cc7fdc0c54a12520 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 20 21:01:03 2015 -0700 Simplifying twitter example Replacing the KEY_DICT global and helpers with a shorter script. I don't have a Twitter account so unfortunately can't exercise this sucker, but should be equivalent to what we had previously. This and the prior commit are for... https://trac.torproject.org/projects/tor/ticket/9003 --- docs/tutorials/to_russia_with_love.rst | 87 +++++++++++++------------------- 1 file changed, 36 insertions(+), 51 deletions(-) diff --git a/docs/tutorials/to_russia_with_love.rst b/docs/tutorials/to_russia_with_love.rst index 7d91f4b..6bb4252 100644 --- a/docs/tutorials/to_russia_with_love.rst +++ b/docs/tutorials/to_russia_with_love.rst @@ -121,93 +121,78 @@ Besides SocksiPy, you can also use `PycURL <http://pycurl.sourceforge.net/>`_ to Reading Twitter --------------- -Now lets do somthing a little more interesting, and read a Twitter feed over Tor. This can be easily done `using thier API <https://dev.twitter.com/rest/reference/get/statuses/user_timeline>`_ +Now lets do somthing a little more interesting, and read a Twitter feed over Tor. This can be done `using thier API <https://dev.twitter.com/rest/reference/get/statuses/user_timeline>`_, for authentication `see their instructions <https://dev.twitter.com/oauth/overview/application-owner-access-tokens>`_... :: + import binascii + import hashlib + import hmac import json import socket + import time import urllib import urllib2 - import time - import binascii - import hmac - from hashlib import sha1, md5 import socks # SockiPy module import stem.process SOCKS_PORT = 7000 - KEY_DICT = dict() TWITTER_API_URL = "https://api.twitter.com/1.1/statuses/user_timeline.json" CONSUMER_KEY = "" CONSUMER_SECRET = "" ACCESS_TOKEN = "" ACCESS_TOKEN_SECRET = "" - HTTP_METHOD = "GET" - OAUTH_VERSION = "1.0" + + HEADER_AUTH_KEYS = ['oauth_consumer_key', 'oauth_nonce', 'oauth_signature', + 'oauth_signature_method', 'oauth_timestamp', 'oauth_token', 'oauth_version'] socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, '127.0.0.1', SOCKS_PORT) socket.socket = socks.socksocket + def oauth_signature(key_dict): + fin_key = "" - def init_key_dict(): - """ - Initializes KEY_DICT - """ - - global KEY_DICT - KEY_DICT['oauth_consumer_key'] = urllib.quote(CONSUMER_KEY, '') - KEY_DICT['oauth_nonce'] = urllib.quote(md5(str(time.time())).hexdigest(), '') - KEY_DICT['oauth_signature_method'] = urllib.quote("HMAC-SHA1", '') - KEY_DICT['oauth_timestamp'] = urllib.quote(str(int(time.time())), '') - KEY_DICT['oauth_token'] = urllib.quote(ACCESS_TOKEN, '') - KEY_DICT['oauth_version'] = urllib.quote(OAUTH_VERSION, '') + for key in sorted(key_dict.keys()): + fin_key += key + "=" + key_dict[key] + "&" - def get_signature(values): - """ - Generates KEY_DICT['oauth_signature'] - """ - for value in values: - KEY_DICT[value] = urllib.quote(values[value], '') - fin_key = "" - for key in sorted(KEY_DICT.keys()): - fin_key += key + "=" + KEY_DICT[key] + "&" fin_key = fin_key[:-1] - fin_key = HTTP_METHOD + "&" + urllib.quote(TWITTER_API_URL, '') + "&" + urllib.quote(fin_key, '') + fin_key = 'GET' + "&" + urllib.quote(TWITTER_API_URL, '') + "&" + urllib.quote(fin_key, '') key = urllib.quote(CONSUMER_SECRET, '') + "&" + urllib.quote(ACCESS_TOKEN_SECRET, '') - hashed = hmac.new(key, fin_key, sha1) + hashed = hmac.new(key, fin_key, hashlib.sha1) fin_key = binascii.b2a_base64(hashed.digest())[:-1] - KEY_DICT['oauth_signature'] = urllib.quote(fin_key, '') - - def get_header_string(): - """ - Returns the header string - """ - ret = "OAuth " - key_list =['oauth_consumer_key', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method', 'oauth_timestamp', 'oauth_token', 'oauth_version'] - for key in key_list: - ret = ret + key + "=\"" + KEY_DICT[key] + "\", " - ret = ret[:-2] - return ret + return urllib.quote(fin_key, '') def poll_twitter_feed(user_id, tweet_count): """ Polls Twitter for the tweets from a given user. """ - init_key_dict() - values = {'screen_name': user_id, 'count': str(tweet_count), 'include_rts': '1'} - api_url = TWITTER_API_URL - get_signature(values) - headers = {'Authorization': get_header_string()} - data = urllib.urlencode(values) - api_request = urllib2.Request(api_url + "?" + data, headers= headers) + key_dict = { + 'oauth_consumer_key': urllib.quote(CONSUMER_KEY, ''), + 'oauth_nonce': urllib.quote(hashlib.md5(str(time.time())).hexdigest(), ''), + 'oauth_signature_method': urllib.quote("HMAC-SHA1", ''), + 'oauth_timestamp': urllib.quote(str(int(time.time())), ''), + 'oauth_token': urllib.quote(ACCESS_TOKEN, ''), + 'oauth_version': urllib.quote('1.0', ''), + } + + url_values = {'screen_name': user_id, 'count': str(tweet_count), 'include_rts': '1'} + + for key, value in url_values.items(): + key_dict[key] = urllib.quote(value, '') + + key_dict['oauth_signature'] = oauth_signature(key_dict) + + header_auth = 'OAuth ' + ', '.join(['%s="%s"' % (key, key_dict[key]) for key in HEADER_AUTH_KEYS]) + + data = urllib.urlencode(url_values) + api_request = urllib2.Request(TWITTER_API_URL + "?" + data, headers = {'Authorization': header_auth}) try: api_response = urllib2.urlopen(api_request).read() except: - raise IOError("Unable to reach %s" % api_url) + raise IOError("Unable to reach %s" % TWITTER_API_URL) return json.loads(api_response)

1 0