updates

exclude_badExits.py

@@ -100,6 +100,9 @@ Look in tor's notice.log for 'Every introduction point for service'
 ```notice_log``` will parse the notice log for warnings about relays and 
 services that will then  be whitelisted.
 
+```--torrc``` will read a file like /etc/tor/torrc and make some
+suggestions based on what it finds; it will not edit or change the file.
+
 ```--torrc_output``` will write the torrc ExcludeNodes configuration to a file.
 
 ```--good_contacts``` will write the contact info as a ciiss dictionary
@@ -140,9 +143,6 @@ To be "good" the ContactInfo must:
 ```--wellknown_output``` will make the program write the well-known files
 (```/.well-known/tor-relay/rsa-fingerprint.txt```) to a directory.
 
-```--torrc_output``` will write a file of the commands that it sends to
-the Tor controller, so you can include it in a ```/etc/toc/torrc```.
-
 ```--relays_output write the download relays in json to a file. The relays
 are downloaded from https://onionoo.torproject.org/details
 
@@ -618,7 +618,7 @@ def aParseContact(contact, fp):
 
     contact = contact.split(r'\n')[0]
     for elt in lMORONS:
-        contact = contact.replace(elt)
+        contact = contact.replace(elt, '')
     m = oCONTACT_RE.match(contact)
     # 450 matches!
     if m and m.groups and len(m.groups(0)) > 2 and m.span()[1] > 0:
@@ -1301,7 +1301,7 @@ def iMain(lArgs):
 
         if 'EntryNodes' in aGOOD_NODES[sGOOD_ROOT].keys():
             try:
-                LOG.info(f"{sINCLUDE_GUARD_KEY} {len(aGOOD_NODES[sGOOD_ROOT]['EntryNodes'])} guard nodes")
+                LOG.info(f"controller {sINCLUDE_GUARD_KEY} {len(aGOOD_NODES[sGOOD_ROOT]['EntryNodes'])} guard nodes")
                 # FixMe for now override StrictNodes it may be unusable otherwise
                 controller.set_conf(sINCLUDE_GUARD_KEY,
                                     aGOOD_NODES[sGOOD_ROOT]['EntryNodes'])
@@ -1315,12 +1315,12 @@ def iMain(lArgs):
                 controller.set_conf('StrictNodes', oargs.strict_nodes)
                 cur = controller.get_conf('StrictNodes')
                 if int(cur) != oargs.strict_nodes:
-                    LOG.warn(f"OVERRIDING StrictNodes NOT {oargs.strict_nodes}")
+                    LOG.warn(f"controller failed StrictNodes NOT {oargs.strict_nodes}")
                 else:
-                    LOG.info(f"OVERRODE StrictNodes to {oargs.strict_nodes}")
+                    LOG.info(f"controller OVERRODE StrictNodes to {oargs.strict_nodes}")
                     
             else:
-                LOG.info(f"StrictNodes is set to {cur}")
+                LOG.info(f"controller StrictNodes is set to {cur}")
 
     except KeyboardInterrupt:
         return 0

exclude_badExits.txt

@@ -22,7 +22,7 @@ optional arguments:
   --proxy_host PROXY_HOST, --proxy-host PROXY_HOST
                         proxy host
   --proxy_port PROXY_PORT, --proxy-port PROXY_PORT
-                        proxy control port
+                        proxy socks port
   --proxy_ctl PROXY_CTL, --proxy-ctl PROXY_CTL
                         control socket - or port
   --torrc TORRC         torrc to check for suggestions

support_onions.py

@@ -29,45 +29,177 @@ LOG = logging.getLogger()
 
 bHAVE_TORR = shutil.which('tor-resolve')
 
+yKNOWN_ONIONS = """
+  - facebookwkhpilnemxj7asaniu7vnjjbiltxjqhye3mhbshg7kx5tfyd # facebook
+  - duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad # ddg
+  - zkaan2xfbuxia2wpf7ofnkbz6r5zdbbvxbunvp5g2iebopbfc4iqmbad # hks
+"""
+#  grep -B 1 '<li><a href="' /tmp/tor.html |sed -e 's/<li><a href="http:../  - /' -e 's/.onion.*//' -e 's/<li id=./  # /' -e 's/".*//' -e '/^--/d' -e '/<li id/d'
+# This will slow things down 1-2 min each
+yKNOWN_ONIONS_TOR = """
+  # 2019.www.torproject.org
+  - jqyzxhjk6psc6ul5jnfwloamhtyh7si74b4743k2qgpskwwxrzhsxmad
+  # api.donate.torproject.org
+  - rbi3fpvpz4vlrx67scoqef2zxz7k4xyiludszg655favvkygjmhz6wyd
+  # archive.torproject.org
+  - uy3qxvwzwoeztnellvvhxh7ju7kfvlsauka7avilcjg7domzxptbq7qd
+  # aus1.torproject.org
+  - ot3ivcdxmalbsbponeeq5222hftpf3pqil24q3s5ejwo5t52l65qusid
+  # aus2.torproject.org
+  - b5t7emfr2rn3ixr4lvizpi3stnni4j4p6goxho7lldf4qg4hz5hvpqid
+  # blog.torproject.org
+  - pzhdfe7jraknpj2qgu5cz2u3i4deuyfwmonvzu5i3nyw4t4bmg7o5pad
+  # bridges.torproject.org
+  - yq5jjvr7drkjrelzhut7kgclfuro65jjlivyzfmxiq2kyv5lickrl4qd
+  # cloud.torproject.org
+  - ui3cpcohcoko6aydhuhlkwqqtvadhaflcc5zb7mwandqmcal7sbwzwqd
+  # collector.torproject.org
+  - pgmrispjerzzf2tdzbfp624cg5vpbvdw2q5a3hvtsbsx25vnni767yad
+  # collector2.torproject.org
+  - 3srlmjzbyyzz62jvdfqwn5ldqmh6mwnqxre2zamxveb75uz2qrqkrkyd
+  # community.torproject.org
+  - xmrhfasfg5suueegrnc4gsgyi2tyclcy5oz7f5drnrodmdtob6t2ioyd
+  # consensus-health.torproject.org
+  - tkskz5dkjel4xqyw5d5l3k52kgglotwn6vgb5wrl2oa5yi2szvywiyid
+  # crm.torproject.org
+  - 6ojylpznauimd2fga3m7g24vd7ebkzlemxdprxckevqpzs347ugmynqd
+  # deb.torproject.org
+  - apow7mjfryruh65chtdydfmqfpj5btws7nbocgtaovhvezgccyjazpqd
+  # dev.crm.torproject.org
+  - eewp4iydzyu2a5d6bvqadadkozxdbhsdtmsoczu2joexfrjjsheaecad
+  # dist.torproject.org
+  - scpalcwstkydpa3y7dbpkjs2dtr7zvtvdbyj3dqwkucfrwyixcl5ptqd
+  # donate-api.torproject.org
+  - lkfkuhcx62yfvzuz5o3ju4divuf4bsh2bybwd3oierq47kyp2ig2gvid
+  # donate.torproject.org
+  - yoaenchicimox2qdc47p36zm3cuclq7s7qxx6kvxqaxjodigfifljqqd
+  # exonerator.torproject.org
+  - pm46i5h2lfewyx6l7pnicbxhts2sxzacvsbmqiemqaspredf2gm3dpad
+  # extra.torproject.org
+  - kkr72iohlfix5ipjg776eyhplnl2oiv5tz4h2y2bkhjix3quafvjd5ad
+  # gettor.torproject.org
+  - ueghr2hzndecdntou33mhymbbxj7pir74nwzhqr6drhxpbz3j272p4id
+  # git.torproject.org
+  - xtlfhaspqtkeeqxk6umggfbr3gyfznvf4jhrge2fujz53433i2fcs3id
+  # gitlab.torproject.org
+  - eweiibe6tdjsdprb4px6rqrzzcsi22m4koia44kc5pcjr7nec2rlxyad
+  # gitweb.torproject.org
+  - gzgme7ov25seqjbphab4fkcph3jkobfwwpivt5kzbv3kqx2y2qttl4yd
+  # grafana1.torproject.org
+  - 7zjnw5lx2x27rwiocxkqdquo7fawj46mf2wiu2l7e6z6ng6nivmdxnad
+  # grafana2.torproject.org
+  - f3vd6fyiccuppybkxiblgigej3pfvvqzjnhd3wyv7h4ee5asawf2fhqd
+  # ircbouncer.torproject.org
+  - moz5kotsnjony4oxccxfo4lwk3pvoxmdoljibhgoonzgzjs5oemtjmqd
+  # metabase.metrics.torproject.org
+  - gr5pseamigereei4c6654hafzhid5z2c3oqzn6cfnx7yfyelt47znhad
+  # metrics.torproject.org
+  - hctxrvjzfpvmzh2jllqhgvvkoepxb4kfzdjm6h7egcwlumggtktiftid
+  # moat.torproject.org
+  - z7m7ogzdhu43nosvjtsuplfmuqa3ge5obahixydhmzdox6owwxfoxzid
+  # nagios.torproject.org
+  - w6vizvw4ckesva5fvlkrepynemxdq6pgo5sh4r76ec6msq5notkhqryd
+  # newsletter.torproject.org
+  - a4ygisnerpgtc5ayerl22pll6cls3oyj54qgpm7qrmb66xrxts6y3lyd
+  # nightlies.tbb.torproject.org
+  - umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad
+  # nyx.torproject.org
+  - 3ewfgrt4gzfccp6bnquhqb266r3zepiqpnsk3falwygkegtluwuyevid
+  - xao2lxsmia2edq2n5zxg6uahx6xox2t7bfjw6b5vdzsxi7ezmqob6qid
+  - dud2sxm6feahhuwj4y4lzktduy7v3qpaqsfkggtj2ojmzathttkegoid
+  # openpgpkey.torproject.org
+  - 2yldcptk56shc7lwieozoglw3t5ghty7m6mf2faysvfnzccqavbu2mad
+  # people.torproject.org
+  - 5ecey6oe4rocdsfoigr4idu42cecm2j7zfogc3xc7kfn4uriehwrs6qd
+  # prometheus1.torproject.org
+  - ydok5jiruh3ak6hcfdlm2g7iuraaxcomeckj2nucjsxif6qmrrda2byd
+  # prometheus2.torproject.org
+  - vyo6yrqhl3by7d6n5t6hjkflaqbarjpqjnvapr5u5rafk4imnfrmcjyd
+  # rbm.torproject.org
+  - nkuz2tpok7ctwd5ueer5bytj3bm42vp7lgjcsnznal3stotg6vyaakyd
+  # research.torproject.org
+  - xhqthou6scpfnwjyzc3ekdgcbvj76ccgyjyxp6cgypxjlcuhnxiktnqd
+  # review.torproject.net
+  - zhkhhhnppc5k6xju7n25rjba3wuip73jnodicxl65qdpchrwvvsilcyd
+  # rpm.torproject.org
+  - 4ayyzfoh5qdrokqaejis3rdredhvf22n3migyxfudpkpunngfc7g4lqd
+  # snowflake.torproject.org
+  - oljlphash3bpqtrvqpr5gwzrhroziw4mddidi5d2qa4qjejcbrmoypqd
+  # spec.torproject.org
+  - i3xi5qxvbrngh3g6o7czwjfxwjzigook7zxzjmgwg5b7xnjcn5hzciad
+  # staging-api.donate.torproject.org
+  - vorwws6g6mx23djlznmlqva4t5olulpnet6fxyiyytcu5dorp3fstdqd
+  # staging.crm.torproject.org
+  - pt34uujusar4arrvsqljndqlt7tck2d5cosaav5xni4nh7bmvshyp2yd
+  # staging.donate-api.torproject.org
+  - 7niqsyixinnhxvh33zh5dqnplxnc2yd6ktvats3zmtbbpzcphpbsa6qd
+  # status.torproject.org
+  - eixoaclv7qvnmu5rolbdwba65xpdiditdoyp6edsre3fitad777jr3ad
+  # stem.torproject.org
+  - mf34jlghauz5pxjcmdymdqbe5pva4v24logeys446tdrgd5lpsrocmqd
+  # styleguide.torproject.org
+  - 7khzpw47s35pwo3lvtctwf2szvnq3kgglvzc22elx7of2awdzpovqmqd
+  # submission.torproject.org
+  - givpjczyrb5jjseful3o5tn3tg7tidbu4gydl4sa5ekpcipivqaqnpad
+  # support.torproject.org
+  - rzuwtpc4wb3xdzrj3yeajsvm3fkq4vbeubm2tdxaqruzzzgs5dwemlad
+  # survey.torproject.org
+  - eh5esdnd6fkbkapfc6nuyvkjgbtnzq2is72lmpwbdbxepd2z7zbgzsqd
+  # svn-archive.torproject.org
+  - b63iq6es4biaawfilwftlfkw6a6putogxh4iakei2ioppb7dsfucekyd
+  # tb-manual.torproject.org
+  - dsbqrprgkqqifztta6h3w7i2htjhnq7d3qkh3c7gvc35e66rrcv66did
+  # test-api.donate.torproject.org
+  - wiofesr5qt2k7qrlljpk53isgedxi6ddw6z3o7iay2l7ne3ziyagxaid
+  # test-data.tbb.torproject.org
+  - umbk3kbgov4ekg264yulvbrpykfye7ohguqbds53qn547mdpt6o4qkad
+  # test.crm.torproject.org
+  - a4d52y2erv4eijii66cpnyqn7rsnnq3gmtrsdxzt2laoutvu4gz7fwid
+  # test.donate-api.torproject.org
+  - i4zhrn4md3ucd5dfgeo5lnqd3jy2z2kzp3lt4tdisvivzoqqtlrymkid
+  # www
+  - tttyx2vwp7ihml3vkhywwcizv6nbwrikpgeciy3qrow7l7muak2pnhad
+  # www.torproject.org
+  - 2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid
+"""
+
 # we check these each time but we got them by sorting bad relays
 # in the wild we'll keep a copy here so we can avoid restesting
 yKNOWN_NODNS = """
----
-  - 0x0.is 
-  - a9.wtf 
+  - 0x0.is
+  - a9.wtf
   - apt96.com
-  - axims.net 
-  - backup.spekadyon.org 
-  - dfri.se 
+  - axims.net
+  - backup.spekadyon.org
+  - dfri.se
   - dotsrc.org
   - dtf.contact
-  - ezyn.de 
-  - for-privacy.net 
-  - galtland.network 
+  - ezyn.de
+  - for-privacy.net
+  - galtland.network
   - heraldonion.org
-  - interfesse.net 
-  - kryptonit.org 
+  - interfesse.net
+  - kryptonit.org
   - linkspartei.org
-  - mkg20001.io 
+  - mkg20001.io
   - nicdex.com
-  - nx42.de 
+  - nx42.de
   - pineapple.cx
   - privacylayer.xyz
-  - privacysvcs.net 
+  - privacysvcs.net
   - prsv.ch
   - sebastian-elisa-pfeifer.eu
   - thingtohide.nl
-  - tor-exit-2.aa78i2efsewr0neeknk.xyz 
-  - tor-exit-3.aa78i2efsewr0neeknk.xyz 
+  - tor-exit-2.aa78i2efsewr0neeknk.xyz
+  - tor-exit-3.aa78i2efsewr0neeknk.xyz
   - tor.dlecan.com
   - tor.skankhunt42.pw
-  - transliberation.today 
+  - transliberation.today
   - tuxli.org
-  - unzane.com 
+  - unzane.com
   - verification-for-nusenu.net
   - www.defcon.org
 """
-#  - 0x0.is
 #  - aklad5.com
 #  - artikel5ev.de
 #  - arvanode.net