tor-commits May 2018

tor-commits@lists.torproject.org

17 participants
1514 discussions

[tor/release-0.3.2] Merge branch 'bug26116_029' into maint-0.2.9
by nickm＠torproject.org 24 May '18

24 May '18

commit c380562aed5242eab6449b054199d742f02833dd Merge: d1e4ffc71 aeb4be1d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 24 09:39:46 2018 -0400 Merge branch 'bug26116_029' into maint-0.2.9 changes/bug26116 | 7 +++++++ src/common/crypto.c | 7 ++++++- src/test/test_crypto.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Add a unit test for PEM-encrypted documents.
by nickm＠torproject.org 24 May '18

24 May '18

commit aeb4be1d5a17f8ff836e370f8942c09c66b31e1d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 24 09:36:33 2018 -0400 Add a unit test for PEM-encrypted documents. --- src/test/test_crypto.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 64a46f791..8fd9ca767 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1349,6 +1349,46 @@ test_crypto_pk_base64(void *arg) tor_free(encoded); } +static void +test_crypto_pk_pem_encrypted(void *arg) +{ + crypto_pk_t *pk = NULL; + (void)arg; + + pk = crypto_pk_new(); + /* we need to make sure that we won't stall if somebody gives us a key + that's encrypted with a password. */ + { + const char *s = + "-----BEGIN RSA PRIVATE KEY-----\n" + "Proc-Type: 4,ENCRYPTED\n" + "DEK-Info: AES-128-CBC,EFA86BB9D2AB11E80B4E3DCD97782B16\n" + "\n" + "Z2Je4m0cFepc6coQkVbGcvNCHxTf941N2XYEVE6kn0CqWqoUH4tlwV6for5D91np\n" + "5NiEFTkWj31EhrvrYcuiJtQ/iEbABxZULFWFeJ058rb+1izBz5rScqnEacIS/3Go\n" + "YntnROBDwiKmUnue6PJVYg==\n" + "-----END RSA PRIVATE KEY-----\n"; + tt_int_op(-1, OP_EQ, + crypto_pk_read_private_key_from_string(pk, s, strlen(s))); + } + /* For fun, make sure we aren't hit by OpenSSL issue + https://github.com/openssl/openssl/issues/6347 , where we get in trouble + if a cipher doesn't use an IV. + */ + { + const char *s = + "-----BEGIN RSA PUBLIC KEY-----\n" + "Proc-Type:4,ENCRYPTED\n" + "DEK-Info:des-ede -\n" + "\n" + "iRqK\n" + "-----END RSA PUBLIC KEY-----\n"; + tt_int_op(-1, OP_EQ, + crypto_pk_read_public_key_from_string(pk, s, strlen(s))); + } + done: + crypto_pk_free(pk); +} #ifdef HAVE_TRUNCATE #define do_truncate truncate #else @@ -2914,6 +2954,7 @@ struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(pk), { "pk_fingerprints", test_crypto_pk_fingerprints, TT_FORK, NULL, NULL }, { "pk_base64", test_crypto_pk_base64, TT_FORK, NULL, NULL }, + { "pk_pem_encrypted", test_crypto_pk_pem_encrypted, TT_FORK, NULL, NULL }, CRYPTO_LEGACY(digests), { "digest_names", test_crypto_digest_names, 0, NULL, NULL }, { "sha3", test_crypto_sha3, TT_FORK, NULL, NULL},

1 0

[tor/maint-0.2.9] Merge branch 'bug26116_029' into maint-0.2.9
by nickm＠torproject.org 24 May '18

24 May '18

1 0

[tor/maint-0.2.9] Return -1 from our PEM password callback
by nickm＠torproject.org 24 May '18

24 May '18

commit 881f7157f648eb8a39e5dfd3efb95951ee7ac215 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 11:39:42 2018 -0400 Return -1 from our PEM password callback Apparently, contrary to its documentation, this is how OpenSSL now wants us to report an error. Fixes bug 26116; bugfix on 0.2.5.16. --- changes/bug26116 | 7 +++++++ src/common/crypto.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug26116 b/changes/bug26116 new file mode 100644 index 000000000..3bfde74f7 --- /dev/null +++ b/changes/bug26116 @@ -0,0 +1,7 @@ + o Minor bugfixes (compatibility, openssl): + - Work around a change in OpenSSL 1.1.1 where + return values that would previously indicate "no password" now + indicate an empty password. Without this workaround, Tor instances + running with OpenSSL 1.1.1 would accept descriptors that other Tor + instances would reject. Fixes bug 26116; bugfix on 0.2.5.16. + diff --git a/src/common/crypto.c b/src/common/crypto.c index 39c8cc2b0..f8495bb10 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -653,7 +653,12 @@ pem_no_password_cb(char *buf, int size, int rwflag, void *u) (void)size; (void)rwflag; (void)u; - return 0; + /* The openssl documentation says that a callback "must" return 0 if an + * error occurred. But during the 1.1.1 series (commit c82c3462267afdbbaa5 + * they changed the interpretation so that 0 indicates an empty password and + * -1 indicates an error. We want to reject any encrypted PEM buffers, so we + * return -1. This will work on older OpenSSL versions and LibreSSL too. */ + return -1; } /** Read a PEM-encoded private key from the <b>len</b>-byte string <b>s</b>

1 0

[stem/master] Example script for downloading descriptors
by atagar＠torproject.org 23 May '18

23 May '18

commit ee3bca1e15e4bc927a296b52df5c2706ce087b52 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 23 12:03:08 2018 -0700 Example script for downloading descriptors Providing a simple demo in our examples of downloading descriptors from ORPort or DirPorts. Handy little script in its own right. :P % python download_descriptor.py --type consensus --dirport 128.31.0.34:9131 Downloading consensus descriptor from 128.31.0.34:9131... r moria1 lpXfw1/+uGEym58asExGOXAgzjE IpcU7dolas8+Q+oAzwgvZIWx7PA 2018-05-23 02:41:25 128.31.0.34 9101 9131 s Authority Fast Running Stable V2Dir Valid v Tor 0.3.3.5-rc-dev pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 w Bandwidth=20 Unmeasured=1 p reject 1-65535 Requested by starlight on... https://lists.torproject.org/pipermail/tor-relays/2018-May/015270.html --- docs/_static/example/download_descriptor.py | 131 ++++++++++++++++++++++ docs/change_log.rst | 1 + docs/tutorials/double_double_toil_and_trouble.rst | 4 + docs/tutorials/examples/download_descriptor.rst | 27 +++++ 4 files changed, 163 insertions(+) diff --git a/docs/_static/example/download_descriptor.py b/docs/_static/example/download_descriptor.py new file mode 100644 index 00000000..7e712ecf --- /dev/null +++ b/docs/_static/example/download_descriptor.py @@ -0,0 +1,131 @@ +""" +Simple script to dowload a descriptor from Tor's ORPort or DirPort. +""" + +import collections +import getopt +import sys + +import stem +import stem.descriptor.remote +import stem.util.connection +import stem.util.tor_tools + +# By default downloading moria1's server descriptor from itself. + +DEFAULT_ARGS = { + 'descriptor_type': 'server', + 'fingerprint': '9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'download_from': stem.DirPort('128.31.0.34', 9131), + 'print_help': False, +} + +VALID_TYPES = ('server', 'extrainfo', 'consensus') + +HELP_TEXT = """\ +Downloads a descriptor through Tor's ORPort or DirPort. + + -t, --type TYPE descriptor type to download, options are: + %s + -f, --fingerprint FP relay to download the descriptor of + --orport ADDRESS:PORT ORPort to download from + --dirport ADDRESS:PORT DirPort to download from + -h, --help presents this help +""" % ', '.join(VALID_TYPES) + + +def parse(argv): + """ + Parses our arguments, providing a named tuple with their values. + + :param list argv: input arguments to be parsed + + :returns: a **named tuple** with our parsed arguments + + :raises: **ValueError** if we got an invalid argument + """ + + args = dict(DEFAULT_ARGS) + + try: + recognized_args, unrecognized_args = getopt.getopt(argv, 't:f:h', ['type=', 'fingerprint=', 'orport=', 'dirport=', 'help']) + + if unrecognized_args: + raise getopt.GetoptError("'%s' aren't recognized arguments" % "', '".join(unrecognized_args)) + except Exception as exc: + raise ValueError('%s (for usage provide --help)' % exc) + + for opt, arg in recognized_args: + if opt in ('-t', '--type'): + if arg not in VALID_TYPES: + raise ValueError("'%s' isn't a recognized decriptor type, options are: %s" % (arg, ', '.join(VALID_TYPES))) + + args['descriptor_type'] = arg + elif opt in ('-f', '--fingerprint'): + if not stem.util.tor_tools.is_valid_fingerprint(arg): + raise ValueError("'%s' isn't a relay fingerprint" % arg) + + args['fingerprint'] = arg + elif opt in ('--orport', '--dirport'): + if ':' not in arg: + raise ValueError("'%s' should be of the form 'address:port'" % arg) + + address, port = arg.rsplit(':', 1) + + if not stem.util.connection.is_valid_ipv4_address(address): + raise ValueError("'%s' isn't a valid IPv4 address" % address) + elif not stem.util.connection.is_valid_port(port): + raise ValueError("'%s' isn't a valid port number" % port) + + endpoint_class = stem.ORPort if opt == '--orport' else stem.DirPort + args['download_from'] = endpoint_class(address, port) + elif opt in ('-h', '--help'): + args['print_help'] = True + + # translates our args dict into a named tuple + + Args = collections.namedtuple('Args', args.keys()) + return Args(**args) + + +def main(): + try: + args = parse(sys.argv[1:]) + except ValueError as exc: + print(exc) + sys.exit(1) + + if args.print_help: + print(HELP_TEXT) + sys.exit() + + print('Downloading %s descriptor from %s:%s...\n' % (args.descriptor_type, args.download_from.address, args.download_from.port)) + desc = None + + if args.descriptor_type in ('server', 'extrainfo'): + if args.descriptor_type == 'server': + download_func = stem.descriptor.remote.get_server_descriptors + else: + download_func = stem.descriptor.remote.get_extrainfo_descriptors + + desc = download_func( + fingerprints = [args.fingerprint], + endpoints = [args.download_from], + ).run()[0] + elif args.descriptor_type == 'consensus': + for consensus_desc in stem.descriptor.remote.get_consensus(endpoints = [args.download_from]): + if consensus_desc.fingerprint == args.fingerprint: + desc = consensus_desc + break + + if not desc: + print('Unable to find a descriptor for %s in the consensus' % args.fingerprint) + sys.exit(1) + else: + print("'%s' is not a recognized descriptor type, options are: %s" % (args.descriptor_type, ', '.join(VALID_TYPES))) + sys.exit(1) + + print(desc) + +if __name__ == '__main__': + main() diff --git a/docs/change_log.rst b/docs/change_log.rst index 257ff123..8d1f302d 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -84,6 +84,7 @@ The following are only available within Stem's `git repository * Added `terminal styling <tutorials/east_of_the_sun.html#terminal-styling>`_ to our utilities tutorial * Added `multiprocessing <tutorials/east_of_the_sun.html#multiprocessing>`_ to our utilities tutorial + * Added a `descriptor download example <tutorials/examples/download_descriptor.html>`_ * Added a `relay connection summary example <tutorials/examples/relay_connections.html>`_ .. _version_1.6: diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 48d665aa..6701f1dc 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -110,6 +110,10 @@ Relays Descriptors ----------- +* `Download Descriptors <examples/download_descriptor.html>`_ + + Download a descriptor from a Tor relay's ORPort or DirPort. + * `List Outdated Relays <examples/outdated_relays.html>`_ Prints contact information for relays prior to a given version. diff --git a/docs/tutorials/examples/download_descriptor.rst b/docs/tutorials/examples/download_descriptor.rst new file mode 100644 index 00000000..615eef7d --- /dev/null +++ b/docs/tutorials/examples/download_descriptor.rst @@ -0,0 +1,27 @@ +Download Tor Descriptors +======================== + +.. image:: /_static/buttons/back.png + :target: ../double_double_toil_and_trouble.html + +Tor relays provide a mirror for the tor relay descriptors it has cached. +These are available from its ORPort using `Tor's wire protocol +<https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt>`_, and optionally +with http as well from a `DirPort +<https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_. + +.. literalinclude:: /_static/example/download_descriptor.py + :language: python + +:: + + % python download_descriptor.py --type consensus --dirport 128.31.0.34:9131 + Downloading consensus descriptor from 128.31.0.34:9131... + + r moria1 lpXfw1/+uGEym58asExGOXAgzjE IpcU7dolas8+Q+oAzwgvZIWx7PA 2018-05-23 02:41:25 128.31.0.34 9101 9131 + s Authority Fast Running Stable V2Dir Valid + v Tor 0.3.3.5-rc-dev + pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 + w Bandwidth=20 Unmeasured=1 + p reject 1-65535 +

1 0

[tor/master] Merge branch 'appveyor_min_029_v2' into appveyor_min_034_v2
by nickm＠torproject.org 23 May '18

23 May '18

commit e053c71e3e216ae41dc93d546eda33c18772897a Merge: add00045a 0c81bdc9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 09:57:12 2018 -0400 Merge branch 'appveyor_min_029_v2' into appveyor_min_034_v2 .appveyor.yml | 62 ++++++++++++ changes/ticket25549 | 4 + scripts/test/appveyor-irc-notify.py | 192 ++++++++++++++++++++++++++++++++++++ 3 files changed, 258 insertions(+)

1 0

[tor/master] Merge branch 'appveyor_min_034_v2'
by nickm＠torproject.org 23 May '18

23 May '18

commit 7fb941e9f26a1ae6b6faccea9a3e9620b8d90ef3 Merge: 36a107855 e053c71e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 23 15:08:50 2018 -0400 Merge branch 'appveyor_min_034_v2' .appveyor.yml | 62 ++++++++++++ changes/ticket25549 | 4 + scripts/test/appveyor-irc-notify.py | 192 ++++++++++++++++++++++++++++++++++++ 3 files changed, 258 insertions(+)

1 0

[tor/master] changes file for appveyor support
by nickm＠torproject.org 23 May '18

23 May '18

commit 0c81bdc9efd5aa2a5009be5db6f097e887ac3225 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 21 17:24:17 2018 -0400 changes file for appveyor support --- changes/ticket25549 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket25549 b/changes/ticket25549 new file mode 100644 index 000000000..82b41278a --- /dev/null +++ b/changes/ticket25549 @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - Add the necessary configuration files for continuous integration + testing on Windows, via the Appveyor platform. Closes ticket 25549. + Patches from Marcin Cieślak and Isis Lovecruft.

1 0

[tor/master] Python script for IRC notifications from appveyor
by nickm＠torproject.org 23 May '18

23 May '18

commit 459ab3650cdaceb186c7fc63d15c07d4cc2b7734 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 21 15:23:53 2018 -0400 Python script for IRC notifications from appveyor Original by Christopher Wood, with modifications by nexB, Isis Lovecruft, and Marcin Cieślak. --- scripts/test/appveyor-irc-notify.py | 192 ++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py new file mode 100644 index 000000000..44ef4c96f --- /dev/null +++ b/scripts/test/appveyor-irc-notify.py @@ -0,0 +1,192 @@ +# coding=utf8 +# Copyright (C) 2015-2016 Christopher R. Wood +# Copyright (c) 2018 The Tor Project +# Copyright (c) 2018 isis agora lovecruft +# +# From: https://raw.githubusercontent.com/gridsync/gridsync/def54f8166089b733d16666… +# and: https://github.com/gridsync/gridsync +# +# Modified by nexB on October 2016: +# - rework the handling of environment variables. +# - made the script use functions +# - support only Appveyor loading its environment variable to craft IRC notices. +# +# Modified by isis agora lovecruft <isis(a)torproject.org> in 2018: +# - Make IRC server configurable. +# - Make bot IRC nick deterministic. +# - Make bot join the channel rather than sending NOTICE messages externally. +# - Fix a bug which always caused sys.exit() to be logged as a traceback. +# - Actually reset the IRC colour codes after printing. +# +# Modified by Marcin Cieślak in 2018: +# - Accept UTF-8 +# - only guess github URLs +# - stop using ANSI colors + +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software Foundation; +# either version 2 of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with this +# program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, +# Fifth Floor, Boston, MA 02110-1301 USA. + +"""Simple AppVeyor IRC notification script. + +The first argument is an IRC server and port; the second is the channel. Other +arguments passed to the script will be sent as notice messages content and any +{var}-formatted environment variables will be expanded automatically, replaced +with a corresponding Appveyor environment variable value. Use commas to +delineate multiple messages. + + +Example: +export APPVEYOR_URL=https://ci.appveyor.com +export APPVEYOR_PROJECT_NAME=tor +export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft +export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23 +export APPVEYOR_REPO_PROVIDER=gihub +export APPVEYOR_REPO_BRANCH=repo_branch +export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title +export APPVEYOR_BUILD_VERSION=1 +export APPVEYOR_REPO_COMMIT=22c95b72e29248dc4de9b85e590ee18f6f587de8 +export APPVEYOR_REPO_COMMIT_MESSAGE="some IRC test" +export APPVEYOR_ACCOUNT_NAME=isislovecruft +export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number +export APPVEYOR_REPO_NAME=isislovecruft/tor +python ./appveyor-irc-notify.py irc.oftc.net:6697 tor-ci '{repo_name} {repo_branch} {short_commit} - {repo_commit_author}: {repo_commit_message}','Build #{build_version} passed. Details: {build_url} | Commit: {commit_url} + +See also https://github.com/gridsync/gridsync/blob/master/appveyor.yml for examples +in Appveyor's YAML: + + on_success: + - "python scripts/test/appveyor-irc-notify.py irc.oftc.net:6697 tor-ci success + on_failure: + - "python scripts/test/appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure +""" + +from __future__ import print_function +from __future__ import absolute_import + +import os +import random +import socket +import ssl +import sys +import time + + +def appveyor_vars(): + """ + Return a dict of key value carfted from appveyor environment variables. + """ + + vars = dict([ + ( + v.replace('APPVEYOR_', '').lower(), + os.getenv(v, '').decode('utf-8') + ) for v in [ + 'APPVEYOR_URL', + 'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED', + 'APPVEYOR_REPO_BRANCH', + 'APPVEYOR_REPO_COMMIT_AUTHOR', + 'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL', + 'APPVEYOR_REPO_COMMIT_TIMESTAMP', + 'APPVEYOR_REPO_PROVIDER', + 'APPVEYOR_PROJECT_NAME', + 'APPVEYOR_PULL_REQUEST_TITLE', + 'APPVEYOR_BUILD_VERSION', + 'APPVEYOR_REPO_COMMIT', + 'APPVEYOR_REPO_COMMIT_MESSAGE', + 'APPVEYOR_ACCOUNT_NAME', + 'APPVEYOR_PULL_REQUEST_NUMBER', + 'APPVEYOR_REPO_NAME' + ] + ]) + + BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}' + + if vars["repo_provider"] == 'github': + COMMIT_FMT = u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}' + vars.update(commit_url=COMMIT_FMT.format(**vars)) + + vars.update( + build_url=BUILD_FMT.format(**vars), + short_commit=vars["repo_commit"][:7], + ) + return vars + + +def notify(): + """ + Send IRC notification + """ + apvy_vars = appveyor_vars() + + server, port = sys.argv[1].rsplit(":", 1) + channel = sys.argv[2] + success = sys.argv[3] == "success" + failure = sys.argv[3] == "failure" + + if success or failure: + messages = [] + messages.append(u"{repo_name} {repo_branch} {short_commit} - {repo_commit_author}: {repo_commit_message}") + + if success: + m = u"Build #{build_version} passed. Details: {build_url}" + if failure: + m = u"Build #{build_version} failed. Details: {build_url}" + + if "commit_url" in apvy_vars: + m += " Commit: {commit_url}" + + messages.append(m) + else: + messages = sys.argv[3:] + messages = ' '.join(messages) + messages = messages.decode("utf-8").split(',') + + print(repr(apvy_vars)) + messages = [msg.format(**apvy_vars).strip() for msg in messages] + + irc_username = 'appveyor-ci' + irc_nick = irc_username + + # establish connection + irc_sock = ssl.wrap_socket(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) + irc_sock.connect((socket.gethostbyname(server), int(port))) + irc_sock.send('NICK {0}\r\nUSER {0} * 0 :{0}\r\n'.format(irc_username).encode()) + irc_sock.send('JOIN #{0}\r\n'.format(channel).encode()) + irc_file = irc_sock.makefile() + + while irc_file: + line = irc_file.readline() + print(line.rstrip()) + response = line.split() + + if response[0] == 'PING': + irc_file.send('PONG {}\r\n'.format(reponse[1]).encode()) + + elif response[1] == '433': + irc_sock.send('NICK {}\r\n'.format(irc_nick).encode()) + + elif response[1] == '001': + time.sleep(5) + # send notification + for msg in messages: + print(u'PRIVMSG #{} :{}'.format(channel, msg).encode("utf-8")) + irc_sock.send(u'PRIVMSG #{} :{}\r\n'.format(channel, msg).encode("utf-8")) + time.sleep(5) + return + + +if __name__ == '__main__': + try: + notify() + except: + import traceback + print('ERROR: Failed to send notification: \n' + traceback.format_exc())

1 0

[tor/master] Appveyor configuration files.
by nickm＠torproject.org 23 May '18

23 May '18

commit 406366c540a5af7b9d823a8552887c74e120f7e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 21 15:29:32 2018 -0400 Appveyor configuration files. Original by Marcin Cieślak, with modifications from Isis Lovecruft and Nick Mathewson. --- .appveyor.yml | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 000000000..197097d1f --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,62 @@ +version: 1.0.{build} + +clone_depth: 50 + +environment: + compiler: mingw + + matrix: + - target: i686-w64-mingw32 + compiler_path: mingw32 + openssl_path: /c/OpenSSL-Win32 + - target: x86_64-w64-mingw32 + compiler_path: mingw64 + openssl_path: /c/OpenSSL-Win64 + +install: +- ps: >- + Function Execute-Command ($commandPath) + { + & $commandPath $args 2>&1 + if ( $LastExitCode -ne 0 ) { + $host.SetShouldExit( $LastExitCode ) + } + } + Function Execute-Bash () + { + Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args + } + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd + +build_script: +- ps: >- + if ($env:compiler -eq "mingw") { + $oldpath = ${env:Path} -split ';' + $buildpath = @("C:\msys64\${env:compiler_path}\bin", "C:\msys64\usr\bin") + $oldpath + $env:Path = @($buildpath) -join ';' + $env:build = @("${env:APPVEYOR_BUILD_FOLDER}", $env:target) -join '\' + Set-Location "${env:APPVEYOR_BUILD_FOLDER}" + Execute-Bash 'autoreconf -i' + mkdir "${env:build}" + Set-Location "${env:build}" + Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}" + Execute-Bash "V=1 make -j2" + Execute-Bash "V=1 make -j2 install" + } + +test_script: +- ps: >- + if ($env:compiler -eq "mingw") { + $oldpath = ${env:Path} -split ';' + $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath + $env:Path = $buildpath -join ';' + Set-Location "${env:build}" + Execute-Bash "VERBOSE=1 make -j2 check" + } + +on_success: +- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci success + +on_failure: +- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure +

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2018