You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/10 20:48:54 UTC
svn commit: r1181132 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_svn/cyrus_auth.c
Author: hwright
Date: Mon Oct 10 18:48:53 2011
New Revision: 1181132
URL: http://svn.apache.org/viewvc?rev=1181132&view=rev
Log:
Merge r1179767 from trunk:
* r1179767
Prefix SASL error messages with a prefix that identifies them as such.
Justification:
Avoids silly error messages like "svn: generic failure".
Reported on users@.
Notes:
<danielsh> would also be +1 on a follow-up that adds APR_INLINE.
Votes:
+1: stsp, danielsh, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_svn/cyrus_auth.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:48:53 2011
@@ -64,4 +64,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,115
6827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1175888,1177001,1179767
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181132&r1=1181131&r2=1181132&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:48:53 2011
@@ -141,16 +141,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1179767
- Prefix SASL error messages with a prefix that identifies them as such.
- Justification:
- Avoids silly error messages like "svn: generic failure".
- Reported on users@.
- Notes:
- <danielsh> would also be +1 on a follow-up that adds APR_INLINE.
- Votes:
- +1: stsp, danielsh, rhuijben
-
* r1179680
Fix javahl org.tigris.subversion to avoid double finalize.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_svn/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_svn/cyrus_auth.c?rev=1181132&r1=1181131&r2=1181132&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_svn/cyrus_auth.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_svn/cyrus_auth.c Mon Oct 10 18:48:53 2011
@@ -321,6 +321,16 @@ get_password_cb(sasl_conn_t *conn, void
return SASL_FAIL;
}
+/* Wrap an error message from SASL with a prefix that allow users
+ * to tell that the error message came from SASL. */
+static const char *
+get_sasl_error(sasl_conn_t *sasl_ctx, apr_pool_t *result_pool)
+{
+ return apr_psprintf(result_pool,
+ _("SASL authentication error: %s"),
+ sasl_errdetail(sasl_ctx));
+}
+
/* Create a new SASL context. */
static svn_error_t *new_sasl_ctx(sasl_conn_t **sasl_ctx,
svn_boolean_t is_tunneled,
@@ -355,7 +365,7 @@ static svn_error_t *new_sasl_ctx(sasl_co
SASL_AUTH_EXTERNAL, " ");
if (result != SASL_OK)
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(*sasl_ctx));
+ get_sasl_error(*sasl_ctx, pool));
}
/* Set security properties. */
@@ -401,7 +411,7 @@ static svn_error_t *try_auth(svn_ra_svn_
case SASL_NOMEM:
/* Fatal error. Fail the authentication. */
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(sasl_ctx));
+ get_sasl_error(sasl_ctx, pool));
default:
/* For anything else, delete the mech from the list
and try again. */
@@ -462,7 +472,7 @@ static svn_error_t *try_auth(svn_ra_svn_
if (result != SASL_OK && result != SASL_CONTINUE)
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(sasl_ctx));
+ get_sasl_error(sasl_ctx, pool));
/* If the server thinks we're done, then don't send any response. */
if (strcmp(status, "success") == 0)
@@ -518,6 +528,7 @@ typedef struct sasl_baton {
unsigned int read_len; /* Its current length. */
const char *write_buf; /* The buffer returned by sasl_encode. */
unsigned int write_len; /* Its length. */
+ apr_pool_t *scratch_pool;
} sasl_baton_t;
/* Functions to implement a SASL encrypted svn_ra_svn__stream_t. */
@@ -545,7 +556,8 @@ static svn_error_t *sasl_read_cb(void *b
&sasl_baton->read_len);
if (result != SASL_OK)
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(sasl_baton->ctx));
+ get_sasl_error(sasl_baton->ctx,
+ sasl_baton->scratch_pool));
}
/* The buffer returned by sasl_decode might be larger than what the
@@ -586,7 +598,8 @@ sasl_write_cb(void *baton, const char *b
if (result != SASL_OK)
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(sasl_baton->ctx));
+ get_sasl_error(sasl_baton->ctx,
+ sasl_baton->scratch_pool));
}
do
@@ -642,7 +655,7 @@ svn_error_t *svn_ra_svn__enable_sasl_enc
result = sasl_getprop(sasl_ctx, SASL_SSF, (void*) &ssfp);
if (result != SASL_OK)
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(sasl_ctx));
+ get_sasl_error(sasl_ctx, pool));
if (*ssfp > 0)
{
@@ -655,12 +668,13 @@ svn_error_t *svn_ra_svn__enable_sasl_enc
/* Create and initialize the stream baton. */
sasl_baton = apr_pcalloc(conn->pool, sizeof(*sasl_baton));
sasl_baton->ctx = sasl_ctx;
+ sasl_baton->scratch_pool = conn->pool;
/* Find out the maximum input size for sasl_encode. */
result = sasl_getprop(sasl_ctx, SASL_MAXOUTBUF, &maxsize);
if (result != SASL_OK)
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(sasl_ctx));
+ get_sasl_error(sasl_ctx, pool));
sasl_baton->maxsize = *((const unsigned int *) maxsize);
/* If there is any data left in the read buffer at this point,
@@ -673,7 +687,7 @@ svn_error_t *svn_ra_svn__enable_sasl_enc
&sasl_baton->read_len);
if (result != SASL_OK)
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
- sasl_errdetail(sasl_ctx));
+ get_sasl_error(sasl_ctx, pool));
conn->read_end = conn->read_ptr;
}