Configure hidden services as non-anonymous

Jim Newsomerequested to merge
single-hop into main

Hopefully this will speed them up a bit.

Merge request reports

.gitlab-ci.yml

+11 −3
Changes for .gitlab-ci.yml: 11 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -378,13 +378,21 @@ tornettools-stage: 
    # Serve cache volume over onion service to access previous runs's caches

    # (workaround pending access to runner host machine).

    - apt install -y tor # Use stock tor

    # Single hop, non-anonymous, services

    - echo "SocksPort 0" >> /etc/tor/torrc

    - echo "HiddenServiceNonAnonymousMode 1" >> /etc/tor/torrc

    - echo "HiddenServiceSingleHopMode 1" >> /etc/tor/torrc

    # Cache service

    - echo "HiddenServiceDir /var/lib/tor/cache/" >> /etc/tor/torrc

    - echo "HiddenServicePort 80 127.0.0.1:8080" >> /etc/tor/torrc

    - (cd /cache/jnewsome/sponsor-61-sims && python3 -m http.server 8080) &

    - (cd /cache/jnewsome/sponsor-61-sims && python3 -m http.server 8080) &> cache-http.log &

    # simdir service

    - echo "HiddenServiceDir /var/lib/tor/simdir/" >> /etc/tor/torrc

    - echo "HiddenServicePort 80 127.0.0.1:8081" >> /etc/tor/torrc

    - (cd $(dirname $SIMDIR) && python3 -m http.server 8081) &

    - /usr/bin/tor &

    - (cd $(dirname $SIMDIR) && python3 -m http.server 8081) &> simdir-http.log &

    # Run tor

    - /usr/bin/tor &> tor.log &

    # Print hostnames once they've appeared

    - while [ ! -f /var/lib/tor/cache/hostname ]; do echo "Waiting for cache service"; sleep 1; done

    - 'echo Cache service: $(cat /var/lib/tor/cache/hostname)'

    - while [ ! -f /var/lib/tor/simdir/hostname ]; do echo "Waiting for simdir service"; sleep 1; done