[or-cvs] r13384: Check for correctness of AuthDir* options in options_validat (in tor/trunk: . src/or)
nickm at seul.org
nickm at seul.org
Tue Feb 5 21:39:33 UTC 2008
Author: nickm
Date: 2008-02-05 16:39:32 -0500 (Tue, 05 Feb 2008)
New Revision: 13384
Modified:
tor/trunk/
tor/trunk/src/or/config.c
tor/trunk/src/or/or.h
tor/trunk/src/or/policies.c
Log:
r17910 at catbus: nickm | 2008-02-05 15:36:29 -0500
Check for correctness of AuthDir* options in options_validate; check for possible bugs where options_validate() is happy but parse_policies_from_options() is sad.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r17910] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c 2008-02-05 21:39:29 UTC (rev 13383)
+++ tor/trunk/src/or/config.c 2008-02-05 21:39:32 UTC (rev 13384)
@@ -1182,7 +1182,11 @@
parse_virtual_addr_network(options->VirtualAddrNetwork, 0, &msg);
/* Update address policies. */
- policies_parse_from_options(options);
+ if (policies_parse_from_options(options) < 0) {
+ /* This should be impossible, but let's be sure. */
+ log_warn(LD_BUG,"Error parsing already-validated policy options.");
+ return -1;
+ }
if (init_cookie_authentication(options->CookieAuthentication) < 0) {
log_warn(LD_CONFIG,"Error creating cookie authentication file.");
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2008-02-05 21:39:29 UTC (rev 13383)
+++ tor/trunk/src/or/or.h 2008-02-05 21:39:32 UTC (rev 13384)
@@ -3452,7 +3452,7 @@
int validate_addr_policies(or_options_t *options, char **msg);
void policy_expand_private(smartlist_t **policy);
-void policies_parse_from_options(or_options_t *options);
+int policies_parse_from_options(or_options_t *options);
addr_policy_t *addr_policy_get_canonical_entry(addr_policy_t *ent);
int cmp_addr_policies(smartlist_t *a, smartlist_t *b);
Modified: tor/trunk/src/or/policies.c
===================================================================
--- tor/trunk/src/or/policies.c 2008-02-05 21:39:29 UTC (rev 13383)
+++ tor/trunk/src/or/policies.c 2008-02-05 21:39:32 UTC (rev 13384)
@@ -135,11 +135,14 @@
}
/** Helper: parse the Reachable(Dir|OR)?Addresses fields into
- * reachable_(or|dir)_addr_policy. */
-static void
+ * reachable_(or|dir)_addr_policy. The options should already have
+ * been validated by validate_addr_policies.
+ */
+static int
parse_reachable_addresses(void)
{
or_options_t *options = get_options();
+ int ret = 0;
if (options->ReachableDirAddresses &&
options->ReachableORAddresses &&
@@ -160,6 +163,7 @@
log_warn(LD_CONFIG,
"Error parsing Reachable%sAddresses entry; ignoring.",
options->ReachableORAddresses ? "OR" : "");
+ ret = -1;
}
addr_policy_list_free(reachable_dir_addr_policy);
@@ -174,7 +178,9 @@
if (options->ReachableDirAddresses)
log_warn(LD_CONFIG,
"Error parsing ReachableDirAddresses entry; ignoring.");
+ ret = -1;
}
+ return ret;
}
/** Return true iff the firewall options might block any address:port
@@ -289,6 +295,9 @@
int
validate_addr_policies(or_options_t *options, char **msg)
{
+ /* XXXX Maybe merge this into parse_policies_from_options, to make sure
+ * that the two can't go out of sync. */
+
smartlist_t *addr_policy=NULL;
*msg = NULL;
@@ -302,6 +311,19 @@
REJECT("Error in DirPolicy entry.");
if (parse_addr_policy(options->SocksPolicy, &addr_policy, -1))
REJECT("Error in SocksPolicy entry.");
+ if (parse_addr_policy(options->AuthDirReject, &addr_policy,
+ ADDR_POLICY_REJECT))
+ REJECT("Error in AuthDirReject entry.");
+ if (parse_addr_policy(options->AuthDirInvalid, &addr_policy,
+ ADDR_POLICY_REJECT))
+ REJECT("Error in AuthDirInvalid entry.");
+ if (parse_addr_policy(options->AuthDirBadDir, &addr_policy,
+ ADDR_POLICY_REJECT))
+ REJECT("Error in AuthDirBadDir entry.");
+ if (parse_addr_policy(options->AuthDirBadExit, &addr_policy,
+ ADDR_POLICY_REJECT))
+ REJECT("Error in AuthDirBadExit entry.");
+
if (parse_addr_policy(options->ReachableAddresses, &addr_policy,
ADDR_POLICY_ACCEPT))
REJECT("Error in ReachableAddresses entry.");
@@ -328,7 +350,7 @@
* is parsed, and put the processed version in *<b>policy</b>.
* Ignore port specifiers.
*/
-static void
+static int
load_policy_from_option(config_line_t *config, smartlist_t **policy,
int assume_action)
{
@@ -336,32 +358,44 @@
addr_policy_list_free(*policy);
*policy = NULL;
r = parse_addr_policy(config, policy, assume_action);
- if (r < 0 || !*policy) {
- return; /* XXXX020 have an error return. */
+ if (r < 0) {
+ return -1;
}
- SMARTLIST_FOREACH(*policy, addr_policy_t *, n, {
- /* ports aren't used. */
- n->prt_min = 1;
- n->prt_max = 65535;
- });
+ if (*policy) {
+ SMARTLIST_FOREACH(*policy, addr_policy_t *, n, {
+ /* ports aren't used. */
+ n->prt_min = 1;
+ n->prt_max = 65535;
+ });
+ }
+ return 0;
}
/** Set all policies based on <b>options</b>, which should have been validated
- * first. */
-void
+ * first by validate_addr_policies. */
+int
policies_parse_from_options(or_options_t *options)
{
- load_policy_from_option(options->SocksPolicy, &socks_policy, -1);
- load_policy_from_option(options->DirPolicy, &dir_policy, -1);
- load_policy_from_option(options->AuthDirReject,
- &authdir_reject_policy, ADDR_POLICY_REJECT);
- load_policy_from_option(options->AuthDirInvalid,
- &authdir_invalid_policy, ADDR_POLICY_REJECT);
- load_policy_from_option(options->AuthDirBadDir,
- &authdir_baddir_policy, ADDR_POLICY_REJECT);
- load_policy_from_option(options->AuthDirBadExit,
- &authdir_badexit_policy, ADDR_POLICY_REJECT);
- parse_reachable_addresses();
+ int ret = 0;
+ if (load_policy_from_option(options->SocksPolicy, &socks_policy, -1) < 0)
+ ret = -1;
+ if (load_policy_from_option(options->DirPolicy, &dir_policy, -1) < 0)
+ ret = -1;
+ if (load_policy_from_option(options->AuthDirReject,
+ &authdir_reject_policy, ADDR_POLICY_REJECT) < 0)
+ ret = -1;
+ if (load_policy_from_option(options->AuthDirInvalid,
+ &authdir_invalid_policy, ADDR_POLICY_REJECT) < 0)
+ ret = -1;
+ if (load_policy_from_option(options->AuthDirBadDir,
+ &authdir_baddir_policy, ADDR_POLICY_REJECT) < 0)
+ ret = -1;
+ if (load_policy_from_option(options->AuthDirBadExit,
+ &authdir_badexit_policy, ADDR_POLICY_REJECT) < 0)
+ ret = -1;
+ if (parse_reachable_addresses() < 0)
+ ret = -1;
+ return ret;
}
/** Compare two provided address policy items, and return -1, 0, or 1
More information about the tor-commits
mailing list