Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ANON-201 - Rename http responses and some logs leftovers, remove links #95

Merged
merged 7 commits into from
Oct 8, 2024
Merged

ANON-201 - Rename http responses and some logs leftovers, remove links #95

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1112ec5
ANON-201 - Rename http responses and some logs lefovers
yumirkov Oct 2, 2024
376955c
ANON-201 - Remove some of the links and emails appeared in logs and r…
yumirkov Oct 2, 2024
9e38ada
ANON-201 - Fix after review
yumirkov Oct 2, 2024
e6b41b2
ANON-201 - Fix after review 2
yumirkov Oct 3, 2024
825118d
ANON-201 - Fix after review 3
yumirkov Oct 4, 2024
c311627
ANON-201 - Fix after review 4
yumirkov Oct 7, 2024
7246237
Merge branch 'main' into ANON-201-http-responses-and-links-rebranding
yumirkov Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config
# DO NOT EDIT THIS DEFINITION BY HAND UNLESS YOU KNOW WHAT YOU'RE DOING.
#
# The update_versions.py script updates this definition when the
# version number changes. Tor uses it to make sure that it
# version number changes. Anon uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date.
AC_DEFINE(APPROX_RELEASE_DATE, ["2024-08-01"], # for 0.4.9.7-git
Expand Down Expand Up @@ -73,9 +73,9 @@ AC_ARG_ENABLE(static-libevent,
AC_ARG_ENABLE(static-zlib,
AS_HELP_STRING(--enable-static-zlib, [link against a static zlib library. Requires --with-zlib-dir]))
AC_ARG_ENABLE(static-tor,
AS_HELP_STRING(--enable-static-tor, [create an entirely static Tor binary. Requires --with-openssl-dir and --with-libevent-dir and --with-zlib-dir]))
AS_HELP_STRING(--enable-static-tor, [create an entirely static Anon binary. Requires --with-openssl-dir and --with-libevent-dir and --with-zlib-dir]))
AC_ARG_ENABLE(unittests,
AS_HELP_STRING(--disable-unittests, [don't build unit tests for Tor. Risky!]))
AS_HELP_STRING(--disable-unittests, [don't build unit tests for Anon. Risky!]))
AC_ARG_ENABLE(coverage,
AS_HELP_STRING(--enable-coverage, [enable coverage support in the unit-test build]))
AC_ARG_ENABLE(asserts-in-tests,
Expand All @@ -89,13 +89,13 @@ AC_ARG_ENABLE(oss-fuzz,
AC_ARG_ENABLE(memory-sentinels,
AS_HELP_STRING(--disable-memory-sentinels, [disable code that tries to prevent some kinds of memory access bugs. For fuzzing only.]))
AC_ARG_ENABLE(restart-debugging,
AS_HELP_STRING(--enable-restart-debugging, [Build Tor with support for debugging in-process restart. Developers only.]))
AS_HELP_STRING(--enable-restart-debugging, [Build Anon with support for debugging in-process restart. Developers only.]))
AC_ARG_ENABLE(zstd-advanced-apis,
AS_HELP_STRING(--disable-zstd-advanced-apis, [Build without support for zstd's "static-only" APIs.]))
AC_ARG_ENABLE(nss,
AS_HELP_STRING(--enable-nss, [Use Mozilla's NSS TLS library. (EXPERIMENTAL)]))
AC_ARG_ENABLE(pic,
AS_HELP_STRING(--enable-pic, [Build Tor's binaries as position-independent code, suitable to link as a library.]))
AS_HELP_STRING(--enable-pic, [Build Anon's binaries as position-independent code, suitable to link as a library.]))

AC_ARG_ENABLE(missing-doc-warnings,
AS_HELP_STRING(--enable-missing-doc-warnings, [Tell doxygen to warn about missing documentation. Makes doxygen warnings nonfatal.]))
Expand Down Expand Up @@ -241,17 +241,17 @@ AC_ARG_ENABLE(gcc-hardening,

dnl Deprecated --enable-expensive-hardening but keep it for now for backward compat.
AC_ARG_ENABLE(expensive-hardening,
AS_HELP_STRING(--enable-expensive-hardening, [enable more fragile and expensive compiler hardening; makes Tor slower]))
AS_HELP_STRING(--enable-expensive-hardening, [enable more fragile and expensive compiler hardening; makes Anon slower]))
AC_ARG_ENABLE(fragile-hardening,
AS_HELP_STRING(--enable-fragile-hardening, [enable more fragile and expensive compiler hardening; makes Tor slower]))
AS_HELP_STRING(--enable-fragile-hardening, [enable more fragile and expensive compiler hardening; makes Anon slower]))
if test "x$enable_expensive_hardening" = "xyes" || test "x$enable_fragile_hardening" = "xyes"; then
fragile_hardening="yes"
AC_DEFINE(ENABLE_FRAGILE_HARDENING, 1, [Defined if we're building with additional, fragile and expensive compiler hardening])
AC_DEFINE(DEBUG_SMARTLIST, 1, [Enable smartlist debugging])
fi

AC_ARG_ENABLE(all-bugs-are-fatal,
AS_HELP_STRING(--enable-all-bugs-are-fatal, [force all soft asserts in Tor codebase (tor_assert_nonfatal(), BUG(), etc.) to act as hard asserts (tor_assert() and equivalents); makes Tor fragile; only recommended for dev builds]))
AS_HELP_STRING(--enable-all-bugs-are-fatal, [force all soft asserts in Anon codebase (tor_assert_nonfatal(), BUG(), etc.) to act as hard asserts (tor_assert() and equivalents); makes Anon fragile; only recommended for dev builds]))

if test "x$enable_all_bugs_are_fatal" = "xyes"; then
AC_DEFINE(ALL_BUGS_ARE_FATAL, 1, [All assert failures are fatal])
Expand Down Expand Up @@ -539,7 +539,7 @@ AC_CACHE_CHECK([for working C99 mid-block declaration syntax],
[tor_cv_c_c99_decl=yes],
[tor_cv_c_c99_decl=no] )])
if test "$tor_cv_c_c99_decl" != "yes"; then
AC_MSG_ERROR([Your compiler doesn't support c99 mid-block declarations. This is required as of Tor 0.2.6.x])
AC_MSG_ERROR([Your compiler doesn't support c99 mid-block declarations. This is required as of Anon 0.2.6.x])
fi

AC_CACHE_CHECK([for working C99 designated initializers],
Expand All @@ -551,7 +551,7 @@ AC_CACHE_CHECK([for working C99 designated initializers],
[tor_cv_c_c99_designated_init=no] )])

if test "$tor_cv_c_c99_designated_init" != "yes"; then
AC_MSG_ERROR([Your compiler doesn't support c99 designated initializers. This is required as of Tor 0.2.6.x])
AC_MSG_ERROR([Your compiler doesn't support c99 designated initializers. This is required as of Anon 0.2.6.x])
fi

saved_CFLAGS="$CFLAGS"
Expand Down Expand Up @@ -1071,7 +1071,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#endif
]], [[]])],
[ AC_MSG_RESULT([no]) ],
[ AC_MSG_ERROR([This version of LibreSSL won't work with Tor. Please upgrade to LibreSSL 3.4.1 or later. (Or downgrade to 3.2.0 if you really must.)]) ])
[ AC_MSG_ERROR([This version of LibreSSL won't work with Anon. Please upgrade to LibreSSL 3.4.1 or later. (Or downgrade to 3.2.0 if you really must.)]) ])

AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <openssl/opensslv.h>
Expand Down Expand Up @@ -1834,7 +1834,7 @@ AX_CHECK_SIGN([time_t],
])

if test "$ax_cv_decl_time_t_signed" = "no"; then
AC_MSG_ERROR([You have an unsigned time_t; Tor does not support that. Please tell the Tor developers about your interesting platform.])
AC_MSG_ERROR([You have an unsigned time_t; Anon does not support that. Please tell the Anon developers about your interesting platform.])
fi

AX_CHECK_SIGN([size_t],
Expand Down Expand Up @@ -2067,7 +2067,7 @@ AS_CASE([$malloc],

[openbsd], [
tor_incr_n_warnings
AC_MSG_WARN([The openbsd malloc port is deprecated in Tor 0.3.5 and will be removed in a future version.])
AC_MSG_WARN([The openbsd malloc port is deprecated in Anon 0.3.5 and will be removed in a future version.])
enable_openbsd_malloc=yes
],

Expand Down Expand Up @@ -2646,9 +2646,9 @@ if test "$fragile_hardening" = "yes"; then
AC_MSG_WARN([

============
Warning! Building Tor with --enable-fragile-hardening (also known as
Warning! Building Anon with --enable-fragile-hardening (also known as
--enable-expensive-hardening) makes some kinds of attacks harder, but makes
other kinds of attacks easier. A Tor instance build with this option will be
other kinds of attacks easier. A Anon instance build with this option will be
somewhat less vulnerable to remote code execution, arithmetic overflow, or
out-of-bounds read/writes... but at the cost of becoming more vulnerable to
denial of service attacks. For more information, see
Expand Down Expand Up @@ -2682,7 +2682,7 @@ PPRINT_SET_INDENT(1)
PPRINT_SET_TS(65)

AS_ECHO
AS_ECHO("Tor Version: ${PPRINT_COLOR_BLDBLU}Tor $PACKAGE_VERSION $PPRINT_COLOR_RST")
AS_ECHO("Anon Version: ${PPRINT_COLOR_BLDBLU}Anon $PACKAGE_VERSION $PPRINT_COLOR_RST")
AS_ECHO

PPRINT_SUBTITLE([Build Features])
Expand Down
46 changes: 23 additions & 23 deletions contrib/operator-tools/anon-exit-notice.html
View file
Open in desktop
yumirkov marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en-US">
<head>
<meta charset="UTF-8">
<title>This is a Tor Exit Router</title>
<title>This is a Anon Exit Router</title>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be This is an Anon Exit Router

<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAMxQTFRFAAAAcK9AAAAAaK9IAAAAaq9FAAAAaK9EAAAAaa9DAAAAaK9FAAAAaa9EAAAAaK9EAgICZ7FEAgICaLBDAgICZ7BEAQEBaLBEAQEBZ7BEAQEBaLBDAQEBZ7BEHDATAQEB9fje5unQ19nCx8q1uLqnqauZmpuLaLBEiox9e31wbG1iSHkvfkeYXV5UdkOPbj6FZzp8TU5GXzZyVzFpPj84Ty1fRyhWQCRNLy8qLykwJyQmMBs6ICAdKBcwIBMnGA4dEBAPEQoUCQUKAQEBYGuyKwAAACB0Uk5TABAQICAwMEBAUFBgYHBwgICPj5+fr6+/v8/P39/v7+9rEnzIAAABbUlEQVR42n2SbVuCMBSG8TXzpUzN1DTOBoyNmIZOpUJS9///U0f7EFzIno+77z3b2TXrZmo1y5i7oZl3ppXOsFKKHzuL3uu0nDeeF1PfwK3hwjfyiu/7C9MM9yg0ynG7/uT7PcP+vn57f7EMqUduPG+aDA0ibRl4VUNw6Bv4WNJ4p0sr2rYijKWb86B6e/uRA/U8sVke7HaRN+cxBZBEkM8wxJLCgLYkQCIGzGXbMPwoGDMJ4CkHqKPIIbwY+at2EwCBDnCXsa8Qs5/nC7BbIPfcAKRaobA8515UExIh5wwrpFyHmNyDtRIEQJSDkuTqKuzHWUEBFkTIPSaY2l+FSXbIBAWPA9BAuDL5E0ZWJjYVjiDYTwKi9PWI9CErjIQTCAqUg3D0VVjpelZoHWnEObguCKH1EoXviZXLIHbihLgMBNc/yLc2FuQyioMkAgkq0jvkul38sEedRAFL9Gm5Tm9+zPrI1pekp1n3f/UXYAE8WMMDnnoAAAAASUVORK5CYII=">
<!--
Expand Down Expand Up @@ -79,7 +79,7 @@
</head>
<body>
<main>
<h1>This is a Tor Exit Router</h1>
<h1>This is a Anon Exit Router</h1>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be 'an Anon ...'

<p style="text-align:center">
<svg xmlns="http://www.w3.org/2000/svg" width="500" viewBox="0 0 274.3 159.9" style="width:100%;max-width:500px">
<desc></desc>
Expand Down Expand Up @@ -191,22 +191,22 @@ <h1>This is a Tor Exit Router</h1>
<p>
You are most likely accessing this website because you've had some issue with
the traffic coming from this IP. This router is part of the <a
href="https://www.torproject.org/">Tor Anonymity Network</a>, which is
href="https://www.torproject.org/">Anon Anonymity Network</a>, which is
yumirkov marked this conversation as resolved.
Show resolved Hide resolved
dedicated to <a href="https://2019.www.torproject.org/about/overview">providing
yumirkov marked this conversation as resolved.
Show resolved Hide resolved
privacy</a> to people who need it most: average computer users. This
router IP should be generating no other traffic, unless it has been
compromised.</p>

<p>
Tor works by running user traffic through a random chain of encrypted
servers, and then letting the traffic exit the Tor network through an
Anon works by running user traffic through a random chain of encrypted
servers, and then letting the traffic exit the Anon network through an
yumirkov marked this conversation as resolved.
Show resolved Hide resolved
exit node like this one. This design makes it very hard for a service to
know which user is connecting to it, since it can only see the IP-address
of the Tor exit node:</p>
of the Anon exit node:</p>

<p style="text-align:center;margin:40px 0">
<svg xmlns="http://www.w3.org/2000/svg" width="500" viewBox="0 0 490.28 293.73" style="width:100%;max-width:600px">
<desc>Illustration showing how a user might connect to a service through the Tor network. The user first sends their data through three daisy-chained encrypted Tor servers that exist on three different continents. Then the last Tor server in the chain connects to the target service over the normal internet.</desc>
<desc>Illustration showing how a user might connect to a service through the Anon network. The user first sends their data through three daisy-chained encrypted Anon servers that exist on three different continents. Then the last Anon server in the chain connects to the target service over the normal internet.</desc>
yumirkov marked this conversation as resolved.
Show resolved Hide resolved
<defs>
<style>
.t{
Expand Down Expand Up @@ -236,7 +236,7 @@ <h1>This is a Tor Exit Router</h1>
<text xml:space="preserve" x="-24.76" y="10.37" stroke-width=".26" font-size="16.93" font-weight="700" style="line-height:1.25" transform="translate(27.79 2.5)" word-spacing="0"><tspan x="-24.76" y="10.37">The user</tspan></text>
<text xml:space="preserve" x="150.63" y="196.62" stroke-width=".26" font-size="16.93" font-weight="700" style="line-height:1.25" transform="translate(27.79 2.5)" word-spacing="0"><tspan x="150.63" y="196.62">This server</tspan></text>
<text xml:space="preserve" x="346.39" y="202.63" stroke-width=".26" font-size="16.93" font-weight="700" style="line-height:1.25" transform="translate(27.79 2.5)" word-spacing="0"><tspan x="346.39" y="202.63">Your service</tspan></text>
<text xml:space="preserve" x="34.52" y="249.07" stroke-width=".26" font-size="16.93" font-weight="700" style="line-height:1.25" transform="translate(27.79 2.5)" word-spacing="0"><tspan x="34.52" y="249.07">Tor encrypted link</tspan></text>
<text xml:space="preserve" x="34.52" y="249.07" stroke-width=".26" font-size="16.93" font-weight="700" style="line-height:1.25" transform="translate(27.79 2.5)" word-spacing="0"><tspan x="34.52" y="249.07">Anon encrypted link</tspan></text>
<text xml:space="preserve" x="34.13" y="276.05" stroke-width=".26" font-size="16.93" font-weight="700" style="line-height:1.25" transform="translate(27.79 2.5)" word-spacing="0"><tspan x="34.13" y="276.05">Unencrypted link</tspan></text>
<path fill="none" stroke-linecap="round" stroke-width="1.67" d="M222.6 184.1c-2.6-15.27 8.95-23.6 18.43-38.86m186.75 45.61c-.68-10.17-9.4-17.68-18.08-23.49"/>
<path fill="none" stroke-linecap="round" stroke-width="1.67" d="M240.99 153.41c.35-3.41 1.19-6.17.04-8.17m-7.15 5.48c1.83-2.8 4.58-4.45 7.15-5.48"/>
Expand All @@ -247,14 +247,14 @@ <h1>This is a Tor Exit Router</h1>
</p>

<p>
<a href="https://2019.www.torproject.org/about/overview">Read more about how Tor works.</a></p>
<a href="https://2019.www.torproject.org/about/overview">Read more about how Anon works.</a></p>
yumirkov marked this conversation as resolved.
Show resolved Hide resolved

<p>
Copy link

@rA3ka rA3ka Oct 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove everything from here to last line in this file.

Tor sees use by <a href="https://2019.www.torproject.org/about/torusers">many
Anon sees use by <a href="https://2019.www.torproject.org/about/torusers">many
important segments of the population</a>, including whistle blowers,
journalists, Chinese dissidents skirting the Great Firewall and oppressive
censorship, abuse victims, stalker targets, the US military, and law
enforcement, just to name a few. While Tor is not designed for malicious
enforcement, just to name a few. While Anon is not designed for malicious
computer users, it is true that they can use the network for malicious ends.
In reality however, the actual amount of <a
href="https://support.torproject.org/abuse/">abuse</a> is quite low. This
Expand All @@ -264,23 +264,23 @@ <h1>This is a Tor Exit Router</h1>
href="https://web.archive.org/web/20200131013910/http://voices.washingtonpost.com/securityfix/2008/08/web_fraud_20_tools.html">build,
sell, and trade</a> far larger and <a
href="https://web.archive.org/web/20200131013908/http://voices.washingtonpost.com/securityfix/2008/08/web_fraud_20_distributing_your.html">more
powerful networks</a> than Tor on a daily basis. Thus, in the mind of this
powerful networks</a> than Anon on a daily basis. Thus, in the mind of this
operator, the social need for easily accessible censorship-resistant private,
anonymous communication trumps the risk of unskilled bad actors, who are
almost always more easily uncovered by traditional police work than by
extensive monitoring and surveillance anyway.</p>

<p>
In terms of applicable law, the best way to understand Tor is to consider it a
In terms of applicable law, the best way to understand Anon is to consider it a
network of routers operating as common carriers, much like the Internet
backbone. However, unlike the Internet backbone routers, Tor routers
backbone. However, unlike the Internet backbone routers, Anon routers
explicitly do not contain identifiable routing information about the source of
a packet, and no single Tor node can determine both the origin and destination
a packet, and no single Anon node can determine both the origin and destination
of a given transmission.</p>

<p>
As such, there is little the operator of this router can do to help you track
the connection further. This router maintains no logs of any of the Tor
the connection further. This router maintains no logs of any of the Anon
traffic, so there is little that can be done to trace either legitimate or
illegitimate traffic (or to filter one from the other). Attempts to
seize this router will accomplish nothing.</p>
Expand Down Expand Up @@ -317,9 +317,9 @@ <h1>This is a Tor Exit Router</h1>
<p>For more information, please consult the following documentation:</p>

<div class="links">
<a href="https://2019.www.torproject.org/about/overview">Tor Overview</a>
<a href="https://support.torproject.org/abuse/">Tor Abuse FAQ</a>
<a href="https://community.torproject.org/relay/community-resources/eff-tor-legal-faq/">Tor Legal FAQ</a>
<a href="https://2019.www.torproject.org/about/overview">Anon Overview</a>
<a href="https://support.torproject.org/abuse/">Anon Abuse FAQ</a>
<a href="https://community.torproject.org/relay/community-resources/eff-tor-legal-faq/">Anon Legal FAQ</a>
</div>

<p>
Expand All @@ -333,14 +333,14 @@ <h1>This is a Tor Exit Router</h1>

<p>
You also have the option of blocking this IP address and others on
the Tor network if you so desire. The Tor project provides a <a
the Anon network if you so desire. The Anon project provides a <a
href="https://check.torproject.org/torbulkexitlist">web service</a>
to fetch a list of all IP addresses of Tor exit nodes that allow exiting to a
to fetch a list of all IP addresses of Anon exit nodes that allow exiting to a
specified IP:port combination, and an official <a
href="https://dist.torproject.org/tordnsel/">DNSRBL</a> is also available to
determine if a given IP address is actually a Tor exit server. Please
determine if a given IP address is actually a Anon exit server. Please
be considerate
when using these options. It would be unfortunate to deny all Tor users access
when using these options. It would be unfortunate to deny all Anon users access
to your site indefinitely simply because of a few bad apples.</p>

</main>
Expand Down
2 changes: 1 addition & 1 deletion debian/anon.runscript/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -- "${daemon}" \
--RunAsDaemon 0

if ! "$@" --verify-config ; then
echo "persistent error: Tor configuration is not valid"
echo "persistent error: Anon configuration is not valid"
exec sv down anon
fi

Expand Down
Loading
Loading