add proper handling of exceptions raised by network procedures

This commit is contained in:
2025-09-06 16:41:42 -07:00
parent dbaa44190f
commit dbe6bbf43b
2 changed files with 84 additions and 51 deletions

View File

@@ -82,6 +82,14 @@
(define/private (get url) (define/private (get url)
(define (iter url depth) (define (iter url depth)
(with-handlers
([exn:fail:network?
(λ (exn)
(displayln (exn-message exn)))]
[net:exn:fail:response?
(λ (exn)
(displayln (exn-message exn)))])
(let-values ([(status header c-in) (net:request url)]) (let-values ([(status header c-in) (net:request url)])
;; TODO there are bunch of other status codes to deal with for ;; TODO there are bunch of other status codes to deal with for
;; compliance ;; compliance
@@ -140,6 +148,6 @@
;; 60-69 CERTIFICATE REQUIRED ;; 60-69 CERTIFICATE REQUIRED
[(and (>= status 60) [(and (>= status 60)
(<= status 69)) (<= status 69))
(displayln "certificate handling not yet implemented")]))) (displayln "certificate handling not yet implemented")]))))
(iter url 5)))) (iter url 5))))

33
net.rkt
View File

@@ -1,11 +1,14 @@
#lang racket #lang racket
(provide (contract-out (provide (contract-out
[request (-> url? (values integer? string? input-port?))])) [request (-> url? (values integer? string? input-port?))])
(struct-out exn:fail:response))
(require openssl) (require openssl)
(require net/url-string) (require net/url-string)
;; ssl-connect may raise (by way of tcp-connect) exn:fail:network
;; read-response may raise exn:fail:network:gemini
(define (request url) (define (request url)
(define-values (c-in c-out) (define-values (c-in c-out)
(ssl-connect (url-host url) (ssl-connect (url-host url)
@@ -19,13 +22,30 @@
(values status header c-in)) (values status header c-in))
(struct exn:fail:response exn:fail ()
#:extra-constructor-name make-exn:fail:response
#:transparent)
(define (raise-response-error name message response)
(raise (make-exn:fail:response
(format (string-append "~a: ~a~n"
" response: ~a")
(symbol->string name)
message
(if (> (string-length response) 20)
(format "~a... (truncated)" (substring response 0 20))
response))
(current-continuation-marks))))
(define (read-response (c-in (current-input-port))) (define (read-response (c-in (current-input-port)))
(define maxlen 1027) (define maxlen 1027)
(let ([header (peek-string maxlen 0 c-in)]) (let ([header (peek-string maxlen 0 c-in)])
(if (not (string-contains? header "\r\n")) (if (not (string-contains? header "\r\n"))
(error "header exceeds maximum length") (raise-response-error 'read-response
"header exceeds maximum length"
header)
(let ([header (read-line c-in 'return-linefeed)]) (let ([header (read-line c-in 'return-linefeed)])
(define-values (status meta) (define-values (status meta)
@@ -35,10 +55,15 @@
(cond (cond
[(> (string-length status) 2) [(> (string-length status) 2)
(error "status code exceeds maximum length")] (raise-response-error 'read-response
"status code exceeds maximum length"
header)]
[(andmap (compose not char-numeric?) (string->list status)) [(andmap (compose not char-numeric?) (string->list status))
(error "status code is not numeric")] (raise-response-error 'read-response
"status code not numeric"
header)]
[else [else
(values (string->number status) meta)]))))) (values (string->number status) meta)])))))