Skip to content

Commit 072aeca

Browse files
authored
Merge pull request #720 from pinheadmz/onion-2025
🧅🧅🧅
2 parents a5dfebf + 427cd08 commit 072aeca

31 files changed

+586
-1
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
- logging_test.py
4343
- ln_basic_test.py
4444
- ln_test.py
45+
- onion_test.py
4546
- plugin_test.py
4647
- rpc_test.py
4748
- services_test.py

resources/charts/bitcoincore/templates/pod.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ spec:
9898
value: {{ .Values.metrics }}
9999
{{- end }}
100100
{{- end}}
101+
{{- with .Values.extraContainers }}
102+
{{- toYaml . | nindent 4 }}
103+
{{- end }}
101104
volumes:
102105
{{- with .Values.volumes }}
103106
{{- toYaml . | nindent 4 }}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM debian:bookworm-slim
2+
ENV DEBIAN_FRONTEND=noninteractive
3+
4+
RUN apt-get update && apt-get install -y tor iproute2 dnsutils
5+
6+
RUN mkdir -p /home/debian-tor/.tor/keys
7+
RUN chown -R debian-tor:debian-tor /home/debian-tor
8+
RUN mkdir -p /var/log/tor
9+
RUN chown -R debian-tor:debian-tor /var/log/tor
10+
11+
COPY ./tor-keys /home/debian-tor/.tor/keys
12+
RUN chown -R debian-tor:debian-tor /home/debian-tor/.tor/keys
13+
COPY ./torrc.da /etc/tor/torrc
14+
15+
COPY ./tor-entrypoint.sh /entrypoint.sh
16+
17+
ENTRYPOINT ["/entrypoint.sh"]
18+
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM debian:bookworm-slim
2+
ENV DEBIAN_FRONTEND=noninteractive
3+
4+
RUN apt-get update && apt-get install -y tor iproute2 dnsutils
5+
6+
RUN mkdir -p /home/debian-tor/.tor
7+
RUN chown -R debian-tor:debian-tor /home/debian-tor
8+
RUN mkdir -p /var/log/tor
9+
RUN chown -R debian-tor:debian-tor /var/log/tor
10+
11+
12+
COPY ./torrc.relay /etc/tor/torrc
13+
14+
COPY ./tor-entrypoint.sh /entrypoint.sh
15+
16+
ENTRYPOINT ["/entrypoint.sh"]

resources/images/tor/build-tor.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
SCRIPT_PATH="$(realpath "${BASH_SOURCE[0]}")"
2+
3+
docker buildx build \
4+
--platform linux/amd64,linux/arm64,linux/armhf \
5+
--push \
6+
-t bitcoindevproject/tor-da:latest \
7+
-f ./resources/images/tor/Dockerfile_tor_da \
8+
./resources/images/tor/
9+
10+
docker buildx build \
11+
--platform linux/amd64,linux/arm64,linux/armhf \
12+
--push \
13+
-t bitcoindevproject/tor-relay:latest \
14+
-f ./resources/images/tor/Dockerfile_tor_relay \
15+
./resources/images/tor/
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
set -e
3+
4+
echo "Starting tor-entrypoint.sh"
5+
6+
IP_ADDR=$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)
7+
8+
until TORDA_IP=$(dig +short torda.default.svc.cluster.local); do
9+
echo "Waiting for DNS: torda"
10+
sleep 2
11+
done
12+
13+
echo "My IP address: $IP_ADDR"
14+
echo "Directory Authority IP address: $TORDA_IP"
15+
16+
echo "Address $IP_ADDR" >> /etc/tor/torrc
17+
echo "DirAuthority orport=9001 no-v2 v3ident=15E09A6BE3619593076D8324A2E1DBEEAD4539CD $TORDA_IP:9030 03E942A4F12D85B2CF7CBA4E910F321AE98EC233" >> /etc/tor/torrc
18+
19+
cat /etc/tor/torrc
20+
21+
su -s /bin/sh debian-tor -c 'tor'
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
dir-key-certificate-version 3
2+
fingerprint 15E09A6BE3619593076D8324A2E1DBEEAD4539CD
3+
dir-key-published 2023-09-08 18:28:10
4+
dir-key-expires 2025-09-08 18:28:10
5+
dir-identity-key
6+
-----BEGIN RSA PUBLIC KEY-----
7+
MIIBigKCAYEAs1eKRRP+mWy2XpLbkY3dPkEfdKIfPMDDiG3o/Xu0c3fin1aJ32uG
8+
BY3PGtwS2KQZHEJETjSaACq+2x9+fb4RV5bWhaptbt6l7dvDn15NbEklnkV3sx86
9+
VxiKqybUp5IQ3cNkM0AxUmQ1M/N+zzIe95T1XplaHVBSQN4xhJgYlDkDkNexIHpP
10+
0uFxjO+2hro3cMRotjqR6xZw5OWKVJh5Is8jiSUs57xomeUy5HaUsADw46b88Ff9
11+
iVfTP975jzuFF7H0kKOxRpIZGRnfnuDdAtYXWHYXtIVwKBdSeHeK/N53++kxtGET
12+
AcyWoHqO2xlvhtPbiKLHkwq0nNFFfwnhgJJSWHqYs6YI300pEMRHJMFWNsZwgwVE
13+
dplmxnOLv9/TnJsD06d+kc05/JTfZXE/3JFs4rMci0jIhMlw+HtFfRwpDMjGI00u
14+
VyADI0DMYTFWr+wFWrhs5N17BdQVSZUZlfxL5trZFdQpUZhxuKJowNLV1EdWzHFJ
15+
srwV+C0LLWr/AgMBAAE=
16+
-----END RSA PUBLIC KEY-----
17+
dir-signing-key
18+
-----BEGIN RSA PUBLIC KEY-----
19+
MIIBCgKCAQEAyARJ1Nano6bZsTf3UplBhaP8BfrhvDLrJmmk8x4sAot0aHPG/eOH
20+
qGak3y3CM1I+uxozyE58w9mBOuueUIzZelUZVjgg91dsqT5/3lIYEhB4riV29Of0
21+
AJeh2uibEVrv1ecXo5HYFKEcCHMRTvZaWIWSKjV6TPqPbpXhDBwIcZ+/tHpAml8h
22+
CfGMFRYIEmisNL9xjoNU1R4Iyu07xQw85+xeMU/9UJgsXnvkqkAPbAhwxZq9/8yj
23+
/9V4jcE5NR0KdDuPblEcD5ZNjMckUeTzuVDLgdsazOROD05zaTx8kP1UixJdon8Z
24+
oJ/fsNWsgpzNv6ns8BIwwEAOnd7seXlmfQIDAQAB
25+
-----END RSA PUBLIC KEY-----
26+
dir-key-crosscert
27+
-----BEGIN ID SIGNATURE-----
28+
DJzp0QmipBz3IJ6zWziyBEkNBPA5J6QDhq2XDFNjdq2RYcOh1hZ1D089587wP3Xg
29+
FoQehBDQccZCrmerEegdZ89dk+QXeNWrGGVpRwp7v+ok7lRPooC1IV3BIHcLs0BQ
30+
fm7d3kYByVl1IaY7D9mpKG6COS/WOrKEnxp75YW18KEH7oIA60c395DfEkUZvDWt
31+
a2ba2eBizM76cFUknQNlExWkw32DNtj1Axz9QyS6IQmyGxvlA1kWL6hiIPAV16NS
32+
E5FcU/wQHL7a7tqAM3UkuLKT3nhcbdYGcaYpbzU/4jF61bzm7ETcqqL40EMQg5Hs
33+
y3kcXZ4ItPFBn/LISp/zCg==
34+
-----END ID SIGNATURE-----
35+
dir-key-certification
36+
-----BEGIN SIGNATURE-----
37+
e9OQlThM7Y1jBIvZHYsm00ZcCR4L0JRGnzPtZhPtrczAi7dT7gdLhJZSYY5BM1VU
38+
EB24flAJXeP03BtnOuFOURaazvW7J154sVHGQf96OyuCjSOjTlDNQLc6kNL1f0WD
39+
bIXoJ0mPfRJzGX5NmGUa3KmW7/PgNO49VJSCuQQpBmC2qzQBPTCkATehJxCfiB8p
40+
B6toi/ODKmXtFce1J0K9TRmAEIhmA5jzxqd3JISgGx0iP1iXmnMPHESXMS8QJ13e
41+
U4t46NbobZDCAk7xkF/DNjuu0ZSV/IFg7EbB7f/qdIGvvK9bu7Esq5FoVr8sFZ50
42+
jxeNBEJgNk7Z/DwmNyBODqUfWVSnOydaqRCAxyHIbHGJGHLXKOOdym4sqOBe1O4+
43+
lyXjp/iIcrTN8rCoKFI9uT4DZj9rzzRv2tzQYl7Iqlt1fImaPN4PAnFpG/LOMrxe
44+
v8S85DhkLpzl5uhojmVKAp810T9ege5MqXXGMDsisUtCyXDtqeQE6xqBDvydTm1m
45+
-----END SIGNATURE-----
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
-----BEGIN ENCRYPTED PRIVATE KEY-----
2+
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
40+
AO5X54JZORhV3fvT0QE=
41+
-----END ENCRYPTED PRIVATE KEY-----
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEpAIBAAKCAQEAyARJ1Nano6bZsTf3UplBhaP8BfrhvDLrJmmk8x4sAot0aHPG
3+
/eOHqGak3y3CM1I+uxozyE58w9mBOuueUIzZelUZVjgg91dsqT5/3lIYEhB4riV2
4+
9Of0AJeh2uibEVrv1ecXo5HYFKEcCHMRTvZaWIWSKjV6TPqPbpXhDBwIcZ+/tHpA
5+
ml8hCfGMFRYIEmisNL9xjoNU1R4Iyu07xQw85+xeMU/9UJgsXnvkqkAPbAhwxZq9
6+
/8yj/9V4jcE5NR0KdDuPblEcD5ZNjMckUeTzuVDLgdsazOROD05zaTx8kP1UixJd
7+
on8ZoJ/fsNWsgpzNv6ns8BIwwEAOnd7seXlmfQIDAQABAoIBAAm+YGdgfpb5EOfy
8+
cUICP8AgzS1Fu7s/4sHYCdD4cmM8WRMhOBDUWvPamOOwtmIVeq4Bgy4Z7reEEBN8
9+
o2rKoGnhHTnHRF8wOyr30GGrmksU/NVaSLQlBuIEK6kURZY/7xOP7VBKpvNYUYXd
10+
hHrA2Fqxb72j0HL8DhfbGspiJOIotHMHVKcPN/qb7pEPg9UOlapE8HjZf+G82l0f
11+
CPo3tLSOVCQdn4y4DSFbC/KlwVmvcJYEdBfs/XdjbGN0ytEcLihFgoPKnLDqnl3U
12+
jy5VVL0VO1yY9r7Vq9UmKPfWnwntAE3P5FZv/ZnYSIMNG0JYGKVzSOdco8X3qyTX
13+
69I87LECgYEA/0zcKCzRDOu8gUPAQjttSKeFXoR0uJMonMwiGWm8mhsuB8B+Tzqn
14+
vL3zPSdfjnhhQVmLhhVLOJddKcg8gWECmu3UB/hX9hm/J8sZ355/pdEs+zOkw6WB
15+
MHWXZ+JsqCflGMQKB1GCvnA00IfQnHBC2K6oVkMhSjh6eWU8IrYpU20CgYEAyJCj
16+
C7UOxGFbS/7814j3w0B3niHCzYa0td5aYo8AvT8t6fC6Suba9wqt0qfcGbDGXMpq
17+
O9yL5+SbQohm/nd7brGQfOKzpgqjHhpXctRgvBGqSHpJ0yhKDQJ8L5cfW3JHiArh
18+
fQ2YvgSc03Y3RIRmj4OVfV1647cbLdWAPCDsZVECgYEAhaSzfuhvCseAp15TD5jS
19+
TX08SM0n2NNYKDSICSubykQ+JVq0BD+dPSVmZnXtBMSpjK8WZbtR5C8AWvXyDnw9
20+
A+NJ4l4zlaXGtksQoUn0YlYMqPdQ4gYKidaUypHx9VjlCcDdyxT1T0GntB3Uq3/s
21+
zkcn4fhEPfkwy8md4EHhgkUCgYARxwg8tGq/q2V9QffFXwWfD+rKYHG05/jCmhfm
22+
3ogRPjVipAzPMNE9znuDzY8r08hxVxu9fJoGDvRYHGEMsyiEskZ9W1bTI+Q7edhA
23+
fGSqpuIyFGzQw6R0rMC3Myz7XRDMFTLRc9ATH7OK5tKVRysUE3S/rPaEkqldEayR
24+
J9XsUQKBgQCBidpMXIxmL0DLaOX45h7l9QWK2g0l6zWhmE1XjJ+fBbkyE1jLcnaN
25+
fPvWJEATyKn/7hbwe+ay+bp04U+jwK37XoRmHCCA+WdNlfkO8qGY+RDDVH62WKS9
26+
MC5pE3n4didM8kSm1OCDBHWEL3tUPoLs09zHauaqnGFy8KYAN7Y5JA==
27+
-----END RSA PRIVATE KEY-----
Binary file not shown.

0 commit comments

Comments
 (0)