comparison libpurple/protocols/jabber/auth.c @ 28514:5328e205d3fb

jabber: Use purple_strequal to simplify some auth code

28513:fa7f3426ed13

#ifdef HAVE_CYRUS_SASL
		/* Don't include Google Talk's X-GOOGLE-TOKEN mechanism, as we will not
		 * support it and including it gives a false fall-back to other mechs offerred,
		 * leading to incorrect error handling.
		 */
		if (mech_name && !strcmp(mech_name, "X-GOOGLE-TOKEN")) {
			g_free(mech_name);
			continue;
		}

		g_string_append(js->sasl_mechs, mech_name);
		g_string_append_c(js->sasl_mechs, ' ');
#else
		if(mech_name && !strcmp(mech_name, "DIGEST-MD5"))
			digest_md5 = TRUE;
		else if(mech_name && !strcmp(mech_name, "PLAIN"))
			plain = TRUE;
#endif
		g_free(mech_name);
	}

		const char *err_code;

		/* FIXME: Why is this not in jabber_parse_error? */
		if((error = xmlnode_get_child(packet, "error")) &&
					(err_code = xmlnode_get_attrib(error, "code")) &&
					!strcmp(err_code, "401")) {
			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
			/* Clear the pasword if it isn't being saved */
			if (!purple_account_get_remember_password(js->gc->account))
				purple_account_set_password(js->gc->account, NULL);
		}

		if (g_hash_table_lookup(parts, "rspauth")) {
			char *rspauth = g_hash_table_lookup(parts, "rspauth");


			if(rspauth && js->expected_rspauth &&
					!strcmp(rspauth, js->expected_rspauth)) {
				jabber_send_raw(js,
						"<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />",
						-1);
			} else {
				purple_connection_error_reason(js->gc,

				 *
				 * My reading of the digestmd5 plugin indicates the username and
				 * realm are always encoded in UTF-8 (they seem to be the values
				 * we pass in), so we need to ensure charset=utf-8 is set.
				 */
				if (!js->current_mech || !g_str_equal(js->current_mech, "DIGEST-MD5") ||
						strstr(c_out, ",charset="))
					/* If we're not using DIGEST-MD5 or Cyrus SASL is fixed */
					enc_out = purple_base64_encode((unsigned char*)c_out, clen);
				else {
					char *tmp = g_strdup_printf("%s,charset=utf-8", c_out);

	const char *ns = xmlnode_get_namespace(packet);
#ifdef HAVE_CYRUS_SASL
	const void *x;
#endif

	if(!ns || strcmp(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) {
		purple_connection_error_reason(js->gc,
			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
			_("Invalid response from server"));
		return;
	}

28514:5328e205d3fb

#ifdef HAVE_CYRUS_SASL
		/* Don't include Google Talk's X-GOOGLE-TOKEN mechanism, as we will not
		 * support it and including it gives a false fall-back to other mechs offerred,
		 * leading to incorrect error handling.
		 */
		if (purple_strequal(mech_name, "X-GOOGLE-TOKEN")) {
			g_free(mech_name);
			continue;
		}

		g_string_append(js->sasl_mechs, mech_name);
		g_string_append_c(js->sasl_mechs, ' ');
#else
		if (purple_strequal(mech_name, "DIGEST-MD5"))
			digest_md5 = TRUE;
		else if (purple_strequal(mech_name, "PLAIN"))
			plain = TRUE;
#endif
		g_free(mech_name);
	}

		const char *err_code;

		/* FIXME: Why is this not in jabber_parse_error? */
		if((error = xmlnode_get_child(packet, "error")) &&
					(err_code = xmlnode_get_attrib(error, "code")) &&
					g_str_equal(err_code, "401")) {
			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
			/* Clear the pasword if it isn't being saved */
			if (!purple_account_get_remember_password(js->gc->account))
				purple_account_set_password(js->gc->account, NULL);
		}

		if (g_hash_table_lookup(parts, "rspauth")) {
			char *rspauth = g_hash_table_lookup(parts, "rspauth");


			if (rspauth && purple_strequal(rspauth, js->expected_rspauth)) {
				jabber_send_raw(js,
						"<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />",
						-1);
			} else {
				purple_connection_error_reason(js->gc,

				 *
				 * My reading of the digestmd5 plugin indicates the username and
				 * realm are always encoded in UTF-8 (they seem to be the values
				 * we pass in), so we need to ensure charset=utf-8 is set.
				 */
				if (!purple_strequal(js->current_mech, "DIGEST-MD5") ||
						strstr(c_out, ",charset="))
					/* If we're not using DIGEST-MD5 or Cyrus SASL is fixed */
					enc_out = purple_base64_encode((unsigned char*)c_out, clen);
				else {
					char *tmp = g_strdup_printf("%s,charset=utf-8", c_out);

	const char *ns = xmlnode_get_namespace(packet);
#ifdef HAVE_CYRUS_SASL
	const void *x;
#endif

	if (!purple_strequal(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) {
		purple_connection_error_reason(js->gc,
			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
			_("Invalid response from server"));
		return;
	}