November 2017 - tor-commits - lists.torproject.org

[tor/master] Explain purpose, usage, and status of tor_runner.c
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 8b313bd4adac122bb01c52af3e616c5c69fd9414 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:11:45 2017 -0400 Explain purpose, usage, and status of tor_runner.c --- src/tools/tor_runner.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c index ee35b72df..ac398742d 100644 --- a/src/tools/tor_runner.c +++ b/src/tools/tor_runner.c @@ -4,6 +4,21 @@ * Copyright (c) 2007-2017, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * @file tor_runner.c + * @brief Experimental module to emulate tor_run_main() API with fork+exec + * + * The functions here are meant to allow the application developer to + * use the tor_run_main() API without having to care whether Tor is + * running in-process or out-of-process. For in-process usage, the + * developer can link Tor as a library and call tor_run_main(); for + * out-of-process usage, the developer can link this library instead. + * + * This interface is EXPERIMENTAL; please let us know if you would like + * to depend on it. We don't know yet whether it will be reliable in + * practice. + */ + #include "tor_api.h" #include "tor_api_internal.h"

1 0

[tor/master] Merge branch 'tor_api_squashed'
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit ef25f957e7912491ced116733e699ee341f2dadc Merge: 963584334 221f5238a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:22:16 2017 -0400 Merge branch 'tor_api_squashed' .gitignore | 1 + changes/ticket23845 | 9 ++++ configure.ac | 1 + src/or/config.c | 3 +- src/or/git_revision.c | 17 +++++++ src/or/git_revision.h | 12 +++++ src/or/include.am | 11 ++++- src/or/main.c | 12 +++-- src/or/main.h | 2 - src/or/tor_api.c | 88 +++++++++++++++++++++++++++++++++++ src/or/tor_api.h | 102 +++++++++++++++++++++++++++++++++++++++++ src/or/tor_api_internal.h | 20 ++++++++ src/or/tor_main.c | 12 ----- src/test/bench.c | 5 -- src/test/fuzz/fuzzing_common.c | 3 -- src/test/testing_common.c | 6 --- src/tools/include.am | 5 ++ src/tools/tor_runner.c | 101 ++++++++++++++++++++++++++++++++++++++++ 18 files changed, 374 insertions(+), 36 deletions(-)

1 0

[tor/master] Add more usage notes on tor_api.h
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 8c491945057fae9b22823ace92acdf997ff28a28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:19:12 2017 -0400 Add more usage notes on tor_api.h --- src/or/tor_api.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/or/tor_api.h b/src/or/tor_api.h index 1699d5c68..1abe6d114 100644 --- a/src/or/tor_api.h +++ b/src/or/tor_api.h @@ -12,6 +12,19 @@ * a library, and launch it in a separate thread. If you have the ability * to run Tor as a separate executable, you should probably do that instead * of embedding it as a library. + * + * To use this API, first construct a tor_main_configuration_t object using + * tor_main_configuration_new(). Then, you use one or more other function + * calls (such as tor_main_configuration_set_command_line() to configure how + * Tor should be run. Finally, you pass the configuration object to + * tor_run_main(). + * + * At this point, tor_run_main() will block its thread to run a Tor daemon; + * when the Tor daemon exits, it will return. See notes on bugs and + * limitations below. + * + * There is no other public C API to Tor: calling any C Tor function not + * documented in this file is not guaranteed to be stable. **/ #ifndef TOR_API_H @@ -35,6 +48,7 @@ tor_main_configuration_t *tor_main_configuration_new(void); */ int tor_main_configuration_set_command_line(tor_main_configuration_t *cfg, int argc, char *argv[]); + /** * Release all storage held in cfg. * @@ -63,6 +77,12 @@ void tor_main_configuration_free(tor_main_configuration_t *cfg); * LIMITATION: You cannot run more than one instance of Tor in the same * process at the same time. Concurrent calls will cause undefined behavior. * We do not currently have plans to change this. + * + * LIMITATION: While we will try to fix any problems found here, you + * should be aware that Tor was originally written to run as its own + * process, and that the functionality of this file was added later. If + * you find any bugs or strange behavior, please report them, and we'll + * try to straighten them out. */ int tor_run_main(const tor_main_configuration_t *);

1 0

[tor/master] Add a public tor_api.h with an implementation in tor_api.c
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit fa02ea102e3ccc946d269788e88c6818e84ad6f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 14:26:29 2017 -0400 Add a public tor_api.h with an implementation in tor_api.c The main effect of this change is to commit to an extensible long-term API. Closes ticket 23684. --- changes/ticket23845 | 5 +++ src/or/include.am | 9 +++-- src/or/main.c | 12 ++++--- src/or/main.h | 2 -- src/or/tor_api.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++ src/or/tor_api.h | 82 +++++++++++++++++++++++++++++++++++++++++++ src/or/tor_api_internal.h | 20 +++++++++++ 7 files changed, 210 insertions(+), 8 deletions(-) diff --git a/changes/ticket23845 b/changes/ticket23845 index 01f57374b..93c150bdb 100644 --- a/changes/ticket23845 +++ b/changes/ticket23845 @@ -1,3 +1,8 @@ + o Major features (embedding): + - There is now a documented stable API for programs that need to + embed Tor. See tor_api.h for full documentation and known bugs. + Closes ticket 23684. + o Code simplification and refactoring: - The tor_git_revision[] constant no longer needs to be redeclared by everything that links against the rest of Tor. Done as part diff --git a/src/or/include.am b/src/or/include.am index 662bd4807..bc7327064 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -105,6 +105,7 @@ LIBTOR_A_SOURCES = \ src/or/statefile.c \ src/or/status.c \ src/or/torcert.c \ + src/or/tor_api.c \ src/or/onion_ntor.c \ $(tor_platform_source) @@ -245,9 +246,13 @@ ORHEADERS = \ src/or/scheduler.h \ src/or/statefile.h \ src/or/status.h \ - src/or/torcert.h + src/or/torcert.h \ + src/or/tor_api_internal.h -noinst_HEADERS+= $(ORHEADERS) micro-revision.i +# This may someday want to be an installed file? +noinst_HEADERS += src/or/tor_api.h + +noinst_HEADERS += $(ORHEADERS) micro-revision.i micro-revision.i: FORCE $(AM_V_at)rm -f micro-revision.tmp; \ diff --git a/src/or/main.c b/src/or/main.c index 65b0b8f4d..5152ec10b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -106,6 +106,8 @@ #include "shared_random.h" #include "statefile.h" #include "status.h" +#include "tor_api.h" +#include "tor_api_internal.h" #include "util_process.h" #include "ext_orport.h" #ifdef USE_DMALLOC @@ -3703,14 +3705,16 @@ sandbox_init_filter(void) return cfg; } -/** Main entry point for the Tor process. Called from main(). */ -/* This function is distinct from main() only so we can link main.c into - * the unittest binary without conflicting with the unittests' main. */ +/* Main entry point for the Tor process. Called from tor_main(), and by + * anybody embedding Tor. */ int -tor_main(int argc, char *argv[]) +tor_run_main(const tor_main_configuration_t *tor_cfg) { int result = 0; + int argc = tor_cfg->argc; + char **argv = tor_cfg->argv; + #ifdef _WIN32 #ifndef HeapEnableTerminationOnCorruption #define HeapEnableTerminationOnCorruption 1 diff --git a/src/or/main.h b/src/or/main.h index 132ab12bb..3868519c8 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -74,8 +74,6 @@ void release_lockfile(void); void tor_cleanup(void); void tor_free_all(int postfork); -int tor_main(int argc, char *argv[]); - int do_main_loop(void); int tor_init(int argc, char **argv); diff --git a/src/or/tor_api.c b/src/or/tor_api.c new file mode 100644 index 000000000..4260cc88f --- /dev/null +++ b/src/or/tor_api.c @@ -0,0 +1,88 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file tor_api.c + **/ + +#include "tor_api.h" +#include "tor_api_internal.h" + +// Include this after the above headers, to insure that they don't +// depend on anything else. +#include "orconfig.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +// We don't want to use tor_malloc and tor_free here, since this needs +// to run before anything is initialized at all, and ought to run when +// we're not linked to anything at all. + +#define raw_malloc malloc +#define raw_free free + +tor_main_configuration_t * +tor_main_configuration_new(void) +{ + static const char *fake_argv[] = { "tor" }; + tor_main_configuration_t *cfg = raw_malloc(sizeof(*cfg)); + if (cfg == NULL) + return NULL; + + memset(cfg, 0, sizeof(*cfg)); + + cfg->argc = 1; + cfg->argv = (char **) fake_argv; + + return cfg; +} + +int +tor_main_configuration_set_command_line(tor_main_configuration_t *cfg, + int argc, char *argv[]) +{ + if (cfg == NULL) + return -1; + cfg->argc = argc; + cfg->argv = argv; + return 0; +} + +void +tor_main_configuration_free(tor_main_configuration_t *cfg) +{ + if (cfg == NULL) + return; + raw_free(cfg); +} + +/* Main entry point for the Tor process. Called from main(). + * + * This function is distinct from main() only so we can link main.c into + * the unittest binary without conflicting with the unittests' main. + * + * Some embedders have historically called this function; but that usage is + * deprecated: they should use tor_run_main() instead. + */ +int +tor_main(int argc, char *argv[]) +{ + tor_main_configuration_t *cfg = tor_main_configuration_new(); + if (!cfg) { + puts("INTERNAL ERROR: Allocation failure. Cannot proceed"); + return 1; + } + if (tor_main_configuration_set_command_line(cfg, argc, argv) < 0) { + puts("INTERNAL ERROR: Can't set command line. Cannot proceed."); + return 1; + } + int rv = tor_run_main(cfg); + tor_main_configuration_free(cfg); + return rv; +} + diff --git a/src/or/tor_api.h b/src/or/tor_api.h new file mode 100644 index 000000000..1699d5c68 --- /dev/null +++ b/src/or/tor_api.h @@ -0,0 +1,82 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file tor_api.h + * \brief Public C API for the Tor network service. + * + * This interface is intended for use by programs that need to link Tor as + * a library, and launch it in a separate thread. If you have the ability + * to run Tor as a separate executable, you should probably do that instead + * of embedding it as a library. + **/ + +#ifndef TOR_API_H +#define TOR_API_H + +typedef struct tor_main_configuration_t tor_main_configuration_t; + +/** + * Create and return a new tor_main_configuration(). + */ +tor_main_configuration_t *tor_main_configuration_new(void); + +/** + * Set the command-line arguments in cfg. + * + * The argc and argv values here are as for main(). The + * contents of the argv pointer must remain unchanged until tor_run_main() has + * finished and you call tor_main_configuration_free(). + * + * Return 0 on success, -1 on failure. + */ +int tor_main_configuration_set_command_line(tor_main_configuration_t *cfg, + int argc, char *argv[]); +/** + * Release all storage held in cfg. + * + * Once you have passed a tor_main_configuration_t to tor_run_main(), you + * must not free it until tor_run_main() has finished. + */ +void tor_main_configuration_free(tor_main_configuration_t *cfg); + +/** + * Run the tor process, as if from the command line. + * + * The command line arguments from tor_main_configuration_set_command_line() + * are taken as if they had been passed to main(). + * + * This function will not return until Tor is done running. It returns zero + * on success, and nonzero on failure. + * + * BUG 23848: In many cases, tor_main will call exit() or abort() instead of + * returning. This is not the intended long-term behavior; we are trying to + * fix it. + * + * BUG 23847: You can only call tor_main() once in a single process; if it + * returns and you call it again, you may crash. This is not intended + * long-term behavior; we are trying to fix it. + * + * LIMITATION: You cannot run more than one instance of Tor in the same + * process at the same time. Concurrent calls will cause undefined behavior. + * We do not currently have plans to change this. + */ +int tor_run_main(const tor_main_configuration_t *); + +/** + * Run the tor process, as if from the command line. + * + * @deprecated Using this function from outside Tor is deprecated; you should + * use use tor_run_main() instead. + * + * BUGS: This function has all the same bugs as tor_run_main(). + * + * LIMITATIONS: This function has all the limitations of tor_run_main(). + */ +int tor_main(int argc, char **argv); + +#endif /* !defined(TOR_API_H) */ + diff --git a/src/or/tor_api_internal.h b/src/or/tor_api_internal.h new file mode 100644 index 000000000..a69ba7642 --- /dev/null +++ b/src/or/tor_api_internal.h @@ -0,0 +1,20 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_API_INTERNAL_H +#define TOR_API_INTERNAL_H + +/* The contents of this type are private; don't mess with them from outside + * Tor. */ +struct tor_main_configuration_t { + /** As in main() */ + int argc; + /** As in main(). This pointer is owned by the caller */ + char **argv; +}; + +#endif +

1 0

[orbot/master] update CHANGELOG
by n8fr8＠torproject.org 01 Nov '17

01 Nov '17

commit 1b904125f30fb987afbb0f9107e599ecabd3f5f5 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Nov 1 09:57:40 2017 -0400 update CHANGELOG --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 43fe17fe..f1b32552 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** v15.5.1 RC 2 / 1 Nov 2017 **/ + +b2de89b fix issue with select apps + /** v15.5.1 / 31 Oct 2017 / 2c99e9efa4aa253e4d63ee786759efdbeaf9b78f **/ 2c99e9e update version to 15.5.1-RC-1 (1551000*)

1 0

[orbot/master] update to 15.5.1-RC-2-multi-
by n8fr8＠torproject.org 01 Nov '17

01 Nov '17

commit 61aff8ce82c73d4e282a0414c8abba3408ca2f86 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Nov 1 09:52:34 2017 -0400 update to 15.5.1-RC-2-multi- --- app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2b7329c2..12f5eace 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,16 +30,16 @@ android { applicationId 'org.torproject.android' targetSdkVersion 23 maxSdkVersion 23 - versionCode 15510000 - versionName '15.5.1-RC-1-multi-SDK16' + versionCode 15510001 + versionName '15.5.1-RC-2-multi-SDK16' } fullperm { dimension "free" minSdkVersion 23 applicationId 'org.torproject.android' targetSdkVersion 25 - versionCode 15510001 - versionName '15.5.1-RC-1-multi-SDK23' + versionCode 15510002 + versionName '15.5.1-RC-2-multi-SDK23' } } }

1 0

[orbot/master] fix issue with select apps
by n8fr8＠torproject.org 01 Nov '17

01 Nov '17

commit b2de89b2cb4de0d8fe7b5fc859ae4c4429f2cc6a Author: n8fr8 <nathan(a)freitas.net> Date: Wed Nov 1 09:51:34 2017 -0400 fix issue with select apps --- .../main/java/org/torproject/android/ui/AppManagerActivity.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index 0f8e2f06..30e52ebc 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -83,7 +83,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList protected void onPreExecute() { // Pre Code - dialog = new ProgressDialog(AppManagerActivity.this); + dialog = new ProgressDialog(AppManagerActivity.this, android.support.v4.app.DialogFragment.STYLE_NO_TITLE); dialog.show(); } protected Void doInBackground(Void... unused) { @@ -125,7 +125,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList if (convertView == null) convertView = inflater.inflate(R.layout.layout_apps_item, parent, false); else - entry = (ListEntry) convertView.getTag();; + entry = (ListEntry) convertView.getTag(); if (entry == null) { // Inflate a new view @@ -134,8 +134,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck); entry.text = (TextView) convertView.findViewById(R.id.itemtext); convertView.setTag(entry); - - } final TorifiedApp app = mApps.get(position); @@ -162,6 +160,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList if (entry.box != null) { entry.box.setOnClickListener(AppManagerActivity.this); entry.box.setChecked(app.isTorified()); + entry.box.setTag(app); } return convertView;

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 01 Nov '17

01 Nov '17

commit fff8806552ec9986bee59d80965f3000a5893941 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 1 11:21:40 2017 +0000 Update translations for tails-greeter-2 --- ko/ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/ko.po b/ko/ko.po index 376e2ccdc..b04b6abf3 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-15 21:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Yongmin Hong <revi(a)pobox.com>, 2017\n" +"Last-Translator: Revi_ <revi(a)pobox.com>, 2017\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 01 Nov '17

01 Nov '17

commit 29c79db094434ba94668fc2ecac8e19ac2fbbef2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 1 07:46:01 2017 +0000 Update translations for liveusb-creator_completed --- da/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/da.po b/da/da.po index f4844f2f6..3dba03de7 100644 --- a/da/da.po +++ b/da/da.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-21 22:52+0000\n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-11-01 07:16+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -354,7 +354,7 @@ msgstr "Der kunne ikke findes nogen egnet enhed til installation af Tails" #: ../tails_installer/gui.py:518 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." -msgstr "Isæt venligst et USB-flash-drev eller SD-kort på mindst %0.1f GB." +msgstr "Sæt venligst et USB-flash-drev eller SD-kort i på mindst %0.1f GB." #: ../tails_installer/gui.py:552 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 01 Nov '17

01 Nov '17

commit 55de7a53fdabc833e43fee9d3d08efd8de9a9f31 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 1 07:45:54 2017 +0000 Update translations for liveusb-creator --- da/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/da.po b/da/da.po index f4844f2f6..3dba03de7 100644 --- a/da/da.po +++ b/da/da.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-21 22:52+0000\n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-11-01 07:16+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -354,7 +354,7 @@ msgstr "Der kunne ikke findes nogen egnet enhed til installation af Tails" #: ../tails_installer/gui.py:518 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." -msgstr "Isæt venligst et USB-flash-drev eller SD-kort på mindst %0.1f GB." +msgstr "Sæt venligst et USB-flash-drev eller SD-kort i på mindst %0.1f GB." #: ../tails_installer/gui.py:552 #, python-format

1 0