edit testing script

documentation/dev-portal/src/events/37c3/faq.md

@@ -4,7 +4,9 @@ Besides the FAQ for CCC 2023 event listed below, you can have a look at [Nym gen
 
 ## NymVPN
 
-Make sure you read [NymVPV webpage](https://nymvpn.com/en) and our [guide to install, run and test](./nym-vpn.md) the client. 
+Make sure you read [NymVPN webpage](https://nymvpn.com/en), the official NymVPN [support & FAQ page](https://nymvpn.com/en/support) and our guide on how to [install, run and test](./nym-vpn.md) the client.
+
+Below are some extra FAQ's which came out during the event.
 
 ### What's the difference between 2-hops and 5-hops
 

documentation/dev-portal/src/events/37c3/nym-vpn.md

@@ -21,7 +21,7 @@ Users can switch to 2-hop only mode, which is a faster but less private option.
 The client can optionally do the first connection to the entry gateway using Wireguard. NymVPN uses Mullvad libraries for wrapping `wireguard-go` and to setup local routing rules to route all traffic to the TUN virtual network device.
 
 ```admonish warning
-NymVPN is an experimental software and it's for [testing](./nym-vpn.md#testing) purposes only. All users testing the client are expected to sign GDPR Information Sheet and Consent Form, available [here](https://opnform.com/forms/nymvpn-user-research-at-37c3-yccqko).
+NymVPN is an experimental software and it's for [testing](./nym-vpn.md#testing) purposes only. All users testing the client are expected to sign GDPR Information Sheet and Consent Form (shared at the event), and follow the steps listed in the form [*NymVPN User research at 37c3*](https://opnform.com/forms/nymvpn-user-research-at-37c3-yccqko).
 ```
 
 ## Goals
@@ -237,7 +237,39 @@ nym-vpn-tests
 ```sh
 #!/bin/bash
 
-NEW_ENDPOINT="https://nymvpn.com/en/ccc/api/gateways"
+ENDPOINT="https://sandbox-nym-api1.nymtech.net/api/v1/gateways/described"
+json_array=()
+
+data=$(curl -s "$ENDPOINT" | jq -c '.[] | {host: .bond.gateway.host, hostname: .self_described.host_information.hostname, identity_key: .bond.gateway.identity_key, exitGateway: .self_described.ip_packet_router.address}')
+
+while IFS= read -r entry; do
+    host=$(echo "$entry" | jq -r '.host')
+    hostname=$(echo "$entry" | jq -r '.hostname')
+    identity_key=$(echo "$entry" | jq -r '.identity_key')
+    exit_gateway_address=$(echo "$entry" | jq -r '.exitGateway // empty')
+    valid_ip=$(echo "$host")
+
+    if [ -n "$exit_gateway_address" ]; then
+        exit_gateway="{\"address\": \"${exit_gateway_address}\"}"
+    else
+        exit_gateway="{}"
+    fi
+
+    if [[ $valid_ip =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        country_info=$(curl -s "http://ipinfo.io/${valid_ip}/country" | tr -d '\n')
+        country_info_escaped=$(echo "$country_info" | tr -d '\n' | jq -aRs . | tr -d '"')
+    else
+        country_info_escaped=""
+    fi
+
+    json_object="{\"hostname\": \"${hostname}\", \"identityKey\": \"${identity_key}\", \"exitGateway\": ${exit_gateway}, \"location\": \"${country_info_escaped}\"}"
+    json_array+=("$json_object")
+done < <(echo "$data")
+
+if [ $? -ne 0 ]; then
+    echo "Error fetching data from endpoint"
+    exit 1
+fi
 
 download_file() {
     local file_url=$1
@@ -261,12 +293,6 @@ if ! command -v jq &>/dev/null; then
     exit 1
 fi
 
-data=$(curl -s "$NEW_ENDPOINT")
-if [ $? -ne 0 ]; then
-    echo "Error fetching data from endpoint"
-    exit 1
-fi
-
 temp_log_file="temp_log.txt"
 
 perform_tests() {
@@ -316,7 +342,7 @@ read -p "enter a gateway ID: " identity_key
 read -p "enter an exit address: " exit_address
 
 # starting nymVpn
-sudo ./nym-vpn-cli -c sandbox.env --entry-gateway-id "$identity_key" --exit-router-address "$exit_address" --enable-two-hop >"$temp_log_file" 2>&1 &
+sudo ./nym-vpn-cli-test -c sandbox.env --entry-gateway-id "$identity_key" --exit-router-address "$exit_address" --enable-two-hop >"$temp_log_file" 2>&1 &
 
 timeout=15
 start_time=$(date +%s)
@@ -338,6 +364,7 @@ echo "terminating nym-vpn-cli..."
 pkill -f './nym-vpn-cli'
 sleep 5
 rm -f "$temp_log_file"
+
 ```
 
 ## Troubleshooting