X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=f9455868e6996e59c45f50825110ec1f11119cbd;hp=20ccb5c9a9c0b423e9a638f205e20820625a13cf;hb=a7795c35f46dfbff0e3a832a48ff288107fcc81d;hpb=3dfbabb47c0de83cdce89c835d9c6d19e25dfbb9 diff --git a/bin/blhc b/bin/blhc index 20ccb5c..f945586 100755 --- a/bin/blhc +++ b/bin/blhc @@ -27,6 +27,58 @@ use Term::ANSIColor (); our $VERSION = '0.01'; +# CONSTANTS/VARIABLES + +# Regex to catch compiler commands. +my $cc_regex = qr/(?:[a-z0-9_]+-(?:linux|kfreebsd)-gnu(?:eabi|eabihf)?-)? + (?:(? '-O2', + '-Wl,(-z,)?relro' => '-Wl,-z,relro', + '-Wl,(-z,)?now' => '-Wl,-z,now', +); + + # FUNCTIONS sub error_flags { @@ -67,7 +119,7 @@ sub any_flags_used { my ($line, @flags) = @_; foreach my $flag (@flags) { - return 1 if $line =~ /\s$flag(?:\s|\\|$)/; + return 1 if $line =~ /\s$flag(?:\s|\\)/; } return 0; @@ -77,14 +129,12 @@ sub all_flags_used { my @missing_flags = (); foreach my $flag (@flags) { - if ($line !~ /\s$flag(?:\s|\\|$)/) { + if ($line !~ /\s$flag(?:\s|\\)/) { push @missing_flags, $flag; } } - if (scalar @missing_flags == 0) { - return 1; - } + return 1 if scalar @missing_flags == 0; @{$missing_flags_ref} = @missing_flags; return 0; @@ -113,30 +163,32 @@ sub pic_pie_conflict { } sub is_non_verbose_build { - my ($line, $next_line, $cc_regex, $skip_ref) = @_; + my ($line, $next_line, $skip_ref) = @_; - my $cmake_non_verbose = qr/^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/; if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/ - or $line =~ /^\s*(?:CC|CCLD)\s+/ - or $line =~ /^\s*(?:C|c)ompiling\s+/ - or $line =~ /$cmake_non_verbose/)) { + or $line =~ /^\s*\[?(?:CC|CCLD|CXX|CXXLD|LD)\]?\s+(.+?)$/ + or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/ + or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/ + or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) { return 0; } + my $file = $1; + # On the first pass we only check if this line is verbose or not. return 1 if not defined $next_line; # Second pass, we have access to the next line. ${$skip_ref} = 0; - # CMake prints the non-verbose messages also when building verbose. If a - # compiler and the file name occurs in the next line, treat it as verbose - # build. - if ($line =~ /$cmake_non_verbose/) { + # CMake and other build systems print the non-verbose messages also when + # building verbose. If a compiler and the file name occurs in the next + # line, treat it as verbose build. + if (defined $file) { # Get filename, we can't use the complete path as only parts of it are - # used in the real compiler command ... - $1 =~ m{/([a-zA-Z0-9._-]+)$}; - my $file = $1; + # used in the real compiler command. + $file =~ m{/([a-zA-Z0-9._-]+)$}; + $file = $1; if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/) { # We still have to skip the current line as it doesn't contain any @@ -150,66 +202,32 @@ sub is_non_verbose_build { } -# CONSTANTS/VARIABLES - -# Regex to catch compiler commands. -my $cc_regex = qr/(?:(? '-Wl,-z,relro', - '-Wl,(-z,)?now' => '-Wl,-z,now', -); - - # MAIN -# Additional hardening options. -my $pie = 0; -my $bindnow = 0; +# Hardening options. Not all architectures support all hardening options. +my $harden_format = 1; +my $harden_fortify = 1; +my $harden_stack = 1; +my $harden_relro = 1; +my $harden_bindnow = 0; +my $harden_pie = 0; # Parse command line arguments. -my $option_all = 0; my $option_help = 0; my $option_version = 0; +my $option_all = 0; +my $option_arch = undef; +my $option_buildd = 0; if (not Getopt::Long::GetOptions( 'help|h|?' => \$option_help, 'version' => \$option_version, - 'pie' => \$pie, - 'bindnow' => \$bindnow, + # Hardening options. + 'pie' => \$harden_pie, + 'bindnow' => \$harden_bindnow, 'all' => \$option_all, + # Misc. + 'arch' => \$option_arch, + 'buildd' => \$option_buildd, )) { require Pod::Usage; Pod::Usage::pod2usage(2); @@ -238,8 +256,8 @@ along with this program. If not, see . } if ($option_all) { - $pie = 1; - $bindnow = 1; + $harden_pie = 1; + $harden_bindnow = 1; } # Final exit code. @@ -248,11 +266,54 @@ my $exit = 0; # Input lines, contain only the lines with compiler commands. my @input = (); +my $start = 0; my $continuation = 0; +my $complete_line = undef; while (my $line = <>) { + # 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. + # + # Packages which were built before 1.16.1 but used their own hardening + # flags are not checked. + if ($option_buildd and not $start + and $line =~ /^Toolchain package versions: /) { + require Dpkg::Version; + if ($line !~ /dpkg-dev_(\S+)/ + or Dpkg::Version::version_compare($1, '1.16.1') < 0) { + $harden_format = 0; + $harden_fortify = 0; + $harden_stack = 0; + $harden_relro = 0; + $harden_bindnow = 0; + $harden_pie = 0; + } + } + + # We skip over unimportant lines at the beginning of the log to prevent + # false positives. + $start = 1 if $line =~ /^dpkg-buildpackage:/; + next if not $start; + + # Detect architecture automatically unless overridden. + if (not $option_arch + and $line =~ /^dpkg-buildpackage: host architecture (.+)$/) { + $option_arch = $1; + } + # Ignore compiler warnings for now. next if $line =~ /$warning_regex/; + # Remove all ANSI color sequences which are sometimes used in non-verbose + # builds. + $line = Term::ANSIColor::colorstrip($line); + # Also strip '\0xf' (delete previous character), used by Elinks' build + # system. + $line =~ s/\x0f//g; + # And "ESC(B" which seems to be used on armhf and hurd (not sure what it + # does). + $line =~ s/\033\(B//g; + # Check if this line indicates a non verbose build. my $non_verbose = is_non_verbose_build($line); @@ -269,10 +330,26 @@ while (my $line = <>) { # Join lines, but leave the "\" in place so it's clear where the # original line break was. - chomp $input[-1]; - $input[-1] .= ' ' . $line; + chomp $complete_line; + $complete_line .= ' ' . $line; + } + # Line continuation, line ends with "\". + if ($line =~ /\\\s*$/) { + $continuation = 1; + # Start line continuation. + if (not defined $complete_line) { + $complete_line = $line; + } + next; + } + + if (not $continuation) { + # Use the complete line if a line continuation occurred. + if (defined $complete_line) { + $line = $complete_line; + $complete_line = undef; + } - } else { # Ignore lines with no compiler commands. next if $line !~ /\b$cc_regex(?:\s|\\)/ and not $non_verbose; @@ -280,13 +357,20 @@ while (my $line = <>) { # # `./configure` output. next if not $non_verbose and $line =~ /^checking /; + next if $line =~ /^\s*(?:C\s+)? + (?:C|c)ompiler[\s.]*:\s+ + $cc_regex + (?:\s-std=[a-z0-9:+]+)?\s*$ + /x + or $line =~ /^\s*(?:- )?(?:CC|CXX)\s*=\s*$cc_regex\s*$/ + or $line =~ /^\s*-- Check for working (?:C|CXX) compiler: / + or $line =~ /^\s*(?:echo )?Using [A-Z_]+\s*=\s*/; + # Debian buildd output. + next if $line =~ /^\s*Depends: .*?$cc_regex.*?$/ + and $line !~ /\s-./; # option, prevent false negatives - push @input, $line; - } - # Line continuation, line ends with "\". - if ($line =~ /\\\s*$/) { - $continuation = 1; + push @input, $line; } } } @@ -297,18 +381,53 @@ if (scalar @input == 0) { exit $exit; } +# Option or auto detected. +if ($option_arch) { + # The following was partially copied from dpkg-dev 1.16.1.2 + # (/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. + + require Dpkg::Arch; + my ($abi, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($option_arch); + + # Disable unsupported hardening options. + if ($cpu =~ /^(ia64|alpha|mips|mipsel|hppa)$/ or $option_arch eq 'arm') { + $harden_stack = 0; + } + if ($cpu =~ /^(ia64|hppa|avr32)$/) { + $harden_relro = 0; + $harden_bindnow = 0; + } +} + # Check if additional hardening options were used. Used to ensure they are # used for the complete build. foreach my $line (@input) { - $pie = 1 if any_flags_used($line, @cflags_pie, @ldflags_pie); - $bindnow = 1 if any_flags_used($line, @ldflags_bindnow); + $harden_pie = 1 if any_flags_used($line, @cflags_pie, @ldflags_pie); + $harden_bindnow = 1 if any_flags_used($line, @ldflags_bindnow); } -if ($pie) { +# Check the specified hardening options, same order as dpkg-buildflags. +if ($harden_pie) { @cflags = (@cflags, @cflags_pie); @ldflags = (@ldflags, @ldflags_pie); } -if ($bindnow) { +if ($harden_stack) { + @cflags = (@cflags, @cflags_stack); +} +if ($harden_fortify) { + @cflags = (@cflags, @cflags_fortify); + @cppflags = (@cppflags, @cppflags_fortify); +} +if ($harden_format) { + @cflags = (@cflags, @cflags_format); +} +if ($harden_relro) { + @ldflags = (@ldflags, @ldflags_relro); +} +if ($harden_bindnow) { @ldflags = (@ldflags, @ldflags_bindnow); } @@ -316,7 +435,7 @@ for (my $i = 0; $i < scalar @input; $i++) { my $line = $input[$i]; my $skip = 0; - if (is_non_verbose_build($line, $input[$i + 1], $cc_regex, \$skip)) { + if (is_non_verbose_build($line, $input[$i + 1], \$skip)) { error_non_verbose_build($line); $exit |= 1 << 2; next; @@ -324,25 +443,20 @@ for (my $i = 0; $i < scalar @input; $i++) { # Even if it's a verbose build, we might have to skip this line. next if $skip; - # Ignore false positives. - # - # ./configure summary. - next if $line =~ /^\s*(?:C|c)ompiler[\s.]*:\s+$cc_regex(?:\s-std=[a-z0-9:+]+)?\s*$/ - or $line =~ /^\s*- (?:CC|CXX)\s*=\s*$cc_regex\s*$/ - or $line =~ /^\s*-- Check for working (?:C|CXX) compiler: /; # Is this a compiler or linker command? my $compiler = 1; my $linker = 0; # Linker commands. - if ($line =~ m{\s-o # -o - [\s\\]*\s+ # possible line continuation - (?:[A-Za-z0-9_/.-]+/)? # path to file - [A-Za-z0-9_-]+ # binary name (no dots!) + if ($line =~ m{\s-o # -o + [\s\\]*\s+ # possible line continuation + (?:[/.A-Za-z0-9~_-]+/)? # path to file + [A-Za-z0-9~_-]+ # binary name (no dots!) (?:[0-9.]*\.so[0-9.]*[a-z]? # library (including version) - |\.la)? - (?:\s|\\|\$) # end of file name + |\.la + |\.cgi)? # CGI binary + (?:\s|\\|$) # end of file name }x or $line =~ /^libtool: link: / or $line =~ m{\s*/bin/bash .+?libtool\s+(.+?\s+)?--mode=(re)?link}) { @@ -361,7 +475,7 @@ for (my $i = 0; $i < scalar @input; $i++) { if ($compiler and not all_flags_used($line, \@missing, @cflags) # Libraries linked with -fPIC don't have to (and can't) be linked # with -fPIE as well. It's no error if only PIE flags are missing. - and not pic_pie_conflict($line, $pie, \@missing, @cflags_pie)) { + and not pic_pie_conflict($line, $harden_pie, \@missing, @cflags_pie)) { error_flags('CFLAGS missing', \@missing, \%flag_renames, $line); $exit |= 1 << 3; } @@ -371,7 +485,7 @@ for (my $i = 0; $i < scalar @input; $i++) { } if ($linker and not all_flags_used($line, \@missing, @ldflags) # Same here, -fPIC conflicts with -fPIE. - and not pic_pie_conflict($line, $pie, \@missing, @ldflags_pie)) { + and not pic_pie_conflict($line, $harden_pie, \@missing, @ldflags_pie)) { error_flags('LDFLAGS missing', \@missing, \%flag_renames, $line); $exit |= 1 << 3; } @@ -397,6 +511,8 @@ B [--pie] [--bindnow] [--all] --pie force +pie check --bindnow force +bindbow check --all force +all (+pie, +bindnow) check + --arch set architecture (autodetected) + --buildd parser mode for buildds =head1 DESCRIPTION @@ -428,10 +544,31 @@ Force check for all +bindnow hardening flags. By default it's auto detected. Force check for all +all (+pie, +bindnow) hardening flags. By default it's auto detected. +=item B<--arch> + +Set the specific architecture (e.g. amd64, armel, etc.), automatically +disables hardening flags not available on this architecture. Is detected +automatically if dpkg-buildpackage is used. + +=item B<--buildd> + +Special mode for buildds when automatically parsing log files. The following +changes are in effect: + +=over 2 + +=item + +Don't check hardening flags in old log files (if dpkg-dev << 1.16.1 is +detected). + +=back + =back -Auto detection only works if at least one command uses the required hardening -flag (e.g. -fPIE). Then it's required for all other commands as well. +Auto detection for B<--pie> and B<--bindnow> only works if at least one +command uses the required hardening flag (e.g. -fPIE). Then it's required for +all other commands as well. =head1 EXIT STATUS