From 22a35c7448599aaa4e6c43d69c3e1c511e1534e3 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 7 Oct 2008 17:31:24 +0000 Subject: Modified modelfunctions library to include validation in get/setfiledetails. Modified all uses to validate the file name - this was a major security hole. git-svn-id: svn://svn.alpinelinux.org/acf/tcpproxy/trunk@1542 ab2d0c66-481e-0410-8bed-d214d4d58bed --- tcpproxy-model.lua | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/tcpproxy-model.lua b/tcpproxy-model.lua index e0e820b..508301f 100644 --- a/tcpproxy-model.lua +++ b/tcpproxy-model.lua @@ -201,8 +201,7 @@ function getconfigfile() end function setconfigfile(filedetails) - filedetails.value.filename.value = configfile - return modelfunctions.setfiledetails(filedetails) + return modelfunctions.setfiledetails(filedetails, {configfile}) end function getsmtpstatus() @@ -374,21 +373,11 @@ function createsmtpfile(filedetails) end function readsmtpfile(filename) - if validator.is_valid_filename(filename, smtpdirectory) and fs.is_file(filename) then - return modelfunctions.getfiledetails(filename) - end - local retval = modelfunctions.getfiledetails("") - retval.value.filename.value = filename - return retval + return modelfunctions.getfiledetails(filename, function(filename) return validator.is_valid_filename(filename, smtpdirectory) end) end function updatesmtpfile(filedetails) - if validator.is_valid_filename(filedetails.value.filename.value, smtpdirectory) and fs.is_file(filedetails.value.filename.value) then - return modelfunctions.setfiledetails(filedetails) - end - filedetails.value.filename.errtxt = "Invalid Filename" - filedetails.errtxt = "Failed to set file" - return filedetails + return modelfunctions.setfiledetails(filedetails, function(filename) return validator.is_valid_filename(filename, smtpdirectory) end) end function delsmtpfile(filename) -- cgit v1.2.3