webadmin/okaeri-timings
1
0
Fork 0
mirror of https://github.com/OkaeriPoland/okaeri-timings.git synced 2026-01-18 03:28:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace amazon IP source with noproxy, add asn/provider/country to the metadata

Browse Source
This commit is contained in:
Sandra
2022-01-30 01:03:14 +01:00
parent 6030764f18
commit 4974c00a26
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/public/otimings.sh
View File

@@ -10,12 +10,23 @@ with_fallback() {
} }
print_metadata() { print_metadata() {
noproxyout=$(curl -s https://noproxy-api.okaeri.eu/v1/me)
ip=$(echo "$noproxyout" | grep -oP '"ip":(\s+)?"([^"\\]|\\.)*",?' | awk -F '"' '{print $4}')
asn=$(echo "$noproxyout" | grep -oP '"asn":(\s+)?([0-9]+),?' | grep -oP '[0-9]+')
provider=$(echo "$noproxyout" | grep -oP '"provider":(\s+)?"([^"\\]|\\.)*",?' | awk -F '"' '{print $4}')
country=$(echo "$noproxyout" | grep -oP '"country":(\s+)?"([^"\\]|\\.)*",?' | awk -F '"' '{print $4}')
echo "#" echo "#"
echo "# Okaeri Timings 1.0" echo "# Okaeri Timings 1.0"
echo "#" echo "#"
echo "# User: $(with_fallback "<Unknown>" $(whoami))" echo "# User: $(with_fallback "<Unknown>" $(whoami))"
echo "# Hostname: $(with_fallback "<Unknown>" $(hostname))" echo "# Hostname: $(with_fallback "<Unknown>" $(hostname))"
echo "# IP: $(with_fallback "<Unknown>" $(curl -s https://checkip.amazonaws.com/))" echo "#"
echo "# IP: $(with_fallback "<Unknown>" $ip)"
echo "# ASN: $(with_fallback "<Unknown>" $asn)"
echo "# Provider: $(with_fallback "<Unknown>" $provider)"
echo "# Country: $(with_fallback "<Unknown>" $country)"
echo "#" echo "#"
echo "# Kernel: $(with_fallback "<Unknown>" $(uname -r))" echo "# Kernel: $(with_fallback "<Unknown>" $(uname -r))"
echo "# OS: $(with_fallback "<Unknown>" $(cat /etc/os-release | grep PRETTY_NAME | awk -F '"' '{print $2}'))" echo "# OS: $(with_fallback "<Unknown>" $(cat /etc/os-release | grep PRETTY_NAME | awk -F '"' '{print $2}'))"