Attachment 125600 Details for Bug 97245 – uri: Support 'module-name' and 'module-path'

[patch] uri: Support 'module-name' and 'module-path'

uri-Support-module-name-and-module-path.patch (text/plain), 8.86 KB, created by Daiki Ueno on 2016-08-08 15:09:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daiki Ueno

Created: 2016-08-08 15:09:14 UTC

Size: 8.86 KB

patch

obsolete

>From fa91b4fc8910d547d7a943751f7248ca3ebe8734 Mon Sep 17 00:00:00 2001
>From: Daiki Ueno <dueno@redhat.com>
>Date: Mon, 8 Aug 2016 16:41:44 +0200
>Subject: [PATCH] uri: Support 'module-name' and 'module-path'
>
>Accept 'module-name' and 'module-path' query attributes defined in RFC
>7512.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=97245
>---
> p11-kit/test-uri.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> p11-kit/uri.c      | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> p11-kit/uri.h      |  10 +++++
> 3 files changed, 220 insertions(+)
>
>diff --git a/p11-kit/test-uri.c b/p11-kit/test-uri.c
>index 1fb5081..78cc3f5 100644
>--- a/p11-kit/test-uri.c
>+++ b/p11-kit/test-uri.c
>@@ -1447,6 +1447,106 @@ test_uri_free_null (void)
> }
> 
> static void
>+test_uri_module_name (void)
>+{
>+	P11KitUri *uri;
>+	const char *module_name;
>+	char *string;
>+	int ret;
>+
>+	uri = p11_kit_uri_new ();
>+	assert_ptr_not_null (uri);
>+
>+	p11_kit_uri_set_module_name (uri, "123456");
>+
>+	module_name = p11_kit_uri_get_module_name (uri);
>+	assert_str_eq ("123456", module_name);
>+
>+	p11_kit_uri_set_module_name (uri, "1*&#%&@(");
>+
>+	module_name = p11_kit_uri_get_module_name (uri);
>+	assert_str_eq ("1*&#%&@(", module_name);
>+
>+	ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_ANY, &string);
>+	assert_num_eq (P11_KIT_URI_OK, ret);
>+	assert (strstr (string, "pkcs11:module-name=1%2a%26%23%25%26%40%28") != NULL);
>+	free (string);
>+
>+	ret = p11_kit_uri_parse ("pkcs11:module-name=blah%2Fblah", P11_KIT_URI_FOR_ANY, uri);
>+	assert_num_eq (P11_KIT_URI_OK, ret);
>+
>+	module_name = p11_kit_uri_get_module_name (uri);
>+	assert_str_eq ("blah/blah", module_name);
>+
>+	p11_kit_uri_free (uri);
>+}
>+
>+static void
>+test_uri_module_name_bad (void)
>+{
>+	P11KitUri *uri;
>+	int ret;
>+
>+	uri = p11_kit_uri_new ();
>+	assert_ptr_not_null (uri);
>+
>+	ret = p11_kit_uri_parse ("pkcs11:module-name=blahblah%2", P11_KIT_URI_FOR_ANY, uri);
>+	assert_num_eq (P11_KIT_URI_BAD_ENCODING, ret);
>+
>+	p11_kit_uri_free (uri);
>+}
>+
>+static void
>+test_uri_module_path (void)
>+{
>+	P11KitUri *uri;
>+	const char *module_path;
>+	char *string;
>+	int ret;
>+
>+	uri = p11_kit_uri_new ();
>+	assert_ptr_not_null (uri);
>+
>+	p11_kit_uri_set_module_path (uri, "123456");
>+
>+	module_path = p11_kit_uri_get_module_path (uri);
>+	assert_str_eq ("123456", module_path);
>+
>+	p11_kit_uri_set_module_path (uri, "1*&#%&@(");
>+
>+	module_path = p11_kit_uri_get_module_path (uri);
>+	assert_str_eq ("1*&#%&@(", module_path);
>+
>+	ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_ANY, &string);
>+	assert_num_eq (P11_KIT_URI_OK, ret);
>+	assert (strstr (string, "pkcs11:module-path=1%2a%26%23%25%26%40%28") != NULL);
>+	free (string);
>+
>+	ret = p11_kit_uri_parse ("pkcs11:module-path=blah%2Fblah", P11_KIT_URI_FOR_ANY, uri);
>+	assert_num_eq (P11_KIT_URI_OK, ret);
>+
>+	module_path = p11_kit_uri_get_module_path (uri);
>+	assert_str_eq ("blah/blah", module_path);
>+
>+	p11_kit_uri_free (uri);
>+}
>+
>+static void
>+test_uri_module_path_bad (void)
>+{
>+	P11KitUri *uri;
>+	int ret;
>+
>+	uri = p11_kit_uri_new ();
>+	assert_ptr_not_null (uri);
>+
>+	ret = p11_kit_uri_parse ("pkcs11:module-path=blahblah%2", P11_KIT_URI_FOR_ANY, uri);
>+	assert_num_eq (P11_KIT_URI_BAD_ENCODING, ret);
>+
>+	p11_kit_uri_free (uri);
>+}
>+
>+static void
> test_uri_message (void)
> {
> 	assert (p11_kit_uri_message (P11_KIT_URI_OK) == NULL);
>@@ -1505,6 +1605,10 @@ main (int argc,
> 	p11_test (test_uri_pin_value_bad, "/uri/pin-value-bad");
> 	p11_test (test_uri_slot_id, "/uri/slot-id");
> 	p11_test (test_uri_slot_id_bad, "/uri/slot-id-bad");
>+	p11_test (test_uri_module_name, "/uri/module-name");
>+	p11_test (test_uri_module_name_bad, "/uri/module-name-bad");
>+	p11_test (test_uri_module_path, "/uri/module-path");
>+	p11_test (test_uri_module_path_bad, "/uri/module-path-bad");
> 	p11_test (test_uri_free_null, "/uri/test_uri_free_null");
> 	p11_test (test_uri_message, "/uri/test_uri_message");
> 
>diff --git a/p11-kit/uri.c b/p11-kit/uri.c
>index 1fd7a89..de3f42a 100644
>--- a/p11-kit/uri.c
>+++ b/p11-kit/uri.c
>@@ -148,6 +148,8 @@ struct p11_kit_uri {
> 	char *pin_source;
> 	char *pin_value;
> 	CK_SLOT_ID slot_id;
>+	char *module_name;
>+	char *module_path;
> };
> 
> static char *
>@@ -728,6 +730,76 @@ p11_kit_uri_set_pinfile (P11KitUri *uri, const char *pinfile)
> }
> 
> /**
>+ * p11_kit_uri_get_module_name:
>+ * @uri: The URI
>+ *
>+ * Get the 'module-name' part of the URI. This is used by some
>+ * applications to modify the default settings for accessing a
>+ * PKCS\#11 provider.
>+ *
>+ * Returns: The module-name or %NULL if not present.
>+ */
>+const char *
>+p11_kit_uri_get_module_name (P11KitUri *uri)
>+{
>+	return_val_if_fail (uri != NULL, NULL);
>+	return uri->module_name;
>+}
>+
>+/**
>+ * p11_kit_uri_set_module_name:
>+ * @uri: The URI
>+ * @module_name: The new module-name
>+ *
>+ * Set the 'module-name' part of the URI. This is used by some
>+ * applications to modify the default settings for accessing a
>+ * PKCS\#11 provider.
>+ */
>+void
>+p11_kit_uri_set_module_name (P11KitUri  *uri,
>+                             const char *module_name)
>+{
>+	return_if_fail (uri != NULL);
>+	free (uri->module_name);
>+	uri->module_name = module_name ? strdup (module_name) : NULL;
>+}
>+
>+/**
>+ * p11_kit_uri_get_module_path:
>+ * @uri: The URI
>+ *
>+ * Get the 'module-path' part of the URI. This is used by some
>+ * applications to modify the default settings for accessing a
>+ * PKCS\#11 provider.
>+ *
>+ * Returns: The module-path or %NULL if not present.
>+ */
>+const char *
>+p11_kit_uri_get_module_path (P11KitUri *uri)
>+{
>+	return_val_if_fail (uri != NULL, NULL);
>+	return uri->module_path;
>+}
>+
>+/**
>+ * p11_kit_uri_set_module_path:
>+ * @uri: The URI
>+ * @pin: The new module-path
>+ *
>+ * Set the 'module-path' part of the URI. This is used by some
>+ * applications to modify the default settings for accessing a
>+ * PKCS\#11 provider.
>+ */
>+void
>+p11_kit_uri_set_module_path (P11KitUri  *uri,
>+                             const char *module_path)
>+{
>+	return_if_fail (uri != NULL);
>+	free (uri->module_path);
>+	uri->module_path = module_path ? strdup (module_path) : NULL;
>+}
>+
>+/**
>  * p11_kit_uri_new:
>  *
>  * Create a new blank PKCS\#11 URI.
>@@ -1026,6 +1098,22 @@ p11_kit_uri_format (P11KitUri *uri, P11KitUriType uri_type, char **string)
> 		}
> 	}
> 
>+	if (uri->module_name) {
>+		if (!format_encode_string (&buffer, &is_first, "module-name",
>+					   (const unsigned char*)uri->module_name,
>+					   strlen (uri->module_name), 0)) {
>+			return_val_if_reached (P11_KIT_URI_UNEXPECTED);
>+		}
>+	}
>+
>+	if (uri->module_path) {
>+		if (!format_encode_string (&buffer, &is_first, "module-path",
>+					   (const unsigned char*)uri->module_path,
>+					   strlen (uri->module_path), 0)) {
>+			return_val_if_reached (P11_KIT_URI_UNEXPECTED);
>+		}
>+	}
>+
> 	return_val_if_fail (p11_buffer_ok (&buffer), P11_KIT_URI_UNEXPECTED);
> 	*string = p11_buffer_steal (&buffer, NULL);
> 	return P11_KIT_URI_OK;
>@@ -1306,6 +1394,18 @@ parse_extra_info (const char *name_start, const char *name_end,
> 		free (uri->pin_value);
> 		uri->pin_value = (char*)pin_source;
> 		return 1;
>+	} else if (memcmp ("module-name", name_start, name_end - name_start) == 0) {
>+		module_name = p11_url_decode (start, end, P11_URL_WHITESPACE, NULL);
>+		if (module_name == NULL)
>+			return P11_KIT_URI_BAD_ENCODING;
>+		free (uri->module_name);
>+		uri->module_name = (char*)module_name;
>+	} else if (memcmp ("module-path", name_start, name_end - name_start) == 0) {
>+		module_path = p11_url_decode (start, end, P11_URL_WHITESPACE, NULL);
>+		if (module_path == NULL)
>+			return P11_KIT_URI_BAD_ENCODING;
>+		free (uri->module_path);
>+		uri->module_path = (char*)module_path;
> 	}
> 
> 	return 0;
>@@ -1382,6 +1482,10 @@ p11_kit_uri_parse (const char *string, P11KitUriType uri_type,
> 	free (uri->pin_value);
> 	uri->pin_value = NULL;
> 	uri->slot_id = (CK_SLOT_ID)-1;
>+	free (uri->module_name);
>+	uri->module_name = NULL;
>+	free (uri->module_path);
>+	uri->module_path = NULL;
> 
> 	for (;;) {
> 		spos = strchr (string, ';');
>@@ -1447,6 +1551,8 @@ p11_kit_uri_free (P11KitUri *uri)
> 	p11_attrs_free (uri->attrs);
> 	free (uri->pin_source);
> 	free (uri->pin_value);
>+	free (uri->module_name);
>+	free (uri->module_path);
> 	free (uri);
> }
> 
>diff --git a/p11-kit/uri.h b/p11-kit/uri.h
>index 58f6fc9..9eed297 100644
>--- a/p11-kit/uri.h
>+++ b/p11-kit/uri.h
>@@ -151,6 +151,16 @@ void                p11_kit_uri_set_pinfile                 (P11KitUri *uri,
> 
> #endif /* P11_KIT_DISABLE_DEPRECATED */
> 
>+const char         *p11_kit_uri_get_module_name             (P11KitUri *uri);
>+
>+void                p11_kit_uri_set_module_name             (P11KitUri *uri,
>+                                                             const char *module_name);
>+
>+const char         *p11_kit_uri_get_module_path             (P11KitUri *uri);
>+
>+void                p11_kit_uri_set_module_path             (P11KitUri *uri,
>+                                                             const char *module_path);
>+
> void                p11_kit_uri_set_unrecognized            (P11KitUri *uri,
>                                                              int unrecognized);
> 
>-- 
>2.7.4

Actions: View | Splinter Review

Attachments on bug 97245: 125597 | 125598 | 125599 | 125600 | 125704 | 125705 | 125706 | 125707 | 125708 | 126649 | 126743

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.