From 65cb995c0cdb5a686dff1b4b15ea2a2d7f42bc24 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 9 Aug 2016 19:38:49 +0200 Subject: [PATCH 1/7] remove nodes which rely on dns (#69) * replace dns hosts with resolved IPs * remove mixxit's nodes which no longer exist * Removed rethymno-meshnet node cause dynamic IP and hostnames. * Removed rethymno-meshnet node cause dynamic IP and hostnames --- AS/hk/hk.hub.icfreedom.net.k | 8 -------- AS/sg/singapore/sg.hub.icfreedom.net.k | 8 -------- EU/fr/nord-pas-de-calais/hub.icfreedom.net.k | 8 -------- EU/fr/nord-pas-de-calais/play.fallofanempire.com.k | 8 -------- EU/gr/rethymno/kaotisk.rethymno-meshnet.k | 9 --------- EU/md/chisinau/eu-east.hub.icfreedom.net.k | 8 -------- NA/ca/quebec/ca.hub.icfreedom.net.k | 8 -------- NA/us/oregon/h.us-west.hub.icfreedom.net.k | 8 -------- 8 files changed, 65 deletions(-) delete mode 100644 AS/hk/hk.hub.icfreedom.net.k delete mode 100644 AS/sg/singapore/sg.hub.icfreedom.net.k delete mode 100644 EU/fr/nord-pas-de-calais/hub.icfreedom.net.k delete mode 100644 EU/fr/nord-pas-de-calais/play.fallofanempire.com.k delete mode 100644 EU/gr/rethymno/kaotisk.rethymno-meshnet.k delete mode 100644 EU/md/chisinau/eu-east.hub.icfreedom.net.k delete mode 100644 NA/ca/quebec/ca.hub.icfreedom.net.k delete mode 100644 NA/us/oregon/h.us-west.hub.icfreedom.net.k diff --git a/AS/hk/hk.hub.icfreedom.net.k b/AS/hk/hk.hub.icfreedom.net.k deleted file mode 100644 index b9eb121..0000000 --- a/AS/hk/hk.hub.icfreedom.net.k +++ /dev/null @@ -1,8 +0,0 @@ -{ - "hk.hub.icfreedom.net:39119":{ - "contact":"mixxit@hyperboria.name", - "password":"60dgptu2x8400qxnss5u1h9ld6h89p4", - "peerName":"hk.hub.icfreedom.net", - "publicKey":"b5rxqzvz1m8nbmx2473dgpxqgh7q0m7hu8fr1kxv40018zq1bwm0.k" - } -} diff --git a/AS/sg/singapore/sg.hub.icfreedom.net.k b/AS/sg/singapore/sg.hub.icfreedom.net.k deleted file mode 100644 index 24e5747..0000000 --- a/AS/sg/singapore/sg.hub.icfreedom.net.k +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sg.hub.icfreedom.net:64221":{ - "contact":"mixxit@hyperboria.name", - "password":"92tkn2fhkyx4p139v2320cs2d1407u0", - "peerName":"sg.hub.icfreedom.net", - "publicKey":"265s36tzlnj26ctxbmk4zjdt6fn5xmn0lgtyurkrwgftc3uysgb0.k" - } -} diff --git a/EU/fr/nord-pas-de-calais/hub.icfreedom.net.k b/EU/fr/nord-pas-de-calais/hub.icfreedom.net.k deleted file mode 100644 index 1dbe49e..0000000 --- a/EU/fr/nord-pas-de-calais/hub.icfreedom.net.k +++ /dev/null @@ -1,8 +0,0 @@ -{ - "hub.icfreedom.net:64749":{ - "contact":"mixxit@hyperboria.name", - "password":")h.1-_[?bFW!0H:O{=a>H+9&17q]*j1~Bjzk{e.$", - "peerName":"icfreedom.net", - "publicKey":"ny90t66vzmfywtcs3rs8fwwhzfk7frgvdfxutqxslk18jrj82hx0.k" - } -} diff --git a/EU/fr/nord-pas-de-calais/play.fallofanempire.com.k b/EU/fr/nord-pas-de-calais/play.fallofanempire.com.k deleted file mode 100644 index b3f8dbb..0000000 --- a/EU/fr/nord-pas-de-calais/play.fallofanempire.com.k +++ /dev/null @@ -1,8 +0,0 @@ -{ - "play.fallofanempire.com:50005":{ - "contact":"mixxit@hyperboria.name", - "password":"LTRXc&UQ>YQOB=zNSWh{^HXf%|ha5r)A)R/IV!dT", - "peerName":"play.fallofanempire.com", - "publicKey":"3c4q5wfvjm525gq0d0lmp1lh87dhm7llxhcyh2srhkjyrrmnxsm0.k" - } -} diff --git a/EU/gr/rethymno/kaotisk.rethymno-meshnet.k b/EU/gr/rethymno/kaotisk.rethymno-meshnet.k deleted file mode 100644 index b54ea39..0000000 --- a/EU/gr/rethymno/kaotisk.rethymno-meshnet.k +++ /dev/null @@ -1,9 +0,0 @@ -{ - "rethymno-meshnet.tk:38295":{ - "contact":"kaotisk@irc.fc00.io", - "login":"default-login", - "password":"wgs9k7n7j5yh0kx7kyl5m7cpp71ls4y", - "peerName":"gr-rethymno-meshnet", - "publicKey":"wb3pt76psbt28mt9t2wzyudyh9zkqwq9z3jqb3t06y53g6f5qzh0.k" - } -} diff --git a/EU/md/chisinau/eu-east.hub.icfreedom.net.k b/EU/md/chisinau/eu-east.hub.icfreedom.net.k deleted file mode 100644 index b2e1bd7..0000000 --- a/EU/md/chisinau/eu-east.hub.icfreedom.net.k +++ /dev/null @@ -1,8 +0,0 @@ -{ - "eu-east.hub.icfreedom.net:22992":{ - "contact":"mixxit@hyperboria.name", - "password":"g7575cd9p1f6cmubhy705b50f0qp95b", - "peerName":"eu-east.hub.icfreedom.net", - "publicKey":"5xvkzx99t4x915x8xqzbsflvj3urpu48558wjc0613v97p377ks0.k" - } -} diff --git a/NA/ca/quebec/ca.hub.icfreedom.net.k b/NA/ca/quebec/ca.hub.icfreedom.net.k deleted file mode 100644 index c61673a..0000000 --- a/NA/ca/quebec/ca.hub.icfreedom.net.k +++ /dev/null @@ -1,8 +0,0 @@ -{ - "ca.hub.icfreedom.net:25109":{ - "contact":"mixxituk@gmail.com", - "password":".!jjR[tyKF1ZO(J7mbf1=9!0jS^(~LUb#JPknsO,", - "publicKey":"g0q7z39pnptj1r5src9jnpp5wuzl1rtg608gy5xmd4ulpg275520.k", - "user":"ca.hub.icfreedom.net" - } -} diff --git a/NA/us/oregon/h.us-west.hub.icfreedom.net.k b/NA/us/oregon/h.us-west.hub.icfreedom.net.k deleted file mode 100644 index ac33cca..0000000 --- a/NA/us/oregon/h.us-west.hub.icfreedom.net.k +++ /dev/null @@ -1,8 +0,0 @@ -{ - "us-west.hub.icfreedom.net:56941":{ - "contact":"mixxituk@gmail.com", - "password":"80b8cqnbfy560f9mh8g3dqkh17gwp6g", - "publicKey":"wjzupkw8h2n20krbf887zyhu107j1dsz8m34rfbb9z10063ym2t0.k", - "user":"us-west.hub.icfreedom.net" - } -} From 4e8cf4c383acdbe7188c2552ce6eb1856c35ded9 Mon Sep 17 00:00:00 2001 From: cwningen Date: Tue, 9 Aug 2016 18:40:32 +0100 Subject: [PATCH 2/7] Additional cwningen.cymru node (#65) * Cleaned up formatting * Additional cwningen.cymru node --- EU/uk/london/cwningen.cymru.k | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/EU/uk/london/cwningen.cymru.k b/EU/uk/london/cwningen.cymru.k index 1d7e0ca..f2ca0f2 100644 --- a/EU/uk/london/cwningen.cymru.k +++ b/EU/uk/london/cwningen.cymru.k @@ -1,4 +1,12 @@ { + "195.177.253.230:31545":{ + "contact":"hostmaster@cwningen.cymru", + "gpg":"B60E86E6", + "login":"public-peer", + "password":"txxjhyblpsfg6v50gs6h70nxk793zlk", + "peerName":"wisgers.cwningen.cymru", + "publicKey":"yck8q799rrf6hcb29xryfrrzjgblw1xvc0nxv2xbqqv86p0k0c90.k" + }, "46.235.225.176:31545":{ "contact":"hostmaster@cwningen.cymru", "gpg":"B60E86E6", @@ -30,5 +38,13 @@ "password":"p0zk85ff2lk3zbvgypzr1tvbu1gnlkc", "peerName":"penfar.cwningen.cymru", "publicKey":"7ktfb2n336bguhfx81ts15qgjb8mjj4rz3vrnvj2dw89wsmmtpg0.k" + }, + "[2001:67c:2990:d00::c375:fde6]:31545":{ + "contact":"hostmaster@cwningen.cymru", + "gpg":"B60E86E6", + "login":"public-peer", + "password":"txxjhyblpsfg6v50gs6h70nxk793zlk", + "peerName":"wisgers.cwningen.cymru", + "publicKey":"yck8q799rrf6hcb29xryfrrzjgblw1xvc0nxv2xbqqv86p0k0c90.k" } } From 5f25c3fa50929c6558652c3f3d989408033a2c5c Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 9 Aug 2016 19:47:03 +0200 Subject: [PATCH 3/7] forbid hostnames in credentials --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 94ea866..00c01d8 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,8 @@ We have tried to standardize the structure of the actual credential files, as su - there is a space after each colon - indentation uses four spaces - the file ends with a newline character. +* credentials must use IP:port strings for keys + - credentials using hostnames will not be accepted ``` { From a1684bae51dfa4a65d4e7988062eaa3f927472a2 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 9 Aug 2016 22:25:20 +0200 Subject: [PATCH 4/7] add new peer in NA/us/newjersey --- NA/us/newjersey/h.transitiontech.ca.k | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 NA/us/newjersey/h.transitiontech.ca.k diff --git a/NA/us/newjersey/h.transitiontech.ca.k b/NA/us/newjersey/h.transitiontech.ca.k new file mode 100644 index 0000000..05efc9f --- /dev/null +++ b/NA/us/newjersey/h.transitiontech.ca.k @@ -0,0 +1,9 @@ +{ + "104.200.29.163:53053":{ + "contact":"ansuz@transitiontech.ca", + "gpg":"024A7C03E67ED8CF", + "password":"cLjDBorhsYJUmJrESGueHsRY4HXcFyj", + "peerName":"transitiontech", + "publicKey":"1941p5k8qqvj17vjrkb9z97wscvtgc1vp8pv1huk5120cu42ytt0.k" + } +} From 3a692daa2a05363e20d821eb443874622e303234 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 9 Aug 2016 22:25:55 +0200 Subject: [PATCH 5/7] add gpg field to ansuz.science.k --- EU/uk/london/ansuz.science.k | 1 + 1 file changed, 1 insertion(+) diff --git a/EU/uk/london/ansuz.science.k b/EU/uk/london/ansuz.science.k index 81ae3c4..b92bef8 100644 --- a/EU/uk/london/ansuz.science.k +++ b/EU/uk/london/ansuz.science.k @@ -1,6 +1,7 @@ { "139.162.219.143:2331":{ "contact":"ansuz@transitiontech.ca", + "gpg":"024A7C03E67ED8CF", "password":"CJ36KhxxO7nmfCy1kVB27rhwlWgnG95i", "publicKey":"bddc5j6sc45hlrdnccu120zwnmm2z0qlbfkxn9n8xbs0vqgx9fh0.k", "user":"ansuz" From c5d1dba06f4628e76b07268f672534cf5664557c Mon Sep 17 00:00:00 2001 From: Jacob Henner Date: Wed, 17 Aug 2016 01:18:04 -0400 Subject: [PATCH 6/7] Added gpg field and fixed formatting --- NA/us/newyork/jacobhenner.usa.k | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/NA/us/newyork/jacobhenner.usa.k b/NA/us/newyork/jacobhenner.usa.k index 183e526..f6d7ce1 100644 --- a/NA/us/newyork/jacobhenner.usa.k +++ b/NA/us/newyork/jacobhenner.usa.k @@ -1,18 +1,20 @@ { "107.170.57.34:63472":{ - "contact":"code@ventricle.us", - "location":"digitalocean nyc2", - "login":"public-peer", - "password":"ppm6j89mgvss7uvtntcd9scy6166mwb", - "peerName":"Jacob Henner", - "publicKey":"1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" + "contact": "code@ventricle.us", + "gpg": "7FE895160E3314027CD3B5D37392CF088BB4345C", + "location": "digitalocean nyc2", + "login": "public-peer", + "password": "ppm6j89mgvss7uvtntcd9scy6166mwb", + "peerName": "Jacob Henner", + "publicKey": "1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" }, "[2604:a880:0:1010::f:4001]:63472":{ - "contact":"code@ventricle.us", - "location":"digitalocean nyc2", - "login":"public-peer", - "password":"ppm6j89mgvss7uvtntcd9scy6166mwb", - "peerName":"Jacob Henner", - "publicKey":"1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" + "contact": "code@ventricle.us", + "gpg": "7FE895160E3314027CD3B5D37392CF088BB4345C", + "location": "digitalocean nyc2", + "login": "public-peer", + "password": "ppm6j89mgvss7uvtntcd9scy6166mwb", + "peerName": "Jacob Henner", + "publicKey": "1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" } } From 4f34a9002a967e0b7ab38b3dec9e6f84f2c141ef Mon Sep 17 00:00:00 2001 From: Jacob Henner Date: Wed, 17 Aug 2016 01:26:33 -0400 Subject: [PATCH 7/7] Fixing README.md to reflect formatting expected by tests.py --- NA/us/newyork/jacobhenner.usa.k | 28 ++++++++++++++-------------- README.md | 10 ++++------ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/NA/us/newyork/jacobhenner.usa.k b/NA/us/newyork/jacobhenner.usa.k index f6d7ce1..49d840e 100644 --- a/NA/us/newyork/jacobhenner.usa.k +++ b/NA/us/newyork/jacobhenner.usa.k @@ -1,20 +1,20 @@ { "107.170.57.34:63472":{ - "contact": "code@ventricle.us", - "gpg": "7FE895160E3314027CD3B5D37392CF088BB4345C", - "location": "digitalocean nyc2", - "login": "public-peer", - "password": "ppm6j89mgvss7uvtntcd9scy6166mwb", - "peerName": "Jacob Henner", - "publicKey": "1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" + "contact":"code@ventricle.us", + "gpg":"7FE895160E3314027CD3B5D37392CF088BB4345C", + "location":"digitalocean nyc2", + "login":"public-peer", + "password":"ppm6j89mgvss7uvtntcd9scy6166mwb", + "peerName":"Jacob Henner", + "publicKey":"1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" }, "[2604:a880:0:1010::f:4001]:63472":{ - "contact": "code@ventricle.us", - "gpg": "7FE895160E3314027CD3B5D37392CF088BB4345C", - "location": "digitalocean nyc2", - "login": "public-peer", - "password": "ppm6j89mgvss7uvtntcd9scy6166mwb", - "peerName": "Jacob Henner", - "publicKey": "1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" + "contact":"code@ventricle.us", + "gpg":"7FE895160E3314027CD3B5D37392CF088BB4345C", + "location":"digitalocean nyc2", + "login":"public-peer", + "password":"ppm6j89mgvss7uvtntcd9scy6166mwb", + "peerName":"Jacob Henner", + "publicKey":"1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k" } } diff --git a/README.md b/README.md index 00c01d8..9eb5b81 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ We have tried to standardize the structure of the actual credential files, as su + publicKey + contact (a means of contacting the operator) * credentials should be formatted such that: - - there is a space after each colon - indentation uses four spaces - the file ends with a newline character. * credentials must use IP:port strings for keys @@ -46,10 +45,10 @@ We have tried to standardize the structure of the actual credential files, as su ``` { "192.168.1.5:10326": { - "login": "default-login", - "password": "nq1uhmf06k8c5594jqmpgy26813b81s", - "publicKey": "ssxlh80x0bqjfrnbkm1801xsxyd8zd45jkwn1zhlnccqj4hdqun0.k", - "peerName": "your-name-goes-here" + "login":"default-login", + "password":"nq1uhmf06k8c5594jqmpgy26813b81s", + "publicKey":"ssxlh80x0bqjfrnbkm1801xsxyd8zd45jkwn1zhlnccqj4hdqun0.k", + "peerName":"your-name-goes-here" } } ``` @@ -87,4 +86,3 @@ console.log(Peers.peers); console.log(Peers.peers.NA.us.california); ``` -