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

utils: Allow Perl utils to store and write back unsupported rules

Browse Source 
This patch:
- allows the unsupported rules to be stored when parsing profiles
- writes all the unsupported rules back to profile

Acked-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
Kshitij Gupta 2014-10-09 01:42:33 +05:30
parent 8bc6a176f6
commit b34e81e606
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deprecated/utils/Immunix/AppArmor.pm
View File

@ -5440,7 +5440,12 @@ sub parse_profile_data($$$) {
} }
} elsif (/^\s*(audit\s+)?(deny\s+)?(owner\s+)?(capability|dbus|file|mount|pivot_root|remount|umount|signal|unix|ptrace)/) { } elsif (/^\s*(audit\s+)?(deny\s+)?(owner\s+)?(capability|dbus|file|mount|pivot_root|remount|umount|signal|unix|ptrace)/) {
# ignore valid rules that are currently unsupported by AppArmor.pm # ignore valid rules that are currently unsupported by AppArmor.pm
# BUG: when writing the profile, those rules are lost! if (! defined $profile_data->{$profile}{$hat}{unsupported_rules}) {
$profile_data->{$profile}{$hat}{unsupported_rules} = [];
}
$_ =~ s/^\s+|\s+$//g;
push @{$profile_data->{$profile}{$hat}{unsupported_rules}}, $_ ;
} else { } else {
# we hit something we don't understand in a profile... # we hit something we don't understand in a profile...
die sprintf(gettext('%s contains syntax errors. Line [%s]'), $file, $_) . "\n"; die sprintf(gettext('%s contains syntax errors. Line [%s]'), $file, $_) . "\n";
@ -5894,6 +5899,25 @@ sub writepaths ($$) {
return @data; return @data;
} }
sub writeunsupportedrules ($$) {
my ($prof_data, $depth) = @_;
my @data;
my $pre = " " x $depth;
if (defined $prof_data->{unsupported_rules}) {
for my $rule (@{$prof_data->{unsupported_rules}}){
push @data, "${pre}${rule}";
}
push @data, "";
}
return @data;
}
sub write_rules ($$) { sub write_rules ($$) {
my ($prof_data, $depth) = @_; my ($prof_data, $depth) = @_;
@ -5904,6 +5928,7 @@ sub write_rules ($$) {
push @data, writerlimits($prof_data, $depth); push @data, writerlimits($prof_data, $depth);
push @data, writecapabilities($prof_data, $depth); push @data, writecapabilities($prof_data, $depth);
push @data, writenetdomain($prof_data, $depth); push @data, writenetdomain($prof_data, $depth);
push @data, writeunsupportedrules($prof_data, $depth); ## Legacy support for unknown/new rules
push @data, writelinks($prof_data, $depth); push @data, writelinks($prof_data, $depth);
push @data, writepaths($prof_data, $depth); push @data, writepaths($prof_data, $depth);
push @data, writechange_profile($prof_data, $depth); push @data, writechange_profile($prof_data, $depth);