X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=168a1699c21744707ff22708aebd49e7c44ef20d;hp=accb99fbff8226aa42fb55ed423a9e32b40d3710;hb=47eb461331046250bbe1b2d39f73266a25bb5315;hpb=ec2b4beb8fdc976b98d31c1f2d85db6b59115580 diff --git a/bin/blhc b/bin/blhc index accb99f..168a169 100755 --- a/bin/blhc +++ b/bin/blhc @@ -2,7 +2,7 @@ # Build log hardening check, checks build logs for missing hardening flags. -# Copyright (C) 2012-2016 Simon Ruderich +# Copyright (C) 2012-2018 Simon Ruderich # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ use warnings; use Getopt::Long (); use Text::ParseWords (); -our $VERSION = '0.07'; +our $VERSION = '0.08'; # CONSTANTS/VARIABLES @@ -33,7 +33,7 @@ our $VERSION = '0.07'; my $cc_regex = qr/ (? 1 } ( @source_no_preprocess_compile_ada, @source_no_preprocess_no_compile_ada, ); +my %extensions_fortran = map { $_ => 1 } ( + @source_no_preprocess_compile_fortran, + @source_preprocess_compile_fortran, +); my %extensions_object = map { $_ => 1 } ( @object, ); @@ -337,7 +349,7 @@ sub array_equal { } sub error_flags { - my ($message, $missing_flags_ref, $flag_renames_ref, $line) = @_; + my ($message, $missing_flags_ref, $flag_renames_ref, $line, $number) = @_; # Get string value of qr//-escaped regexps and if requested rename them. my @missing_flags = map { @@ -345,6 +357,7 @@ sub error_flags { } @{$missing_flags_ref}; my $flags = join ' ', @missing_flags; + printf '%d:', $number if defined $number; printf '%s (%s)%s %s', error_color($message, 'red'), $flags, error_color(':', 'yellow'), $line; @@ -352,8 +365,9 @@ sub error_flags { return; } sub error_non_verbose_build { - my ($line) = @_; + my ($line, $number) = @_; + printf '%d:', $number if defined $number; printf '%s%s %s', error_color('NONVERBOSE BUILD', 'red'), error_color(':', 'yellow'), @@ -590,7 +604,9 @@ my @option_ignore_arch_line = (); my $option_all = 0; my $option_arch = undef; my $option_buildd = 0; +my $option_debian = 0; $option_color = 0; +my $option_line_numbers = 0; if (not Getopt::Long::GetOptions( 'help|h|?' => \$option_help, 'version' => \$option_version, @@ -608,6 +624,8 @@ if (not Getopt::Long::GetOptions( 'color' => \$option_color, 'arch=s' => \$option_arch, 'buildd' => \$option_buildd, + 'debian' => \$option_debian, + 'line-numbers' => \$option_line_numbers, )) { require Pod::Usage; Pod::Usage::pod2usage(2); @@ -618,7 +636,7 @@ if ($option_help) { } if ($option_version) { print <<"EOF"; -blhc $VERSION Copyright (C) 2012-2016 Simon Ruderich +blhc $VERSION Copyright (C) 2012-2018 Simon Ruderich This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -730,13 +748,25 @@ foreach my $file (@ARGV) { # different CFLAGS. But only perform ada checks if an ada compiler is used # for performance reasons. my $ada = 0; + # Fortran also requires different CFLAGS. + my $fortran = 0; # Number of parallel jobs to prevent false positives when detecting # non-verbose builds. As not all jobs declare the number of parallel jobs # use a large enough default. my $parallel = 10; + # Don't check for PIE flags if automatically applied by the compiler. Only + # used in buildd and Debian mode. + my $disable_harden_pie = 0; + if ($option_debian) { + $disable_harden_pie = 1; + } + + my $number = 0; while (my $line = <$fh>) { + $number++; + # 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, @@ -758,6 +788,10 @@ foreach my $file (@ARGV) { # flags are not checked. # # Strong stack protector is used since dpkg 1.17.11. + # + # Recent GCC versions automatically use PIE (only on supported + # architectures) and dpkg respects this properly since 1.18.15 and + # doesn't pass PIE flags manually. if ($option_buildd and index($line, 'Toolchain package versions: ') == 0) { require Dpkg::Version; @@ -772,6 +806,9 @@ foreach my $file (@ARGV) { if (Dpkg::Version::version_compare($1, '1.17.11') >= 0) { $disable_strong = 0; } + if (Dpkg::Version::version_compare($1, '1.18.15') >= 0) { + $disable_harden_pie = 1; + } } if ($disable) { @@ -827,11 +864,15 @@ foreach my $file (@ARGV) { if ($line =~ /\bgnat\b/) { $ada = 1; } + # Fortran compiler. + if ($line =~ /\bgfortran\b/) { + $fortran = 1; + } } # This flags is not always available, but if it is use it. if ($line =~ /^DEB_BUILD_OPTIONS=.*\bparallel=(\d+)/) { - $parallel = $1; + $parallel = $1 * 2; } # We skip over unimportant lines at the beginning of the log to @@ -845,11 +886,15 @@ foreach my $file (@ARGV) { # is_non_verbose_build() (which is quite slow) in the second loop when # it's already clear if a line is non-verbose or not. my @input_nonverbose = (); + # Input line number. + my @input_number = (); my $continuation = 0; my $complete_line = undef; my $non_verbose; while (my $line = <$fh>) { + $number++; + # And stop at the end of the build log. Package details (reported by # the buildd logs) are not important for us. This also prevents false # positives. @@ -991,6 +1036,7 @@ foreach my $file (@ARGV) { push @input, $line; push @input_nonverbose, $non_verbose; + push @input_number, $number if $option_line_numbers; } } @@ -1022,14 +1068,26 @@ foreach my $file (@ARGV) { # Option or auto detected. if ($arch) { - # The following was partially copied from dpkg-dev 1.18.10 - # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, _add_hardening_flags()), - # copyright Raphaël Hertzog , Kees Cook - # , Canonical, Ltd. licensed under GPL version 2 or - # later. Keep it in sync. + # The following was partially copied from dpkg-dev 1.19.0.5 + # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, _add_build_flags()), + # copyright Raphaël Hertzog , Guillem Jover + # , Kees Cook , Canonical, Ltd. + # licensed under GPL version 2 or later. Keep it in sync. require Dpkg::Arch; - my ($abi, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($arch); + my ($os, $cpu); + # Recent dpkg versions use a quadruplet for arch. Support both. + eval { + (undef, undef, $os, $cpu) = Dpkg::Arch::debarch_to_debtuple($arch); + }; + if ($@) { + (undef, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($arch); + } + + my %builtin_pie_arch = map { $_ => 1 } qw( + amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 + mips mipsel mips64el powerpc ppc64 ppc64el s390x sparc sparc64 + ); # Disable unsupported hardening options. if ($os !~ /^(?:linux|kfreebsd|knetbsd|hurd)$/ @@ -1044,6 +1102,10 @@ foreach my $file (@ARGV) { $harden_relro = 0; $harden_bindnow = 0; } + + if ($disable_harden_pie and exists $builtin_pie_arch{$arch}) { + $harden_pie = 0; + } } # Default values. @@ -1080,14 +1142,13 @@ foreach my $file (@ARGV) { @ldflags = (@ldflags, @def_ldflags_bindnow); } - # Stores normal CFLAGS when @cflags_ada are temporarily used. - my @cflags_backup; - # Ada CFLAGS, only set if ada is used. - my @cflags_ada; # Ada doesn't support format hardening flags, see #680117 for more - # information. Filter them out if ada is used. - if ($ada and $harden_format) { - @cflags_ada = grep { + # information. Same for fortran. Filter them out if either language is + # used. + my @cflags_backup; + my @cflags_noformat; + if (($ada or $fortran) and $harden_format) { + @cflags_noformat = grep { my $ok = 1; foreach my $flag (@def_cflags_format) { $ok = 0 if $_ eq $flag; @@ -1132,7 +1193,7 @@ LINE: and is_non_verbose_build($line, \$skip, \@input, $i, $parallel)) { if (not $option_buildd) { - error_non_verbose_build($line); + error_non_verbose_build($line, $input_number[$i]); $exit |= $exit_code{non_verbose_build}; } else { $statistics{commands_nonverbose}++; @@ -1229,7 +1290,7 @@ LINE: } my $compile_cpp = 0; - my $compile_ada = 0; + my $restore_cflags = 0; # Assume CXXFLAGS are required when a C++ file is specified in the # compiler line. if ($compile @@ -1239,10 +1300,16 @@ LINE: # Ada needs special CFLAGS, use them if only ada files are compiled. } elsif ($ada and extension_found(\%extensions_ada, @extensions)) { - $compile_ada = 1; + $restore_cflags = 1; $preprocess = 0; # Ada uses no CPPFLAGS @cflags_backup = @cflags; - @cflags = @cflags_ada; + @cflags = @cflags_noformat; + # Same for fortran. + } elsif ($fortran + and extension_found(\%extensions_fortran, @extensions)) { + $restore_cflags = 1; + @cflags_backup = @cflags; + @cflags = @cflags_noformat; } if ($option_buildd) { @@ -1270,7 +1337,8 @@ LINE: # Assume dpkg-buildflags returns the correct flags. and index($line, '`dpkg-buildflags --get CFLAGS`') == -1) { if (not $option_buildd) { - error_flags('CFLAGS missing', \@missing, \%flag_renames, $input[$i]); + error_flags('CFLAGS missing', \@missing, \%flag_renames, + $input[$i], $input_number[$i]); $exit |= $exit_code{flags_missing}; } else { $statistics{compile_missing}++; @@ -1283,7 +1351,8 @@ LINE: # Assume dpkg-buildflags returns the correct flags. and index($line, '`dpkg-buildflags --get CXXFLAGS`') == -1) { if (not $option_buildd) { - error_flags('CXXFLAGS missing', \@missing, \%flag_renames, $input[$i]); + error_flags('CXXFLAGS missing', \@missing, \%flag_renames, + $input[$i], $input_number[$i]); $exit |= $exit_code{flags_missing}; } else { $statistics{compile_cpp_missing}++; @@ -1297,7 +1366,8 @@ LINE: # Assume dpkg-buildflags returns the correct flags. and index($line, '`dpkg-buildflags --get CPPFLAGS`') == -1) { if (not $option_buildd) { - error_flags('CPPFLAGS missing', \@missing, \%flag_renames, $input[$i]); + error_flags('CPPFLAGS missing', \@missing, \%flag_renames, + $input[$i], $input_number[$i]); $exit |= $exit_code{flags_missing}; } else { $statistics{preprocess_missing}++; @@ -1309,7 +1379,8 @@ LINE: # Assume dpkg-buildflags returns the correct flags. and index($line, '`dpkg-buildflags --get LDFLAGS`') == -1) { if (not $option_buildd) { - error_flags('LDFLAGS missing', \@missing, \%flag_renames, $input[$i]); + error_flags('LDFLAGS missing', \@missing, \%flag_renames, + $input[$i], $input_number[$i]); $exit |= $exit_code{flags_missing}; } else { $statistics{link_missing}++; @@ -1317,7 +1388,7 @@ LINE: } # Restore normal CFLAGS. - if ($compile_ada) { + if ($restore_cflags) { @cflags = @cflags_backup; } } @@ -1438,10 +1509,20 @@ error). =back +=item B<--debian> + +Apply Debian-specific settings. At the moment this only disables checking for +PIE which is automatically applied by Debian's GCC and no longer requires a +compiler command line argument. + =item B<--color> Use colored (ANSI) output for warning messages. +=item B<--line-numbers> + +Display line numbers. + =item B<--ignore-arch> I Ignore build logs from architectures matching I. I is a string. @@ -1525,6 +1606,13 @@ Use blhc with pbuilder. pbuilder path/to/package.dsc | tee path/log/file blhc path/to/file || echo flags missing +Assume this build log was created on a Debian system and thus don't warn about +missing PIE flags if the current architecture injects them automatically (this +is enabled in buildd mode per default). C<--arch> is necessary if the build +log contains no architecture information as written by dpkg-buildpackage. + + blhc --debian --all --arch=amd64 path/to/log/file + =head1 BUILDD TAGS The following tags are used in I<--buildd> mode. In braces the additional data @@ -1619,7 +1707,7 @@ Ejari.aalto@cante.netE for their valuable input and suggestions. =head1 LICENSE AND COPYRIGHT -Copyright (C) 2012-2016 by Simon Ruderich +Copyright (C) 2012-2018 by Simon Ruderich This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by