Merge branch 'master' into debian

3 files changed, 21 insertions, 0 deletions

diff --git a/tests/auth-logindisabled/interimap.remote b/tests/auth-logindisabled/interimap.remote
new file mode 120000
index 0000000..a4ea3f3
--- /dev/null
+++ b/tests/auth-logindisabled/interimap.remote
@@ -0,0 +1 @@
+../auth-sasl-plain/interimap.remote
\ No newline at end of file
diff --git a/tests/auth-logindisabled/remote.conf b/tests/auth-logindisabled/remote.conf
new file mode 100644
index 0000000..1f02afe
--- /dev/null
+++ b/tests/auth-logindisabled/remote.conf
@@ -0,0 +1,4 @@
+!include conf.d/imapd.conf
+
+# trick dovecot into treating local connections as insecure
+imap_capability = +LOGINDISABLED
diff --git a/tests/auth-logindisabled/t b/tests/auth-logindisabled/t
new file mode 100644
index 0000000..0bcd0d6
--- /dev/null
+++ b/tests/auth-logindisabled/t
@@ -0,0 +1,16 @@
+! interimap --debug || error
+
+# double check the presence of 'LOGINDISABLED' in the preauth capability list
+grep -oE -m1 '^remote: S: \* OK \[CAPABILITY IMAP4rev1( [^]]*)? AUTH=[^]]*\]' <"$STDERR" >"$TMPDIR/capability"
+
+sed -ri 's/^remote: S: \* OK \[CAPABILITY (.*)\]$/\1/' "$TMPDIR/capability"
+tr " " "\\n" <"$TMPDIR/capability" >"$TMPDIR/capabilities"
+grep -Fx "IMAP4rev1"     <"$TMPDIR/capabilities" || error
+grep -Fx "LOGINDISABLED" <"$TMPDIR/capabilities" || error
+! grep -Fx "STARTTLS"    <"$TMPDIR/capabilities" || error # otherwise we'd try to upgrade the connectionn
+
+# make sure we didn't send any credentials
+grep -Fx "remote: ERROR: Logins are disabled."   <"$STDERR" || error
+! grep -E "^remote: C: .* (AUTHENTICATE|LOGIN) " <"$STDERR" || error
+
+# vim: set filetype=sh :