summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lasso/id-wsf/data_service.h9
-rw-r--r--lasso/id-wsf/discovery.h3
-rw-r--r--lasso/id-wsf/interaction_profile_service.h3
-rw-r--r--lasso/id-wsf/utils.h4
-rw-r--r--lasso/id-wsf/wsf_profile.c67
-rw-r--r--lasso/id-wsf/wsf_profile.h14
-rw-r--r--lasso/id-wsf/wsf_profile_private.h2
7 files changed, 25 insertions, 77 deletions
diff --git a/lasso/id-wsf/data_service.h b/lasso/id-wsf/data_service.h
index cafdd060..f74a5f14 100644
--- a/lasso/id-wsf/data_service.h
+++ b/lasso/id-wsf/data_service.h
@@ -84,9 +84,9 @@ LASSO_EXPORT gint lasso_data_service_add_query_item(LassoDataService *service,
LASSO_EXPORT gint lasso_data_service_process_query_msg(LassoDataService *service,
const char *message, const char *security_mech_id);
-LASSO_EXPORT gint lasso_data_service_build_modify_response_msg(LassoDataService *service);
+LASSO_EXPORT gint lasso_data_service_build_query_response_msg(LassoDataService *service);
-LASSO_EXPORT gint lasso_data_service_build_response_msg(LassoDataService *service);
+LASSO_EXPORT gint lasso_data_service_build_modify_response_msg(LassoDataService *service);
LASSO_EXPORT gint lasso_data_service_process_query_response_msg(LassoDataService *service,
const char *message);
@@ -116,9 +116,8 @@ LASSO_EXPORT gint lasso_data_service_process_modify_response_msg(LassoDataServic
LASSO_EXPORT gchar* lasso_data_service_get_redirect_request_url(LassoDataService *service);
-LASSO_EXPORT LassoDiscoResourceOffering* lasso_data_service_get_resource_offering(
- LassoDataService *service);
-
+LASSO_EXPORT gint lasso_data_service_get_query_item(LassoDataService *service, const char *select,
+ const char *item_id, LassoDstQueryItem **output);
#ifdef __cplusplus
}
diff --git a/lasso/id-wsf/discovery.h b/lasso/id-wsf/discovery.h
index f8a77359..6b1fa579 100644
--- a/lasso/id-wsf/discovery.h
+++ b/lasso/id-wsf/discovery.h
@@ -75,7 +75,8 @@ LASSO_EXPORT GType lasso_discovery_get_type(void);
LASSO_EXPORT LassoDiscovery* lasso_discovery_new(LassoServer *server);
-LASSO_EXPORT void lasso_discovery_destroy(LassoDiscovery *discovery);
+LASSO_EXPORT LassoDiscovery* lasso_discovery_new_full(LassoServer *server,
+ LassoDiscoResourceOffering *offering);
LASSO_EXPORT gint lasso_discovery_init_modify(LassoDiscovery *discovery,
const char *security_mech_id);
diff --git a/lasso/id-wsf/interaction_profile_service.h b/lasso/id-wsf/interaction_profile_service.h
index ed947367..e9b2a97e 100644
--- a/lasso/id-wsf/interaction_profile_service.h
+++ b/lasso/id-wsf/interaction_profile_service.h
@@ -76,6 +76,9 @@ LASSO_EXPORT gint lasso_interaction_profile_service_process_response_msg(
LassoInteractionProfileService *service,
const gchar *response_msg);
+LASSO_EXPORT gint lasso_interaction_profile_service_build_redirect_response_msg(
+ LassoWsfProfile *profile, char *redirect_url);
+
#ifdef __cplusplus
}
diff --git a/lasso/id-wsf/utils.h b/lasso/id-wsf/utils.h
index b3971b79..4ceac9fd 100644
--- a/lasso/id-wsf/utils.h
+++ b/lasso/id-wsf/utils.h
@@ -28,7 +28,7 @@
LASSO_EXPORT gboolean lasso_security_mech_id_is_null_authentication(const gchar *security_mech_id);
LASSO_EXPORT gboolean lasso_security_mech_id_is_x509_authentication(const gchar *security_mech_id);
LASSO_EXPORT gboolean lasso_security_mech_id_is_saml_authentication(const gchar *security_mech_id);
-LASSO_EXPORT
- gboolean lasso_security_mech_id_is_bearer_authentication(const gchar *security_mech_id);
+LASSO_EXPORT gboolean lasso_security_mech_id_is_bearer_authentication(
+ const gchar *security_mech_id);
#endif
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index 711d87c4..8f1dd6fe 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -34,10 +34,10 @@
#include "../utils.h"
-#include "wsf_profile.h"
-#include "wsf_profile_private.h"
-#include "discovery.h"
-#include "utils.h"
+#include "./wsf_profile.h"
+#include "./wsf_profile_private.h"
+#include "./discovery.h"
+#include "./utils.h"
#include "../xml/disco_modify.h"
#include "../xml/soap_fault.h"
#include "../xml/soap_binding_correlation.h"
@@ -73,9 +73,11 @@
/* private methods */
/*****************************************************************************/
+static LassoDiscoDescription* lasso_wsf_profile_get_description_auto(
+ const LassoDiscoServiceInstance *si, const gchar *security_mech_id);
static gint lasso_wsf_profile_add_saml_signature(LassoWsfProfile *wsf_profile, xmlDoc *doc);
-static LassoSoapBindingCorrelation* lasso_wsf_profile_utils_get_header_correlation(LassoSoapEnvelope
- *envelope);
+static LassoSoapBindingCorrelation* lasso_wsf_profile_utils_get_header_correlation(
+ LassoSoapEnvelope *envelope);
static char* lasso_wsf_profile_utils_get_message_id(LassoSoapEnvelope *envelope);
static char* lasso_wsf_profile_utils_get_ref_message_id(LassoSoapEnvelope *envelope);
@@ -379,7 +381,7 @@ lasso_wsf_profile_add_credential(G_GNUC_UNUSED LassoWsfProfile *profile, G_GNUC_
* Return value: a #LassoDiscoDescription that supports security_mech_id, NULL
* otherwise.
*/
-LassoDiscoDescription*
+static LassoDiscoDescription*
lasso_wsf_profile_get_description_auto(const LassoDiscoServiceInstance *si,
const gchar *security_mech_id)
{
@@ -581,57 +583,6 @@ lasso_wsf_profile_build_soap_envelope(const char *refToMessageId, const char *pr
/**
- * lasso_wsf_profile_is_principal_online():
- * @profile: a #LassoWsfProfile
- *
- * @Deprecated: Since 2.2.1
- *
- * Return value: FALSE.
- **/
-gboolean
-lasso_wsf_profile_principal_is_online(G_GNUC_UNUSED LassoWsfProfile *profile)
-{
- return FALSE;
-}
-
-/**
- * lasso_wsf_profile_set_principal_online():
- * @profile: a #LassoWsfProfile
- * @status : a char* representing status of principal.
- *
- * @Deprecated: Since 2.2.1
- *
- **/
-void
-lasso_wsf_profile_set_principal_status(G_GNUC_UNUSED LassoWsfProfile *profile, G_GNUC_UNUSED const char *status)
-{
-}
-
-/**
- * lasso_wsf_profile_set_principal_online():
- * @profile: a #LassoWsfProfile
- *
- * @Deprecated: Since 2.2.1
- *
- **/
-void
-lasso_wsf_profile_set_principal_online(G_GNUC_UNUSED LassoWsfProfile *profile)
-{
-}
-
-/**
- * lasso_wsf_profile_set_principal_offline():
- * @profile: a #LassoWsfProfile
- *
- * Set the principal status as offline.
- *
- **/
-void
-lasso_wsf_profile_set_principal_offline(G_GNUC_UNUSED LassoWsfProfile *profile)
-{
-}
-
-/**
* lasso_wsf_profile_get_identity:
* @profile: a #LassoWsfProfile
*
diff --git a/lasso/id-wsf/wsf_profile.h b/lasso/id-wsf/wsf_profile.h
index 6cfef407..a5c9227c 100644
--- a/lasso/id-wsf/wsf_profile.h
+++ b/lasso/id-wsf/wsf_profile.h
@@ -147,15 +147,6 @@ LASSO_EXPORT gint lasso_wsf_profile_set_security_mech_id(LassoWsfProfile *profil
LASSO_EXPORT const char *lasso_wsf_profile_get_security_mech_id(LassoWsfProfile *profile);
-G_GNUC_DEPRECATED LASSO_EXPORT void lasso_wsf_profile_set_principal_status(LassoWsfProfile *profile,
- const char *status);
-
-G_GNUC_DEPRECATED LASSO_EXPORT void lasso_wsf_profile_set_principal_online(
- LassoWsfProfile *profile);
-
-G_GNUC_DEPRECATED LASSO_EXPORT void lasso_wsf_profile_set_principal_offline(
- LassoWsfProfile *profile);
-
LASSO_EXPORT gint lasso_wsf_profile_init(LassoWsfProfile *profile, LassoServer *server,
LassoDiscoResourceOffering *offering);
@@ -172,6 +163,11 @@ LASSO_EXPORT gint lasso_wsf_profile_set_status_code(LassoWsfProfile *wsf_profile
LASSO_EXPORT const char* lasso_wsf_profile_get_status_code(LassoWsfProfile *wsf_profile);
+LASSO_EXPORT gint lasso_wsf_profile_set_msg_url_from_description(LassoWsfProfile *wsf_profile);
+
+LASSO_EXPORT void lasso_wsf_profile_set_resource_offering(LassoWsfProfile *profile,
+ LassoDiscoResourceOffering *offering);
+
#define lasso_wsf_profile_helper_assign_resource_id(from,to) \
if ((from)->ResourceID) {\
lasso_assign_gobject((to)->ResourceID, (from)->ResourceID); \
diff --git a/lasso/id-wsf/wsf_profile_private.h b/lasso/id-wsf/wsf_profile_private.h
index 859cee1d..eefc7f34 100644
--- a/lasso/id-wsf/wsf_profile_private.h
+++ b/lasso/id-wsf/wsf_profile_private.h
@@ -44,8 +44,6 @@ struct _LassoWsfProfilePrivate
};
LassoSoapFault* lasso_wsf_profile_get_fault(const LassoWsfProfile *profile);
-LassoDiscoDescription* lasso_wsf_profile_get_description_auto(const LassoDiscoServiceInstance *si,
- const gchar *security_mech_id);
void lasso_wsf_profile_set_resource_offering(LassoWsfProfile *profile,
LassoDiscoResourceOffering *offering);
gint lasso_wsf_profile_set_msg_url_from_description(LassoWsfProfile *wsf_profile);
generated by cgit (git 2.34.1) at 2026-01-06 05:40:01 +0000