From e5cdb84647b17427ed0f8afc77ab83af6f537ac0 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 21 Jan 2009 22:04:37 +0000 Subject: Added escapespecialcharacters to format.lua to escape shell special characters. Reviewed all calls to io.popen and os.execute to escape special characters. Fixed file uploads in openssl and ipsectools with viewfunctions.lua. Tried to fix openssl renew when subject contains special characters, but not done yet. git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1687 ab2d0c66-481e-0410-8bed-d214d4d58bed --- lib/fs.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/fs.lua') diff --git a/lib/fs.lua b/lib/fs.lua index 55c5340..5ad6e33 100644 --- a/lib/fs.lua +++ b/lib/fs.lua @@ -7,7 +7,8 @@ module (..., package.seeall) -require ("posix") +require("posix") +require("format") basename = function (string, suffix) string = string or "" @@ -43,7 +44,7 @@ end -- Creates a directory if it doesn't exist function create_directory ( path ) - local cmd = "mkdir -p "..(path or "") + local cmd = "mkdir -p " .. format.escapespecialcharacters(path) local f = io.popen(cmd) f:close() return is_dir(path) @@ -53,7 +54,7 @@ end function create_file ( path ) path = path or "" if dirname(path) and not posix.stat(dirname(path)) then create_directory(dirname(path)) end - local cmd = "touch "..path + local cmd = "touch "..format.escapespecialcharacters(path) local f = io.popen(cmd) f:close() return is_file(path) @@ -116,9 +117,9 @@ end --will return a string with md5sum and filename function md5sum_file ( path ) - cmd = "/usr/bin/md5sum " .. (path or "") + local cmd = "/usr/bin/md5sum "..format.escapespecialcharacters(path) f = io.popen(cmd) - checksum = f:read("*a") + local checksum = f:read("*a") f:close() return checksum end -- cgit v1.2.3