add default timeouts to curl and requests calls

firefox-relay-tools/fxrelay-add

@@ -8,6 +8,7 @@ then
 fi
 
 curl -f -S -s https://relay.firefox.com/api/v1/relayaddresses/ \
+	-m 60 \
 	-H "Authorization: Token $FXRELAY_TOKEN" \
 	-H "content-type: application/json" \
 	-d "{\"enabled\": true, \"block_list_emails\": false, \"description\": \"${1-}\"}"

firefox-relay-tools/fxrelay-delete

@@ -27,5 +27,6 @@ fi
 
 curl -f -S -s https://relay.firefox.com/api/v1/relayaddresses/"$1"/ \
 	-X DELETE \
+	-m 60 \
 	-H "Authorization: Token $FXRELAY_TOKEN" \
 	-H "content-type: application/json"

firefox-relay-tools/fxrelay-list

@@ -8,4 +8,5 @@ then
 fi
 
 curl -f -S -s https://relay.firefox.com/api/v1/relayaddresses/ \
+	-m 60 \
 	-H "Authorization: Token $FXRELAY_TOKEN"

firefox-relay-tools/fxrelay-set-block

@@ -42,6 +42,7 @@ esac
 
 curl -f -S -s https://relay.firefox.com/api/v1/relayaddresses/"$1"/ \
 	-X PATCH \
+	-m 60 \
 	-H "Authorization: Token $FXRELAY_TOKEN" \
 	-H "content-type: application/json" \
 	-d "$json"

gotify-tools/gotify-push.py

@@ -15,6 +15,7 @@
 parser.add_argument("-t", "--title")
 parser.add_argument("-p", "--priority", type=int, default=0)
 parser.add_argument("-e", "--extra", action="append", metavar="NAMESPACE::ACTION::KEY=VALUE", default=[])
+parser.add_argument("--timeout", type=int, default=60)
 parser.add_argument("message", nargs="+")
 args = parser.parse_args()
 
@@ -48,7 +49,9 @@
 }
 
 # request
-response = session.post(urljoin(args.url, "message"), json=pdata)
+response = session.post(
+	urljoin(args.url, "message"), json=pdata, timeout=args.timeout,
+)
 response.raise_for_status()
 
 print(json.dumps(response.json(), indent=2))

gotify-tools/gotify-push.sh

@@ -31,6 +31,7 @@ jsonstr () {
 
 PRIORITY=1
 TITLE=
+TIMEOUT=60
 
 while getopts p:u:k:K:t: f
 do
@@ -85,6 +86,7 @@ TITLE=$(printf %s "$TITLE" | jsonstr)
 
 curl \
 	-s -S -f \
+	-m "$TIMEOUT" \
 	-H 'Content-Type: application/json' \
 	-H "X-Gotify-Key: $GOTIFY_TOKEN" \
 	-d "{\"message\": \"$message\", \"title\": \"${TITLE}\", \"priority\": ${PRIORITY}}" \

hibp/hibp

@@ -15,7 +15,7 @@ import requests
 def verify(pass_cb=getpass, prompt='Password to check on HIBP: '):
     expected = hashlib.sha1(pass_cb(prompt).encode('utf-8')).hexdigest().upper()
     url = 'https://api.pwnedpasswords.com/range/%s' % expected[:5]
-    hashes = requests.get(url).text.split()
+    hashes = requests.get(url, timeout=60).text.split()
     for h in hashes:
         h = expected[:5] + h.upper()
         if h.startswith(expected):

links2markdown/links2markdown.py

@@ -45,6 +45,7 @@ def fetch_title(url):
             headers={
                 "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0",
             },
+            timeout=120,
         )
     except requests.exceptions.RequestException:
         return None