1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From 54e876d3fc25ec59c58beda915a8c9d1f8d5f101 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 09 Jul 2013 21:06:16 +0000
Subject: CalDAV: Add support for OAuth 2.0 authentication.
---
Index: evolution-data-server-3.8.5/calendar/backends/caldav/e-cal-backend-caldav.c
===================================================================
--- evolution-data-server-3.8.5.orig/calendar/backends/caldav/e-cal-backend-caldav.c 2013-09-01 22:36:20.224754093 +0200
+++ evolution-data-server-3.8.5/calendar/backends/caldav/e-cal-backend-caldav.c 2013-09-01 22:36:20.220754053 +0200
@@ -958,6 +958,32 @@
/* Authentication helpers for libsoup */
static void
+soup_authenticate_bearer (SoupSession *session,
+ SoupMessage *message,
+ SoupAuth *auth,
+ ESource *source)
+{
+ gchar *access_token = NULL;
+ gint expires_in_seconds = -1;
+ GError *local_error = NULL;
+
+ e_source_get_oauth2_access_token_sync (
+ source, NULL, &access_token,
+ &expires_in_seconds, &local_error);
+
+ e_soup_auth_bearer_set_access_token (
+ E_SOUP_AUTH_BEARER (auth),
+ access_token, expires_in_seconds);
+
+ if (local_error != NULL) {
+ g_warning ("%s: %s", G_STRFUNC, local_error->message);
+ g_error_free (local_error);
+ }
+
+ g_free (access_token);
+}
+
+static void
soup_authenticate (SoupSession *session,
SoupMessage *msg,
SoupAuth *auth,
@@ -975,8 +1001,14 @@
extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
auth_extension = e_source_get_extension (source, extension_name);
+ if (retrying)
+ return;
+
+ if (E_IS_SOUP_AUTH_BEARER (auth)) {
+ soup_authenticate_bearer (session, msg, auth, source);
+
/* do not send same password twice, but keep it for later use */
- if (!retrying && cbdav->priv->password != NULL) {
+ } else if (cbdav->priv->password != NULL) {
gchar *user;
user = e_source_authentication_dup_user (auth_extension);
@@ -5210,6 +5242,8 @@
static void
e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
{
+ SoupSessionFeature *feature;
+
cbdav->priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
cbdav->priv->session = soup_session_sync_new ();
g_object_set (
@@ -5219,6 +5253,16 @@
SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
NULL);
+ /* XXX SoupAuthManager is public API as of libsoup 2.42, but
+ * this isn't worth bumping our libsoup requirement over.
+ * So get the SoupAuthManager GType by its type name. */
+ feature = soup_session_get_feature (
+ cbdav->priv->session,
+ g_type_from_name ("SoupAuthManager"));
+
+ /* Add the "Bearer" auth type to support OAuth 2.0. */
+ soup_session_feature_add_feature (feature, E_TYPE_SOUP_AUTH_BEARER);
+
cbdav->priv->proxy = e_proxy_new ();
e_proxy_setup_proxy (cbdav->priv->proxy);
g_signal_connect (cbdav->priv->proxy, "changed", G_CALLBACK (proxy_settings_changed), cbdav->priv);
|