X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=8b21c8f2d4cfd509f928aa745f2c761f918b76d3;hb=48f6d8ed0c3c7ae59c3a55c9d2e9dd6c8aa5f052;hp=38ca653cd655b8dd6209df0229fdf86e1754edc6;hpb=d7e5c1de20c3adb24676f405e8930a61c5746759;p=blhc%2Fblhc.git
diff --git a/bin/blhc b/bin/blhc
index 38ca653..8b21c8f 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -23,6 +23,7 @@ use warnings;
use Getopt::Long ();
use Term::ANSIColor ();
+use Text::ParseWords ();
our $VERSION = '0.01';
@@ -30,42 +31,156 @@ our $VERSION = '0.01';
# CONSTANTS/VARIABLES
# Regex to catch compiler commands.
-my $cc_regex = qr/(?:x86_64-linux-gnu-)?(?:(? 1 } (
+ @source_no_preprocess,
+);
+my %extensions_preprocess = map { $_ => 1 } (
+ @header_preprocess,
+ @source_preprocess,
+);
+my %extensions_compile_link = map { $_ => 1 } (
+ @source_preprocess,
+ @source_no_preprocess,
+);
+my %extensions_compile = map { $_ => 1 } (
+ @source_preprocess_compile,
+ @source_no_preprocess_compile,
+);
+my %extensions_no_compile = map { $_ => 1 } (
+ @source_preprocess_no_compile,
+ @source_no_preprocess_no_compile,
+);
+my %extensions_compile_cpp = map { $_ => 1 } (
+ @source_preprocess_compile_cpp,
+ @source_no_preprocess_compile_cpp,
+);
+my %extension = map { $_ => 1 } (
+ @source_no_preprocess,
+ @source_no_preprocess_compile,
+ @source_no_preprocess_compile_cpp,
+ @source_no_preprocess_no_compile,
+ @header_preprocess,
+ @source_preprocess,
+ @source_preprocess_compile,
+ @source_preprocess_compile_cpp,
+ @source_preprocess_no_compile,
+);
+
+# Regexp to match file extensions.
+my $file_extension_regex = qr/
+ \s
+ \S+ # Filename without extension.
+ \.
+ ([^\\.\s]+) # File extension.
+ (?=\s|\\) # At end of word. Can't use \b because some files have non
+ # word characters at the end and because \b matches double
+ # extensions (like .cpp.o). Works always as all lines are
+ # terminated with "\n".
+ /x;
+
# Expected (hardening) flags. All flags are used as regexps.
-my @cflags = (
+my @def_cflags = (
'-g',
'-O(?:2|3)',
);
-my @cflags_format = (
+my @def_cflags_format = (
'-Wformat',
'-Wformat-security',
'-Werror=format-security',
);
-my @cflags_fortify = (
+my @def_cflags_fortify = (
# fortify needs at least -O1, but -O2 is recommended anyway
);
-my @cflags_stack = (
+my @def_cflags_stack = (
'-fstack-protector',
'--param=ssp-buffer-size=4',
);
-my @cflags_pie = (
+my @def_cflags_pie = (
'-fPIE',
);
-my @cppflags = ();
-my @cppflags_fortify = (
+my @def_cxxflags = (
+ '-g',
+ '-O(?:2|3)',
+);
+# @def_cxxflags_* is the same as @def_cflags_*.
+my @def_cppflags = ();
+my @def_cppflags_fortify = (
'-D_FORTIFY_SOURCE=2',
);
-my @ldflags = ();
-my @ldflags_relro = (
+my @def_ldflags = ();
+my @def_ldflags_relro = (
'-Wl,(-z,)?relro',
);
-my @ldflags_bindnow = (
+my @def_ldflags_bindnow = (
'-Wl,(-z,)?now',
);
-my @ldflags_pie = (
+my @def_ldflags_pie = (
'-fPIE',
'-pie',
);
@@ -76,6 +191,9 @@ my %flag_renames = (
'-Wl,(-z,)?now' => '-Wl,-z,now',
);
+# Use colored (ANSI) output?
+my $option_color;
+
# FUNCTIONS
@@ -102,11 +220,16 @@ sub error_non_verbose_build {
error_color(':', 'yellow'),
$line;
}
+sub error_hardening_wrapper {
+ printf "%s%s %s\n",
+ error_color('HARDENING WRAPPER', 'red'),
+ error_color(':', 'yellow'),
+ 'no checks possible, aborting';
+}
sub error_color {
my ($message, $color) = @_;
- # Use colors when writing to a terminal.
- if (-t STDOUT) {
+ if ($option_color) {
return Term::ANSIColor::colored($message, $color);
} else {
return $message;
@@ -117,7 +240,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;
@@ -127,14 +250,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;
@@ -166,7 +287,7 @@ sub is_non_verbose_build {
my ($line, $next_line, $skip_ref) = @_;
if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/
- or $line =~ /^\s*(?:CC|CCLD)\s+(.+?)$/
+ or $line =~ /^\s*\[?(?:CC|CCLD|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*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) {
@@ -190,7 +311,7 @@ sub is_non_verbose_build {
$file =~ m{/([a-zA-Z0-9._-]+)$};
$file = $1;
- if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/) {
+ if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/o) {
# We still have to skip the current line as it doesn't contain any
# compiler commands.
${$skip_ref} = 1;
@@ -201,31 +322,42 @@ sub is_non_verbose_build {
return 1;
}
+sub extension_found {
+ my ($extensions_ref, @extensions) = @_;
-# MAIN
+ my $found = 0;
+ foreach my $extension (@extensions) {
+ if (exists $extensions_ref->{$extension}) {
+ $found = 1;
+ last;
+ }
+ }
+ return $found;
+}
-# 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;
+
+# MAIN
# Parse command line arguments.
my $option_help = 0;
my $option_version = 0;
+my $option_pie = 0;
+my $option_bindnow = 0;
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,
# Hardening options.
- 'pie' => \$harden_pie,
- 'bindnow' => \$harden_bindnow,
+ 'pie' => \$option_pie,
+ 'bindnow' => \$option_bindnow,
'all' => \$option_all,
# Misc.
- 'arch' => \$option_arch,
+ 'color' => \$option_color,
+ 'arch=s' => \$option_arch,
+ 'buildd' => \$option_buildd,
)) {
require Pod::Usage;
Pod::Usage::pod2usage(2);
@@ -254,23 +386,67 @@ along with this program. If not, see .
}
if ($option_all) {
- $harden_pie = 1;
- $harden_bindnow = 1;
+ $option_pie = 1;
+ $option_bindnow = 1;
}
# Final exit code.
my $exit = 0;
+FILE: foreach my $file (@ARGV) {
+open my $fh, '<', $file or die "$!: $file";
+
+# 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 = $option_bindnow; # defaults to 0
+my $harden_pie = $option_pie; # defaults to 0
+
# Input lines, contain only the lines with compiler commands.
my @input = ();
my $start = 0;
my $continuation = 0;
-while (my $line = <>) {
- # We skip over unimportant lines at the beginning to prevent false
- # positives.
+my $complete_line = undef;
+while (my $line = <$fh>) {
+ # 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;
+ }
+ }
+
+ # If hardening wrapper is used (wraps calls to gcc and adds hardening
+ # flags automatically) we can't perform any checks, abort.
+ if (not $start and $line =~ /^Build-Depends: .*\bhardening-wrapper\b/) {
+ error_hardening_wrapper();
+ $exit |= 1 << 4;
+ next FILE;
+ }
+
+ # 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;
+ # 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.
+ last if $line =~ /^Build finished at \d{8}-\d{4}$/;
# Detect architecture automatically unless overridden.
if (not $option_arch
@@ -279,50 +455,94 @@ while (my $line = <>) {
}
# Ignore compiler warnings for now.
- next if $line =~ /$warning_regex/;
+ next if $line =~ /$warning_regex/o;
+
+ if ($line =~ /\033/) { # esc
+ # 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);
# One line may contain multiple commands (";"). Treat each one as single
- # line.
- my @line = split /(? [-h -? --help]
+B [options] ..
-B [--pie] [--bindnow] [--all]
-
- --help available options
- --version version number and license
- --pie force +pie check
- --bindnow force +bindbow check
--all force +all (+pie, +bindnow) check
--arch set architecture (autodetected)
+ --bindnow force +bindbow check
+ --buildd parser mode for buildds
+ --color use colored output
+ --pie force +pie check
+ --help available options
+ --version version number and license
=head1 DESCRIPTION
@@ -471,44 +735,63 @@ other important warnings. It's licensed under the GPL 3 or later.
=over 8
-=item B<-h -? --help>
-
-Print available options.
-
-=item B<--version>
+=item B<--all>
-Print version number and license.
+Force check for all +all (+pie, +bindnow) hardening flags. By default it's
+auto detected.
-=item B<--pie>
+=item B<--arch>
-Force check for all +pie hardening flags. By default it's auto detected.
+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<--bindnow>
Force check for all +bindnow hardening flags. By default it's auto detected.
-=item B<--all>
+=item B<--buildd>
-Force check for all +all (+pie, +bindnow) hardening flags. By default it's
-auto detected.
+Special mode for buildds when automatically parsing log files. The following
+changes are in effect:
-=item B<--arch>
+=over 2
-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
+
+Don't check hardening flags in old log files (if dpkg-dev << 1.16.1 is
+detected).
+
+=back
+
+=item B<--color>
+
+Use colored (ANSI) output for warning messages.
+
+=item B<--pie>
+
+Force check for all +pie hardening flags. By default it's auto detected.
+
+=item B<-h -? --help>
+
+Print available options.
+
+=item B<--version>
+
+Print version number and license.
=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
The exit status is a "bit mask", each listed status is ORed when the error
condition occurs to get the result.
-=over 8
+=over 4
=item B<0>
@@ -530,6 +813,10 @@ Non verbose build.
Missing hardening flags.
+=item B<16>
+
+Hardening wrapper detected, no tests performed.
+
=back
=head1 AUTHOR