mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-18 21:55:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

common: Export glob_to_regexp util and make it handle empty parts as *

Browse Source 
This means you can use "org.foo.bar//stable" instead of "org.foo.bar/*/stable"
which is similar to what other APIs do.

We want to use this for masking extensions too, thus the export.
This commit is contained in:
Alexander Larsson
2019-09-25 15:45:10 +02:00
committed by Alexander Larsson
parent c601a808a8
commit 9f6fc5591c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/flatpak-utils-private.h
View File

@@ -184,6 +184,7 @@ gboolean flatpak_id_has_subref_suffix (const char *id);
char **flatpak_decompose_ref (const char *ref,
GError **error);
char * flatpak_filter_glob_to_regexp (const char *glob, GError **error);
gboolean flatpak_parse_filters (const char *data,
GRegex **allow_refs_out,
GRegex **deny_refs_out,

16
common/flatpak-utils.c
View File

@@ -1127,11 +1127,12 @@ line_get_word (char **line)
return word;
}
static char *
glob_to_regexp (const char *glob, GError **error)
char *
flatpak_filter_glob_to_regexp (const char *glob, GError **error)
{
g_autoptr(GString) regexp = g_string_new ("");
int parts = 1;
gboolean empty_part;
if (g_str_has_prefix (glob, "app/"))
{
@@ -1153,6 +1154,7 @@ glob_to_regexp (const char *glob, GError **error)
return NULL;
}
empty_part = TRUE;
while (*glob != 0)
{
char c = *glob;
@@ -1160,6 +1162,9 @@ glob_to_regexp (const char *glob, GError **error)
if (c == '/')
{
if (empty_part)
g_string_append (regexp, "[.\\-_a-zA-Z0-9]*");
empty_part = TRUE;
parts++;
g_string_append (regexp, "/");
if (parts > 3)
@@ -1170,14 +1175,17 @@ glob_to_regexp (const char *glob, GError **error)
}
else if (c == '*')
{
g_string_append (regexp, "[.\\-_a-zA-Z0-9]*");
empty_part = FALSE;
g_string_append (regexp, "[.\\-_a-zA-Z0-9]*");
}
else if (c == '.')
{
empty_part = FALSE;
g_string_append (regexp, "\\.");
}
else if (g_ascii_isalnum (c) || c == '-' || c == '_')
{
empty_part = FALSE;
g_string_append_c (regexp, c);
}
else
@@ -1241,7 +1249,7 @@ flatpak_parse_filters (const char *data,
if (next != NULL)
return flatpak_fail_error (error, FLATPAK_ERROR_INVALID_DATA, _("Trailing text on line %d"), i + 1);
ref_regexp = glob_to_regexp (glob, error);
ref_regexp = flatpak_filter_glob_to_regexp (glob, error);
if (ref_regexp == NULL)
return glnx_prefix_error (error, _("on line %d"), i + 1);