2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00

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 <steve@nxnw.org>
This commit is contained in:
Christian Boltz 2014-11-05 20:25:44 +01:00
parent 06c3e0be75
commit c35a4c412d
2 changed files with 5 additions and 1 deletions

View File

@ -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

View File

@ -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