February 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.1] dirserv: Improve returned message when relay is rejected
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e658dad625ef15f3a74a76aadf382d43c4ef44d1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 8 09:42:26 2018 -0500 dirserv: Improve returned message when relay is rejected Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 000000000..065213940 --- /dev/null +++ b/changes/ticket25170 @@ -0,0 +1,5 @@ + o Minor bugfix (directory authority, documentation): + - When a fingerprint or network address is marked as rejected, the + returned message by the authority now explicitly mention to set a valid + ContactInfo address and contact the bad-relays@ mailing list. Fixes bug + 25170; bugfix on 0.2.9.1. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index da34c196f..41c6bf3dc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, if (result & FP_REJECT) { if (msg) - *msg = "Fingerprint is marked rejected -- please contact us?"; + *msg = "Fingerprint is marked rejected -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your fingerprint(s)?"; return FP_REJECT; } else if (result & FP_INVALID) { if (msg) @@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr32(addr)); if (msg) - *msg = "Suspicious relay address range -- please contact us?"; + *msg = "Suspicious relay address range -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your address(es) and fingerprint(s)?"; return FP_REJECT; } if (!authdir_policy_valid_address(addr, or_port)) {

1 0

[tor/maint-0.3.2] dirserv: Improve returned message when relay is rejected
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e658dad625ef15f3a74a76aadf382d43c4ef44d1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 8 09:42:26 2018 -0500 dirserv: Improve returned message when relay is rejected Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 000000000..065213940 --- /dev/null +++ b/changes/ticket25170 @@ -0,0 +1,5 @@ + o Minor bugfix (directory authority, documentation): + - When a fingerprint or network address is marked as rejected, the + returned message by the authority now explicitly mention to set a valid + ContactInfo address and contact the bad-relays@ mailing list. Fixes bug + 25170; bugfix on 0.2.9.1. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index da34c196f..41c6bf3dc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, if (result & FP_REJECT) { if (msg) - *msg = "Fingerprint is marked rejected -- please contact us?"; + *msg = "Fingerprint is marked rejected -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your fingerprint(s)?"; return FP_REJECT; } else if (result & FP_INVALID) { if (msg) @@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr32(addr)); if (msg) - *msg = "Suspicious relay address range -- please contact us?"; + *msg = "Suspicious relay address range -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your address(es) and fingerprint(s)?"; return FP_REJECT; } if (!authdir_policy_valid_address(addr, or_port)) {

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit b062730a11a78f9cb11e4b0af20a66997280c0f9 Merge: 021c3bd58 17a923941 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit b062730a11a78f9cb11e4b0af20a66997280c0f9 Merge: 021c3bd58 17a923941 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] dirserv: Improve returned message when relay is rejected
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e658dad625ef15f3a74a76aadf382d43c4ef44d1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 8 09:42:26 2018 -0500 dirserv: Improve returned message when relay is rejected Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 000000000..065213940 --- /dev/null +++ b/changes/ticket25170 @@ -0,0 +1,5 @@ + o Minor bugfix (directory authority, documentation): + - When a fingerprint or network address is marked as rejected, the + returned message by the authority now explicitly mention to set a valid + ContactInfo address and contact the bad-relays@ mailing list. Fixes bug + 25170; bugfix on 0.2.9.1. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index da34c196f..41c6bf3dc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, if (result & FP_REJECT) { if (msg) - *msg = "Fingerprint is marked rejected -- please contact us?"; + *msg = "Fingerprint is marked rejected -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your fingerprint(s)?"; return FP_REJECT; } else if (result & FP_INVALID) { if (msg) @@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr32(addr)); if (msg) - *msg = "Suspicious relay address range -- please contact us?"; + *msg = "Suspicious relay address range -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your address(es) and fingerprint(s)?"; return FP_REJECT; } if (!authdir_policy_valid_address(addr, or_port)) {

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 17a923941a41d9283cad0cb093024c872fafdb0a Merge: 91109bc81 e658dad62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:58 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] dirserv: Improve returned message when relay is rejected
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e658dad625ef15f3a74a76aadf382d43c4ef44d1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 8 09:42:26 2018 -0500 dirserv: Improve returned message when relay is rejected Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 000000000..065213940 --- /dev/null +++ b/changes/ticket25170 @@ -0,0 +1,5 @@ + o Minor bugfix (directory authority, documentation): + - When a fingerprint or network address is marked as rejected, the + returned message by the authority now explicitly mention to set a valid + ContactInfo address and contact the bad-relays@ mailing list. Fixes bug + 25170; bugfix on 0.2.9.1. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index da34c196f..41c6bf3dc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, if (result & FP_REJECT) { if (msg) - *msg = "Fingerprint is marked rejected -- please contact us?"; + *msg = "Fingerprint is marked rejected -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your fingerprint(s)?"; return FP_REJECT; } else if (result & FP_INVALID) { if (msg) @@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr32(addr)); if (msg) - *msg = "Suspicious relay address range -- please contact us?"; + *msg = "Suspicious relay address range -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your address(es) and fingerprint(s)?"; return FP_REJECT; } if (!authdir_policy_valid_address(addr, or_port)) {

1 0

[tor/master] Remove 25170 changes file from master: it was already merged in 0.3.3.2-alpha
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 412a8256a5c13231b89edb782b0e8555bde2c30a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:51:29 2018 -0500 Remove 25170 changes file from master: it was already merged in 0.3.3.2-alpha --- changes/ticket25170 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 deleted file mode 100644 index 065213940..000000000 --- a/changes/ticket25170 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfix (directory authority, documentation): - - When a fingerprint or network address is marked as rejected, the - returned message by the authority now explicitly mention to set a valid - ContactInfo address and contact the bad-relays@ mailing list. Fixes bug - 25170; bugfix on 0.2.9.1.

1 0

[tor/release-0.3.1] dirserv: Improve returned message when relay is rejected
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e658dad625ef15f3a74a76aadf382d43c4ef44d1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 8 09:42:26 2018 -0500 dirserv: Improve returned message when relay is rejected Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 000000000..065213940 --- /dev/null +++ b/changes/ticket25170 @@ -0,0 +1,5 @@ + o Minor bugfix (directory authority, documentation): + - When a fingerprint or network address is marked as rejected, the + returned message by the authority now explicitly mention to set a valid + ContactInfo address and contact the bad-relays@ mailing list. Fixes bug + 25170; bugfix on 0.2.9.1. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index da34c196f..41c6bf3dc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, if (result & FP_REJECT) { if (msg) - *msg = "Fingerprint is marked rejected -- please contact us?"; + *msg = "Fingerprint is marked rejected -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your fingerprint(s)?"; return FP_REJECT; } else if (result & FP_INVALID) { if (msg) @@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr32(addr)); if (msg) - *msg = "Suspicious relay address range -- please contact us?"; + *msg = "Suspicious relay address range -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your address(es) and fingerprint(s)?"; return FP_REJECT; } if (!authdir_policy_valid_address(addr, or_port)) {

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit ff02ea65ecb40069ba2023c331c5b60fa5ef2b02 Merge: 4f26c67d4 e658dad62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:58 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0