jmcbray/germinal
2
1
Fork 1
Code Issues 5 Pull requests Releases Wiki Activity

Create SSL context once and free it on exit #14

Merged
jmcbray merged 2 commits from tobias/germinal:master into master 2020-06-13 15:41:57 -04:00
Conversation 0 Commits 2 Files changed 1 +12 -12
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0884b8cba5 - Show all commits

Create SSL context once and free it on exit

Prev Next
Tobias Rautenkranz 2020-06-13 12:50:30 +02:00
commit 0884b8cba5

24
server.lisp
View file

@ -72,10 +72,15 @@
(setf (gethash "gmi" mimes:*mime-db*) "text/gemini") (setf (gethash "gmi" mimes:*mime-db*) "text/gemini")
(write-line #?"Listening on ${host} port ${port}") (write-line #?"Listening on ${host} port ${port}")
(force-output) (force-output)
(usocket:socket-server host port #'gemini-handler ()
:multi-threading t (with-global-context ((make-context :disabled-protocols (list +ssl-op-no-sslv2+ +ssl-op-no-sslv3+
:element-type '(unsigned-byte 8) +ssl-op-no-tlsv1+ +ssl-op-no-tlsv1-1+
:in-new-thread background)) +ssl-op-no-tlsv1-2+))
:auto-free-p t)
(usocket:socket-server host port #'gemini-handler ()
:multi-threading t
:element-type '(unsigned-byte 8)
:in-new-thread background)))
(defun start-cli () (defun start-cli ()
"Start the germinal server, taking config from the environment or command-line." "Start the germinal server, taking config from the environment or command-line."
@ -170,14 +175,9 @@
(defun gemini-handler (stream) (defun gemini-handler (stream)
"The main Gemini request handler. Sets up TLS and sets up request and response" "The main Gemini request handler. Sets up TLS and sets up request and response"
(handler-case (handler-case
(let* ((cl+ssl::*ssl-global-context* (let* ((tls-stream (make-ssl-server-stream stream
(make-context :disabled-protocols (list +ssl-op-no-sslv2+ +ssl-op-no-sslv3+ :certificate *germinal-cert*
+ssl-op-no-tlsv1+ +ssl-op-no-tlsv1-1+ :key *germinal-cert-key*))
+ssl-op-no-tlsv1-2+)))
(tls-stream
(make-ssl-server-stream stream
:certificate *germinal-cert*
:key *germinal-cert-key*))
(request (read-line-crlf tls-stream)) (request (read-line-crlf tls-stream))
(response (gemini-serve-file-or-directory request))) (response (gemini-serve-file-or-directory request)))
(write-sequence (write-sequence