Ticket #117: libsyncml_session_support_cred.diff

./parser/sml_xml_assm.c

@@ -742 +747 @@
-                if (!_smlXmlAssemblerEndNode(assm, error))
-                        goto error_free_writer;
-        }
+
+        if (session->cred) {
+            if (!smlCredAssemble(session->cred, assm, error)) {
+                goto error_free_writer;
+            }
+        }
-        
-        if (!_smlXmlAssemblerEndNode(assm, error))
-                goto error_free_writer;

./sml_session.c

@@ -1114 +1114 @@
-        session->end = FALSE;
-        session->sessionType = sessionType;
-        session->lastCommandID = 0;
+        session->cred = NULL;
-        
-        if (sessionType == SML_SESSION_TYPE_CLIENT)
-                session->sending = TRUE;
@@ -1199 +1200 @@
-                
-                if (session->parentCommand)
-                        smlCommandUnref(session->parentCommand);
+                if (session->cred)
+                        smlCredFree(session->cred);
-                
-                g_free(session);
-        }
@@ -1597 +1600 @@
-        return FALSE;
-}
-
+SmlBool smlSessionRegisterCred(SmlSession *session, SmlAuthType type, const char *user, const char *password, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %u, %p, %p)", __func__, session, type, user, password, error);
+        SmlCred *cred = smlTryMalloc0(sizeof(SmlCred), error);
+        gchar *data = NULL, *encoded = NULL;
+        if (!cred)
+            goto error;
+        /* 
+         * FIXME
+         * Currently, libsyncml supports basic authentication only.
+         */
+        cred->format = SML_FORMAT_TYPE_BASE64;
+        cred->type = type;
+
+        data = g_strconcat(user, ":", password, NULL);
+        if (!data) {
+                smlErrorSet(error, SML_ERROR_NO_MEMORY, "No memory left");
+                goto error_free_cred;
+        }
+        switch (type) {
+            case SML_AUTH_TYPE_BASIC:
+                if (smlBase64Encode(data, &encoded, error)) {
+                    cred->data = encoded;
+                    g_free(data);
+                    if (session->cred)
+                        smlCredFree(session->cred);
+                    session->cred = cred;
+                    smlTrace(TRACE_EXIT, "%s", __func__);
+                    return TRUE;
+                }
+                break;
+            default:
+                break;
+        }
+
+        smlErrorSet(error, SML_ERROR_NOT_SUPPORTED, "Basic authentication type support only");
+        free(data);
+error_free_cred:
+        smlCredFree(cred);
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
-/*@}*/
-
-/*@}*/

./sml_session.h

@@ -79 +79 @@
-
-SmlBool smlSessionCheck(SmlSession *session);
-void smlSessionDispatch(SmlSession *session);
+SmlBool smlSessionRegisterCred(SmlSession *session, SmlAuthType type, const char *user, const char *password, SmlError **error);
-
-#endif //_SML_SESSION_H_

./sml_session_internals.h

@@ -82 +82 @@
-        void *frag_userdata;
-        
-        SmlBool active;
+        SmlCred *cred;
-};
-
-struct SmlPendingStatus {