Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Bearer Authorization #142

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat: Bearer Authorization #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 37 additions & 18 deletions request.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,14 @@ headers of the chunked stream \(if any) as a second value."
form-data
cookie-jar
basic-authorization
bearer-authorization
(user-agent :drakma)
(accept "*/*")
range
(proxy *default-http-proxy*)
(no-proxy-domains *no-proxy-domains*)
proxy-basic-authorization
proxy-bearer-authorization
real-host
additional-headers
(redirect 5)
Expand Down Expand Up @@ -374,7 +376,11 @@ according to the `Set-Cookie' header\(s) sent back by the server.

BASIC-AUTHORIZATION, if not NIL, should be a list of two strings
\(username and password) which will be sent to the server for
basic authorization. USER-AGENT, if not NIL, denotes which
basic authorization. BEARER-AUTHORIZATION, if not NIL, should be a
string which will be sent to the server for bearer authorization.
You can only supply one of both.

USER-AGENT, if not NIL, denotes which
`User-Agent' header will be sent with the request. It can be one
of the keywords :DRAKMA, :FIREFOX, :EXPLORER, :OPERA, or :SAFARI
which denote the current version of Drakma or, in the latter four
Expand All @@ -395,11 +401,13 @@ server through which the request should be sent. Or it can be a
list of two values - a string denoting the proxy server and an
integer denoting the port to use \(which will default to 80
otherwise). Defaults to *default-http-proxy*.
PROXY-BASIC-AUTHORIZATION is used like
BASIC-AUTHORIZATION, but for the proxy, and only if PROXY is
true. If the host portion of the uri is present in the
*no-proxy-domains* or the NO-PROXY-DOMAINS list then the proxy
setting will be ignored for this request.
PROXY-BASIC-AUTHORIZATION is used like BASIC-AUTHORIZATION, but for
the proxy, and only if PROXY is true. PROXY-BEARER-AUTHORIZATION
is used like BEARER-AUTHORIZATION, but for the proxy, and only if
PROXY is true. You can only supply either PROXY-BASIC-AUTHORIZATION
or PROXY-BEARER-AUTHORIZATION. If the host portion of the uri is
present in the *no-proxy-domains* or the NO-PROXY-DOMAINS list then
the proxy setting will be ignored for this request.

If NO-PROXY-DOMAINS is set then it will supersede the
*no-proxy-domains* variable. Inserting domains into this list will
Expand Down Expand Up @@ -705,18 +713,29 @@ Any encodings in Transfer-Encoding, such as chunking, are always performed."
(non-default-port uri)))
(when user-agent
(write-header "User-Agent" "~A" (user-agent-string user-agent)))
(when basic-authorization
(write-header "Authorization" "Basic ~A"
(base64:string-to-base64-string
(format nil "~A:~A"
(first basic-authorization)
(second basic-authorization)))))
(when (and proxy proxy-basic-authorization)
(write-header "Proxy-Authorization" "Basic ~A"
(base64:string-to-base64-string
(format nil "~A:~A"
(first proxy-basic-authorization)
(second proxy-basic-authorization)))))
(cond ((and basic-authorization bearer-authorization)
(error "Please supply only basic or bearer authorization."))
(basic-authorization
(write-header "Authorization" "Basic ~A"
(base64:string-to-base64-string
(format nil "~A:~A"
(first basic-authorization)
(second basic-authorization)))))
(bearer-authorization
(write-header "Authorization" "Bearer ~A" bearer-authorization)))
(when proxy
(cond ((and proxy-basic-authorization proxy-bearer-authorization)
(error "Please supply only basic or bearer proxy-authorization."))
(proxy-basic-authorization
(write-header "Proxy-Authorization" "Basic ~A"
(base64:string-to-base64-string
(format nil "~A:~A"
(first proxy-basic-authorization)
(second proxy-basic-authorization)))))
(proxy-bearer-authorization
(write-header "Proxy-Authorization"
"Bearer ~A"
proxy-bearer-authorization))))
(when accept
(write-header "Accept" "~A" accept))
(when range
Expand Down
49 changes: 49 additions & 0 deletions test/drakma-test.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,55 @@ But this is not according to HTTP spec."
(signals error
(drakma:http-request "https://untrusted-root.badssl.com/" :verify :required)))

;; ------------------- header tests ---------------------

(test bearer-authorization
(let* ((stream (make-string-output-stream))
(drakma:*header-stream* stream))
(drakma:http-request "http://codeberg.org/"
:bearer-authorization "abdefgh")
(let ((header-list
(mapcar (lambda (line)
(ppcre:split (list :sequence ": ")
line))
(ppcre:split (list :sequence "
")
(get-output-stream-string stream) :limit 0)))
(bearer-p
nil))
(mapc (lambda (item)
(when (and (string= (first item) "Authorization")
(string= (second item) "Bearer abdefgh"))
(setf bearer-p t)))
header-list)
(is-true bearer-p))))

(test basic-authorization
(let* ((stream (make-string-output-stream))
(drakma:*header-stream* stream))
(drakma:http-request "http://codeberg.org/"
:basic-authorization (list "abdefgh" "asdgdfgdfg"))
(let ((header-list
(mapcar (lambda (line)
(ppcre:split (list :sequence ": ")
line))
(ppcre:split (list :sequence "
")
(get-output-stream-string stream) :limit 0)))
(basic-p
nil))
(mapc (lambda (item)
(when (and (string= (first item) "Authorization")
(string= (second item) "Basic YWJkZWZnaDphc2RnZGZnZGZn"))
(setf basic-p t)))
header-list)
(is-true basic-p))))

(test two-authorization-fail
(signals error
(drakma:http-request "http://codeberg.org/"
:bearer-authorization "abdefgh"
:basic-authorization (list "asdg" "adsg"))))

;; ------------------- server routes --------------------

Expand Down