diff --git a/resources/images/tor/README.md b/resources/images/tor/README.md new file mode 100644 index 000000000..03bb281f8 --- /dev/null +++ b/resources/images/tor/README.md @@ -0,0 +1,30 @@ +## Refresh Tor DA V3 Authority Keys + +1. Generate new authority identity key (should only need to do this once) + +From `tor/tor-keys/` directory: + +``` +tor-gencert --create-identity-key -i authority_identity_key +``` + +The PEM passphrase used is `warnet` + +2. Generate new certificates (expires in 24 months) + +``` +tor-gencert -i authority_identity_key -s authority_signing_key -c authority_certificate -m 24 +``` + +3. Configure tor + +Copy the `fingerprint` value from line 2 in `authority_certificate` and paste in to the top of `tor-entrypoint.sh` as `V3IDENT` + + +## Build and upload Warnet images + +From repository root: + +``` +./resources/images/tor/build-tor.sh +``` \ No newline at end of file diff --git a/resources/images/tor/tor-entrypoint.sh b/resources/images/tor/tor-entrypoint.sh index a2d70e54e..6fa3d08e9 100755 --- a/resources/images/tor/tor-entrypoint.sh +++ b/resources/images/tor/tor-entrypoint.sh @@ -1,6 +1,8 @@ #!/bin/bash set -e +V3IDENT=D9ED7BC69543F1477968C312E7EEEB933BC4EF6D + echo "Starting tor-entrypoint.sh" IP_ADDR=$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1) @@ -14,7 +16,7 @@ echo "My IP address: $IP_ADDR" echo "Directory Authority IP address: $TORDA_IP" echo "Address $IP_ADDR" >> /etc/tor/torrc -echo "DirAuthority orport=9001 no-v2 v3ident=15E09A6BE3619593076D8324A2E1DBEEAD4539CD $TORDA_IP:9030 03E942A4F12D85B2CF7CBA4E910F321AE98EC233" >> /etc/tor/torrc +echo "DirAuthority orport=9001 no-v2 v3ident=$V3IDENT $TORDA_IP:9030 03E942A4F12D85B2CF7CBA4E910F321AE98EC233" >> /etc/tor/torrc cat /etc/tor/torrc diff --git a/resources/images/tor/tor-keys/authority_certificate b/resources/images/tor/tor-keys/authority_certificate index 4c4bcaad9..19f3eef42 100644 --- a/resources/images/tor/tor-keys/authority_certificate +++ b/resources/images/tor/tor-keys/authority_certificate @@ -1,45 +1,45 @@ dir-key-certificate-version 3 -fingerprint 15E09A6BE3619593076D8324A2E1DBEEAD4539CD -dir-key-published 2023-09-08 18:28:10 -dir-key-expires 2025-09-08 18:28:10 +fingerprint D9ED7BC69543F1477968C312E7EEEB933BC4EF6D +dir-key-published 2025-09-09 15:29:22 +dir-key-expires 2027-09-09 15:29:22 dir-identity-key -----BEGIN RSA PUBLIC KEY----- -MIIBigKCAYEAs1eKRRP+mWy2XpLbkY3dPkEfdKIfPMDDiG3o/Xu0c3fin1aJ32uG -BY3PGtwS2KQZHEJETjSaACq+2x9+fb4RV5bWhaptbt6l7dvDn15NbEklnkV3sx86 -VxiKqybUp5IQ3cNkM0AxUmQ1M/N+zzIe95T1XplaHVBSQN4xhJgYlDkDkNexIHpP -0uFxjO+2hro3cMRotjqR6xZw5OWKVJh5Is8jiSUs57xomeUy5HaUsADw46b88Ff9 -iVfTP975jzuFF7H0kKOxRpIZGRnfnuDdAtYXWHYXtIVwKBdSeHeK/N53++kxtGET -AcyWoHqO2xlvhtPbiKLHkwq0nNFFfwnhgJJSWHqYs6YI300pEMRHJMFWNsZwgwVE -dplmxnOLv9/TnJsD06d+kc05/JTfZXE/3JFs4rMci0jIhMlw+HtFfRwpDMjGI00u -VyADI0DMYTFWr+wFWrhs5N17BdQVSZUZlfxL5trZFdQpUZhxuKJowNLV1EdWzHFJ -srwV+C0LLWr/AgMBAAE= +MIIBigKCAYEArVKyRDT0nfpLBNwJgp6BBSJXZNT9c2NuADheEFP61DY8s5tZmXFE +hMahb++e+pQqFg4qCRsD91enS+psf6NoUqeuKiLlrAuRqeZRP1sFi6srvLr0Ytbv +OTwtNxC65s3aHjWudYfO4MAL83pnOSrTj5cQ9WMKZSM7pWTT9DVzVqWcGxJ/ykhr +6NoXdqu5VIJillI9mzqKwANCPqykbXO0qX3nvr0fJiJXMMNiSXquIgSWRRJrtOp1 +AuI9Wukkx+q03TS5MZRa1MU8YgXzFmVfr4Erhik3RfS5NO8N2m2qqH4cef2HzIUQ +tlFuq6kn76j8H0R6ut3s+AYhIXe4zfN/quK5nTLnMI3JbhfXhpNHAyTsCFBCE0Am +t0gh6Vh4epukQpS4FK6Bt5tCIaeuAS4PruvaN3eNHg3RnYDrfg071G8TP5ye0l5l +hkD4j8u1mdagqykFBrxRRHYM6BVDQPSkuqshPuu9FGOcOpeB+GlC8HpmNuJwwlyg +02b2x46Eu23jAgMBAAE= -----END RSA PUBLIC KEY----- dir-signing-key -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAyARJ1Nano6bZsTf3UplBhaP8BfrhvDLrJmmk8x4sAot0aHPG/eOH -qGak3y3CM1I+uxozyE58w9mBOuueUIzZelUZVjgg91dsqT5/3lIYEhB4riV29Of0 -AJeh2uibEVrv1ecXo5HYFKEcCHMRTvZaWIWSKjV6TPqPbpXhDBwIcZ+/tHpAml8h -CfGMFRYIEmisNL9xjoNU1R4Iyu07xQw85+xeMU/9UJgsXnvkqkAPbAhwxZq9/8yj -/9V4jcE5NR0KdDuPblEcD5ZNjMckUeTzuVDLgdsazOROD05zaTx8kP1UixJdon8Z -oJ/fsNWsgpzNv6ns8BIwwEAOnd7seXlmfQIDAQAB +MIIBCgKCAQEAnZVQviMvuflUfqgSLbVrH79ljdihFTWYgNefw1ewdYtODWsFvAMT +Ttd+WpIDipAx3+LiZXgSNgzyVAMKpvozZWVaKPMKyf4zNqI0qT0AakborZSlgrOY +eFbyWc+0FIU7pfuVT/ukWEBxebif5EXe+X2z4LuCoUpV/xZ2oU7LOhOAJ8Dnm6B3 +M8jwIouEMWxtIYVYVeObvI81Q8rADzERtRPDlP4gd9hwoqVTnD3u8xY3Z5cmiVCt +nJmiiQPVkXItLqZDtajVPqTF8pDySsIo/CssFdU1MWs+sBVFKM+c/Z7LpmipC7pV +pFw0B4BmKR8x51I3QSSKQ7V66IjH2WP3JwIDAQAB -----END RSA PUBLIC KEY----- dir-key-crosscert -----BEGIN ID SIGNATURE----- -DJzp0QmipBz3IJ6zWziyBEkNBPA5J6QDhq2XDFNjdq2RYcOh1hZ1D089587wP3Xg -FoQehBDQccZCrmerEegdZ89dk+QXeNWrGGVpRwp7v+ok7lRPooC1IV3BIHcLs0BQ -fm7d3kYByVl1IaY7D9mpKG6COS/WOrKEnxp75YW18KEH7oIA60c395DfEkUZvDWt -a2ba2eBizM76cFUknQNlExWkw32DNtj1Axz9QyS6IQmyGxvlA1kWL6hiIPAV16NS -E5FcU/wQHL7a7tqAM3UkuLKT3nhcbdYGcaYpbzU/4jF61bzm7ETcqqL40EMQg5Hs -y3kcXZ4ItPFBn/LISp/zCg== +Q6O+oPe4NJYj3fHXJ/nxrwI6hBeRjyYMvwYzA3fKu7ow+2jfayMHB2k1zXUpoQKq +2GphDAr55RKPEREYkNRWNcJEPWVHzVzhqZITJDeDnHZMIYU4LlUBm59xOHJfv7F2 +m8cgRTPxEzn9bg1qx5/1zMv4tSwIX40VEBYijH2nWzl6pgds/B8bRnOoTCDQ5ieP +VpxKm4qpBWA8ePsiQkVOegKKVlEFkPmQZDF7HV5EQ5cKfumWvdf5mSgXQoqhn9MQ +4DM7YSg438tx4Cqlka+dBnX9GHm7EtiFkEsNRdlOt4tAjkIUZh1vux8Qn58GZXEl +1ikQimYdlOJNLHhaS7Oxsw== -----END ID SIGNATURE----- dir-key-certification -----BEGIN SIGNATURE----- -e9OQlThM7Y1jBIvZHYsm00ZcCR4L0JRGnzPtZhPtrczAi7dT7gdLhJZSYY5BM1VU -EB24flAJXeP03BtnOuFOURaazvW7J154sVHGQf96OyuCjSOjTlDNQLc6kNL1f0WD -bIXoJ0mPfRJzGX5NmGUa3KmW7/PgNO49VJSCuQQpBmC2qzQBPTCkATehJxCfiB8p -B6toi/ODKmXtFce1J0K9TRmAEIhmA5jzxqd3JISgGx0iP1iXmnMPHESXMS8QJ13e -U4t46NbobZDCAk7xkF/DNjuu0ZSV/IFg7EbB7f/qdIGvvK9bu7Esq5FoVr8sFZ50 -jxeNBEJgNk7Z/DwmNyBODqUfWVSnOydaqRCAxyHIbHGJGHLXKOOdym4sqOBe1O4+ -lyXjp/iIcrTN8rCoKFI9uT4DZj9rzzRv2tzQYl7Iqlt1fImaPN4PAnFpG/LOMrxe -v8S85DhkLpzl5uhojmVKAp810T9ege5MqXXGMDsisUtCyXDtqeQE6xqBDvydTm1m +K2qbsfUFzUih4a5lPR4kU77F81jHQWs11NI18pwyQ/Q71eGHCfMvaHyQdGy0hJJU +I6CcMQD3AuUIQ5AFuyIgPhlsgiyHOxfq8ZiAGbrA+/5ZHB5iwn7J5rxNnVq8tO/e +P0xHKtjiDIm0bZuqw9NINclD9C7/B0fafEnZ0NsIjNQ7omMvVKhbcQgojb9d1n9E +v59LgoylFyr7V6FJFrpZwPV7nMznEdX9L4U/ZAq85M7owEUSfDQH6Ep/aJ7PH2YE +BiMSMuyLf0qqylgYUGFI0zg+GrR93pN9ajKvomAvu5BiqoEzoQNwLe24/CIGFiN6 +S9zFDki5SoZGC9w+RIK4P8YZxrxbmPGtH0UKjlI76RXoCCb0dif2snxGd+YZHUev +8wxn2jvgUZNAfT0bGKAZQZLmys2TCnKoBALR3nf/tR5stpMFM/207XJd8OykRsve +fzHmCLp0xO7Son6xG9urJ4qAOuBYcxdbAOtASNIsMtxTMhA+HqECZ+h8X5BZM9Q4 -----END SIGNATURE----- diff --git a/resources/images/tor/tor-keys/authority_identity_key b/resources/images/tor/tor-keys/authority_identity_key index e3b484bae..398beab1e 100644 --- a/resources/images/tor/tor-keys/authority_identity_key +++ b/resources/images/tor/tor-keys/authority_identity_key @@ -1,41 +1,41 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIHKjAcBgoqhkiG9w0BDAEDMA4ECBw6S2JG/GCKAgIIAASCBwgnCUGiqRPi2GZW -UBCZMd3jnzhts341Ry1AfHZgpn+kKa1gDbkTbW6aqEsmQJS/janksZnw2W+446fE -01JOo1tQ0OBdWbd++lbDv3sQLVHX4xDVB7HDnUG6ddrnTq2Dc2YS99A6E6Ss9mgp -Ua4XLFyB6gXp3QOdO5QT6Q50DGmGind2xmjqDO+fhupv/dXHh/DWgwhxFMHmqb+y -a7HTZuHOVsMDc/a6ZrGIq85l3NQIWm8+kXcNTHZidG3n6ydakZIvV6Jzh+1R1rEa -9TO9OZDUTVj2PHO95WCVJLWB7JmQINl1VZkEtcvz+LcyIegW3zr9b10026eWe0sj -ymK+CE9hh9Ia2JJA7KZOKqvgzZrWSKPF4Bu1BIRlnJ28iKmUzh25Fq28P+T0m+r/ -qvyuDxmmaDOUetUYXT8YRNd3Jfh6Fb+JNu6E35tyBloNDwQNB/WHgZiGpJ+TRSJr -7I+9v2pWZovI/7TwcZwxrLeHBRX56SD4wp26Ac7yD9RZk138EBPzHtuRww4Yo8XY -FJ0HFX/kGoFJo0GaKaWNMxcFEnefI3KxJB/fYcawTnkHFB/u8LqtjJ7n40zMsyib -jQhBQqmJ5asEarOQRrBwjRi59CvA7GHJEsl+WFTrMcpaL/UpPrAFYRtIHKVHorcI -iqtt8vVASE8Y9dfArA67FwPEhemwvVv1yPGBMewxvJkkMoNHU2NMd7lT8tQEGs9B -kTamf33NZcRjfoBw2apK2vxP8WqiardgzFZW1zNvKQCbsCcQodtjKNegh0AcVOZr -7rs2dX8dK02OPJ66/MkButMvOzxjf9Lou7nUDxo4zBE4LkWmy3gNtZwXoAHfWd60 -GNGKLyw9cK5hjEMfJobt3u/i2pRKsHxc/ZKv+aOCp8U6q/jdLW2uUYuw2bL0LVUD -K4Yu4iEpWYgQA1kXJHOxh4+3iZlmEQhF+PDD1w+M+5kysuOn0ZjG4jEwa1umVyjq -DPw59qrzG7U5ud6ZWjAys5OMM54tYFTbiRtwNkTIFZu7/gUHoPpiBSfD5qGxMcUw -ZC2NoLB6Z0ijiQLJcU52xmFlcipV6GCYAPcJOumGw+czPurSM5UvMuWb8G+UIer6 -T/iIyXYrhOWtYfGOs7pzNWx3USaZYQblnx+gHmD5LxR7YXRmwqLfadlsRATsw6Qj -q1/0hDWB+j3Ckf+alBzbSmDsX2/b43kskAZRPBpxecG4VW3HwQbDIckzFtM6NWFv -cYP2ENzeNR3Qy+8E87l0ZZPLXWXykH6Dsas94oKesTHN86LSpznODZMIMMjHntzo -IGR82pi6O+01ntcWXeJBhamy4eG0fl9Klfu6wJ3r67pe/9jHlWzl8JaulZ15+Myx -c3e/qtG3emT07diOXo+9ChalIYwvmiL87DlhoqREu+MsoYJ5NgnA6aQQA0BoeIEi -ZRjTzPjx+vNsk2leEoWEb34e+ft7ebgZEdak1zaINJpFeayBMYyFoCtdegb9wBzy -tZMgCjNDCb2hbpcvyXx+0HXPDW4iP7SP92lfaDSP2tgvaxeI+mjDfX2xGTaaAzzJ -wOV6FmwlurwCOZt8uGHJnBNoTWaMumf5oXKmFP4LYskDhto66lEgr0mbj1X3f6NR -8zRKtKxaFKDKQL8ddotamei+TxVajm+lyp349AocCQD8It7h497xi5C1NZPIFdWU -bKAKTuwf+ZWX2vt/Dli0YpObmD+hG+SKU39t9vpznJC6BmWneNkZ7BRabMdDlJPO -h6HSSkcSqkqwsCbjiu73n1Wj0tLUgdqvdEwjZdmGjCm6+tffcrYZZEUVzR8ErcCY -EGq/4tOWuhZc6UdsUh8JBMJAX35xXFDHbJBEMKaKD8flZBcnV+bgDTnTKEAJAcvD -WJgtJWRr0QN+BUXumqh8exzGJJVFbb47qJiCUSu3wm4XKWv15gZgBH0ZjpI/qnHu -QtijZz7pvNx/d6jilo4ph1esIwmmSHUfXF1IFshs6BfRnajpp0d5+44p4k6U2GhB -mv2nhp5iXvCn0v79GV1iO3MNzLYCuOwm0q+YqoFiYnS67BriWqfQdgupnE0iLINE -fD6jAhIgOIQ9GQ7SdmWGtAXNFm1INDxgxTgTbdTQcBkVoTVIefqp5Prgt76qmIrg -03MZqayUA9WIItHaKMXgvoDxnUlI4wWVQ44LQnBBxsIw+Wi6GXlqpjIYQ34ICjEi -xB7+ux/Wv12heEk+VeugvB2+ZKLQoq+dtKyNsgfc+emIPWBfufDS7bg+0g8evCYt -u6e99Mm6RJp9BGaEwAPiQfd03FbAnLJmH2I0U5P5R8h7ec0H01e/flG2wqD+/ejh -keYCQIG3obSCKj7ps0GUY496aaL1OZzqDepPzliBf59sXB3myQw7IYUxGwKenrpD -AO5X54JZORhV3fvT0QE= +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 +xhYqQ4VR8ylP25os7jI= -----END ENCRYPTED PRIVATE KEY----- diff --git a/resources/images/tor/tor-keys/authority_signing_key b/resources/images/tor/tor-keys/authority_signing_key index 7c4723395..dde8bc06b 100644 --- a/resources/images/tor/tor-keys/authority_signing_key +++ b/resources/images/tor/tor-keys/authority_signing_key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/resources/images/tor/tor-keys/ed25519_master_id_public_key b/resources/images/tor/tor-keys/ed25519_master_id_public_key deleted file mode 100644 index b05aa494f..000000000 Binary files a/resources/images/tor/tor-keys/ed25519_master_id_public_key and /dev/null differ diff --git a/resources/images/tor/tor-keys/ed25519_master_id_secret_key b/resources/images/tor/tor-keys/ed25519_master_id_secret_key deleted file mode 100644 index ccc1f8039..000000000 Binary files a/resources/images/tor/tor-keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/resources/images/tor/tor-keys/ed25519_signing_cert b/resources/images/tor/tor-keys/ed25519_signing_cert deleted file mode 100644 index b3736275e..000000000 Binary files a/resources/images/tor/tor-keys/ed25519_signing_cert and /dev/null differ diff --git a/resources/images/tor/tor-keys/ed25519_signing_secret_key b/resources/images/tor/tor-keys/ed25519_signing_secret_key deleted file mode 100644 index c65350151..000000000 Binary files a/resources/images/tor/tor-keys/ed25519_signing_secret_key and /dev/null differ diff --git a/resources/images/tor/tor-keys/secret_onion_key b/resources/images/tor/tor-keys/secret_onion_key deleted file mode 100644 index ebb57748b..000000000 --- a/resources/images/tor/tor-keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQCx44LveS/8Z72FSGfKK9gs+wDTKjYRcIuL87Vn7x7v1x9ilosj -wL5q7yNeHxKPW5V27Ax/rjMvsbZ92THsxMIQvYdpU8QlCO9QWJC8y0WS6nYZ42MP -JwUkV9ZF0Pf4HM7PNlW0VXps9c+szyCu9qK89QpLHtIheY1blxFckRrTnwIDAQAB -AoGAfDzENpHx5JtjbpGaA0XJzehjtBcX+egbXdwQhw0nEySwQ7+WX5r+olpv3g1f -fgXdhlfnhsjX8Ohx5sTpLE5ipfnGaF9y05V2GWaWv7TA1qzI2PNNrEKVz92lWF9d -Tx+m+mO5pCO67WxUdZ+RqCKZTie830SxAbTWQx25/W+6DQECQQDiySS7a4SIZYgP -qRerdftDCwxKhdQEoiyzEVVpnp32i2ZYuPr+YNvp9ImCajfSYQnrmAPH0yIrXhAS -UepAxwSBAkEAyM3cTsSzlYIknHbgRg8N8ZiVBWTgWKfZVn5D2pLOkyjezXhv3LNx -KKkynQFTF8mIqHT8VW8f76rzxlCQLT1IHwJAQJedmKv04YxZhmxYy4Mc/2lkJM2d -J3yxUoc7VovQ3emySs7U3iLkP+xgRf7Oy2LMGof/e6iM8OEnnrAqEi0dAQJAC6Sk -GY0ePJUHOmtKJcXJsTB/s4hd2cYhu/omRQ4uHCpKgO9yzQE6lnj5DlF9V+u/mMTv -vKRs3aCz8dPKCFV9UQJATrpPkJorFlp323nxn3bCIXu/0n2iFDhk/GZoZYIe7Zqt -12Puw3Gi6PlVRd67Cf9IVdXYBeQurOgj5ZGM8jpxOw== ------END RSA PRIVATE KEY----- diff --git a/resources/images/tor/tor-keys/secret_onion_key_ntor b/resources/images/tor/tor-keys/secret_onion_key_ntor deleted file mode 100644 index d1ed0e48d..000000000 Binary files a/resources/images/tor/tor-keys/secret_onion_key_ntor and /dev/null differ diff --git a/resources/images/tor/torrc b/resources/images/tor/torrc deleted file mode 100644 index e1b3bf675..000000000 --- a/resources/images/tor/torrc +++ /dev/null @@ -1,34 +0,0 @@ -# Common -Log err file /var/log/tor/debug.log -DataDirectory /home/debian-tor/.tor/ -RunAsDaemon 1 -ControlPort 9051 -CookieAuthentication 1 -CookieAuthFileGroupReadable 1 -DataDirectoryGroupReadable 1 -TestingTorNetwork 1 -ClientUseIPv6 0 -ClientUseIPv4 1 - -# Relay -DirAuthority orport=9001 no-v2 v3ident=15E09A6BE3619593076D8324A2E1DBEEAD4539CD 100.20.15.18:9030 03E942A4F12D85B2CF7CBA4E910F321AE98EC233 -AssumeReachable 1 -ExitRelay 0 - -# Reduce resource usage -CircuitPadding 0 -MaxMemInQueues 10 Mbytes -BridgeRecordUsageByCountry 0 -DirReqStatistics 0 -ExtraInfoStatistics 0 -HiddenServiceStatistics 0 -OverloadStatistics 0 -PaddingStatistics 0 -# BandwidthBurst 10 Mbytes -# BandwidthRate 10 Mbytes -ConstrainedSockets 1 -ConstrainedSockSize 8192 Bytes -NumEntryGuards 1 -NumDirectoryGuards 1 - -# `Address ` will be added by docker_entrypoint.sh