produce 1.1 requests and notifications when interoperating with previous

liberty implementations

7 files changed, 43 insertions, 7 deletions

diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c
index 9103cae4..6275f0b8 100644
--- a/lasso/id-ff/defederation.c
+++ b/lasso/id-ff/defederation.c
@@ -223,6 +223,11 @@ lasso_defederation_init_notification(LassoDefederation *defederation, gchar *rem
 			g_strdup(profile->msg_relayState);
 	}
 
+	if (lasso_provider_compatibility_level(remote_provider) < LIBERTY_1_2) {
+		profile->request->MajorVersion = 1;
+		profile->request->MinorVersion = 1;
+	}
+
 	/* Set the nameIdentifier attribute from content local variable */
 	profile->nameIdentifier = g_object_ref(nameIdentifier);
 
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 247aa7ba..04b10ec8 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -914,6 +914,10 @@ lasso_login_init_authn_request(LassoLogin *login, const gchar *remote_providerID
 	profile->request->RequestID = lasso_build_unique_id(32);
 	profile->request->MajorVersion = LASSO_LIB_MAJOR_VERSION_N;
 	profile->request->MinorVersion = LASSO_LIB_MINOR_VERSION_N;
+	if (lasso_provider_compatibility_level(remote_provider) < LIBERTY_1_2) {
+		profile->request->MajorVersion = 1;
+		profile->request->MinorVersion = 1;
+	}
 	profile->request->IssueInstant = lasso_get_current_time();
 	LASSO_LIB_AUTHN_REQUEST(profile->request)->ProviderID = g_strdup(
 			LASSO_PROVIDER(profile->server)->ProviderID);
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 158037cf..452016d4 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -373,6 +373,12 @@ lasso_logout_init_request(LassoLogout *logout, char *remote_providerID,
 				LASSO_SIGNATURE_TYPE_NONE,
 				0);
 	}
+
+	if (lasso_provider_compatibility_level(remote_provider) < LIBERTY_1_2) {
+		profile->request->MajorVersion = 1;
+		profile->request->MinorVersion = 1;
+	}
+
 	if (session_index)
 		LASSO_LIB_LOGOUT_REQUEST(profile->request)->SessionIndex = session_index;
 	if (profile->msg_relayState)
diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c
index 10efa867..0cf80fe2 100644
--- a/lasso/id-ff/name_identifier_mapping.c
+++ b/lasso/id-ff/name_identifier_mapping.c
@@ -244,6 +244,11 @@ lasso_name_identifier_mapping_init_request(LassoNameIdentifierMapping *mapping,
 		return critical_error(LASSO_PROFILE_ERROR_BUILDING_REQUEST_FAILED);
 	}
 
+	if (lasso_provider_compatibility_level(remote_provider) < LIBERTY_1_2) {
+		profile->request->MajorVersion = 1;
+		profile->request->MinorVersion = 1;
+	}
+
 	profile->http_request_method = LASSO_HTTP_METHOD_SOAP;
 
 	return 0;
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index e2a3a2be..606cdd1c 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -324,6 +324,11 @@ lasso_name_registration_init_request(LassoNameRegistration *name_registration,
 	LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(profile->request)->RelayState = 
 			g_strdup(profile->msg_relayState);
 
+	if (lasso_provider_compatibility_level(remote_provider) < LIBERTY_1_2) {
+		profile->request->MajorVersion = 1;
+		profile->request->MinorVersion = 1;
+	}
+
 	profile->http_request_method = http_method;
 
 	return 0;
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index bdd43430..a008cfcd 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -35,7 +35,7 @@
 struct _LassoProviderPrivate
 {
 	gboolean dispose_has_run;
-	gboolean liberty_12_conformance; /* conformance with Liberty 1.2 specs */
+	LibertyConformanceLevel conformance;
 	GHashTable *SPDescriptor;
 	char *default_assertion_consumer;
 	GHashTable *IDPDescriptor;
@@ -522,6 +522,12 @@ lasso_provider_get_type()
 	return this_type;
 }
 
+LibertyConformanceLevel
+lasso_provider_compatibility_level(LassoProvider *provider)
+{
+	return provider->private_data->conformance;
+}
+
 gboolean
 lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 {
@@ -529,7 +535,6 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 	xmlXPathContext *xpathCtx;
 	xmlXPathObject *xpathObj;
 	xmlNode *node;
-	gboolean compatibility = FALSE; /* compatibility with ID-FF 1.1 metadata files */
 	const char *xpath_idp = "/md:EntityDescriptor/md:IDPDescriptor";
 	const char *xpath_sp = "/md:EntityDescriptor/md:SPDescriptor";
 
@@ -538,6 +543,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 		return FALSE;
 
 	provider->metadata_filename = g_strdup(metadata);
+	provider->private_data->conformance = LIBERTY_1_2;
 
 	xpathCtx = xmlXPathNewContext(doc);
 	xmlXPathRegisterNs(xpathCtx, "md", LASSO_METADATA_HREF);
@@ -556,7 +562,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 			xmlXPathFreeContext(xpathCtx);
 			return FALSE;
 		}
-		compatibility = TRUE;
+		provider->private_data->conformance = LIBERTY_1_1;
 		xpath_idp = "/md11:IDPDescriptor";
 		xpath_sp = "/md11:SPDescriptor";
 	}
@@ -567,7 +573,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr == 1) {
 		load_descriptor(xpathObj->nodesetval->nodeTab[0],
 				provider->private_data->IDPDescriptor, provider);
-		if (compatibility) {
+		if (provider->private_data->conformance < LIBERTY_1_2) {
 			/* lookup ProviderID */
 			node = xpathObj->nodesetval->nodeTab[0]->children;
 			while (node) {
@@ -585,7 +591,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr == 1) {
 		load_descriptor(xpathObj->nodesetval->nodeTab[0],
 				provider->private_data->SPDescriptor, provider);
-		if (compatibility) {
+		if (provider->private_data->conformance < LIBERTY_1_2) {
 			/* lookup ProviderID */
 			node = xpathObj->nodesetval->nodeTab[0]->children;
 			while (node) {
@@ -602,8 +608,6 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 	xmlFreeDoc(doc);
 	xmlXPathFreeContext(xpathCtx);
 
-	provider->private_data->liberty_12_conformance = compatibility;
-
 	return TRUE;
 }
 
diff --git a/lasso/id-ff/providerprivate.h b/lasso/id-ff/providerprivate.h
index 8ae70a7d..c026c889 100644
--- a/lasso/id-ff/providerprivate.h
+++ b/lasso/id-ff/providerprivate.h
@@ -29,9 +29,16 @@
 extern "C" {
 #endif /* __cplusplus */ 
 
+typedef enum {
+	LIBERTY_1_0,
+	LIBERTY_1_1,
+	LIBERTY_1_2,
+} LibertyConformanceLevel;
+
 gboolean lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata);
 int lasso_provider_verify_signature(LassoProvider *provider,
 		const char *message, const char *id_attr_name, LassoMessageFormat format);
+LibertyConformanceLevel lasso_provider_compatibility_level(LassoProvider *provider);
 
 #ifdef __cplusplus
 }