From 2f2381451b2dd94c5afbeb19122be81a904b9fda Mon Sep 17 00:00:00 2001 From: Alec Muffett Date: Sun, 10 Apr 2022 15:45:55 +0000 Subject: [PATCH] auto-update on Sun Apr 10 15:45:55 UTC 2022 --- 02-footnotes.md | 3 ++- README.md | 25 +++++++++++++------------ rwos-db.py | 13 ++++++++----- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/02-footnotes.md b/02-footnotes.md index ad59b5a..cd1b43a 100644 --- a/02-footnotes.md +++ b/02-footnotes.md @@ -16,7 +16,8 @@ - :stop_sign: site up, but reported a system error - :sos: site returned no data, or is down, or curl experienced a transient or permanent network error; may also reflect a problem with the RWOS server connection - :boom: same as :sos: but curl specifically mentioned SSL certificates as an issue -- :alarm_clock: same as :sos: but curl specifically mentioned timeout as an issue +- :alarm_clock: same as :sos: but curl specifically mentioned connection timeout as an issue +- :timer_clock: same as :sos: but curl specifically mentioned ttl expiry as an issue - :question: same as :sos: but curl specifically mentioned inability to resolve an onion descriptor - :exclamation: same as :sos: but curl specifically mentioned inability to connect to the server - :new: site is newly added, no data yet diff --git a/README.md b/README.md index 3a1d733..395ead1 100644 --- a/README.md +++ b/README.md @@ -617,7 +617,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/fr/](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/fr/) * plain: `https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/fr/` * proof: [link](https://www.dw.com/de/schutz-vor-hackern-darum-wird-tor-noch-sicherer/a-57953191) -* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::sos::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: +* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::timer_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: ### [Deutsche Welle German | Deutsch](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/de/) * transport: :closed_lock_with_key: **HTTPS** @@ -652,7 +652,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/id/](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/id/) * plain: `https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/id/` * proof: [link](https://www.dw.com/de/schutz-vor-hackern-darum-wird-tor-noch-sicherer/a-57953191) -* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::sos::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: +* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::timer_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: ### [Deutsche Welle Kiswahili | Kiswahili](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/sw/) * transport: :closed_lock_with_key: **HTTPS** @@ -666,7 +666,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/mk/](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/mk/) * plain: `https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/mk/` * proof: [link](https://www.dw.com/de/schutz-vor-hackern-darum-wird-tor-noch-sicherer/a-57953191) -* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::sos::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: +* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::timer_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: ### [Deutsche Welle Pashto | پښتو](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/ps/) * transport: :closed_lock_with_key: **HTTPS** @@ -687,7 +687,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/pl/](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/pl/) * plain: `https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/pl/` * proof: [link](https://www.dw.com/de/schutz-vor-hackern-darum-wird-tor-noch-sicherer/a-57953191) -* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::sos::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: +* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::timer_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: ### [Deutsche Welle Portuguese | Português do Brasil](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/pt-br/) * transport: :closed_lock_with_key: **HTTPS** @@ -702,7 +702,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/pt-002/not%C3%ADcias/s-13918](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/pt-002/not%C3%ADcias/s-13918) * plain: `https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/pt-002/not%C3%ADcias/s-13918` * proof: [link](https://www.dw.com/de/schutz-vor-hackern-darum-wird-tor-noch-sicherer/a-57953191) -* check: :white_check_mark::white_check_mark::white_check_mark::sos::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark: +* check: :white_check_mark::white_check_mark::white_check_mark::timer_clock::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark: ### [Deutsche Welle Romanian | Română](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/ro/) * transport: :closed_lock_with_key: **HTTPS** @@ -723,7 +723,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/sr/](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/sr/) * plain: `https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/sr/` * proof: [link](https://www.dw.com/de/schutz-vor-hackern-darum-wird-tor-noch-sicherer/a-57953191) -* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::sos::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: +* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::timer_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: ### [Deutsche Welle Spanish | Español](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/es/) * transport: :closed_lock_with_key: **HTTPS** @@ -737,7 +737,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/tr/](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/tr/) * plain: `https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/tr/` * proof: [link](https://www.dw.com/de/schutz-vor-hackern-darum-wird-tor-noch-sicherer/a-57953191) -* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::sos::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: +* check: :eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::timer_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: ### [Deutsche Welle Ukrainian | Українська](https://www.dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/uk/) * transport: :closed_lock_with_key: **HTTPS** @@ -763,7 +763,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [https://www.azatli7ifydxlltreov6fyvzwuflgggwdgry2cnxllzs7xpoh7qjmmid.onion/](https://www.azatli7ifydxlltreov6fyvzwuflgggwdgry2cnxllzs7xpoh7qjmmid.onion/) * plain: `https://www.azatli7ifydxlltreov6fyvzwuflgggwdgry2cnxllzs7xpoh7qjmmid.onion/` * proof: :crystal_ball: to be confirmed -* check: :white_check_mark::white_check_mark::white_check_mark::sos::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark: +* check: :white_check_mark::white_check_mark::white_check_mark::timer_clock::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark: ### [RFERL currenttime.tv | Настоящее Время](https://www.currtv242aqatxhyqfyh3mtq2ubzxz7crvj7aon3zccrnwatc5gugvqd.onion/) * transport: :closed_lock_with_key: **HTTPS** @@ -912,7 +912,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [http://jrw32khnmfehvdsvwdf34mywoqj5emvxh4mzbkls6jk2cb3thcgz6nid.onion/](http://jrw32khnmfehvdsvwdf34mywoqj5emvxh4mzbkls6jk2cb3thcgz6nid.onion/) * plain: `http://jrw32khnmfehvdsvwdf34mywoqj5emvxh4mzbkls6jk2cb3thcgz6nid.onion/` * proof: [link](https://www.facebook.com/defcon/posts/i-am-proud-to-announce-the-v3-onion-address-for-def-condefconorg-main-web-siteht/10155438526096656/) -* check: :sos::exclamation::eight_spoked_asterisk::alarm_clock::eight_spoked_asterisk::alarm_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: +* check: :timer_clock::exclamation::eight_spoked_asterisk::alarm_clock::eight_spoked_asterisk::alarm_clock::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk::eight_spoked_asterisk: ### [DEF CON Home](http://g7ejphhubv5idbbu3hb3wawrs5adw7tkx7yjabnf65xtzztgg4hcsqqd.onion/) * transport: :small_red_triangle: **HTTP** @@ -926,7 +926,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [http://m6rqq6kocsyugo2laitup5nn32bwm3lh677chuodjfmggczoafzwfcad.onion/](http://m6rqq6kocsyugo2laitup5nn32bwm3lh677chuodjfmggczoafzwfcad.onion/) * plain: `http://m6rqq6kocsyugo2laitup5nn32bwm3lh677chuodjfmggczoafzwfcad.onion/` * proof: [link](https://www.facebook.com/defcon/posts/i-am-proud-to-announce-the-v3-onion-address-for-def-condefconorg-main-web-siteht/10155438526096656/) -* check: :alarm_clock::sos::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::sos::white_check_mark::exclamation::white_check_mark::white_check_mark: +* check: :alarm_clock::timer_clock::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::timer_clock::white_check_mark::exclamation::white_check_mark::white_check_mark: ### [Debian Onion Index](http://jvgypgbnfyvfopg5msp6nwr2sl2fd6xmnguq35n7rfkw3yungjn2i4yd.onion/) * transport: :small_red_triangle: **HTTP** @@ -1212,7 +1212,7 @@ You can find techical details and the legend/key for symbols in the [footnotes s * link: [http://lvtu6mh6dd6ynqcxtd2mseqfkm7g2iuxvjobbyzpgx2jt427zvd7n3ad.onion](http://lvtu6mh6dd6ynqcxtd2mseqfkm7g2iuxvjobbyzpgx2jt427zvd7n3ad.onion) * plain: `http://lvtu6mh6dd6ynqcxtd2mseqfkm7g2iuxvjobbyzpgx2jt427zvd7n3ad.onion` * proof: [link](https://propublica.org/tips) -* check: :white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::sos::white_check_mark::white_check_mark: +* check: :white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::white_check_mark::timer_clock::white_check_mark::white_check_mark: ### [Public Intelligence](http://z4gd5t2g6u6kqeqjeddvmvlhhjtjgslg4elh4ztnct7snskcd7phbiyd.onion) *via: https://securedrop.org/api/v1/directory/* @@ -1415,7 +1415,8 @@ These sites have apparently stopped responding. - :stop_sign: site up, but reported a system error - :sos: site returned no data, or is down, or curl experienced a transient or permanent network error; may also reflect a problem with the RWOS server connection - :boom: same as :sos: but curl specifically mentioned SSL certificates as an issue -- :alarm_clock: same as :sos: but curl specifically mentioned timeout as an issue +- :alarm_clock: same as :sos: but curl specifically mentioned connection timeout as an issue +- :timer_clock: same as :sos: but curl specifically mentioned ttl expiry as an issue - :question: same as :sos: but curl specifically mentioned inability to resolve an onion descriptor - :exclamation: same as :sos: but curl specifically mentioned inability to connect to the server - :new: site is newly added, no data yet diff --git a/rwos-db.py b/rwos-db.py index 6faeacf..24bc473 100755 --- a/rwos-db.py +++ b/rwos-db.py @@ -43,7 +43,8 @@ EMOJI_DEAD = ':sos:' EMOJI_NO_CONN = ':exclamation:' EMOJI_NO_DATA = ':new:' EMOJI_NO_DESC = ':question:' -EMOJI_TIMED_OUT = ':alarm_clock:' +EMOJI_CONN_TIMEOUT = ':alarm_clock:' +EMOJI_TTL_TIMEOUT = ':timer_clock:' H1 = '#' H2 = '##' @@ -258,13 +259,15 @@ def get_summary(url): if 'SSL certificate' in errstr: emoji = EMOJI_BAD_CERT elif 'timed out' in errstr: - emoji = EMOJI_TIMED_OUT + emoji = EMOJI_CONN_TIMEOUT elif "Can't complete SOCKS5 connection" in errstr: # todo: parse out socks error codes from https://datatracker.ietf.org/doc/html/rfc1928#section-6 - if re.search(r'\(4\)$', errstr): - emoji = EMOJI_NO_DESC - elif re.search(r'\(1\)$', errstr): + if re.search(r'\(1\)$', errstr): emoji = EMOJI_NO_CONN + elif re.search(r'\(4\)$', errstr): + emoji = EMOJI_NO_DESC + elif re.search(r'\(6\)$', errstr): + emoji = EMOJI_TTL_TIMEOUT t = datetime.fromtimestamp(when, timezone.utc) result.append('{0}'.format(emoji, attempt, hcode, ecode, t)) return result