[evolution-data-server] I#95 - [WebDAV Session] Ignore empty current-user-privilege-set response

[Milan Crha <mcrha src gnome org>]

commit 6d8efe427209d89a2ea9e921c0a97590ee33f6c1
Author: Milan Crha <mcrha redhat com>
Date:   Thu Mar 14 13:54:14 2019 +0100

    I#95 - [WebDAV Session] Ignore empty current-user-privilege-set response
    
    Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/95

 src/libedataserver/e-webdav-session.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/src/libedataserver/e-webdav-session.c b/src/libedataserver/e-webdav-session.c
index 8e90a0e19..c2b587497 100644
--- a/src/libedataserver/e-webdav-session.c
+++ b/src/libedataserver/e-webdav-session.c
@@ -4173,6 +4173,11 @@ e_webdav_session_extract_privilege_simple (xmlXPathObjectPtr xpath_obj_privilege
        return privilege;
 }
 
+typedef struct _PrivilegeSetData {
+       gboolean any_found;
+       GSList **out_privileges;
+} PrivilegeSetData;
+
 static gboolean
 e_webdav_session_current_user_privilege_set_cb (EWebDAVSession *webdav,
                                                xmlXPathContextPtr xpath_ctx,
@@ -4182,10 +4187,10 @@ e_webdav_session_current_user_privilege_set_cb (EWebDAVSession *webdav,
                                                guint status_code,
                                                gpointer user_data)
 {
-       GSList **out_privileges = user_data;
+       PrivilegeSetData *psd = user_data;
 
        g_return_val_if_fail (xpath_ctx != NULL, FALSE);
-       g_return_val_if_fail (out_privileges != NULL, FALSE);
+       g_return_val_if_fail (psd != NULL, FALSE);
 
        if (!xpath_prop_prefix) {
                e_xml_xpath_context_register_namespaces (xpath_ctx,
@@ -4195,6 +4200,8 @@ e_webdav_session_current_user_privilege_set_cb (EWebDAVSession *webdav,
                   e_xml_xpath_eval_exists (xpath_ctx, "%s/D:current-user-privilege-set/D:privilege", 
xpath_prop_prefix)) {
                xmlXPathObjectPtr xpath_obj;
 
+               psd->any_found = TRUE;
+
                xpath_obj = e_xml_xpath_eval (xpath_ctx, "%s/D:current-user-privilege-set/D:privilege", 
xpath_prop_prefix);
 
                if (xpath_obj) {
@@ -4212,7 +4219,7 @@ e_webdav_session_current_user_privilege_set_cb (EWebDAVSession *webdav,
 
                                        privilege = e_webdav_session_extract_privilege_simple 
(xpath_obj_privilege);
                                        if (privilege)
-                                               *out_privileges = g_slist_prepend (*out_privileges, 
privilege);
+                                               *(psd->out_privileges) = g_slist_prepend 
(*(psd->out_privileges), privilege);
 
                                        xmlXPathFreeObject (xpath_obj_privilege);
                                }
@@ -4220,6 +4227,9 @@ e_webdav_session_current_user_privilege_set_cb (EWebDAVSession *webdav,
 
                        xmlXPathFreeObject (xpath_obj);
                }
+       } else if (status_code == SOUP_STATUS_OK &&
+                  e_xml_xpath_eval_exists (xpath_ctx, "%s/D:current-user-privilege-set", xpath_prop_prefix)) 
{
+               psd->any_found = TRUE;
        }
 
        return TRUE;
@@ -4252,6 +4262,7 @@ e_webdav_session_get_current_user_privilege_set_sync (EWebDAVSession *webdav,
                                                      GError **error)
 {
        EXmlDocument *xml;
+       PrivilegeSetData psd;
        gboolean success;
 
        g_return_val_if_fail (E_IS_WEBDAV_SESSION (webdav), FALSE);
@@ -4266,13 +4277,20 @@ e_webdav_session_get_current_user_privilege_set_sync (EWebDAVSession *webdav,
        e_xml_document_add_empty_element (xml, NULL, "current-user-privilege-set");
        e_xml_document_end_element (xml); /* prop */
 
+       psd.any_found = FALSE;
+       psd.out_privileges = out_privileges;
+
        success = e_webdav_session_propfind_sync (webdav, uri, E_WEBDAV_DEPTH_THIS, xml,
-               e_webdav_session_current_user_privilege_set_cb, out_privileges, cancellable, error);
+               e_webdav_session_current_user_privilege_set_cb, &psd, cancellable, error);
 
        g_object_unref (xml);
 
-       if (success)
+       if (success && !psd.any_found) {
+               success = FALSE;
+               g_set_error_literal (error, SOUP_HTTP_ERROR, SOUP_STATUS_NOT_FOUND, soup_status_get_phrase 
(SOUP_STATUS_NOT_FOUND));
+       } else if (success) {
                *out_privileges = g_slist_reverse (*out_privileges);
+       }
 
        return success;
 }