fetch-uri: Use tor whitelist, disable curl globbing. - annna - Annna the nice f… | |
git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws6… | |
Log | |
Files | |
Refs | |
Tags | |
README | |
--- | |
commit f4e2b6a01fa82272722c9d243087545af94ca961 | |
parent b4fac2254b27c24c21d6c57103f7e1918e6f24c1 | |
Author: eidolon <?> | |
Date: Fri, 18 Oct 2024 13:41:31 -0400 | |
fetch-uri: Use tor whitelist, disable curl globbing. | |
Signed-off-by: Annna Robert-Houdin <[email protected]> | |
Diffstat: | |
M fetch-uri | 21 +++++++++++---------- | |
A modules/tor/whitelist-from-tor | 2 ++ | |
2 files changed, 13 insertions(+), 10 deletions(-) | |
--- | |
diff --git a/fetch-uri b/fetch-uri | |
@@ -19,13 +19,14 @@ then | |
shift | |
fi | |
- | |
- | |
-curl \ | |
- --preproxy socks5h://127.0.0.1:9050 \ | |
- -s \ | |
- -L --max-redirs 3 \ | |
- -m 5 \ | |
- -H "User-Agent: $(http-user-agent)" \ | |
- $opth \ | |
- "$1" 2>/dev/null | |
+uri="$1" | |
+usetor="" | |
+ua="$(http-user-agent)" | |
+beg="${uri#*://}" | |
+beg="${beg:?}" | |
+case "$beg" in | |
+ */*) host="${beg%%/*}" ;; | |
+ *) host="$beg" | |
+esac | |
+grep -qx "$host" "/home/annna/bin/modules/tor/whitelist-from-tor" || usetor=1 | |
+curl -qgsm 5 -L --max-redirs 3 -A "$ua" $opth ${usetor:+--preproxy socks5h://1… | |
diff --git a/modules/tor/whitelist-from-tor b/modules/tor/whitelist-from-tor | |
@@ -0,0 +1,2 @@ | |
+www.forgottenweapons.com | |
+forgottenweapons.com |