From c35a4c412d770d9ee29fee0cbb16772f16f853d2 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Wed, 5 Nov 2014 20:25:44 +0100 Subject: [PATCH] disallow directories as logfile argument in aa-logprof (follow-up for r2769, which only checked for "exists") Also allow everything except directories as logfile argument in aa-genprof. Acked-by: Steve Beattie --- utils/aa-genprof | 4 +++- utils/aa-logprof | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/aa-genprof b/utils/aa-genprof index fbbe8a191..5529f762a 100755 --- a/utils/aa-genprof +++ b/utils/aa-genprof @@ -65,8 +65,10 @@ filename = args.file if filename: - if not os.path.isfile(filename): + if not os.path.exists(filename): raise apparmor.AppArmorException(_('The logfile %s does not exist. Please check the path') % filename) + elif os.path.isdir(filename): + raise apparmor.AppArmorException(_('%s is a directory. Please specify a file as logfile') % filename) else: apparmor.filename = filename diff --git a/utils/aa-logprof b/utils/aa-logprof index b2ed83500..dc821127d 100755 --- a/utils/aa-logprof +++ b/utils/aa-logprof @@ -35,6 +35,8 @@ logmark = args.mark or '' if filename: if not os.path.exists(filename): raise apparmor.AppArmorException(_('The logfile %s does not exist. Please check the path') % filename) + elif os.path.isdir(filename): + raise apparmor.AppArmorException(_('%s is a directory. Please specify a file as logfile') % filename) else: apparmor.filename = filename