Commit 3031aeba authored by Lorenzo Faletra's avatar Lorenzo Faletra

import anonsurf 2.6

parent dc82bd1c
......@@ -85,8 +85,8 @@ function clean_dhcp {
function init {
echo -e -n "$BLUE[$GREEN*$BLUE] killing dangerous applications\n"
killall -q chrome dropbox iceweasel skype icedove thunderbird firefox firefox-esr chromium xchat hexchat transmission steam
echo -e -n "$BLUE[$GREEN*$BLUE] Dangerous applications killed"
sudo killall -q chrome dropbox iceweasel skype icedove thunderbird firefox firefox-esr chromium xchat hexchat transmission steam
echo -e -n "$BLUE[$GREEN*$BLUE] Dangerous applications killed\n"
notify "Dangerous applications killed"
echo -e -n "$BLUE[$GREEN*$BLUE] cleaning some dangerous cache elements\n"
......@@ -103,10 +103,10 @@ function init {
function starti2p {
echo -e -n " $GREEN*$BLUE starting I2P services"
echo -e -n " $GREEN*$BLUE starting I2P services\n"
gksu service i2p start
firefox http://127.0.0.1:7657/home &
echo -e -n "$BLUE[$GREEN*$BLUE] I2P daemon started"
echo -e -n "$BLUE[$GREEN*$BLUE] I2P daemon started\n"
notify "I2P daemon started"
}
......@@ -140,12 +140,12 @@ function start {
echo -e "\n$GREEN[$BLUE i$GREEN ]$BLUE Starting anonymous mode:$RESETCOLOR\n"
if [ ! -e /tmp/tor.pid ]; then
echo -e " $RED*$BLUE Tor is not running! $GREEN starting it $BLUE for you\n" >&2
echo -e -n " $GREEN*$BLUE Stopping service nscd"
echo -e " $RED*$BLUE Tor is not running! $GREEN starting it $BLUE for you" >&2
echo -e -n "\n $GREEN*$BLUE Stopping service nscd"
service nscd stop 2>/dev/null || echo " (already stopped)"
echo -e -n " $GREEN*$BLUE Stopping service resolvconf"
echo -e -n "\n $GREEN*$BLUE Stopping service resolvconf"
service resolvconf stop 2>/dev/null || echo " (already stopped)"
echo -e -n " $GREEN*$BLUE Stopping service dnsmasq"
echo -e -n "\n $GREEN*$BLUE Stopping service dnsmasq"
service dnsmasq stop 2>/dev/null || echo " (already stopped)"
killall dnsmasq nscd resolvconf 2>/dev/null || true
sleep 2
......@@ -159,7 +159,7 @@ function start {
if ! [ -f /etc/network/iptables.rules ]; then
iptables-save > /etc/network/iptables.rules
echo -e " $GREEN*$BLUE Saved iptables rules"
echo -e "\n $GREEN*$BLUE Saved iptables rules\n"
fi
iptables -F
......@@ -168,7 +168,7 @@ function start {
cp /etc/resolv.conf /etc/resolv.conf.bak
touch /etc/resolv.conf
echo -e 'nameserver 127.0.0.1\nnameserver 92.222.97.145\nnameserver 192.99.85.244' > /etc/resolv.conf
echo -e " $GREEN*$BLUE Modified resolv.conf to use Tor and ParrotDNS"
echo -e " $GREEN*$BLUE Modified resolv.conf to use Tor and ParrotDNS\n"
# disable ipv6
sysctl -w net.ipv6.conf.all.disable_ipv6=1
......@@ -226,14 +226,14 @@ function stop {
iptables -F
iptables -t nat -F
echo -e " $GREEN*$BLUE Deleted all iptables rules"
echo -e "\n $GREEN*$BLUE Deleted all iptables rules"
if [ -f /etc/network/iptables.rules ]; then
iptables-restore < /etc/network/iptables.rules
rm /etc/network/iptables.rules
echo -e " $GREEN*$BLUE Iptables rules restored"
echo -e "\n $GREEN*$BLUE Iptables rules restored"
fi
echo -e -n " $GREEN*$BLUE Restore DNS service"
echo -e -n "\n $GREEN*$BLUE Restore DNS service"
if [ -e /etc/resolv.conf.bak ]; then
rm /etc/resolv.conf
cp /etc/resolv.conf.bak /etc/resolv.conf
......@@ -247,7 +247,7 @@ function stop {
sleep 2
killall tor
sleep 6
echo -e -n " $GREEN*$BLUE Restarting services\n"
echo -e -n "\ $GREEN*$BLUE Restarting services\n"
service resolvconf start || service resolvconf restart || true
service dnsmasq start || true
service nscd start || true
......@@ -308,7 +308,7 @@ case "$1" in
;;
*)
echo -e "
Parrot AnonSurf Module (v 2.5)
Parrot AnonSurf Module (v 2.6)
Developed by Lorenzo \"Palinuro\" Faletra <palinuro@parrotsec.org>
Lisetta \"Sheireen\" Ferrero <sheireen@parrotsec.org>
Francesco \"Mibofra\" Bonanno <mibofra@parrotsec.org>
......
......@@ -6,5 +6,5 @@ if [ -e /etc/tor/torrc ]; then
mv /etc/tor/torrc /etc/tor/torrc.orig
fi
if [ -e /etc/anonsurf/torrc ]; then
ln -s /etc/anonsurf/torrc /etc/tor/torrc
cp /etc/anonsurf/torrc /etc/tor/torrc
fi
#!/bin/bash
set -e
if [ -e /etc/tor/torrc.orig ]; then
rm /etc/tor/torrc
mv /etc/tor/torrc.orig /etc/tor/torrc
fi
anonsurf (2.6+parrot0) testing; urgency=medium
* Update torrc to not break apparmor rules.
* Minor fixes in output messages.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Tue, 05 Dec 2017 07:49:03 +0100
anonsurf (2.5+parrot5) testing; urgency=medium
* Update ParrotDNS ip addresses.
......
......@@ -4,7 +4,7 @@ Version=1.0
Type=Application
Terminal=true
Exec=anonsurf starti2p
Name=start i2p services
Name=start i2p
Icon=stock_media-play
Categories=anonsurf;
X-Parrot-Package=i2p
......@@ -4,7 +4,7 @@ Version=1.0
Type=Application
Terminal=true
Exec=anonsurf stopi2p
Name=stop i2p services
Name=stop i2p
Icon=player_stop
Categories=anonsurf;
X-Parrot-Package=i2p
......@@ -4,6 +4,6 @@ Version=1.0
Type=Application
Terminal=true
Exec=menuexecg "anonsurf start"
Name=anonymous mode start
Name=Anonsurf Start
Icon=stock_media-play
Categories=anonsurf;
......@@ -4,6 +4,6 @@ Version=1.0
Type=Application
Terminal=true
Exec=menuexecg "anonsurf stop"
Name=anonymous mode stop
Name=Anonsurf Stop
Icon=player_stop
Categories=anonsurf;
......@@ -15,9 +15,6 @@ DNSPort 127.0.0.1:53
#daemonize
RunAsDaemon 1
#move log to /tmp to prevent digital evidences to be stored on disk ;)
Log notice file /tmp/anonsurf-tor.log
#use hardware accaleration when possible for crypto
HardwareAccel 1
......@@ -34,26 +31,8 @@ NewCircuitPeriod 40
MaxCircuitDirtiness 600
MaxClientCircuitsPending 48
UseEntryGuards 1
UseEntryGuardsAsDirGuards 1
EnforceDistinctSubnets 1
# ok, it is a bit complex, so i will spend more words here:
# this option means that tor will try to use the previously used
# exit node for these domains, this is helpful in case of
# websites with sessions related to your IP that may change
# their behavior if your ip changes, but this option may help
# websites to associate all your actions to a single
# navigation session, by watching your IP.
#
# We decided to use it for the following addresses
# because they track you anyway by using cookies
# (so they will know who you are even if you
# change IP), so we decided to use the IP of the
# same exit node in order to not let these services
# map your exit nodes pool, so they will know
# only one of the exit nodes in your pool.
TrackHostExits .facebook.com,.facebook.net,.twitter.com,.fbcdn.com,.fbcdn.net,.akamaihd.com,.google.com,.google.it,.google.fr,.google.de,.google.br,.yandex.ru,.yandex.com,.gmail.com,.googleapis.com,.gstatic.com,.adform.net,.google-analitics.com,.googletagservices.com,.cloudflare.com,.akamaihd.com,.akamai.com,.cloudfront.net,.cloudfront.com,.cloudflare.com
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment