diff options
| -rw-r--r-- | src/socket.c | 16 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rwxr-xr-x | tests/starttls-xmpp.sh | 46 | ||||
| -rw-r--r-- | tests/starttls-xmpp.txt | 3 |
4 files changed, 59 insertions, 10 deletions
diff --git a/src/socket.c b/src/socket.c index dcffe6bc9c..20b17cef3c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -177,13 +177,13 @@ ssize_t wait_for_text(socket_st * socket, const char *txt, unsigned txt_size) tv.tv_sec = 10; tv.tv_usec = 0; ret = select(socket->fd + 1, &read_fds, NULL, NULL, &tv); - if (ret <= 0) - ret = -1; - else + if (ret > 0) ret = recv(socket->fd, pbuf, left, 0); - if (ret == -1 || ret == 0) { - int e = errno; - fprintf(stderr, "error receiving %s: %s\n", txt, strerror(e)); + if (ret == -1) { + fprintf(stderr, "error receiving '%s': %s\n", txt, strerror(errno)); + exit(2); + } else if (ret == 0) { + fprintf(stderr, "error receiving '%s': Timeout\n", txt); exit(2); } pbuf[ret] = 0; @@ -204,8 +204,8 @@ ssize_t wait_for_text(socket_st * socket, const char *txt, unsigned txt_size) p = memmem(buf, got, txt, txt_size); if (p != NULL && p != buf) { p--; - if (*p == '\n' || *p == '\r') - break; + if (*p == '\n' || *p == '\r' || (*txt == '<' && *p == '>')) // XMPP is not line oriented, uses XML format + break; } } } while(got < txt_size || strncmp(buf, txt, txt_size) != 0); diff --git a/tests/Makefile.am b/tests/Makefile.am index bc01e25fb5..d039afc9e0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,7 +41,7 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \ certs/ed25519.pem certs/cert-ed25519.pem \ system.prio pkcs11/softhsm.h pkcs11/pkcs11-pubkey-import.c gnutls-asan.supp \ rsa-md5-collision/README safe-renegotiation/README starttls-smtp.txt starttls-ftp.txt \ - starttls-lmtp.txt starttls-pop3.txt starttls-nntp.txt starttls-sieve.txt \ + starttls-lmtp.txt starttls-pop3.txt starttls-xmpp.txt starttls-nntp.txt starttls-sieve.txt \ rsa-md5-collision/colliding-chain-md5-2.pem rsa-md5-collision/colliding-chain-md5-1.pem \ ocsp-tests/certs/ocsp-amazon.com.der ocsp-tests/certs/chain-amazon.com.pem \ ocsp-tests/certs/chain-amazon.com-unsorted.pem cipher-neg-common.c \ @@ -462,7 +462,7 @@ dtls_stress_LDADD = $(COMMON_GNUTLS_LDADD) \ $(COMMON_DEPS_LDADD) dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh starttls-smtp.sh \ - starttls-lmtp.sh starttls-pop3.sh starttls-nntp.sh starttls-sieve.sh \ + starttls-lmtp.sh starttls-pop3.sh starttls-xmpp.sh starttls-nntp.sh starttls-sieve.sh \ ocsp-tests/ocsp-tls-connection ocsp-tests/ocsp-must-staple-connection \ ocsp-tests/ocsp-test cipher-listings.sh sni-hostname.sh server-multi-keys.sh \ psktool.sh ocsp-tests/ocsp-load-chain gnutls-cli-save-data.sh gnutls-cli-debug.sh \ diff --git a/tests/starttls-xmpp.sh b/tests/starttls-xmpp.sh new file mode 100755 index 0000000000..71fc512572 --- /dev/null +++ b/tests/starttls-xmpp.sh @@ -0,0 +1,46 @@ +#!/bin/sh + +# Copyright (C) 2010-2016 Free Software Foundation, Inc. +# +# Author: Nikos Mavrogiannopoulos +# +# This file is part of GnuTLS. +# +# GnuTLS is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# GnuTLS 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 +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GnuTLS; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +srcdir="${srcdir:-.}" +SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" +CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +unset RETCODE + +. "${srcdir}/scripts/common.sh" +. "${srcdir}/scripts/starttls-common.sh" + +echo "Checking STARTTLS over XMPP" + +eval "${GETPORT}" +socat TCP-LISTEN:${PORT} EXEC:"$CHAT -e -S -v -f ${srcdir}/starttls-xmpp.txt",pty & +PID=$! +wait_server ${PID} + +${VALGRIND} "${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:+ANON-ECDH --insecure --starttls-proto xmpp --verbose </dev/null >/dev/null +if test $? != 1;then + fail ${PID} "connect should have failed with error code 1" +fi + +kill ${PID} +wait + +exit 0 diff --git a/tests/starttls-xmpp.txt b/tests/starttls-xmpp.txt new file mode 100644 index 0000000000..94e86d48e1 --- /dev/null +++ b/tests/starttls-xmpp.txt @@ -0,0 +1,3 @@ +TIMEOUT 10 +'<stream:stream xmlns:stream' '<?xml version\=\'1.0\'?><stream:stream id\=\'16633990255660214772\' version\=\'1.0\' xml:lang\=\'en\' xmlns:stream\=\'http://etherx.jabber.org/streams\' from\=\'schokokeks.org\' xmlns\=\'jabber:client\'><stream:features><starttls xmlns\=\'urn:ietf:params:xml:ns:xmpp-tls\'><required/></starttls></stream:features>' +'<starttls xmlns\=\'urn:ietf:params:xml:ns:xmpp-tls\'/>' '<proceed xmlns\=\'urn:ietf:params:xml:ns:xmpp-tls\'/>' |