aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVeerapuram Varadhan <vvaradan@src.gnome.org>2005-12-06 16:43:37 +0800
committerVeerapuram Varadhan <vvaradan@src.gnome.org>2005-12-06 16:43:37 +0800
commitb7c92420df7adf6790ca426475fd45fa4e86782d (patch)
treec41cb7ee57f65760f1acf88ea52a63660470fa41
parent3428da057a17b9e8f28f5e04a028dd5536aa5ec0 (diff)
downloadgsoc2013-evolution-b7c92420df7adf6790ca426475fd45fa4e86782d.tar
gsoc2013-evolution-b7c92420df7adf6790ca426475fd45fa4e86782d.tar.gz
gsoc2013-evolution-b7c92420df7adf6790ca426475fd45fa4e86782d.tar.bz2
gsoc2013-evolution-b7c92420df7adf6790ca426475fd45fa4e86782d.tar.lz
gsoc2013-evolution-b7c92420df7adf6790ca426475fd45fa4e86782d.tar.xz
gsoc2013-evolution-b7c92420df7adf6790ca426475fd45fa4e86782d.tar.zst
gsoc2013-evolution-b7c92420df7adf6790ca426475fd45fa4e86782d.zip
Authenticate by reading the store-password for calendars that has "auth"
* conduits/addressbook-conduit.c: (pre_sync): Authenticate by reading the store-password for calendars that has "auth" property set. * conduits/addressbook-conduit.c: (addressbook_authenticate): Implement authentication using e-passwords. svn path=/trunk/; revision=30730
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/conduit/address-conduit.c62
2 files changed, 68 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 58f7a0b3b5..42c2ec1432 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-06 Veerapuram Varadhan <vvaradhan@novell.com>
+
+ * conduits/addressbook-conduit.c: (pre_sync):
+ Authenticate by reading the store-password for calendars that has
+ "auth" property set.
+ * conduits/addressbook-conduit.c: (addressbook_authenticate):
+ Implement authentication using e-passwords.
+
2005-11-26 Tor Lillqvist <tml@novell.com>
* gui/contact-editor/e-contact-editor.c
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 15573c190b..65e64c4931 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -34,6 +34,8 @@
#include <pi-socket.h>
#include <pi-dlp.h>
#include <pi-address.h>
+#include <libedataserver/e-url.h>
+#include <libedataserverui/e-passwords.h>
#include <libebook/e-book.h>
#include <gpilotd/gnome-pilot-conduit.h>
#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
@@ -878,10 +880,15 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
char *add;
/* If the address has 2 lines, make sure both get added */
- if (address->ext != NULL)
+ if (address->ext != NULL &&
+ strlen (address->ext) > 0) {
add = g_strconcat (address->street, "\n", address->ext, NULL);
- else
+ LOG (g_warning ("Address has two lines: [%s]\n", add));
+ }
+ else {
add = g_strdup (address->street);
+ LOG (g_warning ("Address has only one line: [%s]\n", add));
+ }
local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add);
g_free (add);
@@ -1151,6 +1158,50 @@ check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
}
}
+static void
+addressbook_authenticate (EBook *book,
+ gpointer data)
+{
+ gchar *auth;
+ gchar *user;
+ gchar *passwd;
+ gchar *str_uri;
+ gchar *pass_key;
+ gchar *auth_domain;
+ gchar *component_name;
+ EUri *e_uri;
+
+ ESource *source = (ESource *)data;
+
+ auth = e_source_get_property (source, "auth");
+ auth_domain = e_source_get_property (source, "auth-domain");
+ component_name = auth_domain ? auth_domain : "Addressbook";
+
+ if (auth && !strcmp ("plain/password", auth))
+ user = e_source_get_property (source, "user");
+ else
+ user = e_source_get_property (source, "email_addr");
+ if (!user)
+ user = "";
+
+ str_uri = e_source_get_uri (source);
+ e_uri = e_uri_new (str_uri);
+ pass_key = e_uri_to_string (e_uri, FALSE);
+ e_uri_free (e_uri);
+
+ passwd = e_passwords_get_password (component_name, pass_key);
+ if (passwd)
+ passwd = "";
+
+ if (book)
+ if (!e_book_authenticate_user (book, user, passwd, auth, NULL))
+ LOG (g_warning ("Authentication failed"));
+ g_free (pass_key);
+ g_free (str_uri);
+
+ return;
+}
+
/* Pilot syncing callbacks */
static gint
pre_sync (GnomePilotConduit *conduit,
@@ -1164,6 +1215,7 @@ pre_sync (GnomePilotConduit *conduit,
unsigned char *buf;
char *filename;
char *change_id;
+ char *auth;
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
@@ -1179,6 +1231,12 @@ pre_sync (GnomePilotConduit *conduit,
} else {
ctxt->ebook = e_book_new_default_addressbook (NULL);
}
+ auth = e_source_get_property (ctxt->cfg->source, "auth");
+ if (auth) {
+ LOG (g_message ("contacts needs authentication\n"));
+ g_signal_connect (ctxt->ebook, "auth_required",
+ G_CALLBACK (addressbook_authenticate), ctxt->cfg->source);
+ }
if (!ctxt->ebook || !e_book_open (ctxt->ebook, TRUE, NULL)) {
WARN(_("Could not load addressbook"));
gnome_pilot_conduit_error (conduit, _("Could not load addressbook"));