Commit Graph

33907 Commits

Author SHA1 Message Date
Nick Mathewson 4d2c8ca338 Merge branch 'config_macros_doc_cleanup' 2019-10-28 07:31:42 -04:00
teor 3479024cb1 scripts: Change to the top source directory as needed
Bugfix on 31919; not in any released version of tor.
2019-10-28 13:28:50 +10:00
teor 18e09913bf practracker: Don't read editor temp files
(Or any dot files.)

Obviously correct changes to already-reviewed code.
2019-10-28 13:09:58 +10:00
teor 68befa3b84 scripts/git: Fix a shellcheck error in pre-commit.git-hook
Some versions of shellcheck do not detect this error.

Bugfix on 31919; not in any released version of tor.
2019-10-28 13:04:29 +10:00
Nick Mathewson f751cc020f Documentation cleanup in confmacros.h 2019-10-26 17:24:22 -04:00
Nick Mathewson 731464deb5 changes file for 32304 2019-10-26 10:14:05 -04:00
Nick Mathewson 16dffa523e Rename confparse.[ch] identifiers to confmgt.[ch] identifiers.
This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        confparse.h confmgt.h \
        confparse.c confmgt.c \
        CONFPARSE_PRIVATE CONFMGT_PRIVATE \
        TOR_CONFPARSE_H TOR_CONFMGT_H
2019-10-26 10:09:03 -04:00
Nick Mathewson 2402d95715 Rename confparse.[ch] to confmgt.[ch]
This will break compilation until includes etc are fixed.
2019-10-26 10:07:14 -04:00
Nick Mathewson 407fb0c35c Move config_format_t and allied definitions into conftypes.h
Since these are needed by every module that is _configurable_, they
belong in lib/conf, not lib/confmgt.
2019-10-26 10:05:03 -04:00
Nick Mathewson e7993dc046 Merge branch 'ticket31241_v3' 2019-10-25 08:10:39 -04:00
Nick Mathewson 63f2a310cb config,state: check magic in all callbacks. 2019-10-25 08:09:05 -04:00
Nick Mathewson aa6b4b62db confparse: Add a function to check the magic of a toplevel object. 2019-10-25 08:08:43 -04:00
teor 0ae530c8f6 test: Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes
In the unit tests.

Fixes a regression to bug 31334; bug not in any released version of tor.
2019-10-25 17:23:46 +10:00
teor 60aa6dac34 Merge remote-tracking branch 'tor-github/pr/1467' 2019-10-25 17:17:39 +10:00
teor 00c3fba61c scripts/maint: Stop assuming that python3 is in /usr/bin
Obviously correct fix to rename_c_identifier.py.

Bugfix on 32237; not in any released version of tor.
2019-10-25 16:46:54 +10:00
teor f40eb2ead6 Merge remote-tracking branch 'tor-github/pr/1462' 2019-10-25 16:14:37 +10:00
teor 7a5eefd3f8 Makefile: Stop using trailing spaces in an EXTRA_DIST clause
Based on 8-space tabs, the git/less default.

Cleanup after 31919.
2019-10-25 16:13:16 +10:00
teor 9be0324c2c changes: file for 31919 2019-10-25 16:08:44 +10:00
teor c3ff5ad56b Travis: Install coccinelle on macOS and Linux
And print the spatch version and build details

Part of 31919.
2019-10-25 16:08:40 +10:00
teor ba64caee87 Makefile: Add check_cocci_parse.sh as check-cocci
And add it to check-local.

Part of 31919.
2019-10-25 16:08:35 +10:00
teor aff286618c Merge branch 'maint-0.4.2' 2019-10-25 10:56:21 +10:00
teor d7c40beeab Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-25 10:56:13 +10:00
teor 63581d55a6 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-25 10:56:06 +10:00
teor e56e7e865e Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-25 10:55:58 +10:00
teor e03db9934a Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-25 10:55:51 +10:00
teor a91f52a443 Merge branch 'maint-0.4.2' 2019-10-25 10:38:22 +10:00
Nick Mathewson 94853b4ab6 changes tile for ticket 31241 2019-10-24 20:38:02 -04:00
Nick Mathewson 620e40bcfc test_options: add a test for options_trial_assign()
This function is used by controllers to set options.  I refactored
it a bit when refactoring options validation, so it needs to get
tested.
2019-10-24 20:38:02 -04:00
Nick Mathewson 06475f30e9 tests: set DataDirectory_option as well as DataDirectory.
options_validate_cb() derives DataDirectory (which we use) from
DataDirectory_option (which the user sets).  I want to add a test
that will call options_validate_cb(), but it will fail unless it
derives the same value.
2019-10-24 20:38:02 -04:00
Nick Mathewson 4d53bbeafb config: make options_act*() mockable.
I'll need this for testing options_trial_assign().
2019-10-24 20:38:02 -04:00
teor c8aa3cc17d Merge remote-tracking branch 'tor-github/pr/1466' into maint-0.4.2 2019-10-25 10:38:01 +10:00
Nick Mathewson f796bf3aa5 Extend confmgr tests to handle validation callbacks. 2019-10-24 20:37:53 -04:00
Nick Mathewson d17aa09308 config.c: Turn options_transition_allowed() into a proper callback 2019-10-24 20:30:32 -04:00
Nick Mathewson bd891f517f config.c: extract validate, check-transition, and set into a function
This eliminates duplicated code.  The options_validate() function
itself is now tests-only.
2019-10-24 20:30:32 -04:00
Nick Mathewson e0ae137df5 Write a new set of config validation callbacks.
Unlike legacy_validate_fn_t, these callbacks have separation of
duties, into:

    * early normalization and computation.
    * validation
    * transition checking
    * late normalization and computation

Only the first and last steps get mutable objects.  Only the
transition-checking step gets to see the previous values of this
object.
2019-10-24 20:30:32 -04:00
Nick Mathewson dc6d7f072d Make foo_validate() functions call config_validate().
The former foo_validate() functions are now toplevel
legacy_validate_fn callbacks.  The new foo_validate() functions now
call them.

This change lets us remove the old shared_random disk state
validation callback entirely.
2019-10-24 20:30:32 -04:00
Nick Mathewson 0cb4238537 Add a config_validate() function to invoke verify callbacks.
As we turn our monolithic configuration objects into suites of
smaller module-specific configuration objects, we will want each one
to be able to provide its own verification callbacks.  That means
that instead of invoking these verification callbacks directly, we will
want to call them via the configuration manager object.
2019-10-24 20:30:32 -04:00
Nick Mathewson 4a248bafba Rename validate_fn{,_t} to start with "legacy_".
The current API of this callback mixes responsibilities, including:
  * validation
  * transition checking
  * processing (modifying) the configuration object.

These will have to be disentangled piece by piece, so for now, we'll
have "legacy" validate functions as well.

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        validate_fn_t legacy_validate_fn_t \
        validate_fn legacy_validate_fn
2019-10-24 20:30:32 -04:00
Nick Mathewson 24ee44df90 test_options: stop generating old_data entirely.
Now that we no longer use it anywhere, we can remove this variable
from the test data structure.
2019-10-24 20:30:32 -04:00
Nick Mathewson 7c0f966668 test_options: don't pass an old_options argument to options_validate()
This input was inessential, and none of the tests actually depended
on it or tested anything about it (as can be seen from the fact that
tests all still pass when it's removed).

I tried to generate this commit with a coccinelle script, but it had
trouble parsing a lot of options_validate as it stands.  Instead, I
did a search-and-replace to replace "tdata->old_opt," with "NULL,".
2019-10-24 20:30:32 -04:00
Nick Mathewson 27dbf20bf4 Use named-member syntax for initializing config_format_t objects
I'm about to mess with their lists of callbacks, and I don't want to
proliferate lists where we say "NULL, NULL, NULL, ..."
2019-10-24 20:30:32 -04:00
teor b3d035d5c4 Merge remote-tracking branch 'tor-github/pr/1463' 2019-10-25 10:27:41 +10:00
teor 93be7275ec changes: file for 31919's bionic Travis image change 2019-10-25 09:53:11 +10:00
teor 1eb57b20b9 Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035 2019-10-25 09:48:14 +10:00
teor 8e549dd562 Travis: Use Ubuntu Bionic, but keep Trusty for chutney
Bionic has a recent coccinelle version, which passes our CI tests.

But Bionic (and Xenial) cause permissions errors for chutney.
We'll fix those in 32240.

Part of 31919.
2019-10-25 09:45:36 +10:00
teor c00602cc34 Merge branch 'maint-0.4.2' 2019-10-25 09:42:14 +10:00
teor acd27f4b41 Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2 2019-10-25 09:41:48 +10:00
Nick Mathewson 68e1ced607 Merge branch 'maint-0.4.2'
"ours" to avoid version bump.
2019-10-24 15:55:38 -04:00
Nick Mathewson 570d1367ea bump to 0.4.2.3-alpha-dev 2019-10-24 15:55:22 -04:00
Nick Mathewson d0c97bf3b6 Forward-port the changelog for 0.4.2.3-alpha 2019-10-24 15:52:55 -04:00