Update please

README.md

@@ -1,10 +1,25 @@
+
+![4nonimizer logo](./images/logo.png)  
+
+
+### If you like the 4nonimizer, please help us with whatever you want!   
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=24U9T8TTDXA24&lc=US&item_name=4nonimizer&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
+
+
 # What is 4nonimizer?
 
-It is a bash script for anonymizing the public IP used to browsing Internet, managing the connection to TOR network and to different VPNs providers (OpenVPN), whether free or paid. By default, it includes several pre-configured VPN connections to different peers (.ovpn files) and download the credentials. Also, it records each used IP that we use every 300 seconds in log files.
+It is a bash script for anonymizing the public IP used to browsing Internet, managing the connection to TOR network and to different VPNs providers (OpenVPN), whether free or paid. By default, it includes several pre-configured VPN connections to different peers (.ovpn files) and download the credentials (if the corresponding provider support it). Also, it records each used IP that we use every 300 seconds in log files.
 
 This script is enabled as a service in systemd systems and uses a default vpn (VPNBook) at system startup.
 
-Since version 1.05 the dns resolution are throught DnsCrypt.
+Since version 1.06 the dns resolution requests are done throught DnsCrypt (enable and disable with option enable_dns or disable_dns)
+
+Since version 1.12 the logs of connections vpn saved in sqlite in /logs/
+
+# Attention VPN Providers!  
+
+If you are a provider, you support OpenVPN and want your VPN to be integrated into 4nonimizer contact the developers at hackplayers @ ymail.com.
 
 
 # Installation 
@@ -24,7 +39,7 @@ Once installed 4nonymizer, enter the command **4nonimizer help** to get the help
         \___  | | | | (_) | | | | | | | | | | |/ /  __/ |
             |_/_| |_|\___/|_| |_|_|_| |_| |_|_/___\___|_|
                                            By Carlos Antonini & Vicente Motos
-                                           Version: 1.04-beta
+                                           Version: 1.06-beta
 
 Usage: 4nonymizer **\<parameter\>**  
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**install**:  Install the script in run services  
@@ -45,6 +60,8 @@ Usage: 4nonymizer **\<parameter\>**
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**location**: Now you can select a specific country or continent of the vpn peer  
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**enableboot**: You can enable service in boot  
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**disableboot**: You can disable service in boot  
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**enable_dnscrypt**: Enable dnscrypt service  
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**disable_dnscrypt**: Disable dnscrypt service    
 
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**help**: Help (this screen)  
 
@@ -53,25 +70,47 @@ Usage: 4nonymizer **\<parameter\>**
 
 Currently it supports the following VPN providers:
 
-\- HideMyAss <https://www.hidemyass.com/>
+\- 7Proxies <https://www.7proxies.com/> 
 
-\- TorGuard <https://torguard.net/>
+\- AirVPN <https://airvpn.org/>  
 
-\- VPNBook (by default) <http://www.vpnbook.com/>
+\- Cryptostorm <https://cryptostorm.is/>  
 
-\- VPNGate <http://www.vpngate.net/en/>
+\- Cyberghost <https://www.cyberghostvpn.com/en_US/>  
 
-\- VPNMe <https://www.vpnme.me/>
+\- ExpressVPN <https://www.expressvpn.com>  
 
-\- VPNKeys <https://www.vpnkeys.com/>
+\- FreeVPN <https://freevpn.me/>  
 
-\- FreeVPN <https://freevpn.me/>
+\- HideMyAss <https://www.hidemyass.com/>  
 
-\- TunnelBear <https://www.tunnelbear.com/>
+\- IpPVanish <https://www.ipvanish.com/>  
 
-\- Cryptostrom <https://cryptostorm.is/>
+\- NordVPN <https://nordvpn.com>  
 
-\- PIA <https://www.privateinternetaccess.com/>
+\- PIA <https://www.privateinternetaccess.com/>  
+
+\- ProntonVPN <https://protonvpn.com/>  
+
+\- Proxy.sh <https://proxy.sh/>  
+
+\- SlickVPN <https://www.slickvpn.com>   
+
+\- StrongVPN <https://strongvpn.com/>  
+
+\- TorGuard <https://torguard.net/>  
+
+\- TunnelBear <https://www.tunnelbear.com/>  
+
+\- VPNBook (por defecto) <http://www.vpnbook.com/>  
+
+\- VPNGate <http://www.vpngate.net/en/>  
+
+\- VPNKeys <https://www.vpnkeys.com/>  
+
+\- VPNMe <https://www.vpnme.me/>  
+
+\- Vyprvpn <https://www.goldenfrog.com/es/vyprvpn>  
 
 # Install a new VPN
 
@@ -123,6 +162,16 @@ If the VPN provider allows automation of credential and/or .ovpn files getting,
 \- http://www.kitploit.com/2016/10/4nonimizer-bash-script-for-anonymizing_10.html  
 \- https://www.digitalmunition.me/2016/10/4nonimizer-bash-script-anonymizing-public-ip-managing-connection-tor-different-vpns-providers/  
 
+# Videos
+
+\- Instalar 4nonimizer Kali Linux <https://www.youtube.com/watch?v=FQRuRmMkcDg>  
+\- 4nonimizer Navegando de manera segura VPN (Kali Linux 2016.2) <https://www.youtube.com/watch?v=6GApaN7fSn8>  
+\- devenir anonyme sur kali linux (4nonimizer) <https://www.youtube.com/watch?v=Y3puD1Bw3xA>  
+\- Anonymizer - How To Hide Your IP address on Kali Linux 2016.2 (Change IP) <https://www.youtube.com/watch?v=MNdQD0DCG0A>  
+\- Become Anonymous on kali linux 2016.2 <https://www.youtube.com/watch?v=IFnhm-rrnEg>  
+\- Auto Hide IP with 4nonimizer on KALI Linux 2017 <https://www.youtube.com/watch?v=HgqZCm8Wdvw>  
+\- Kali Linux - 4nonimizer | Surf Anonymously <https://www.youtube.com/watch?v=_mOUQBv4sWs>  
+
 # Versions
 
  Number | codename | date  
@@ -131,22 +180,48 @@ If the VPN provider allows automation of credential and/or .ovpn files getting,
  1.02-beta | .evol-time  | 11/10/2016   
  1.03-beta | .using-latin-i | 17/10/2016 
  1.04-beta | .locateit | 22/12/2016
- 1.05-beta | .encrypting | 03/01/2017
+ 1.05-beta | .encrypting | 03/01/2017  
+ 1.06-beta | .1st-trial | 18/01/2017  
+ 1.07-beta | .noname | 03/05/2017  
+ 1.08-beta | .falcon | 15/08/2017  
+ 1.09-beta | .rabbit | 09/11/2017  
+ 1.10 | .fresh_air| 27/02/2018   
+ 1.11 | .shhh| 17/05/2018 
+ 1.12 | .sqliting| 18/05/2018
 
-¡4nonimize the world!
+¡4nonimize the world!  
+
+# TODO
+
+\- migrate to Python and make the tool multiplatform  
+\- make the code cleaner and more versatile  
+\- save the logs in a bd sqlite  
+\- standardize the names of the ovpn files: read the IP (remote line), get the country and rename the ovpn file accordingly  
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 # SPANISH TRANSLATION
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+![4nonimizer logo](./images/logo.png)   
+
+
+### Te gusta 4nonimizer, por favor ayudanos con lo que quieras!    
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=24U9T8TTDXA24&lc=US&item_name=4nonimizer&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
+
 # ¿Que es 4nonimizer?
 
-Es un script en bash cuyo objetivo es anonimizar (de momento) la IP pública con la que salimos a Internet mediante la gestión del proceso de conexión a TOR y a distintos proveedores VPNs (OpenVPN), ya sean gratuitos o de pago. Por defecto incluye preconfiguradas varias VPN gratuitas automatizando la conexión a distintos peers y la descarga de credenciales correspondientes. Además por defecto registra en ficheros logs la IP que usamos cada 300 segundos. 
+Es un script en bash cuyo objetivo es anonimizar (de momento) la IP pública con la que salimos a Internet mediante la gestión del proceso de conexión a TOR y a distintos proveedores VPNs (OpenVPN), ya sean gratuitos o de pago. Por defecto incluye preconfiguradas varias VPN automatizando la conexión a distintos peers y la descarga de credenciales correspondientes (si el proveedor lo soporta). Además por defecto registra en ficheros logs la IP que usamos cada 300 segundos. 
 
 Este script se habilita como servicio en sistemas systemd y levanta la vpn por defecto (VPNBook) en el inicio del sistema.
 
-Desde la version 1.05 las resoluciones DNS se hacen a traver de DnsCrypt
+Desde la version 1.06 las resoluciones DNS se hacen a través de DnsCrypt (habilitarlo y desabilitarlo con la opcion enable_dns o disable_dns).
+
+Desde la versión 1.12 los registros de las conexiones vpn se guardan en sqlite en /logs/
 
+# ¡Atención proveedores de VPN!  
+
+Si eres un proveedor, soportas OpenVPN y quieres que tu VPN sea integrada en 4nonimizer contacta con los desarroladores en hackplayers @ ymail.com.
 
 # Instalación 
 
@@ -169,7 +244,7 @@ Once installed 4nonymizer, enter the command **4nonimizer help** to get the help
         \___  | | | | (_) | | | | | | | | | | |/ /  __/ |
             |_/_| |_|\___/|_| |_|_|_| |_| |_|_/___\___|_|
                                            By Carlos Antonini & Vicente Motos
-                                           Version: 1.04-beta
+                                           Version: 1.06-beta
 
 Usage: 4nonymizer **\<parameter\>**  
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**install**:  Install the script in run services  
@@ -189,7 +264,9 @@ Usage: 4nonymizer **\<parameter\>**
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**test_availability**: Check peers availability and delete ovpn file if the IP/service is unreachable  
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**location**: Now you can select a specific country or continent of the vpn peer 
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**enableboot**: You can enable service in boot  
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**disableboot**: You can disable service in boot  
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**disableboot**: You can disable service in boot 
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**enable_dnscrypt*: Enable dnscrypt service  
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**disable_dnscrypt**: Disable dnscrypt service  
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**help**: Help (this screen)   
 
 
@@ -198,26 +275,47 @@ Usage: 4nonymizer **\<parameter\>**
 
 Actualmente se soportan los siguientes proveedores VPN:
 
-\- HideMyAss <https://www.hidemyass.com/>
+\- 7Proxies <https://www.7proxies.com/> 
 
-\- TorGuard <https://torguard.net/>
+\- AirVPN <https://airvpn.org/>  
 
-\- VPNBook (por defecto) <http://www.vpnbook.com/>
+\- Cryptostorm <https://cryptostorm.is/>  
 
-\- VPNGate <http://www.vpngate.net/en/>
+\- Cyberghost <https://www.cyberghostvpn.com/en_US/>  
 
-\- VPNMe <https://www.vpnme.me/>
+\- ExpressVPN <https://www.expressvpn.com>  
 
-\- VPNKeys <https://www.vpnkeys.com/>
+\- FreeVPN <https://freevpn.me/>  
 
-\- FreeVPN <https://freevpn.me/>
+\- HideMyAss <https://www.hidemyass.com/>  
 
-\- TunnelBear <https://www.tunnelbear.com/>
+\- IpPVanish <https://www.ipvanish.com/>  
 
-\- Cryptostrom <https://cryptostorm.is/>
+\- NordVPN <https://nordvpn.com>  
 
 \- PIA <https://www.privateinternetaccess.com/>
 
+\- ProntonVPN <https://protonvpn.com/>  
+
+\- Proxy.sh <https://proxy.sh/>  
+
+\- SlickVPN <https://www.slickvpn.com>   
+
+\- StrongVPN <https://strongvpn.com/>  
+
+\- TorGuard <https://torguard.net/>  
+
+\- TunnelBear <https://www.tunnelbear.com/>  
+
+\- VPNBook (por defecto) <http://www.vpnbook.com/>  
+
+\- VPNGate <http://www.vpngate.net/en/>  
+
+\- VPNKeys <https://www.vpnkeys.com/>  
+
+\- VPNMe <https://www.vpnme.me/>  
+
+\- Vyprvpn <https://www.goldenfrog.com/es/vyprvpn>  
 
 # Instalar una nueva VPN
 
@@ -271,6 +369,16 @@ Si el proveedor correspondiente permite la automatización de la obtención de c
 \- http://www.kitploit.com/2016/10/4nonimizer-bash-script-for-anonymizing_10.html  
 \- https://www.digitalmunition.me/2016/10/4nonimizer-bash-script-anonymizing-public-ip-managing-connection-tor-different-vpns-providers/  
 
+# Videos
+
+\- Instalar 4nonimizer Kali Linux <https://www.youtube.com/watch?v=FQRuRmMkcDg>  
+\- 4nonimizer Navegando de manera segura VPN (Kali Linux 2016.2) <https://www.youtube.com/watch?v=6GApaN7fSn8>  
+\- devenir anonyme sur kali linux (4nonimizer) <https://www.youtube.com/watch?v=Y3puD1Bw3xA>  
+\- Anonymizer - How To Hide Your IP address on Kali Linux 2016.2 (Change IP) <https://www.youtube.com/watch?v=MNdQD0DCG0A>  
+\- Become Anonymous on kali linux 2016.2 <https://www.youtube.com/watch?v=IFnhm-rrnEg>  
+\- Auto Hide IP with 4nonimizer on KALI Linux 2017 <https://www.youtube.com/watch?v=HgqZCm8Wdvw>  
+\- Kali Linux - 4nonimizer | Surf Anonymously <https://www.youtube.com/watch?v=_mOUQBv4sWs>  
+
 # Versiones
 
  Number | codename | date  
@@ -279,7 +387,21 @@ Si el proveedor correspondiente permite la automatización de la obtención de c
  1.02-beta | .evol-time  | 11/10/2016   
  1.03-beta | .using-latin-i | 17/10/2016 
  1.04-beta | .locateit | 22/12/2016
- 1.05-beta | .encrypting | 03/01/2017
-
+ 1.05-beta | .encrypting | 03/01/2017  
+ 1.06-beta | .1st-trial | 18/01/2017  
+ 1.07-beta | .noname | 03/05/2017  
+ 1.08-beta | .falcon | 15/08/2017  
+ 1.09-beta | .rabbit | 09/11/2017  
+ 1.10 | .fresh_air| 27/02/2018   
+ 1.11 | .shhh| 17/05/2018 
+ 1.12 | .sqliting| 18/05/2018
+
 ¡4nonimiza el mundo!
 
+# TODO
+
+\- migrar a Python y hacer la herramienta multiplataforma  
+\- hacer el código más limpio y versátil  
+\- guardar los logs en una bd sqlite  
+\- estandarizar los nombres de los ficheros ovpn: leer la ip o el fqdn de la linea remote, obtener el país y renombrar el fichero ovpn en consecuencia  
+\- forzar la resoluciób DNS a través del túnel VPN  

TODO.md

@@ -3,9 +3,8 @@
 #NEW FEATURES
 
 \- Add Docker compatibility  
-\- Generate an alarm if the real IP is used (because tun interface is down) 
-\- Sets up iptables and tor to route all services and traffic including DNS through the tor network. 
-
-#HISTORY
-
-\- 05/10/2016 - Initial release v1.0-beta 
+\- Generate an alarm if the real IP is used (because tun interface is down)  
+\- Sets up iptables and tor to route all services and traffic including DNS through the tor network.  
+\- Add compatibility with sysv (generate two sources, 1 for systemd ,2 sysV)  
+\- Add Macchanger option  
+\- Migrate code to Python

countryInfo.txt

@@ -1,6 +1,6 @@
 #ISO	ISO3	ISO-Numeric	fips	Country	Capital	Area(in sq km)	Population	Continent	tld	CurrencyCode	CurrencyName	Phone	Postal Code Format	Postal Code Regex	Languages	geonameid	neighbours	EquivalentFipsCode
 AD	AND	020	AN	Andorra	Andorra la Vella	468	84000	EU	.ad	EUR	Euro	376	AD###	^(?:AD)*(\d{3})$	ca	3041565	ES,FR	
-AE	ARE	784	AE	United Arab Emirates	Abu Dhabi	82880	4975593	AS	.ae	AED	Dirham	971			ar-AE,fa,en,hi,ur	290557	SA,OM	
+AE	ARE	784	AE	UnitedArabEmirates	Abu Dhabi	82880	4975593	AS	.ae	AED	Dirham	971			ar-AE,fa,en,hi,ur	290557	SA,OM	
 AF	AFG	004	AF	Afghanistan	Kabul	647500	29121286	AS	.af	AFN	Afghani	93			fa-AF,ps,uz-AF,tk	1149361	TM,CN,IR,TJ,PK,UZ	
 AG	ATG	028	AC	Antigua and Barbuda	St. John's	443	86754	NA	.ag	XCD	Dollar	+1-268			en-AG	3576396		
 AI	AIA	660	AV	Anguilla	The Valley	102	13254	NA	.ai	XCD	Dollar	+1-264			en-AI	3573511		
@@ -75,7 +75,7 @@ FM	FSM	583	FM	Micronesia	Palikir	702	107708	OC	.fm	USD	Dollar	691	#####	^(\d{5})
 FO	FRO	234	FO	Faroe Islands	Torshavn	1399	48228	EU	.fo	DKK	Krone	298	FO-###	^(?:FO)*(\d{3})$	fo,da-FO	2622320		
 FR	FRA	250	FR	France	Paris	547030	64768389	EU	.fr	EUR	Euro	33	#####	^(\d{5})$	fr-FR,frp,br,co,ca,eu,oc	3017382	CH,DE,BE,LU,IT,AD,MC,ES	
 GA	GAB	266	GB	Gabon	Libreville	267667	1545255	AF	.ga	XAF	Franc	241			fr-GA	2400553	CM,GQ,CG	
-GB	GBR	826	UK	United Kingdom	London	244820	62348447	EU	.uk	GBP	Pound	44	@# #@@|@## #@@|@@# #@@|@@## #@@|@#@ #@@|@@#@ #@@|GIR0AA	^((?:(?:[A-PR-UWYZ][A-HK-Y]\d[ABEHMNPRV-Y0-9]|[A-PR-UWYZ]\d[A-HJKPS-UW0-9])\s\d[ABD-HJLNP-UW-Z]{2})|GIR\s?0AA)$	en-GB,cy-GB,gd	2635167	IE	
+GB	GBR	826	UK	UnitedKingdom	London	244820	62348447	EU	.uk	GBP	Pound	44	@# #@@|@## #@@|@@# #@@|@@## #@@|@#@ #@@|@@#@ #@@|GIR0AA	^((?:(?:[A-PR-UWYZ][A-HK-Y]\d[ABEHMNPRV-Y0-9]|[A-PR-UWYZ]\d[A-HJKPS-UW0-9])\s\d[ABD-HJLNP-UW-Z]{2})|GIR\s?0AA)$	en-GB,cy-GB,gd	2635167	IE	
 GD	GRD	308	GJ	Grenada	St. George's	344	107818	NA	.gd	XCD	Dollar	+1-473			en-GD	3580239		
 GE	GEO	268	GG	Georgia	Tbilisi	69700	4630000	AS	.ge	GEL	Lari	995	####	^(\d{4})$	ka,ru,hy,az	614540	AM,AZ,TR,RU	
 GF	GUF	254	FG	French Guiana	Cayenne	91000	195506	SA	.gf	EUR	Euro	594	#####	^((97|98)3\d{2})$	fr-GF	3381670	SR,BR	
@@ -231,8 +231,9 @@ TW	TWN	158	TW	Taiwan	Taipei	35980	22894384	AS	.tw	TWD	Dollar	886	#####	^(\d{5})$
 TZ	TZA	834	TZ	Tanzania	Dodoma	945087	41892895	AF	.tz	TZS	Shilling	255			sw-TZ,en,ar	149590	MZ,KE,CD,RW,ZM,BI,UG,MW	
 UA	UKR	804	UP	Ukraine	Kiev	603700	45415596	EU	.ua	UAH	Hryvnia	380	#####	^(\d{5})$	uk,ru-UA,rom,pl,hu	690791	PL,MD,HU,SK,BY,RO,RU	
 UG	UGA	800	UG	Uganda	Kampala	236040	33398682	AF	.ug	UGX	Shilling	256			en-UG,lg,sw,ar	226074	TZ,KE,SS,CD,RW	
-UM	UMI	581		United States Minor Outlying Islands		0	0	OC	.um	USD	Dollar 	1			en-UM	5854968		
-US	USA	840	US	United States	Washington	9629091	310232863	NA	.us	USD	Dollar	1	#####-####	^\d{5}(-\d{4})?$	en-US,es-US,haw,fr	6252001	CA,MX,CU	
+UM	UMI	581		UnitedStates Minor Outlying Islands		0	0	OC	.um	USD	Dollar 	1			en-UM	5854968		
+US2	USA	840	US2	U.S.	Washington	9629091	310232863	NA	.us	USD	Dollar	1	#####-####	^\d{5}(-\d{4})?$	en-US,es-US,haw,fr	6252001
+US	USA	840	US	UnitedStates	Washington	9629091	310232863	NA	.us	USD	Dollar	1	#####-####	^\d{5}(-\d{4})?$	en-US,es-US,haw,fr	6252001	CA,MX,CU	
 UY	URY	858	UY	Uruguay	Montevideo	176220	3477000	SA	.uy	UYU	Peso	598	#####	^(\d{5})$	es-UY	3439705	BR,AR	
 UZ	UZB	860	UZ	Uzbekistan	Tashkent	447400	27865738	AS	.uz	UZS	Som	998	######	^(\d{6})$	uz,ru,tg	1512440	TM,AF,KG,TJ,KZ	
 VA	VAT	336	VT	Vatican	Vatican City	0.44	921	EU	.va	EUR	Euro	379	#####	^(\d{5})$	la,it,fr	3164670	IT