mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 18:17:09 +00:00
Code Issues Releases Wiki Activity

binutils: add translation support to aa_status and initial pot file

Browse Source 
Unfortunately aa_status did not support translations. Add a base support
and the initial pot file. There are no translations done at this time.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2024-08-31 17:50:10 -07:00
parent 3ac53e75d0
commit bdedaf61c8
2 changed files with 198 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
binutils/aa_status.c
View File

@ -20,6 +20,8 @@
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>
#include <regex.h> #include <regex.h>
#include <libintl.h>
#define _(s) gettext(s)
#include <sys/apparmor.h> #include <sys/apparmor.h>
#include <sys/apparmor_private.h> #include <sys/apparmor_private.h>
@ -131,7 +133,7 @@ const char *process_statuses[] = {"enforce", "complain", "prompt", "kill", "unco
#define eprintf(...) \ #define eprintf(...) \
do { \ do { \
if (!quiet) \ if (!quiet) \
fprintf(stderr, __VA_ARGS__); \ fprintf(stderr, __VA_ARGS__); \
} while (0) } while (0)
#define dprintf(...) \ #define dprintf(...) \
@ -156,14 +158,14 @@ static int open_profiles(FILE **fp)
ret = stat("/sys/module/apparmor", &st); ret = stat("/sys/module/apparmor", &st);
if (ret != 0) { if (ret != 0) {
eprintf("apparmor not present.\n"); eprintf(_("apparmor not present.\n"));
return AA_EXIT_DISABLED; return AA_EXIT_DISABLED;
} }
dprintf("apparmor module is loaded.\n"); dprintf(_("apparmor module is loaded.\n"));
ret = aa_find_mountpoint(&apparmorfs); ret = aa_find_mountpoint(&apparmorfs);
if (ret == -1) { if (ret == -1) {
eprintf("apparmor filesystem is not mounted.\n"); eprintf(_("apparmor filesystem is not mounted.\n"));
return AA_EXIT_NO_CONTROL; return AA_EXIT_NO_CONTROL;
} }
@ -176,9 +178,9 @@ static int open_profiles(FILE **fp)
*fp = fopen(apparmor_profiles, "r"); *fp = fopen(apparmor_profiles, "r");
if (*fp == NULL) { if (*fp == NULL) {
if (errno == EACCES) { if (errno == EACCES) {
eprintf("You do not have enough privilege to read the profile set.\n"); eprintf(_("You do not have enough privilege to read the profile set.\n"));
} else { } else {
eprintf("Could not open %s: %s", apparmor_profiles, strerror(errno)); eprintf(_("Could not open %s: %s"), apparmor_profiles, strerror(errno));
} }
return AA_EXIT_NO_PERM; return AA_EXIT_NO_PERM;
} }
@ -351,7 +353,7 @@ static int get_processes(struct profile *profiles,
continue; continue;
} else if (rc == -1 || } else if (rc == -1 ||
asprintf(&exe, "/proc/%s/exe", entry->d_name) == -1) { asprintf(&exe, "/proc/%s/exe", entry->d_name) == -1) {
eprintf("ERROR: Failed to allocate memory\n"); eprintf(_("ERROR: Failed to allocate memory\n"));
ret = AA_EXIT_INTERNAL_ERROR; ret = AA_EXIT_INTERNAL_ERROR;
goto exit; goto exit;
} else if (mode) { } else if (mode) {
@ -374,7 +376,7 @@ static int get_processes(struct profile *profiles,
// ensure enough space for NUL terminator // ensure enough space for NUL terminator
real_exe = calloc(PATH_MAX + 1, sizeof(char)); real_exe = calloc(PATH_MAX + 1, sizeof(char));
if (real_exe == NULL) { if (real_exe == NULL) {
eprintf("ERROR: Failed to allocate memory\n"); eprintf(_("ERROR: Failed to allocate memory\n"));
ret = AA_EXIT_INTERNAL_ERROR; ret = AA_EXIT_INTERNAL_ERROR;
goto exit; goto exit;
} }
@ -582,7 +584,7 @@ static int detailed_profiles(FILE *outf, filters_t *filters, bool json,
*/ */
subfilters.mode = &mode_filter; subfilters.mode = &mode_filter;
if (regcomp(&mode_filter, profile_statuses[i], REG_NOSUB) != 0) { if (regcomp(&mode_filter, profile_statuses[i], REG_NOSUB) != 0) {
eprintf("Error: failed to compile sub filter '%s'\n", eprintf(_("Error: failed to compile sub filter '%s'\n"),
profile_statuses[i]); profile_statuses[i]);
return AA_EXIT_INTERNAL_ERROR; return AA_EXIT_INTERNAL_ERROR;
} }
@ -648,7 +650,7 @@ static int detailed_processes(FILE *outf, filters_t *filters, bool json,
*/ */
subfilters.mode = &mode_filter; subfilters.mode = &mode_filter;
if (regcomp(&mode_filter, process_statuses[i], REG_NOSUB) != 0) { if (regcomp(&mode_filter, process_statuses[i], REG_NOSUB) != 0) {
eprintf("Error: failed to compile sub filter '%s'\n", eprintf(_("Error: failed to compile sub filter '%s'\n"),
profile_statuses[i]); profile_statuses[i]);
return AA_EXIT_INTERNAL_ERROR; return AA_EXIT_INTERNAL_ERROR;
} }
@ -710,7 +712,7 @@ exit:
static int print_legacy(const char *command) static int print_legacy(const char *command)
{ {
printf("Usage: %s [OPTIONS]\n" printf(_("Usage: %s [OPTIONS]\n"
"Legacy options and their equivalent command\n" "Legacy options and their equivalent command\n"
" --profiled --count --profiles\n" " --profiled --count --profiles\n"
" --enforced --count --profiles --mode=enforced\n" " --enforced --count --profiles --mode=enforced\n"
@ -718,8 +720,8 @@ static int print_legacy(const char *command)
" --kill --count --profiles --mode=kill\n" " --kill --count --profiles --mode=kill\n"
" --prompt --count --profiles --mode=prompt\n" " --prompt --count --profiles --mode=prompt\n"
" --special-unconfined --count --profiles --mode=unconfined\n" " --special-unconfined --count --profiles --mode=unconfined\n"
" --process-mixed --count --ps --mode=mixed\n", " --process-mixed --count --ps --mode=mixed\n"),
command); command);
exit(0); exit(0);
return 0; return 0;
@ -729,7 +731,7 @@ static int usage_filters(void)
{ {
long unsigned int i; long unsigned int i;
printf("Usage of filters\n" printf(_("Usage of filters\n"
"Filters are used to reduce the output of information to only\n" "Filters are used to reduce the output of information to only\n"
"those entries that will match the filter. Filters use posix\n" "those entries that will match the filter. Filters use posix\n"
"regular expression syntax. The possible values for exes that\n" "regular expression syntax. The possible values for exes that\n"
@ -739,7 +741,7 @@ static int usage_filters(void)
" --filter.profiles: regular expression to match displayed profile names\n" " --filter.profiles: regular expression to match displayed profile names\n"
" --filter.pid: regular expression to match displayed processes pids\n" " --filter.pid: regular expression to match displayed processes pids\n"
" --filter.exe: regular expression to match executable\n" " --filter.exe: regular expression to match executable\n"
); ));
for (i = 0; i < ARRAY_SIZE(process_statuses); i++) { for (i = 0; i < ARRAY_SIZE(process_statuses); i++) {
printf("%s%s", i ? ", " : "", process_statuses[i]); printf("%s%s", i ? ", " : "", process_statuses[i]);
} }
@ -757,7 +759,7 @@ static int print_usage(const char *command, bool error)
status = EXIT_FAILURE; status = EXIT_FAILURE;
} }
printf("Usage: %s [OPTIONS]\n" printf(_("Usage: %s [OPTIONS]\n"
"Displays various information about the currently loaded AppArmor policy.\n" "Displays various information about the currently loaded AppArmor policy.\n"
"Default if no options given\n" "Default if no options given\n"
" --show=all\n\n" " --show=all\n\n"
@ -774,8 +776,8 @@ static int print_usage(const char *command, bool error)
" --verbose (default) displays data points about loaded policy set\n" " --verbose (default) displays data points about loaded policy set\n"
" --quiet don't output error messages\n" " --quiet don't output error messages\n"
" -h[(legacy|filters)] this message, or info on the specified option\n" " -h[(legacy|filters)] this message, or info on the specified option\n"
" --help[=(legacy|filters)] this message, or info on the specified option\n", " --help[=(legacy|filters)] this message, or info on the specified option\n"),
command); command);
exit(status); exit(status);
@ -851,7 +853,7 @@ static int parse_args(int argc, char **argv)
} else if (strcmp(optarg, "filters") == 0) { } else if (strcmp(optarg, "filters") == 0) {
usage_filters(); usage_filters();
} else { } else {
eprintf("Error: Invalid --help option '%s'.\n", optarg); eprintf(_("Error: Invalid --help option '%s'.\n"), optarg);
print_usage(argv[0], true); print_usage(argv[0], true);
break; break;
} }
@ -919,7 +921,7 @@ static int parse_args(int argc, char **argv)
} else if (strcmp(optarg, "processes") == 0) { } else if (strcmp(optarg, "processes") == 0) {
opt_show = SHOW_PROCESSES; opt_show = SHOW_PROCESSES;
} else { } else {
eprintf("Error: Invalid --show option '%s'.\n", optarg); eprintf(_("Error: Invalid --show option '%s'.\n"), optarg);
print_usage(argv[0], true); print_usage(argv[0], true);
break; break;
} }
@ -941,7 +943,7 @@ static int parse_args(int argc, char **argv)
break; break;
default: default:
eprintf("Error: Invalid command.\n"); eprintf(_("Error: Invalid command.\n"));
print_usage(argv[0], true); print_usage(argv[0], true);
break; break;
} }
@ -966,7 +968,7 @@ int main(int argc, char **argv)
if (argc > 1) { if (argc > 1) {
int pos = parse_args(argc, argv); int pos = parse_args(argc, argv);
if (pos < argc) { if (pos < argc) {
eprintf("Error: Unknown options.\n"); eprintf(_("Error: Unknown options.\n"));
print_usage(progname, true); print_usage(progname, true);
} }
} else { } else {
@ -978,24 +980,24 @@ int main(int argc, char **argv)
init_filters(&filters, &filter_set); init_filters(&filters, &filter_set);
if (regcomp(filters.mode, opt_mode, REG_NOSUB) != 0) { if (regcomp(filters.mode, opt_mode, REG_NOSUB) != 0) {
eprintf("Error: failed to compile mode filter '%s'\n", eprintf(_("Error: failed to compile mode filter '%s'\n"),
opt_mode); opt_mode);
return AA_EXIT_INTERNAL_ERROR; return AA_EXIT_INTERNAL_ERROR;
} }
if (regcomp(filters.profile, opt_profiles, REG_NOSUB) != 0) { if (regcomp(filters.profile, opt_profiles, REG_NOSUB) != 0) {
eprintf("Error: failed to compile profiles filter '%s'\n", eprintf(_("Error: failed to compile profiles filter '%s'\n"),
opt_profiles); opt_profiles);
ret = AA_EXIT_INTERNAL_ERROR; ret = AA_EXIT_INTERNAL_ERROR;
goto out; goto out;
} }
if (regcomp(filters.pid, opt_pid, REG_NOSUB) != 0) { if (regcomp(filters.pid, opt_pid, REG_NOSUB) != 0) {
eprintf("Error: failed to compile ps filter '%s'\n", eprintf(_("Error: failed to compile ps filter '%s'\n"),
opt_pid); opt_pid);
ret = AA_EXIT_INTERNAL_ERROR; ret = AA_EXIT_INTERNAL_ERROR;
goto out; goto out;
} }
if (regcomp(filters.exe, opt_exe, REG_NOSUB) != 0) { if (regcomp(filters.exe, opt_exe, REG_NOSUB) != 0) {
eprintf("Error: failed to compile exe filter '%s'\n", eprintf(_("Error: failed to compile exe filter '%s'\n"),
opt_exe); opt_exe);
ret = AA_EXIT_INTERNAL_ERROR; ret = AA_EXIT_INTERNAL_ERROR;
goto out; goto out;
@ -1010,7 +1012,7 @@ int main(int argc, char **argv)
outf_save = outf; outf_save = outf;
outf = open_memstream(&buffer, &buffer_size); outf = open_memstream(&buffer, &buffer_size);
if (!outf) { if (!outf) {
eprintf("Failed to open memstream: %m\n"); eprintf(_("Failed to open memstream: %m\n"));
return AA_EXIT_INTERNAL_ERROR; return AA_EXIT_INTERNAL_ERROR;
} }
} }
@ -1021,7 +1023,7 @@ int main(int argc, char **argv)
*/ */
ret = get_profiles(fp, &profiles, &nprofiles); ret = get_profiles(fp, &profiles, &nprofiles);
if (ret != 0) { if (ret != 0) {
eprintf("Failed to get profiles: %d....\n", ret); eprintf(_("Failed to get profiles: %d....\n"), ret);
goto out; goto out;
} }
@ -1045,7 +1047,7 @@ int main(int argc, char **argv)
ret = get_processes(profiles, nprofiles, &processes, &nprocesses); ret = get_processes(profiles, nprofiles, &processes, &nprocesses);
if (ret != 0) { if (ret != 0) {
eprintf("Failed to get processes: %d....\n", ret); eprintf(_("Failed to get processes: %d....\n"), ret);
} else if (opt_count) { } else if (opt_count) {
ret = simple_filtered_process_count(outf, &filters, ret = simple_filtered_process_count(outf, &filters,
processes, nprocesses); processes, nprocesses);
@ -1071,14 +1073,14 @@ int main(int argc, char **argv)
outf = outf_save; outf = outf_save;
json = cJSON_Parse(buffer); json = cJSON_Parse(buffer);
if (!json) { if (!json) {
eprintf("Failed to parse json output"); eprintf(_("Failed to parse json output"));
ret = AA_EXIT_INTERNAL_ERROR; ret = AA_EXIT_INTERNAL_ERROR;
goto out; goto out;
} }
pretty = cJSON_Print(json); pretty = cJSON_Print(json);
if (!pretty) { if (!pretty) {
eprintf("Failed to print pretty json"); eprintf(_("Failed to print pretty json"));
ret = AA_EXIT_INTERNAL_ERROR; ret = AA_EXIT_INTERNAL_ERROR;
goto out; goto out;
} }

165
binutils/po/aa_status.pot Normal file
View File

@ -0,0 +1,165 @@
# Translations for aa_status
# Copyright (C) 2024 Canonical Ltd
# This file is distributed under the same license as the AppArmor package.
# John Johansen <john.johansen@canonical.com>, 2024.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: apparmor@lists.ubuntu.com\n"
"POT-Creation-Date: 2024-08-31 17:49-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../aa_status.c:161
msgid "apparmor not present.\n"
msgstr ""
#: ../aa_status.c:164
msgid "apparmor module is loaded.\n"
msgstr ""
#: ../aa_status.c:168
msgid "apparmor filesystem is not mounted.\n"
msgstr ""
#: ../aa_status.c:181
msgid "You do not have enough privilege to read the profile set.\n"
msgstr ""
#: ../aa_status.c:183
#, c-format
msgid "Could not open %s: %s"
msgstr ""
#: ../aa_status.c:356 ../aa_status.c:379
msgid "ERROR: Failed to allocate memory\n"
msgstr ""
#: ../aa_status.c:587 ../aa_status.c:653
#, c-format
msgid "Error: failed to compile sub filter '%s'\n"
msgstr ""
#: ../aa_status.c:715
#, c-format
msgid ""
"Usage: %s [OPTIONS]\n"
"Legacy options and their equivalent command\n"
" --profiled --count --profiles\n"
" --enforced --count --profiles --mode=enforced\n"
" --complaining --count --profiles --mode=complain\n"
" --kill --count --profiles --mode=kill\n"
" --prompt --count --profiles --mode=prompt\n"
" --special-unconfined --count --profiles --mode=unconfined\n"
" --process-mixed --count --ps --mode=mixed\n"
msgstr ""
#: ../aa_status.c:734
#, c-format
msgid ""
"Usage of filters\n"
"Filters are used to reduce the output of information to only\n"
"those entries that will match the filter. Filters use posix\n"
"regular expression syntax. The possible values for exes that\n"
"support filters are below\n"
"\n"
" --filter.mode: regular expression to match the profile "
"mode modes: enforce, complain, kill, unconfined, mixed\n"
" --filter.profiles: regular expression to match displayed profile names\n"
" --filter.pid: regular expression to match displayed processes pids\n"
" --filter.exe: regular expression to match executable\n"
msgstr ""
#: ../aa_status.c:762
#, c-format
msgid ""
"Usage: %s [OPTIONS]\n"
"Displays various information about the currently loaded AppArmor policy.\n"
"Default if no options given\n"
" --show=all\n"
"\n"
"OPTIONS (one only):\n"
" --enabled returns error code if AppArmor not enabled\n"
" --show=X What information to show. {profiles,processes,all}\n"
" --count print the number of entries. Implies --quiet\n"
" --filter.mode=filter see filters\n"
" --filter.profiles=filter see filters\n"
" --filter.pid=filter see filters\n"
" --filter.exe=filter see filters\n"
" --json displays multiple data points in machine-readable JSON "
"format\n"
" --pretty-json same data as --json, formatted for human consumption as "
"well\n"
" --verbose (default) displays data points about loaded policy set\n"
" --quiet don't output error messages\n"
" -h[(legacy|filters)] this message, or info on the specified option\n"
" --help[=(legacy|filters)] this message, or info on the specified option\n"
msgstr ""
#: ../aa_status.c:856
#, c-format
msgid "Error: Invalid --help option '%s'.\n"
msgstr ""
#: ../aa_status.c:924
#, c-format
msgid "Error: Invalid --show option '%s'.\n"
msgstr ""
#: ../aa_status.c:946
msgid "Error: Invalid command.\n"
msgstr ""
#: ../aa_status.c:971
msgid "Error: Unknown options.\n"
msgstr ""
#: ../aa_status.c:983
#, c-format
msgid "Error: failed to compile mode filter '%s'\n"
msgstr ""
#: ../aa_status.c:988
#, c-format
msgid "Error: failed to compile profiles filter '%s'\n"
msgstr ""
#: ../aa_status.c:994
#, c-format
msgid "Error: failed to compile ps filter '%s'\n"
msgstr ""
#: ../aa_status.c:1000
#, c-format
msgid "Error: failed to compile exe filter '%s'\n"
msgstr ""
#: ../aa_status.c:1015
#, c-format
msgid "Failed to open memstream: %m\n"
msgstr ""
#: ../aa_status.c:1026
#, c-format
msgid "Failed to get profiles: %d....\n"
msgstr ""
#: ../aa_status.c:1050
#, c-format
msgid "Failed to get processes: %d....\n"
msgstr ""
#: ../aa_status.c:1076
msgid "Failed to parse json output"
msgstr ""
#: ../aa_status.c:1083
msgid "Failed to print pretty json"
msgstr ""