diff --git a/README.md b/README.md index e47c908..5b310b8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Standalone Hola proxy client. Just run it and it'll start plain HTTP proxy server forwarding traffic via Hola proxies of your choice. By default application listens port on 127.0.0.1:8080. -Application is capable to forward traffic via proxies in datacenters (flag `-proxy-type direct`, default) or via peer proxies on residental IPs (consumer ISP) in that country (flag `-proxy-type peer`). +Application is capable to forward traffic via proxies in datacenters (flag `-proxy-type direct`, default) or via peer proxies on residental IPs (consumer ISP) in that country (flag `-proxy-type pool` or `-proxy-type lum`). --- diff --git a/blocked-domains.txt b/blocked-domains.txt new file mode 100644 index 0000000..84a23f9 --- /dev/null +++ b/blocked-domains.txt @@ -0,0 +1,195 @@ +equinix.com +digitalocean.com +oceanconservancy.org +mail.yahoo.com +mail.yahoo.co.jp +mail.aol.com +mail.aol.fr +mail.com +gmx.com +couponcabin.com +outlook.live.com +hotmail.live.com +outlook.com +mailto.space +e.mail.ru +login.sso.bluewin.ch +secure.centurylink.net +secureserver.net +webmail.usfamily.net +webmail.skymesh.net.au +hanmail.net +mail.rambler.ru +freeola.co.uk +webmail-04.datacenter.cha.cantv.net +linustechtips.com +3capp-mailcom-lxa01.server.lan +noiholiday.com +hostedemail.com +heyholla.com +hellixeducation.com +unisalento.it +secrel.com.br +mailorama.fr +kiwiirc.com +derpibooru.org +trixiebooru.org +derpiboo.ru +derpicdn.net +alice.it +vcwebmail.ocn.ad.jp +tentaciones18.com +ocn.ad.jp +ocn.ne.jp +webmail.numericable.fr +webmail.scarlet.be +webmailer.de +mail.uk.tiscali.com +elisa.fi +saunalahti.fi +globalgiving.org +synacor.com +knology.net +netmail.pipex.net +sony.com +playstation.com +playstation.net +playstationnetwork.com +sonymusic.com +sonypictures.com +sonyentertainmentnetwork.com +perfora.net +hmail.com +gigablast.com +126.com +ono.com +funded.today +manenetheoffnewconne.ru +dlfeed.com +odbnfhbyagyz4.net +pinformationbwarranties.ru +musttthewithoutalsothas.ru +bjkaolp4ds4z.com +advseeking.com +companolo.com +mijnbankering-nl-server.com +froekuge.com +updateacces.org +sophisticatiretaj.net +soap4.me +boriel.com +ebb.mtn.co.za +osbservices.vodacom.co.za +apps.telkom.co.za +holadebug.com +fretebras.com.br +megacupons.online +vitacostapi.bbhosted.com +mobilepayca.com +mobilepayusa.org +mobilepayusa.mobi +mobilepayusa.net +mobilepay-web.gaiareply.eu +puffin.com +miosmsclub.com +linkedin.com +ticketsnow.com +playerline.com +ticketmaster.com +ticketmaster.com.mx +livenation.com +stubhub.com +tickets.com +craigslist.org +kufar.by +fastpeoplesearch.com +btc4you.com +elbitcoingratis.es +btcmine.net +virtualfaucet.net +rawbitcoins.net +freebitcoins4u.com +canhasbitcoin.com +bitcats.net +faucetbtc.com +bitcoins4free.me +thefreebitcoins.net +freebitcoins.me +5mindoge.com +freedoge.co.in +moondoge.co.in +moonbit.co.in +bonusbitcoin.co +bitcoinspace.net +btc-faucet.co +treebitcoin.com +flatcoin.net +baglitecoin.com +moonliteco.in +freebitco.in +github.com +smartadvices.com +generictadalafilusa.com +getitllc.com +createyourownteeshirtonline.com +mondino.it +daum.net +workbooks.com +forum.qt.io +radicalexploits.com +craigslist.ca +craigslist.co.uk +bisaboard.de +criusenergy.com +arenagroup.com +truqueira.com +cratejoy.com +gaynext.ca +hispachan.org +freenode.net +exigent.com.au +au.edu +runsignup.com +thegreekbookstore.com +arriveonline.com.au +reimageplus.com +goso.info +checkip.dyndns.org +warezshare.org +blocklist.de +twiki.org +intherooms.com +globalinnovationexchange.org +portal.webgods.de +postfinance.ch +gvtc.com +cantv.net +homepage-baukasten.de +paginawebgratis.es +own-free-website.com +sitowebfaidate.it +ma-page.fr +homepage-konstruktor.ru +bedava-sitem.com +stronygratis.pl +news.ycombinator.com +tdchosting.dk +infusionsoft.com +puregaming.es +blogalizate.com +teftv.com +porticolegal.com +physicalmed.es +www.htcmania.com +www.tebeosfera.com +grupopuntacana.rubypanel.com +www.fansdeapple.com +cerebriti.com +educaciontrespuntocero.com +pymescomercial.com +creativat.com +financiacionparaempresas.net +moon.rightdns.com +uptodate.com +judoprincast.com +office365.com diff --git a/holaapi.go b/holaapi.go index 9e20871..8611f06 100644 --- a/holaapi.go +++ b/holaapi.go @@ -133,7 +133,10 @@ func zgettunnels(ctx context.Context, if proxy_type == "lum" { params.Add("country", country + ".pool_lum_" + country + "_shared") } else if proxy_type == "peer" { - params.Add("country", country + ".peer") + //params.Add("country", country + ".peer") + params.Add("country", country) + } else if proxy_type == "pool" { + params.Add("country", country + ".pool") } else { params.Add("country", country) } diff --git a/main.go b/main.go index 177391a..eb49727 100644 --- a/main.go +++ b/main.go @@ -57,7 +57,7 @@ func parse_args() CLIArgs { "(10 - debug, 20 - info, 30 - warning, 40 - error, 50 - critical)") flag.DurationVar(&args.timeout, "timeout", 10 * time.Second, "timeout for network operations") flag.DurationVar(&args.rotate, "rotate", 1 * time.Hour, "rotate user ID once per given period") - flag.StringVar(&args.proxy_type, "proxy-type", "direct", "proxy type: direct or peer or lum") + flag.StringVar(&args.proxy_type, "proxy-type", "direct", "proxy type: direct or peer or lum or pool") flag.StringVar(&args.resolver, "resolver", "https://cloudflare-dns.com/dns-query", "DNS/DoH/DoT resolver to workaround Hola blocked hosts. " + "See https://github.com/ameshkov/dnslookup/ for upstream DNS URL format.") diff --git a/utils.go b/utils.go index 66b3f27..ec01a5f 100644 --- a/utils.go +++ b/utils.go @@ -104,7 +104,7 @@ func get_endpoint(tunnels *ZGetTunnelsResponse, typ string, trial bool) (string, return "", errors.New("No tunnels found in API response") } var port uint16 - if typ == "direct" || typ == "lum" { + if typ == "direct" || typ == "lum" || typ == "pool" { if trial { port = tunnels.Port.Trial } else {