Update probetest snowflake bridgeline & dependencies

shelikhoorequested to merge
shelikhoo/probeobserver:dev-update-snowflake-bridgeline-2024-oct-16 into main

Ideally this bridge line & dependencies update should be automated, that being said, it makes sense to update this bridge line now.

Edited by shelikhoo

Merge request reports

Dockerfile

+4 −4
Changes for Dockerfile: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line 
FROM golang:1.21-bullseye as builder

FROM golang:1.23-bullseye as builder



COPY . /bridgetest/
@@ -13,16 +13,16 @@ RUN git clone https://gitlab.torproject.org/tpo/anti-censorship/connectivity-mea 
        

RUN git clone https://github.com/v2fly/v2ray-core.git \

        && cd v2ray-core \

        && git checkout v5.11.0 \

        && git checkout v5.20.0 \

        && go get -d && go build -ldflags="-s -w" -o v2ray github.com/v2fly/v2ray-core/v5/main && mv v2ray /usr/bin/v2ray



RUN cd /bridgetest/stun-test && go get -d && go build -ldflags="-s -w" -o stun-test



FROM debian:bullseye-slim

FROM debian:stable-slim



#install python

RUN apt-get update && apt-get install -y wget tcpdump \

    python3 python3-stem tor obfs4proxy python2&& apt-get clean

    python3 python3-stem tor obfs4proxy&& apt-get clean



COPY --from=builder /usr/bin/snowflake /usr/bin/snowflake

probetest.sh

+2 −2
Changes for probetest.sh: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ case $CASE in 
        # First test reachability of STUN servers

        "$dirname/stun-test/stun-test"

        # Throughput/reachibility test of 10 snowflakes

        export SNOWFLAKE_BRIDGELINE="snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com fronts=foursquare.com,github.githubassets.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"

        export SNOWFLAKE_BRIDGELINE="snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"

        export SNOWFLAKE_BRIDGENAME=snowflake1

        "$dirname/snowflaketest"

        

        export SNOWFLAKE_BRIDGELINE="snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com fronts=foursquare.com,github.githubassets.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"

        export SNOWFLAKE_BRIDGELINE="snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"

        export SNOWFLAKE_BRIDGENAME=snowflake2

        "$dirname/snowflaketest"