Skip to content

Commit e5bbd6e

Browse files
committed
Pass server-auth methods as strings
1 parent 681423a commit e5bbd6e

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

suites/smtp.ports

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@
12121212
("500 5.5.6 Authentication Exchange line is too long" #t)
12131213
("503 5.5.1 Error: authentication not enabled" #f) )
12141214
(lambda (response auth-enabled) (begin
1215-
(if auth-enabled (server-set-auths! server '((PLAIN ("account" "password")))))
1215+
(if auth-enabled (server-set-auths! server '(("PLAIN" ("account" "password")))))
12161216
(connect-and-ehlo-smtp-server)
12171217
(server-set-response-code! server response)
12181218
(let
@@ -1237,15 +1237,15 @@
12371237
(server-set-auth-proc! server plain-auth-proc)))
12381238

12391239
(test "plain auth success" (lambda ()
1240-
(server-set-auths! server '((PLAIN ("account" "password"))))
1240+
(server-set-auths! server '(("PLAIN" ("account" "password"))))
12411241
(connect-and-ehlo-smtp-server)
12421242
(let
12431243
((auth-result
12441244
(smtp-authenticate smtp-connection 'PLAIN (list "account" "password"))))
12451245
(assert (smtp-auth-successful? auth-result)))))
12461246

12471247
(test "plain auth unsuccessful" (lambda ()
1248-
(server-set-auths! server '((PLAIN ("account" "password"))))
1248+
(server-set-auths! server '(("PLAIN" ("account" "password"))))
12491249
(connect-and-ehlo-smtp-server)
12501250
(let
12511251
((auth-result (smtp-authenticate smtp-connection 'PLAIN '("account" "foo"))))
@@ -1263,7 +1263,7 @@
12631263
(capability 'initial-response (list
12641264

12651265
(test "plain auth with initial response" (lambda ()
1266-
(server-set-auths! server '((PLAIN ("account" "password"))))
1266+
(server-set-auths! server '(("PLAIN" ("account" "password"))))
12671267
(connect-and-ehlo-smtp-server)
12681268
(let
12691269
((auth-result
@@ -1286,15 +1286,15 @@
12861286
(server-set-auth-proc! server xoauth2-auth-proc)))
12871287

12881288
(test "xoauth2 success" (lambda ()
1289-
(server-set-auths! server '((XOAUTH2 ("account" "token"))))
1289+
(server-set-auths! server '(("XOAUTH2" ("account" "token"))))
12901290
(connect-and-ehlo-smtp-server)
12911291
(let
12921292
((auth-result
12931293
(smtp-authenticate smtp-connection 'XOAUTH2 (list "account" "token"))))
12941294
(assert (smtp-auth-successful? auth-result)))))
12951295

12961296
(test "xoauth2 auth unsuccessful" (lambda ()
1297-
(server-set-auths! server '((XOAUTH2 ("account" "token"))))
1297+
(server-set-auths! server '(("XOAUTH2" ("account" "token"))))
12981298
(connect-and-ehlo-smtp-server)
12991299
(let
13001300
((auth-result (smtp-authenticate smtp-connection 'XOAUTH2 '("account" "not-a-token"))))
@@ -1328,15 +1328,15 @@
13281328
(server-set-auth-proc! server cram-md5-auth-proc)))
13291329

13301330
(test "cram-md5 success" (lambda ()
1331-
(server-set-auths! server '((CRAM-MD5 ("account" "password"))))
1331+
(server-set-auths! server '(("CRAM-MD5" ("account" "password"))))
13321332
(connect-and-ehlo-smtp-server)
13331333
(let
13341334
((auth-result
13351335
(smtp-authenticate smtp-connection 'CRAM-MD5 (list "account" "password"))))
13361336
(assert (smtp-auth-successful? auth-result)))))
13371337

13381338
(test "cram-md5 auth unsuccessful" (lambda ()
1339-
(server-set-auths! server '((CRAM-MD5 ("account" "password"))))
1339+
(server-set-auths! server '(("CRAM-MD5" ("account" "password"))))
13401340
(connect-and-ehlo-smtp-server)
13411341
(let
13421342
((auth-result (smtp-authenticate smtp-connection 'CRAM-MD5 '("account" "not-the-password"))))
@@ -1355,7 +1355,7 @@
13551355

13561356
(test "cram-md5 initial response not supported and should be ignored" (lambda ()
13571357
; Test would fail, as mock auth procedure fails when inital response is provided
1358-
(server-set-auths! server '((CRAM-MD5 ("account" "password"))))
1358+
(server-set-auths! server '(("CRAM-MD5" ("account" "password"))))
13591359
(connect-and-ehlo-smtp-server)
13601360
(let
13611361
((auth-result
@@ -1387,15 +1387,15 @@
13871387
(server-set-auth-proc! server login-auth-proc)))
13881388

13891389
(test "login success" (lambda ()
1390-
(server-set-auths! server '((LOGIN ("account" "password"))))
1390+
(server-set-auths! server '(("LOGIN" ("account" "password"))))
13911391
(connect-and-ehlo-smtp-server)
13921392
(let
13931393
((auth-result
13941394
(smtp-authenticate smtp-connection 'LOGIN (list "account" "password"))))
13951395
(assert (smtp-auth-successful? auth-result)))))
13961396

13971397
(test "login auth unsuccessful" (lambda ()
1398-
(server-set-auths! server '((LOGIN ("account" "password"))))
1398+
(server-set-auths! server '(("LOGIN" ("account" "password"))))
13991399
(connect-and-ehlo-smtp-server)
14001400
(let
14011401
((auth-result (smtp-authenticate smtp-connection 'LOGIN '("account" "not-the-password"))))
@@ -1413,7 +1413,7 @@
14131413
(capability 'initial-response (list
14141414

14151415
(test "login initial response" (lambda ()
1416-
(server-set-auths! server '((LOGIN ("account" "password"))))
1416+
(server-set-auths! server '(("LOGIN" ("account" "password"))))
14171417
(connect-and-ehlo-smtp-server)
14181418
(let
14191419
((auth-result
@@ -1438,7 +1438,7 @@
14381438
(server-set-auth-proc! server buggy-auth-proc)))
14391439

14401440
(test "buggy auth with too many challenges" (lambda ()
1441-
(server-set-auths! server '((BUGGY ("account" "password"))))
1441+
(server-set-auths! server '(("BUGGY" ("account" "password"))))
14421442
(connect-and-ehlo-smtp-server)
14431443
(let
14441444
((auth-result

0 commit comments

Comments
 (0)