summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2016-03-25 19:04:28 -0400
committerDavid Thompson <dthompson2@worcester.edu>2016-03-25 19:04:28 -0400
commite8c4c06420db8cb5ab1ee4bba6082a480d098e95 (patch)
treef9a23c7ff4be594d2ecf18c19643d4c939dba4da /web
parentc4d4f854074dc2a021606119e797d68d8aa01168 (diff)
Extract accept key generation to a new module.
* web/socket/server.scm (handshake): Moved. (make-handshake-response): Use new make-accept-key procedure. * web/socket/utils.scm: New file. * Makefile.am (SOURCES): Add it.
Diffstat (limited to 'web')
-rw-r--r--web/socket/server.scm15
-rw-r--r--web/socket/utils.scm43
2 files changed, 45 insertions, 13 deletions
diff --git a/web/socket/server.scm b/web/socket/server.scm
index 04ab5d4..cd52220 100644
--- a/web/socket/server.scm
+++ b/web/socket/server.scm
@@ -30,23 +30,12 @@
#:use-module (web request)
#:use-module (web response)
#:use-module (web uri)
- #:use-module (web socket base64)
#:use-module (web socket frame)
- #:use-module (web socket sha-1)
+ #:use-module (web socket utils)
#:export (make-server-socket
run-server))
;; See section 4.2 for explanation of the handshake.
-(define (handshake client-key)
- "Translate the base64 encoded CLIENT-KEY string into a base64
-encoded acceptance key."
- (base64-encode
- (sha-1->bytevector
- (sha-1
- (string->utf8
- (string-append (string-trim-both client-key)
- "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"))))))
-
(define (read-handshake-request client-socket)
"Read HTTP request from CLIENT-SOCKET that should contain the
headers required for a WebSocket handshake."
@@ -58,7 +47,7 @@ headers required for a WebSocket handshake."
connection for the client whose key is CLIENT-KEY, a base64 encoded
string."
;; See section 4.2.2.
- (let ((accept-key (handshake client-key)))
+ (let ((accept-key (make-accept-key (string-trim-both client-key))))
(build-response #:code 101
#:headers `((upgrade . ("websocket"))
(connection . (upgrade))
diff --git a/web/socket/utils.scm b/web/socket/utils.scm
new file mode 100644
index 0000000..3788796
--- /dev/null
+++ b/web/socket/utils.scm
@@ -0,0 +1,43 @@
+;;; guile-websocket --- WebSocket client/server
+;;; Copyright © 2016 David Thompson <davet@gnu.org>
+;;;
+;;; This file is part of guile-websocket.
+;;;
+;;; Guile-websocket is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU Lesser General Public License as
+;;; published by the Free Software Foundation; either version 3 of the
+;;; License, or (at your option) any later version.
+;;;
+;;; Guile-websocket is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with guile-websocket. If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; WebSocket utilities.
+;;
+;;; Code:
+
+(define-module (web socket utils)
+ #:use-module (rnrs bytevectors)
+ #:use-module (web socket base64)
+ #:use-module (web socket sha-1)
+ #:export (%handshake-guid
+ make-accept-key))
+
+;; See section 1.3 - Opening Handshake
+(define %handshake-guid "258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
+
+(define (make-accept-key client-key)
+ "Return a WebSocket accept key based on CLIENT-KEY, a base64 encoded
+string."
+ (base64-encode
+ (sha-1->bytevector
+ (sha-1
+ (string->utf8
+ (string-append client-key %handshake-guid))))))