diff options
| -rw-r--r-- | lasso/id-ff/federation_termination.c | 2 | ||||
| -rw-r--r-- | lasso/id-ff/federation_termination.h | 2 | ||||
| -rw-r--r-- | lasso/id-ff/identity.c | 2 | ||||
| -rw-r--r-- | lasso/id-ff/logout.c | 12 | ||||
| -rw-r--r-- | lasso/id-ff/logout.h | 32 | ||||
| -rw-r--r-- | lasso/id-ff/name_identifier_mapping.c | 4 | ||||
| -rw-r--r-- | lasso/id-ff/name_identifier_mapping.h | 4 | ||||
| -rw-r--r-- | lasso/id-ff/profile.c | 34 | ||||
| -rw-r--r-- | lasso/id-ff/profile.h | 29 | ||||
| -rw-r--r-- | lasso/id-ff/register_name_identifier.c | 4 | ||||
| -rw-r--r-- | lasso/id-ff/register_name_identifier.h | 4 |
11 files changed, 65 insertions, 64 deletions
diff --git a/lasso/id-ff/federation_termination.c b/lasso/id-ff/federation_termination.c index ea5e59ed..80751fc6 100644 --- a/lasso/id-ff/federation_termination.c +++ b/lasso/id-ff/federation_termination.c @@ -189,7 +189,7 @@ lasso_federation_termination_init_notification(LassoFederationTermination *defed gint lasso_federation_termination_load_notification_msg(LassoFederationTermination *defederation, gchar *notification_msg, - lassoHttpMethods notification_method) + lassoHttpMethod notification_method) { LassoProfile *profile; diff --git a/lasso/id-ff/federation_termination.h b/lasso/id-ff/federation_termination.h index f524ce82..aee63746 100644 --- a/lasso/id-ff/federation_termination.h +++ b/lasso/id-ff/federation_termination.h @@ -68,7 +68,7 @@ LASSO_EXPORT gint lasso_federation_termination_init_notif LASSO_EXPORT gint lasso_federation_termination_load_notification_msg (LassoFederationTermination *defederation, gchar *request_msg, - lassoHttpMethods request_method); + lassoHttpMethod request_method); LASSO_EXPORT gint lasso_federation_termination_process_notification (LassoFederationTermination *defederation); diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c index 59789519..0d8fe12f 100644 --- a/lasso/id-ff/identity.c +++ b/lasso/id-ff/identity.c @@ -92,7 +92,7 @@ lasso_identity_add_federation(LassoIdentity *identity, } } if(found == TRUE) { - message(G_LOG_LEVEL_CRITICAL, "A federation existed already for this providerID, it was replaced by the new one.\n"); + debug("A federation existed already for this providerID, it was replaced by the new one.\n"); } else { g_ptr_array_add(identity->providerIDs, g_strdup(remote_providerID)); diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c index a458e43a..290e857b 100644 --- a/lasso/id-ff/logout.c +++ b/lasso/id-ff/logout.c @@ -290,16 +290,16 @@ lasso_logout_init_request(LassoLogout *logout, gint lasso_logout_process_request_msg(LassoLogout *logout, gchar *request_msg, - lassoHttpMethods request_method) + lassoHttpMethod request_method) { LassoProfile *profile; g_return_val_if_fail(LASSO_IS_LOGOUT(logout), -1); - g_return_val_if_fail(request_msg!=NULL, -2); + g_return_val_if_fail(request_msg != NULL, -2); profile = LASSO_PROFILE(logout); - switch(request_method){ + switch(request_method) { case lassoHttpMethodSoap: debug("Build a logout request from soap msg\n"); profile->request = lasso_logout_request_new_from_export(request_msg, @@ -437,9 +437,9 @@ lasso_logout_validate_request(LassoLogout *logout) } gint -lasso_logout_process_response_msg(LassoLogout *logout, - gchar *response_msg, - lassoHttpMethods response_method) +lasso_logout_process_response_msg(LassoLogout *logout, + gchar *response_msg, + lassoHttpMethod response_method) { LassoProfile *profile; xmlChar *statusCodeValue; diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h index 69b0b256..a56f624b 100644 --- a/lasso/id-ff/logout.h +++ b/lasso/id-ff/logout.h @@ -62,31 +62,31 @@ struct _LassoLogoutClass { }; -LASSO_EXPORT GType lasso_logout_get_type (void); +LASSO_EXPORT GType lasso_logout_get_type (void); -LASSO_EXPORT LassoLogout* lasso_logout_new (LassoServer *server, - lassoProviderType provider_type); +LASSO_EXPORT LassoLogout* lasso_logout_new (LassoServer *server, + lassoProviderType provider_type); -LASSO_EXPORT gint lasso_logout_build_request_msg (LassoLogout *logout); +LASSO_EXPORT gint lasso_logout_build_request_msg (LassoLogout *logout); -LASSO_EXPORT gint lasso_logout_build_response_msg (LassoLogout *logout); +LASSO_EXPORT gint lasso_logout_build_response_msg (LassoLogout *logout); -LASSO_EXPORT void lasso_logout_destroy (LassoLogout *logout); +LASSO_EXPORT void lasso_logout_destroy (LassoLogout *logout); -LASSO_EXPORT gchar* lasso_logout_get_next_providerID (LassoLogout *logout); +LASSO_EXPORT gchar* lasso_logout_get_next_providerID (LassoLogout *logout); -LASSO_EXPORT gint lasso_logout_init_request (LassoLogout *logout, - gchar *remote_providerID); +LASSO_EXPORT gint lasso_logout_init_request (LassoLogout *logout, + gchar *remote_providerID); -LASSO_EXPORT gint lasso_logout_process_request_msg (LassoLogout *logout, - gchar *request_msg, - lassoHttpMethods request_method); +LASSO_EXPORT gint lasso_logout_process_request_msg (LassoLogout *logout, + gchar *request_msg, + lassoHttpMethod request_method); -LASSO_EXPORT gint lasso_logout_validate_request (LassoLogout *logout); +LASSO_EXPORT gint lasso_logout_validate_request (LassoLogout *logout); -LASSO_EXPORT gint lasso_logout_process_response_msg (LassoLogout *logout, - gchar *response_msg, - lassoHttpMethods response_method); +LASSO_EXPORT gint lasso_logout_process_response_msg (LassoLogout *logout, + gchar *response_msg, + lassoHttpMethod response_method); #ifdef __cplusplus } diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c index 8b99ac1e..b95fb675 100644 --- a/lasso/id-ff/name_identifier_mapping.c +++ b/lasso/id-ff/name_identifier_mapping.c @@ -204,7 +204,7 @@ lasso_name_identifier_mapping_init_request(LassoNameIdentifierMapping *mapping, gint lasso_name_identifier_mapping_process_request_msg(LassoNameIdentifierMapping *mapping, gchar *request_msg, - lassoHttpMethods request_method) + lassoHttpMethod request_method) { LassoProfile *profile; LassoFederation *federation; @@ -279,7 +279,7 @@ lasso_name_identifier_mapping_process_request_msg(LassoNameIdentifierMapping *ma gint lasso_name_identifier_mapping_process_response_msg(LassoNameIdentifierMapping *mapping, gchar *response_msg, - lassoHttpMethods response_method) + lassoHttpMethod response_method) { LassoProfile *profile; xmlChar *statusCodeValue; diff --git a/lasso/id-ff/name_identifier_mapping.h b/lasso/id-ff/name_identifier_mapping.h index 1fd78a3f..303d99b2 100644 --- a/lasso/id-ff/name_identifier_mapping.h +++ b/lasso/id-ff/name_identifier_mapping.h @@ -71,11 +71,11 @@ LASSO_EXPORT gint lasso_name_identifier_mapping_init_requ LASSO_EXPORT gint lasso_name_identifier_mapping_process_request_msg (LassoNameIdentifierMapping *mapping, gchar *request_msg, - lassoHttpMethods request_method); + lassoHttpMethod request_method); LASSO_EXPORT gint lasso_name_identifier_mapping_process_response_msg (LassoNameIdentifierMapping *mapping, gchar *response_msg, - lassoHttpMethods response_method); + lassoHttpMethod response_method); #ifdef __cplusplus } diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c index 4b62a909..0239fa7f 100644 --- a/lasso/id-ff/profile.c +++ b/lasso/id-ff/profile.c @@ -43,13 +43,13 @@ static GObjectClass *parent_class = NULL; /* public functions */ /*****************************************************************************/ -gint +lassoRequestType lasso_profile_get_request_type_from_soap_msg(gchar *soap) { LassoNode *soap_node, *body_node, *request_node; GPtrArray *children; xmlChar *name; - int type = 0; + lassoRequestType type = lassoRequestTypeInvalid; soap_node = lasso_node_new_from_dump(soap); if (soap_node == NULL) { @@ -64,29 +64,29 @@ lasso_profile_get_request_type_from_soap_msg(gchar *soap) } children = lasso_node_get_children(body_node); - if(children->len>0) { + if(children->len > 0) { request_node = g_ptr_array_index(children, 0); name = lasso_node_get_name(request_node); - if(xmlStrEqual(name, "Request")){ + if(xmlStrEqual(name, "Request")) { type = lassoRequestTypeLogin; } - else if(xmlStrEqual(name, "LogoutRequest")){ + else if(xmlStrEqual(name, "LogoutRequest")) { type = lassoRequestTypeLogout; } - else if(xmlStrEqual(name, "FederationTerminationNotification")){ + else if(xmlStrEqual(name, "FederationTerminationNotification")) { type = lassoRequestTypeFederationTermination; } - else if(xmlStrEqual(name, "RegisterNameIdentifierRequest")){ + else if(xmlStrEqual(name, "RegisterNameIdentifierRequest")) { type = lassoRequestTypeRegisterNameIdentifier; } - else if(xmlStrEqual(name, "NameIdentifierMappingRequest")){ + else if(xmlStrEqual(name, "NameIdentifierMappingRequest")) { type = lassoRequestTypeNameIdentifierMapping; } - else if(xmlStrEqual(name, "AuthnRequest")){ + else if(xmlStrEqual(name, "AuthnRequest")) { type = lassoRequestTypeLecp; } - else{ + else { message(G_LOG_LEVEL_ERROR, "Unkown node name : %s\n", name); } xmlFree(name); @@ -102,7 +102,7 @@ lasso_profile_get_request_type_from_soap_msg(gchar *soap) gchar* lasso_profile_dump(LassoProfile *ctx, - const gchar *name) + const gchar *name) { LassoNode *node; LassoNode *request, *response = NULL; @@ -325,8 +325,8 @@ enum { }; static void -lasso_profile_instance_init(GTypeInstance *instance, - gpointer g_class) +lasso_profile_instance_init(GTypeInstance *instance, + gpointer g_class) { LassoProfile *ctx = LASSO_PROFILE(instance); @@ -392,10 +392,10 @@ lasso_profile_set_property (GObject *object, } static void -lasso_profile_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) +lasso_profile_get_property(GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { } diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h index 6acc0dc7..4f53fdd2 100644 --- a/lasso/id-ff/profile.h +++ b/lasso/id-ff/profile.h @@ -51,20 +51,21 @@ typedef struct _LassoProfilePrivate LassoProfilePrivate; /* Request types (used by SOAP endpoint) */ typedef enum { - lassoRequestTypeLogin = 1, + lassoRequestTypeInvalid = 0, + lassoRequestTypeLogin, lassoRequestTypeLogout, lassoRequestTypeFederationTermination, lassoRequestTypeRegisterNameIdentifier, lassoRequestTypeNameIdentifierMapping, - lassoRequestTypeLecp, -} lassoRequestTypes; + lassoRequestTypeLecp +} lassoRequestType; typedef enum { lassoHttpMethodGet = 1, lassoHttpMethodPost, lassoHttpMethodRedirect, - lassoHttpMethodSoap, -} lassoHttpMethods; + lassoHttpMethodSoap +} lassoHttpMethod; typedef enum { lassoMessageTypeNone = 0, @@ -72,8 +73,8 @@ typedef enum { lassoMessageTypeAuthnResponse, lassoMessageTypeRequest, lassoMessageTypeResponse, - lassoMessageTypeArtifact, -} lassoMessageTypes; + lassoMessageTypeArtifact +} lassoMessageType; struct _LassoProfile { GObject parent; @@ -96,8 +97,8 @@ struct _LassoProfile { /*< private >*/ LassoProfilePrivate *private; - lassoMessageTypes request_type; - lassoMessageTypes response_type; + lassoMessageType request_type; + lassoMessageType response_type; lassoProviderType provider_type; }; @@ -105,7 +106,7 @@ struct _LassoProfileClass { GObjectClass parent; }; -LASSO_EXPORT gint lasso_profile_get_request_type_from_soap_msg (gchar *soap); +LASSO_EXPORT lassoRequestType lasso_profile_get_request_type_from_soap_msg (gchar *soap); LASSO_EXPORT GType lasso_profile_get_type (void); @@ -131,17 +132,17 @@ LASSO_EXPORT gint lasso_profile_set_remote_providerID (LassoP LASSO_EXPORT void lasso_profile_set_response_status (LassoProfile *ctx, const gchar *statusCodeValue); -LASSO_EXPORT gint lasso_profile_set_identity (LassoProfile *ctx, +LASSO_EXPORT gint lasso_profile_set_identity (LassoProfile *ctx, LassoIdentity *identity); LASSO_EXPORT gint lasso_profile_set_identity_from_dump (LassoProfile *ctx, - const gchar *dump); + const gchar *dump); LASSO_EXPORT gint lasso_profile_set_session (LassoProfile *ctx, - LassoSession *session); + LassoSession *session); LASSO_EXPORT gint lasso_profile_set_session_from_dump (LassoProfile *ctx, - const gchar *dump); + const gchar *dump); #ifdef __cplusplus } diff --git a/lasso/id-ff/register_name_identifier.c b/lasso/id-ff/register_name_identifier.c index 819592de..cab3b66f 100644 --- a/lasso/id-ff/register_name_identifier.c +++ b/lasso/id-ff/register_name_identifier.c @@ -269,7 +269,7 @@ lasso_register_name_identifier_init_request(LassoRegisterNameIdentifier *registe gint lasso_register_name_identifier_load_request_msg(LassoRegisterNameIdentifier *register_name_identifier, gchar *request_msg, - lassoHttpMethods request_method) + lassoHttpMethod request_method) { LassoProfile *profile; @@ -383,7 +383,7 @@ lasso_register_name_identifier_process_request(LassoRegisterNameIdentifier *regi gint lasso_register_name_identifier_process_response_msg(LassoRegisterNameIdentifier *register_name_identifier, gchar *response_msg, - lassoHttpMethods response_method) + lassoHttpMethod response_method) { LassoProfile *profile; xmlChar *statusCodeValue; diff --git a/lasso/id-ff/register_name_identifier.h b/lasso/id-ff/register_name_identifier.h index fc009520..2856843f 100644 --- a/lasso/id-ff/register_name_identifier.h +++ b/lasso/id-ff/register_name_identifier.h @@ -72,13 +72,13 @@ LASSO_EXPORT gint lasso_register_name_identifier_init_request LASSO_EXPORT gint lasso_register_name_identifier_load_request_msg (LassoRegisterNameIdentifier *register_name_identifier, gchar *request_msg, - lassoHttpMethods request_method); + lassoHttpMethod request_method); LASSO_EXPORT gint lasso_register_name_identifier_process_request (LassoRegisterNameIdentifier *register_name_identifier); LASSO_EXPORT gint lasso_register_name_identifier_process_response_msg (LassoRegisterNameIdentifier *register_name_identifier, gchar *response_msg, - lassoHttpMethods response_method); + lassoHttpMethod response_method); #ifdef __cplusplus } |
