Attachment #124293 for bug #167813

View | Details | Raw Unified | Return to bug 167813
Collapse All | Expand All




#

PORTNAME=	jabberd
PORTVERSION=	2.2.16
PORTREVISION=	1
CATEGORIES=	net-im
MASTER_SITES=	http://cloud.github.com/downloads/Jabberd2/jabberd2/
DIST_SUBDIR=	jabber

MAINTAINER=	mm@FreeBSD.org

USE_OPENSSL=	yes
USE_ICONV=	yes
USE_RC_SUBR=	jabberd
USE_BZIP2=	yes
USE_LDCONFIG=	${PREFIX}/lib/jabberd
CONFIGURE_ARGS+=	--localstatedir=/var \
		--sysconfdir=${PREFIX}/etc/jabberd \
		--enable-ssl --enable-mio=poll \
		--disable-tests \
		--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
		--with-extra-library-path="${LOCALBASE}/lib ${ELP}"


Lines 1-2 Link Here

(-)ports/net-im/jabberd/distinfo (-2 / +2 lines)
1	SHA256 (jabber/jabberd-2.2.14.tar.bz2) = cd6bd518dda172935ad16f180f40ba6ebf7d4aa83ef4f9445ac6b55b438a9e3f	1	SHA256 (jabber/jabberd-2.2.16.tar.gz) = 112844e0319dc31faf9225930fe10f811b9faefe2e4e30b73d8e3ab965a7d4bf
2	SIZE (jabber/jabberd-2.2.14.tar.bz2) = 615984	2	SIZE (jabber/jabberd-2.2.16.tar.gz) = 2818476




=== modified file 'sx/sasl_gsasl.c'
--- sx/sasl_gsasl.c	2011-10-08 22:08:29 +0000
+++ sx/sasl_gsasl.c	2011-12-06 19:50:30 +0000
@@ -138,7 +138,7 @@
 typedef struct _Gsasl_digest_md5_server_state _Gsasl_digest_md5_server_state;
 
 /** utility: generate a success nad */
-static nad_t _sx_sasl_success(sx_t s) {
+static nad_t _sx_sasl_success(sx_t s, char *data, int dlen) {
     nad_t nad;
     int ns;
 
@@ -146,6 +146,8 @@
     ns = nad_add_namespace(nad, uri_SASL, NULL);
 
     nad_append_elem(nad, ns, "success", 0);
+    if(data != NULL)
+        nad_append_cdata(nad, data, dlen, 1);
 
     return nad;
 }
@@ -533,15 +535,25 @@
     if(ret == GSASL_OK) {
         _sx_debug(ZONE, "sasl handshake completed");
 
+        /* encode the leftover response */
+        ret = gsasl_base64_to(out, outlen, &buf, &buflen);
+        if (ret == GSASL_OK) {
+            /* send success */
+            _sx_nad_write(s, _sx_sasl_success(s, buf, buflen), 0);
+            free(buf);
+
+            /* set a notify on the success nad buffer */
+            ((sx_buf_t) s->wbufq->front->data)->notify = _sx_sasl_notify_success;
+            ((sx_buf_t) s->wbufq->front->data)->notify_arg = (void *) p;
+        }
+        else {
+            _sx_debug(ZONE, "gsasl_base64_to failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
+            _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_INCORRECT_ENCODING), 0);
+            if(buf != NULL) free(buf);
+        }
+
         if(out != NULL) free(out);
 
-        /* send success */
-        _sx_nad_write(s, _sx_sasl_success(s), 0);
-
-        /* set a notify on the success nad buffer */
-        ((sx_buf_t) s->wbufq->front->data)->notify = _sx_sasl_notify_success;
-        ((sx_buf_t) s->wbufq->front->data)->notify_arg = (void *) p;
-
         return;
     }
 
@@ -555,6 +567,11 @@
             _sx_nad_write(s, _sx_sasl_challenge(s, buf, buflen), 0);
             free(buf);
         }
+        else {
+            _sx_debug(ZONE, "gsasl_base64_to failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
+            _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_INCORRECT_ENCODING), 0);
+            if(buf != NULL) free(buf);
+        }
 
         if(out != NULL) free(out);
 


Lines 38-43 Link Here

(-)ports/net-im/jabberd/pkg-plist (+3 lines)
38	%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.so	38	%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.so
39	%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.la	39	%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.la
40	%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.so	40	%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.so
		41	lib/jabberd/libstorage.la
		42	lib/jabberd/libstorage.so
		43	lib/jabberd/libstorage.so.0
41	lib/jabberd/mod_active.la	44	lib/jabberd/mod_active.la
42	lib/jabberd/mod_active.so	45	lib/jabberd/mod_active.so
43	lib/jabberd/mod_active.so.0	46	lib/jabberd/mod_active.so.0

Return to bug 167813

Lines 6-15 Link Here

(-)ports/net-im/jabberd/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= jabberd	8	PORTNAME= jabberd
9	PORTVERSION= 2.2.14	9	PORTVERSION= 2.2.16
10	PORTREVISION= 1
11	CATEGORIES= net-im	10	CATEGORIES= net-im
12	MASTER_SITES= http://codex.xiaoka.com/pub/jabberd2/releases/	11	MASTER_SITES= http://cloud.github.com/downloads/Jabberd2/jabberd2/
13	DIST_SUBDIR= jabber	12	DIST_SUBDIR= jabber
14		13
15	MAINTAINER= mm@FreeBSD.org	14	MAINTAINER= mm@FreeBSD.org
Lines 41-51 Link Here
41	USE_OPENSSL= yes	40	USE_OPENSSL= yes
42	USE_ICONV= yes	41	USE_ICONV= yes
43	USE_RC_SUBR= jabberd	42	USE_RC_SUBR= jabberd
44	USE_BZIP2= yes
45	USE_LDCONFIG= ${PREFIX}/lib/jabberd	43	USE_LDCONFIG= ${PREFIX}/lib/jabberd
46	CONFIGURE_ARGS+= --localstatedir=/var \	44	CONFIGURE_ARGS+= --localstatedir=/var \
47	--sysconfdir=${PREFIX}/etc/jabberd \	45	--sysconfdir=${PREFIX}/etc/jabberd \
48	--enable-ssl --enable-mio=poll \	46	--enable-ssl --enable-mio=poll \
		47	--disable-tests \
49	--with-extra-include-path="${LOCALBASE}/include ${EIP}" \	48	--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
50	--with-extra-library-path="${LOCALBASE}/lib ${ELP}"	49	--with-extra-library-path="${LOCALBASE}/lib ${ELP}"
51		50

Lines 1-67 Link Here

(-)ports/net-im/jabberd/files/patch-rev-818 (-67 lines)
1	=== modified file 'sx/sasl_gsasl.c'
2	--- sx/sasl_gsasl.c 2011-10-08 22:08:29 +0000
3	+++ sx/sasl_gsasl.c 2011-12-06 19:50:30 +0000
4	@@ -138,7 +138,7 @@
5	typedef struct _Gsasl_digest_md5_server_state _Gsasl_digest_md5_server_state;
6
7	/** utility: generate a success nad */
8	-static nad_t _sx_sasl_success(sx_t s) {
9	+static nad_t _sx_sasl_success(sx_t s, char *data, int dlen) {
10	nad_t nad;
11	int ns;
12
13	@@ -146,6 +146,8 @@
14	ns = nad_add_namespace(nad, uri_SASL, NULL);
15
16	nad_append_elem(nad, ns, "success", 0);
17	+ if(data != NULL)
18	+ nad_append_cdata(nad, data, dlen, 1);
19
20	return nad;
21	}
22	@@ -533,15 +535,25 @@
23	if(ret == GSASL_OK) {
24	_sx_debug(ZONE, "sasl handshake completed");
25
26	+ /* encode the leftover response */
27	+ ret = gsasl_base64_to(out, outlen, &buf, &buflen);
28	+ if (ret == GSASL_OK) {
29	+ /* send success */
30	+ _sx_nad_write(s, _sx_sasl_success(s, buf, buflen), 0);
31	+ free(buf);
32	+
33	+ /* set a notify on the success nad buffer */
34	+ ((sx_buf_t) s->wbufq->front->data)->notify = _sx_sasl_notify_success;
35	+ ((sx_buf_t) s->wbufq->front->data)->notify_arg = (void *) p;
36	+ }
37	+ else {
38	+ _sx_debug(ZONE, "gsasl_base64_to failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
39	+ _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_INCORRECT_ENCODING), 0);
40	+ if(buf != NULL) free(buf);
41	+ }
42	+
43	if(out != NULL) free(out);
44
45	- /* send success */
46	- _sx_nad_write(s, _sx_sasl_success(s), 0);
47	-
48	- /* set a notify on the success nad buffer */
49	- ((sx_buf_t) s->wbufq->front->data)->notify = _sx_sasl_notify_success;
50	- ((sx_buf_t) s->wbufq->front->data)->notify_arg = (void *) p;
51	-
52	return;
53	}
54
55	@@ -555,6 +567,11 @@
56	_sx_nad_write(s, _sx_sasl_challenge(s, buf, buflen), 0);
57	free(buf);
58	}
59	+ else {
60	+ _sx_debug(ZONE, "gsasl_base64_to failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
61	+ _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_INCORRECT_ENCODING), 0);
62	+ if(buf != NULL) free(buf);
63	+ }
64
65	if(out != NULL) free(out);
66
67