diff options
| -rw-r--r-- | polkit/Makefile.am | 1 | ||||
| -rw-r--r-- | polkit/polkit-policy-file.c | 204 | ||||
| -rw-r--r-- | test/test-invalid-1-action-id.policy | 14 | ||||
| -rw-r--r-- | test/test-invalid-2-bogus-any.policy | 14 | ||||
| -rw-r--r-- | test/test-invalid-3-bogus-inactive.policy | 14 | ||||
| -rw-r--r-- | test/test-invalid-4-bogus-active.policy | 14 | ||||
| -rw-r--r-- | test/test-invalid-5-max-depth.policy | 87 | ||||
| -rw-r--r-- | test/test-valid-1.policy | 14 | ||||
| -rw-r--r-- | test/test-valid-2-annotations.policy | 16 | ||||
| -rw-r--r-- | test/test-valid-3-lang.policy | 28 | ||||
| -rw-r--r-- | test/test-valid-4-unknown-tags.policy | 20 |
11 files changed, 388 insertions, 38 deletions
diff --git a/polkit/Makefile.am b/polkit/Makefile.am index 22bc162..fceba98 100644 --- a/polkit/Makefile.am +++ b/polkit/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DPOLKIT_COMPILATION \ + -DTEST_DATA_DIR=\"$(top_srcdir)/test/\" \ @GLIB_CFLAGS@ lib_LTLIBRARIES=libpolkit.la diff --git a/polkit/polkit-policy-file.c b/polkit/polkit-policy-file.c index e69d3bf..7d56f9d 100644 --- a/polkit/polkit-policy-file.c +++ b/polkit/polkit-policy-file.c @@ -143,6 +143,16 @@ pd_unref_action_data (ParserData *pd) polkit_hash_unref (pd->annotations); pd->annotations = NULL; } + p_free (pd->elem_lang); + pd->elem_lang = NULL; +} + +static void +pd_unref_data (ParserData *pd) +{ + pd_unref_action_data (pd); + p_free (pd->lang); + pd->lang = NULL; } static void @@ -219,10 +229,6 @@ _start (void *data, const char *el, const char **attr) goto oom; } break; - case STATE_IN_ACTION_DESCRIPTION: - break; - case STATE_IN_ACTION_MESSAGE: - break; case STATE_IN_DEFAULTS: if (strcmp (el, "allow_any") == 0) state = STATE_IN_DEFAULTS_ALLOW_ANY; @@ -231,23 +237,15 @@ _start (void *data, const char *el, const char **attr) else if (strcmp (el, "allow_active") == 0) state = STATE_IN_DEFAULTS_ALLOW_ACTIVE; break; - case STATE_IN_DEFAULTS_ALLOW_ANY: - break; - case STATE_IN_DEFAULTS_ALLOW_INACTIVE: - break; - case STATE_IN_DEFAULTS_ALLOW_ACTIVE: - break; - case STATE_IN_ANNOTATE: - break; default: break; } if (state == STATE_NONE) { - g_warning ("skipping unknown tag <%s> at line %d of %s", - el, (int) XML_GetCurrentLineNumber (pd->parser), pd->path); - syslog (LOG_ALERT, "libpolkit: skipping unknown tag <%s> at line %d of %s", - el, (int) XML_GetCurrentLineNumber (pd->parser), pd->path); + //g_warning ("skipping unknown tag <%s> at line %d of %s", + // el, (int) XML_GetCurrentLineNumber (pd->parser), pd->path); + //syslog (LOG_ALERT, "libpolkit: skipping unknown tag <%s> at line %d of %s", + // el, (int) XML_GetCurrentLineNumber (pd->parser), pd->path); state = STATE_UNKNOWN_TAG; } @@ -408,9 +406,6 @@ _end (void *data, const char *el) goto oom; pd->annotations = NULL; - if (pfe == NULL) - goto error; - if (pd->load_descriptions) { policy_description = _localize (pd->policy_descriptions, pd->policy_description_nolang, pd->lang); policy_message = _localize (pd->policy_messages, pd->policy_message_nolang, pd->lang); @@ -422,8 +417,10 @@ _end (void *data, const char *el) if (pd->load_descriptions) { if (!_polkit_policy_file_entry_set_descriptions (pfe, policy_description, - policy_message)) + policy_message)) { + polkit_policy_file_entry_unref (pfe); goto oom; + } } pd->pf->entries = g_slist_prepend (pd->pf->entries, pfe); @@ -473,6 +470,7 @@ polkit_policy_file_new (const char *path, polkit_bool_t load_descriptions, PolKi GError *g_error; pf = NULL; + buf = NULL; /* clear parser data */ memset (&pd, 0, sizeof (ParserData)); @@ -509,8 +507,12 @@ polkit_policy_file_new (const char *path, polkit_bool_t load_descriptions, PolKi XML_SetCharacterDataHandler (pd.parser, _cdata); pf = p_new0 (PolKitPolicyFile, 1); - if (pf == NULL) + if (pf == NULL) { + polkit_error_set_error (error, POLKIT_ERROR_OUT_OF_MEMORY, + "Cannot load PolicyKit policy file at '%s': No memory for object", + path); goto error; + } pf->refcount = 1; @@ -522,8 +524,12 @@ polkit_policy_file_new (const char *path, polkit_bool_t load_descriptions, PolKi if (lang != NULL) { int n; pd.lang = p_strdup (lang); - if (pd.lang == NULL) + if (pd.lang == NULL) { + polkit_error_set_error (error, POLKIT_ERROR_OUT_OF_MEMORY, + "Cannot load PolicyKit policy file at '%s': No memory for lang", + path); goto error; + } for (n = 0; pd.lang[n] != '\0'; n++) { if (pd.lang[n] == '.') { pd.lang[n] = '\0'; @@ -547,17 +553,18 @@ polkit_policy_file_new (const char *path, polkit_bool_t load_descriptions, PolKi XML_ErrorString (XML_GetErrorCode (pd.parser))); } XML_ParserFree (pd.parser); - p_free (buf); goto error; } + XML_ParserFree (pd.parser); - p_free (buf); - pd_unref_action_data (&pd); + g_free (buf); + pd_unref_data (&pd); return pf; error: if (pf != NULL) polkit_policy_file_unref (pf); - pd_unref_action_data (&pd); + pd_unref_data (&pd); + g_free (buf); return NULL; } @@ -627,27 +634,148 @@ polkit_policy_file_entry_foreach (PolKitPolicyFile *policy_file, #ifdef POLKIT_BUILD_TESTS -#define TEST_DATA_DIR "/home/davidz/Hacking/PolicyKit/test/" +/* this checks that the policy descriptions read from test-valid-3-lang.policy are correct */ +static void +_check_pf (PolKitPolicyFile *pf, PolKitPolicyFileEntry *pfe, void *user_data) +{ + const char *r_msg; + const char *r_desc; + char *msg; + char *desc; + char *lang; + int *counter = (int *) user_data; + polkit_bool_t is_danish; + + is_danish = FALSE; + lang = getenv ("LANG"); + if (lang != NULL) { + if (strcmp (lang, "da_DK.UTF8") == 0 || + strcmp (lang, "da_DK") == 0 || + strcmp (lang, "da") == 0) + is_danish = TRUE; + } + + + if (strcmp (polkit_policy_file_entry_get_id (pfe), "org.example") == 0) { + if (is_danish) { + desc = "example (danish)"; + msg = "message (danish)"; + } else { + desc = "example"; + msg = "message"; + } + r_desc = polkit_policy_file_entry_get_action_description (pfe); + r_msg = polkit_policy_file_entry_get_action_message (pfe); + + if (strcmp (r_desc, desc) == 0 && + strcmp (r_msg, msg) == 0) + *counter += 1; + + } else if (strcmp (polkit_policy_file_entry_get_id (pfe), "org.example2") == 0) { + if (is_danish) { + desc = "example 2 (danish)"; + msg = "message 2 (danish)"; + } else { + desc = "example 2"; + msg = "message 2"; + } + r_desc = polkit_policy_file_entry_get_action_description (pfe); + r_msg = polkit_policy_file_entry_get_action_message (pfe); + + if (strcmp (r_desc, desc) == 0 && + strcmp (r_msg, msg) == 0) + *counter += 1; + } +} static polkit_bool_t _run_test (void) { + int m; + unsigned int n; PolKitPolicyFile *pf; PolKitError *error; + const char *valid_files[] = { + TEST_DATA_DIR "test-valid-1.policy", + TEST_DATA_DIR "test-valid-2-annotations.policy", + TEST_DATA_DIR "test-valid-3-lang.policy", + TEST_DATA_DIR "test-valid-4-unknown-tags.policy", + }; + const char *invalid_files[] = { + TEST_DATA_DIR "non-existant-file.policy", + TEST_DATA_DIR "bad.extension", + TEST_DATA_DIR "test-invalid-1-action-id.policy", + TEST_DATA_DIR "test-invalid-2-bogus-any.policy", + TEST_DATA_DIR "test-invalid-3-bogus-inactive.policy", + TEST_DATA_DIR "test-invalid-4-bogus-active.policy", + TEST_DATA_DIR "test-invalid-5-max-depth.policy", + }; + + for (n = 0; n < sizeof (invalid_files) / sizeof (char*); n++) { + error = NULL; + g_assert (polkit_policy_file_new (invalid_files[n], TRUE, &error) == NULL); + g_assert (polkit_error_get_error_code (error) == POLKIT_ERROR_OUT_OF_MEMORY || + polkit_error_get_error_code (error) == POLKIT_ERROR_POLICY_FILE_INVALID); + polkit_error_free (error); + } + + for (n = 0; n < sizeof (valid_files) / sizeof (char*); n++) { - error = NULL; - g_assert (polkit_policy_file_new (TEST_DATA_DIR "bad.extension", TRUE, &error) == NULL); - g_assert (polkit_error_get_error_code (error) == POLKIT_ERROR_OUT_OF_MEMORY || - polkit_error_get_error_code (error) == POLKIT_ERROR_POLICY_FILE_INVALID); - polkit_error_free (error); - error = NULL; + for (m = 0; m < 6; m++) { + polkit_bool_t load_descriptions; - if ((pf = polkit_policy_file_new (TEST_DATA_DIR "test-valid-1.policy", TRUE, NULL)) == NULL) - goto oom; + /* only run the multiple lang tests for test-valid-3-lang.policy */ + if (n != 2) { + if (m > 0) + break; + } -oom: - if (pf != NULL) - polkit_policy_file_unref (pf); + load_descriptions = TRUE; + + switch (m) { + case 0: + unsetenv ("LANG"); + break; + case 1: + setenv ("LANG", "da_DK.UTF8", 1); + break; + case 2: + setenv ("LANG", "da_DK", 1); + break; + case 3: + setenv ("LANG", "da", 1); + break; + case 4: + setenv ("LANG", "en_CA", 1); + break; + case 5: + unsetenv ("LANG"); + load_descriptions = FALSE; + break; + } + + error = NULL; + if ((pf = polkit_policy_file_new (valid_files[n], load_descriptions, &error)) == NULL) { + g_assert (polkit_error_get_error_code (error) == POLKIT_ERROR_OUT_OF_MEMORY); + polkit_error_free (error); + } else { + + if (n == 2 && m != 5) { + int num_passed; + + num_passed = 0; + polkit_policy_file_entry_foreach (pf, + _check_pf, + &num_passed); + g_assert (num_passed == 2); + } + + polkit_policy_file_ref (pf); + polkit_policy_file_unref (pf); + polkit_policy_file_unref (pf); + } + } + } return TRUE; } diff --git a/test/test-invalid-1-action-id.policy b/test/test-invalid-1-action-id.policy new file mode 100644 index 0000000..102d346 --- /dev/null +++ b/test/test-invalid-1-action-id.policy @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="4org.example"> + <description>foo</description> + <message>bar</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + </action> + +</policyconfig> diff --git a/test/test-invalid-2-bogus-any.policy b/test/test-invalid-2-bogus-any.policy new file mode 100644 index 0000000..87b3862 --- /dev/null +++ b/test/test-invalid-2-bogus-any.policy @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="org.example"> + <description>foo</description> + <message>bar</message> + <defaults> + <allow_any>_bogus_</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + </action> + +</policyconfig> diff --git a/test/test-invalid-3-bogus-inactive.policy b/test/test-invalid-3-bogus-inactive.policy new file mode 100644 index 0000000..8306a83 --- /dev/null +++ b/test/test-invalid-3-bogus-inactive.policy @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="org.example"> + <description>foo</description> + <message>bar</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>_bogus_</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + </action> + +</policyconfig> diff --git a/test/test-invalid-4-bogus-active.policy b/test/test-invalid-4-bogus-active.policy new file mode 100644 index 0000000..1d2bcef --- /dev/null +++ b/test/test-invalid-4-bogus-active.policy @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="org.example"> + <description>foo</description> + <message>bar</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>_bogus_</allow_active> + </defaults> + </action> + +</policyconfig> diff --git a/test/test-invalid-5-max-depth.policy b/test/test-invalid-5-max-depth.policy new file mode 100644 index 0000000..f6e923d --- /dev/null +++ b/test/test-invalid-5-max-depth.policy @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + <future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + </future> + + <action id="4org.example"> + <description>foo</description> + <message>bar</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + </action> + +</policyconfig> diff --git a/test/test-valid-1.policy b/test/test-valid-1.policy new file mode 100644 index 0000000..b89c826 --- /dev/null +++ b/test/test-valid-1.policy @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="org.example"> + <description>example</description> + <message>example</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + </action> + +</policyconfig> diff --git a/test/test-valid-2-annotations.policy b/test/test-valid-2-annotations.policy new file mode 100644 index 0000000..06bc95e --- /dev/null +++ b/test/test-valid-2-annotations.policy @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="org.example"> + <description>example 2</description> + <message>message 2</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + <annotate key="the.key1">Some Value 1</annotate> + <annotate key="the.key2">Some Value 2</annotate> + </action> + +</policyconfig> diff --git a/test/test-valid-3-lang.policy b/test/test-valid-3-lang.policy new file mode 100644 index 0000000..e7b7ca5 --- /dev/null +++ b/test/test-valid-3-lang.policy @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="org.example"> + <description>example</description> + <message>message</message> + <description xml:lang="da">example (danish)</description> + <message xml:lang="da">message (danish)</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + </action> + + <action id="org.example2"> + <description>example 2</description> + <message>message 2</message> + <description xml:lang="da">example 2 (danish)</description> + <message xml:lang="da">message 2 (danish)</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + </action> + +</policyconfig> diff --git a/test/test-valid-4-unknown-tags.policy b/test/test-valid-4-unknown-tags.policy new file mode 100644 index 0000000..ba18b37 --- /dev/null +++ b/test/test-valid-4-unknown-tags.policy @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<policyconfig> + + <action id="org.example"> + <description>example</description> + <message>example</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_always</allow_active> + </defaults> + <future_tag> + <future_tag2/> + <future_tag3> + <future_tag4/> + </future_tag3> + </future_tag> + </action> + +</policyconfig> |