added new standard error code LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED

6 files changed, 14 insertions, 11 deletions

diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c
index 70051635..a4ccac68 100644
--- a/lasso/id-ff/defederation.c
+++ b/lasso/id-ff/defederation.c
@@ -97,8 +97,7 @@ lasso_defederation_build_notification_msg(LassoDefederation *defederation)
 
 		if (query == NULL) {
 			g_free(url);
-			message(G_LOG_LEVEL_CRITICAL, "Error while building request QUERY url");
-			return -1;
+			return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED);
 		}
 
 		profile->msg_url = g_strdup_printf("%s?%s", url, query);
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 4f9a8ff5..27f73719 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -575,8 +575,7 @@ lasso_login_build_authn_request_msg(LassoLogin *login)
 					LASSO_PROFILE(login)->request, 0, NULL);
 		}
 		if (query == NULL) {
-			message(G_LOG_LEVEL_CRITICAL, "Failed to create AuthnRequest query");
-			return -3;
+			return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED);
 		}
 
 		/* get SingleSignOnServiceURL metadata */
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 87e7a876..58297a34 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -101,8 +101,7 @@ lasso_logout_build_request_msg(LassoLogout *logout)
 				profile->server->private_key);
 		if (query == NULL) {
 			g_free(url);
-			message(G_LOG_LEVEL_CRITICAL, "Error while building request QUERY url");
-			return -1;
+			return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED);
 		}
 		/* build the msg_url */
 		profile->msg_url = g_strdup_printf("%s?%s", url, query);
@@ -172,7 +171,7 @@ lasso_logout_build_response_msg(LassoLogout *logout)
 				profile->server->private_key);
 		if (query == NULL) {
 			g_free(url);
-			return -1;
+			return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED);
 		}
 		profile->msg_url = g_strdup_printf("%s?%s", url, query);
 		profile->msg_body = NULL;
@@ -526,7 +525,12 @@ lasso_logout_process_response_msg(LassoLogout *logout, gchar *response_msg)
 			query = lasso_node_export_to_query(profile->request,
 					profile->server->signature_method,
 					profile->server->private_key);
+			if (query == NULL) {
+				g_free(url);
+				return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED);
+			}
 			profile->msg_url = g_strdup_printf("%s?%s", url, query);
+			g_free(url);
 			g_free(query);
 			profile->msg_body = NULL;
 
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index ff4e9dd0..23a69bc8 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -88,8 +88,7 @@ lasso_name_registration_build_request_msg(LassoNameRegistration *name_registrati
 				profile->server->private_key);
 		if (query == NULL) {
 			g_free(url);
-			message(G_LOG_LEVEL_CRITICAL, "Error building request QUERY url");
-			return -1;
+			return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED);
 		}
 		/* build the msg_url */
 		profile->msg_url = g_strdup_printf("%s?%s", url, query);
@@ -138,8 +137,7 @@ lasso_name_registration_build_response_msg(LassoNameRegistration *name_registrat
 				profile->server->private_key);
 		if (query == NULL) {
 			g_free(url);
-			message(G_LOG_LEVEL_CRITICAL, "Error building request QUERY url");
-			return -1;
+			return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED);
 		}
 		/* build the msg_url */
 		profile->msg_url = g_strdup_printf("%s?%s", url, query);
diff --git a/lasso/xml/errors.c b/lasso/xml/errors.c
index 0037b831..e43a7974 100644
--- a/lasso/xml/errors.c
+++ b/lasso/xml/errors.c
@@ -95,6 +95,8 @@ lasso_strerror(int error_code)
 			return "Federation not found";
 		case LASSO_PROFILE_ERROR_NAME_IDENTIFIER_NOT_FOUND:
 			return "Name identifier not found";
+		case LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED:
+			return "Error building request QUERY url";
 
 		case LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ:
 			return "An object type provided as parameter "\
diff --git a/lasso/xml/errors.h b/lasso/xml/errors.h
index 19d11fb2..d7e40b36 100644
--- a/lasso/xml/errors.h
+++ b/lasso/xml/errors.h
@@ -69,6 +69,7 @@
 #define LASSO_PROFILE_ERROR_IDENTITY_NOT_FOUND        -411
 #define LASSO_PROFILE_ERROR_FEDERATION_NOT_FOUND      -412
 #define LASSO_PROFILE_ERROR_NAME_IDENTIFIER_NOT_FOUND -413
+#define LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED     -414
 
 /* functions/methods parameters checking */
 #define LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ        -501