X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=d2a4cc31c2cd1b72eb8153eaf68cf13ac36d4e5d;hb=c494af03207cb214ba87057bf296c195e357686e;hp=92ab3b442b1beae820aad9eb3988e3cfbb125795;hpb=c1062539346fc41efb4316cb04f2893ce954bb37;p=blhc%2Fblhc.git
diff --git a/bin/blhc b/bin/blhc
index 92ab3b4..d2a4cc3 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -24,7 +24,7 @@ use warnings;
use Getopt::Long ();
use Text::ParseWords ();
-our $VERSION = '0.01';
+our $VERSION = '0.02';
# CONSTANTS/VARIABLES
@@ -43,7 +43,7 @@ my $cc_regex_full = qr/
$cc_regex
/x;
# Regex to catch (GCC) compiler warnings.
-my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
+my $warning_regex = qr/^(.+?):(\d+):\d+: warning: (.+?) \[(.+?)\]$/;
# List of source file extensions which require preprocessing.
my @source_preprocess_compile_cpp = (
@@ -153,8 +153,7 @@ my @def_cflags = (
);
my @def_cflags_format = (
'-Wformat',
- '-Wformat-security',
- '-Werror=format-security',
+ '-Werror=format-security', # implies -Wformat-security
);
my @def_cflags_fortify = (
# fortify needs at least -O1, but -O2 is recommended anyway
@@ -203,11 +202,11 @@ my @flag_refs = (
\@def_ldflags,
\@def_ldflags_relro,
\@def_ldflags_bindnow,
+ \@def_ldflags_pie,
);
# References to all used flags.
my @flag_refs_all = (
@flag_refs,
- \@def_ldflags_pie,
\@def_ldflags_pic,
);
# Renaming rules for the output so the regex parts are not visible. Also
@@ -227,6 +226,14 @@ my %exit_code = (
invalid_cmake => 1 << 5,
);
+my %buildd_tag = (
+ no_compiler_commands => 'I-no-compiler-commands',
+ non_verbose_build => 'W-compiler-flags-hidden',
+ flags_missing => 'W-dpkg-buildflags-missing',
+ hardening_wrapper => 'I-hardening-wrapper-used',
+ invalid_cmake => 'I-invalid-cmake-used',
+);
+
# Statistics of missing flags and non-verbose build commands. Used for
# $option_buildd.
my %statistics = (
@@ -257,14 +264,14 @@ sub error_flags {
} @{$missing_flags_ref};
my $flags = join ' ', @missing_flags;
- printf "%s (%s)%s %s",
+ printf '%s (%s)%s %s',
error_color($message, 'red'), $flags, error_color(':', 'yellow'),
$line;
}
sub error_non_verbose_build {
my ($line) = @_;
- printf "%s%s %s",
+ printf '%s%s %s',
error_color('NONVERBOSE BUILD', 'red'),
error_color(':', 'yellow'),
$line;
@@ -345,8 +352,8 @@ sub is_non_verbose_build {
if (not (index($line, 'checking if you want to see long compiling messages... no') == 0
or $line =~ /^\s*\[?(?:CC|CCLD|C\+\+|CXX|CXXLD|LD|LINK)\]?\s+(.+?)$/
- or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/
- or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/
+ or $line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/
+ or $line =~ /^\s*[Bb]uilding (?:program|shared library)\s+(.+?)$/
or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) {
return 0;
}
@@ -356,7 +363,7 @@ sub is_non_verbose_build {
# C++ compiler setting.
return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/;
# "Compiling" with no file name.
- if ($line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/) {
+ if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) {
# $file_extension_regex may need spaces around the filename.
return 0 if not " $1 " =~ /$file_extension_regex/o;
}
@@ -389,6 +396,21 @@ sub is_non_verbose_build {
return 1;
}
+sub remove_flags {
+ my ($flag_refs_ref, $flag_renames_ref, @flags) = @_;
+
+ my %removes = map { $_ => 1 } @flags;
+ foreach my $flags (@{$flag_refs_ref}) {
+ @{$flags} = grep {
+ # Flag found as string.
+ not exists $removes{$_}
+ # Flag found as string representation of regexp.
+ and (not defined $flag_renames_ref->{$_}
+ or not exists $removes{$flag_renames_ref->{$_}})
+ } @{$flags};
+ }
+}
+
sub compile_flag_regexp {
my ($flag_renames_ref, @flags) = @_;
@@ -424,32 +446,37 @@ sub extension_found {
# MAIN
# Parse command line arguments.
-my $option_help = 0;
-my $option_version = 0;
-my $option_pie = 0;
-my $option_bindnow = 0;
-my @option_ignore_flag = ();
-my @option_ignore_line = ();
-my $option_all = 0;
-my $option_arch = undef;
-my $option_buildd = 0;
- $option_color = 0;
+my $option_help = 0;
+my $option_version = 0;
+my $option_pie = 0;
+my $option_bindnow = 0;
+my @option_ignore_arch = ();
+my @option_ignore_flag = ();
+my @option_ignore_arch_flag = ();
+my @option_ignore_line = ();
+my @option_ignore_arch_line = ();
+my $option_all = 0;
+my $option_arch = undef;
+my $option_buildd = 0;
+ $option_color = 0;
if (not Getopt::Long::GetOptions(
- 'help|h|?' => \$option_help,
- 'version' => \$option_version,
+ 'help|h|?' => \$option_help,
+ 'version' => \$option_version,
# Hardening options.
- 'pie' => \$option_pie,
- 'bindnow' => \$option_bindnow,
- 'all' => \$option_all,
+ 'pie' => \$option_pie,
+ 'bindnow' => \$option_bindnow,
+ 'all' => \$option_all,
# Ignore.
- 'ignore-flag=s' => \@option_ignore_flag,
- 'ignore-line=s' => \@option_ignore_line,
+ 'ignore-arch=s' => \@option_ignore_arch,
+ 'ignore-flag=s' => \@option_ignore_flag,
+ 'ignore-arch-flag=s' => \@option_ignore_arch_flag,
+ 'ignore-line=s' => \@option_ignore_line,
+ 'ignore-arch-line=s' => \@option_ignore_arch_line,
# Misc.
- 'color' => \$option_color,
- 'arch=s' => \$option_arch,
- 'buildd' => \$option_buildd,
- )
- or scalar @ARGV == 0) {
+ 'color' => \$option_color,
+ 'arch=s' => \$option_arch,
+ 'buildd' => \$option_buildd,
+ )) {
require Pod::Usage;
Pod::Usage::pod2usage(2);
}
@@ -476,6 +503,12 @@ along with this program. If not, see .
exit 0;
}
+# Arguments missing.
+if (scalar @ARGV == 0) {
+ require Pod::Usage;
+ Pod::Usage::pod2usage(2);
+}
+
# Don't load Term::ANSIColor in buildd mode because Term::ANSIColor is not
# installed on Debian's buildds.
if (not $option_buildd) {
@@ -487,17 +520,27 @@ if ($option_all) {
$option_bindnow = 1;
}
+# Precompiled ignores for faster lookup.
+my %option_ignore_arch_flag = ();
+my %option_ignore_arch_line = ();
+
# Strip flags which should be ignored.
if (scalar @option_ignore_flag > 0) {
- my %ignores = map { $_ => 1 } @option_ignore_flag;
- foreach my $flags (@flag_refs) {
- @{$flags} = grep {
- # Flag found as string.
- not exists $ignores{$_}
- # Flag found as string representation of regexp.
- and (not defined $flag_renames{$_}
- or not exists $ignores{$flag_renames{$_}})
- } @{$flags};
+ remove_flags(\@flag_refs, \%flag_renames, @option_ignore_flag);
+}
+# Same for arch specific ignore flags, but only prepare here.
+if (scalar @option_ignore_arch_flag > 0) {
+ foreach my $ignore (@option_ignore_arch_flag) {
+ my ($ignore_arch, $ignore_flag) = split ':', $ignore, 2;
+
+ if (not $ignore_arch or not $ignore_flag) {
+ printf STDERR 'Value "%s" invalid for option ignore-arch-flag '
+ . '("arch:flag" expected)' . "\n", $ignore;
+ require Pod::Usage;
+ Pod::Usage::pod2usage(2);
+ }
+
+ push @{$option_ignore_arch_flag{$ignore_arch}}, $ignore_flag;
}
}
@@ -511,6 +554,21 @@ foreach my $flags (@flag_refs_all) {
foreach my $ignore (@option_ignore_line) {
$ignore = qr/^$ignore$/;
}
+# Same for arch specific ignore lines.
+if (scalar @option_ignore_arch_line > 0) {
+ foreach my $ignore (@option_ignore_arch_line) {
+ my ($ignore_arch, $ignore_line) = split ':', $ignore, 2;
+
+ if (not $ignore_arch or not $ignore_line) {
+ printf STDERR 'Value "%s" invalid for option ignore-arch-line '
+ . '("arch:line" expected)' . "\n", $ignore;
+ require Pod::Usage;
+ Pod::Usage::pod2usage(2);
+ }
+
+ push @{$option_ignore_arch_line{$ignore_arch}}, qr/^$ignore_line$/;
+ }
+}
# Final exit code.
my $exit = 0;
@@ -519,7 +577,7 @@ FILE:
foreach my $file (@ARGV) {
print "checking '$file'...\n" if scalar @ARGV > 1;
- open my $fh, '<', $file or die "$!: $file";
+ open my $fh, '<', $file or die $!;
# Architecture of this file.
my $arch = $option_arch;
@@ -533,6 +591,15 @@ foreach my $file (@ARGV) {
my $harden_pie = $option_pie; # defaults to 0
while (my $line = <$fh>) {
+ # Detect architecture automatically unless overridden. For buildd logs
+ # only, doesn't use the dpkg-buildpackage header. Necessary to ignore
+ # build logs which aren't built (wrong architecture, build error,
+ # etc.).
+ if (not $arch
+ and $line =~ /^Architecture: (.+)$/) {
+ $arch = $1;
+ }
+
# dpkg-buildflags only provides hardening flags since 1.16.1, don't
# check for hardening flags in buildd mode if an older dpkg-dev is
# used. Default flags (-g -O2) are still checked.
@@ -542,7 +609,7 @@ foreach my $file (@ARGV) {
if ($option_buildd
and index($line, 'Toolchain package versions: ') == 0) {
require Dpkg::Version;
- if ($line !~ /\bdpkg-dev_(\S+)/
+ if (not $line =~ /\bdpkg-dev_(\S+)/
or Dpkg::Version::version_compare($1, '1.16.1') < 0) {
$harden_format = 0;
$harden_fortify = 0;
@@ -565,7 +632,7 @@ foreach my $file (@ARGV) {
if (not $option_buildd) {
error_invalid_cmake($1);
} else {
- print "W-invalid-cmake-used $1\n";
+ print "$buildd_tag{invalid_cmake} $1\n";
}
$exit |= $exit_code{invalid_cmake};
}
@@ -577,7 +644,7 @@ foreach my $file (@ARGV) {
if (not $option_buildd) {
error_hardening_wrapper();
} else {
- print "I-hardening-wrapper-used\n";
+ print "$buildd_tag{hardening_wrapper}\n";
}
$exit |= $exit_code{hardening_wrapper};
next FILE;
@@ -633,7 +700,7 @@ foreach my $file (@ARGV) {
$_ =~ s/\s+$//;
$_ .= "\n";
} Text::ParseWords::parse_line(';', 1, $line);
- foreach $line (@line) {
+ foreach my $line (@line) {
if ($continuation) {
$continuation = 0;
@@ -672,9 +739,9 @@ foreach my $file (@ARGV) {
#
# `./configure` output.
next if not $non_verbose
- and $line =~ /^(?:checking|(?:C|c)onfigure:) /;
+ and $line =~ /^(?:checking|[Cc]onfigure:) /;
next if $line =~ /^\s*(?:Host\s+)?(?:C(?:\+\+)?\s+)?
- (?:C|c)ompiler[\s.]*:?\s+
+ [Cc]ompiler[\s.]*:?\s+
/xo;
next if $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex_full\s*$/o;
@@ -687,13 +754,23 @@ foreach my $file (@ARGV) {
}
}
- close $fh;
+ close $fh or die $!;
+
+ # Ignore arch if requested.
+ if (scalar @option_ignore_arch > 0 and $arch) {
+ foreach my $ignore (@option_ignore_arch) {
+ if ($arch eq $ignore) {
+ print "ignoring architecture '$arch'\n";
+ next FILE;
+ }
+ }
+ }
if (scalar @input == 0) {
if (not $option_buildd) {
print "No compiler commands!\n";
} else {
- print "W-no-compiler-commands\n";
+ print "$buildd_tag{no_compiler_commands}\n";
}
$exit |= $exit_code{no_compiler_commands};
next FILE;
@@ -755,12 +832,27 @@ foreach my $file (@ARGV) {
@ldflags = (@ldflags, @def_ldflags_bindnow);
}
+ # Ignore flags for this arch if requested.
+ if ($arch and exists $option_ignore_arch_flag{$arch}) {
+ my @flag_refs = (\@cflags, \@cxxflags, \@cppflags, \@ldflags);
+
+ remove_flags(\@flag_refs,
+ \%flag_renames,
+ @{$option_ignore_arch_flag{$arch}});
+ }
+
+ my @ignore_line = @option_ignore_line;
+ # Ignore lines for this arch if requested.
+ if ($arch and exists $option_ignore_arch_line{$arch}) {
+ @ignore_line = (@ignore_line, @{$option_ignore_arch_line{$arch}});
+ }
+
LINE:
for (my $i = 0; $i < scalar @input; $i++) {
my $line = $input[$i];
# Ignore line if requested.
- foreach my $ignore (@option_ignore_line) {
+ foreach my $ignore (@ignore_line) {
next LINE if $line =~ /$ignore/;
}
@@ -920,32 +1012,32 @@ if ($option_buildd) {
my @warning;
if ($statistics{preprocess_missing}) {
- push @warning, sprintf "CPPFLAGS %d (of %d)",
+ push @warning, sprintf 'CPPFLAGS %d (of %d)',
$statistics{preprocess_missing},
$statistics{preprocess};
}
if ($statistics{compile_missing}) {
- push @warning, sprintf "CFLAGS %d (of %d)",
+ push @warning, sprintf 'CFLAGS %d (of %d)',
$statistics{compile_missing},
$statistics{compile};
}
if ($statistics{compile_cpp_missing}) {
- push @warning, sprintf "CXXFLAGS %d (of %d)",
+ push @warning, sprintf 'CXXFLAGS %d (of %d)',
$statistics{compile_cpp_missing},
$statistics{compile_cpp};
}
if ($statistics{link_missing}) {
- push @warning, sprintf "LDFLAGS %d (of %d)",
+ push @warning, sprintf 'LDFLAGS %d (of %d)',
$statistics{link_missing},
$statistics{link};
}
if (scalar @warning) {
local $" = ', '; # array join string
- print "W-dpkg-buildflags-missing @warning missing\n";
+ print "$buildd_tag{flags_missing} @warning missing\n";
}
if ($statistics{commands_nonverbose}) {
- printf "W-compiler-flags-hidden %d (of %d) hidden\n",
+ printf "$buildd_tag{non_verbose_build} %d (of %d) hidden\n",
$statistics{commands_nonverbose},
$statistics{commands},
}
@@ -963,7 +1055,7 @@ blhc - build log hardening check, checks build logs for missing hardening flags
=head1 SYNOPSIS
-B [I] Idpkg-buildpackage build log fileE..>
+B [I] I<< .. >>
=head1 DESCRIPTION
@@ -1000,17 +1092,17 @@ changes are in effect:
=over 2
-=item
+=item *
Print tags instead of normal warnings, see L"BUILDD TAGS"> for a list of
possible tags.
-=item
+=item *
Don't check hardening flags in old log files (if dpkg-dev << 1.16.1 is
detected).
-=item
+=item *
Don't require Term::ANSIColor.
@@ -1020,6 +1112,20 @@ Don't require Term::ANSIColor.
Use colored (ANSI) output for warning messages.
+=item B<--ignore-arch> I
+
+Ignore build logs from architectures matching I. I is a string.
+
+Used to prevent false positives. This option can be specified multiple times.
+
+=item B<--ignore-arch-flag> I:I
+
+Like B<--ignore-flag>, but only ignore flag on I.
+
+=item B<--ignore-arch-line> I:I
+
+Like B<--ignore-line>, but only ignore line on I.
+
=item B<--ignore-flag> I
Don't print an error when the specific flag is missing in a compiler line.
@@ -1069,6 +1175,10 @@ Don't treat missing C<-g> as error:
blhc --ignore-flag -g path/to/log/file
+Don't treat missing C<-pie> on kfreebsd-amd64 as error:
+
+ blhc --ignore-arch-flag kfreebsd-amd64:-pie path/to/log/file
+
Ignore lines consisting exactly of C<./script gcc file> which would cause a
false positive.
@@ -1090,17 +1200,13 @@ which is displayed.
=over 2
-=item
-
-B
+=item B
The package uses hardening-wrapper which intercepts calls to gcc and adds
hardening flags. The build log doesn't contain any hardening flags and thus
can't be checked by blhc.
-=item
-
-B (summary of hidden lines)
+=item B (summary of hidden lines)
Build log contains lines which hide the real compiler flags. For example:
@@ -1114,19 +1220,20 @@ F fixes builds with hidden compiler flags. Sometimes C<.SILENT>
in a F must be removed. And as last resort the F must be
patched to remove the C<@>s hiding the real compiler commands.
-=item
-
-B (summary of missing flags)
+=item B (summary of missing flags)
CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS missing.
-=item
+=item B (version)
-B (version)
+By default CMake ignores CPPFLAGS thus missing those hardening flags. Debian
+patched CMake in versions 2.8.7-1 and 2.8.7-2 to respect CPPFLAGS, but this
+patch was rejected by upstream and later reverted in Debian. Thus those two
+versions show correct usage of CPPFLAGS even if the package doesn't correctly
+handle them (for example by passing them to CFLAGS). To prevent false
+negatives just blacklist those two versions.
-=item
-
-B
+=item B
No compiler commands were detected. Either the log contains none or they were
not correctly detected by blhc (please report the bug in this case).
@@ -1164,6 +1271,11 @@ Missing hardening flags.
Hardening wrapper detected, no tests performed.
+=item B<32>
+
+Invalid CMake version used. See B under L"BUILDD
+TAGS"> for a detailed explanation.
+
=back
=head1 AUTHOR