cpw.darkrain42.xmpp.scram: f359db47: jabber: Use accessors instead of directl...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Sat Nov 7 02:06:16 EST 2009
-----------------------------------------------------------------
Revision: f359db474d89142adb338f2fe11efaf99092b997
Ancestor: efd6615fa0dbcbc47776cb0c1fd2c1c7d2ec211f
Author: darkrain42 at pidgin.im
Date: 2009-11-07T06:41:33
Branch: im.pidgin.cpw.darkrain42.xmpp.scram
URL: http://d.pidgin.im/viewmtn/revision/info/f359db474d89142adb338f2fe11efaf99092b997
Modified files:
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/auth_cyrus.c
ChangeLog:
jabber: Use accessors instead of directly accessing gc->account (and similar)
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth.c e6d71cbd8154684c68f1ca1915f0f5d6faf59f55
+++ libpurple/protocols/jabber/auth.c 6177c915590038b861ad9397696dad7c333217a9
@@ -48,8 +48,11 @@ jabber_process_starttls(JabberStream *js
gboolean
jabber_process_starttls(JabberStream *js, xmlnode *packet)
{
+ PurpleAccount *account;
xmlnode *starttls;
+ account = purple_connection_get_account(js->gc);
+
if((starttls = xmlnode_get_child(packet, "starttls"))) {
if(purple_ssl_is_supported()) {
jabber_send_raw(js,
@@ -60,7 +63,7 @@ jabber_process_starttls(JabberStream *js
PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
_("Server requires TLS/SSL, but no TLS/SSL support was found."));
return TRUE;
- } else if(purple_account_get_bool(js->gc->account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+ } else if(purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
purple_connection_error_reason(js->gc,
PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
_("You require encryption, but no TLS/SSL support was found."));
@@ -90,14 +93,20 @@ static void allow_plaintext_auth(PurpleA
static void allow_plaintext_auth(PurpleAccount *account)
{
+ PurpleConnection *gc;
+ JabberStream *js;
+
purple_account_set_bool(account, "auth_plain_in_clear", TRUE);
- finish_plaintext_authentication(account->gc->proto_data);
+ gc = purple_account_get_connection(account);
+ js = purple_connection_get_protocol_data(gc);
+
+ finish_plaintext_authentication(js);
}
static void disallow_plaintext_auth(PurpleAccount *account)
{
- purple_connection_error_reason(account->gc,
+ purple_connection_error_reason(purple_account_get_connection(account),
PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
_("Server requires plaintext authentication over an unencrypted stream"));
}
@@ -136,18 +145,14 @@ static void
}
static void
-auth_no_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
+auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
{
- JabberStream *js;
-
/* The password prompt dialog doesn't get disposed if the account disconnects */
- if (!PURPLE_CONNECTION_IS_VALID(conn))
+ if (!PURPLE_CONNECTION_IS_VALID(gc))
return;
- js = conn->proto_data;
-
/* Disable the account as the user has canceled connecting */
- purple_account_set_enabled(conn->account, purple_core_get_ui(), FALSE);
+ purple_account_set_enabled(purple_connection_get_account(gc), purple_core_get_ui(), FALSE);
}
void
@@ -222,19 +227,22 @@ static void auth_old_result_cb(JabberStr
jabber_stream_set_state(js, JABBER_STREAM_POST_AUTH);
jabber_disco_items_server(js);
} else {
+ PurpleAccount *account;
PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
char *msg = jabber_parse_error(js, packet, &reason);
xmlnode *error;
const char *err_code;
+ account = purple_connectoion_get_account(js->gc);
+
/* 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 (!purple_account_get_remember_password(account))
+ purple_account_set_password(account, NULL);
}
purple_connection_error_reason(js->gc, reason, msg);
@@ -307,16 +315,17 @@ static void auth_old_cb(JabberStream *js
jabber_iq_send(iq);
} else if(xmlnode_get_child(query, "password")) {
- if(!jabber_stream_is_ssl(js) && !purple_account_get_bool(js->gc->account,
+ PurpleAccount *account = purple_connection_get_account(js->gc);
+ if(!jabber_stream_is_ssl(js) && !purple_account_get_bool(account,
"auth_plain_in_clear", FALSE)) {
char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"),
- js->gc->account->username);
+ purple_account_get_username(account));
purple_request_yes_no(js->gc, _("Plaintext Authentication"),
_("Plaintext Authentication"),
msg,
1,
- purple_connection_get_account(js->gc), NULL, NULL,
- purple_connection_get_account(js->gc), allow_plaintext_auth,
+ account, NULL, NULL,
+ account, allow_plaintext_auth,
disallow_plaintext_auth);
g_free(msg);
return;
@@ -333,16 +342,19 @@ void jabber_auth_start_old(JabberStream
void jabber_auth_start_old(JabberStream *js)
{
+ PurpleAccount *account;
JabberIq *iq;
xmlnode *query, *username;
+ account = purple_connection_get_account(js->gc);
+
/*
* We can end up here without encryption if the server doesn't support
* <stream:features/> and we're not using old-style SSL. If the user
* is requiring SSL/TLS, we need to enforce it.
*/
if (!jabber_stream_is_ssl(js) &&
- purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+ purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
purple_connection_error_reason(js->gc,
PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
_("You require encryption, but it is not available on this server."));
@@ -370,8 +382,8 @@ void jabber_auth_start_old(JabberStream
* password prompting here
*/
- if (!purple_account_get_password(js->gc->account)) {
- purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
+ if (!purple_account_get_password(account)) {
+ purple_account_request_password(account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
return;
}
#endif
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c dbaf0f12a1caebff4f533df3235701aa4f6591ef
+++ libpurple/protocols/jabber/auth_cyrus.c 5cdd9376869ee6652760219f8b810989b43a6538
@@ -72,10 +72,14 @@ static int jabber_sasl_cb_secret(sasl_co
static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secret_t **secret)
{
JabberStream *js = ctx;
- const char *pw = purple_account_get_password(js->gc->account);
+ PurpleAccount *account;
+ const char *pw;
size_t len;
static sasl_secret_t *x = NULL;
+ account = = purple_connection_get_account(js->gc);
+ pw = purple_account_get_password(account);
+
if (!conn || !secret || id != SASL_CB_PASS)
return SASL_BADPARAM;
@@ -167,6 +171,7 @@ static xmlnode *jabber_auth_start_cyrus(
static xmlnode *jabber_auth_start_cyrus(JabberStream *js)
{
+ PurpleAccount *account;
const char *clientout = NULL;
char *enc_out;
unsigned coutlen = 0;
@@ -179,10 +184,12 @@ static xmlnode *jabber_auth_start_cyrus(
secprops.min_ssf = 0;
secprops.security_flags = SASL_SEC_NOANONYMOUS;
+ account = purple_connection_get_account(js->gc);
+
if (!jabber_stream_is_ssl(js)) {
secprops.max_ssf = -1;
secprops.maxbufsize = 4096;
- plaintext = purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE);
+ plaintext = purple_account_get_bool(account, "auth_plain_in_clear", FALSE);
if (!plaintext)
secprops.security_flags |= SASL_SEC_NOPLAINTEXT;
} else {
@@ -214,8 +221,8 @@ static xmlnode *jabber_auth_start_cyrus(
* to get one
*/
- if (!purple_account_get_password(js->gc->account)) {
- purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
+ if (!purple_account_get_password(account)) {
+ purple_account_request_password(account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
return NULL;
/* If we've got a password, but aren't sending
@@ -224,11 +231,11 @@ static xmlnode *jabber_auth_start_cyrus(
*/
} else if (!plaintext) {
char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"),
- js->gc->account->username);
+ purple_account_get_username(account));
purple_request_yes_no(js->gc, _("Plaintext Authentication"),
_("Plaintext Authentication"),
msg,
- 1, js->gc->account, NULL, NULL, js->gc->account,
+ 1, account, NULL, NULL, account,
allow_cyrus_plaintext_auth,
disallow_plaintext_auth);
g_free(msg);
@@ -313,7 +320,7 @@ static xmlnode *jabber_auth_start_cyrus(
purple_connection_error_reason(js->gc,
PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
_("SASL authentication failed"));
-
+
return NULL;
}
}
@@ -330,6 +337,7 @@ jabber_sasl_build_callbacks(JabberStream
static void
jabber_sasl_build_callbacks(JabberStream *js)
{
+ PurpleAccount *account;
int id;
/* Set up our callbacks structure */
@@ -352,7 +360,8 @@ jabber_sasl_build_callbacks(JabberStream
js->sasl_cb[id].context = (void *)js;
id++;
- if (purple_account_get_password(js->gc->account) != NULL ) {
+ account = purple_connection_get_account(js->gc);
+ if (purple_account_get_password(account) != NULL ) {
js->sasl_cb[id].id = SASL_CB_PASS;
js->sasl_cb[id].proc = jabber_sasl_cb_secret;
js->sasl_cb[id].context = (void *)js;
More information about the Commits
mailing list