Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-12-22 15:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Updated error handling

Browse Source
This commit is contained in:
Uwe Seimet 2021-09-17 19:45:27 +02:00
parent 7018ccac64
commit 7a1a2ec328
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/raspberrypi/rascsi.cpp
View File

@ -715,6 +715,11 @@ string SetReservedIds(const string& ids)
return ""; return "";
} }
bool IsValidFilename(const string& filename)
{
return filename != "." && filename != "..";
}
bool CreateImage(int fd, const PbCommand& command) bool CreateImage(int fd, const PbCommand& command)
{ {
string filename = GetParam(command, "file"); string filename = GetParam(command, "file");
@ -722,6 +727,10 @@ bool CreateImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Missing image filename"); return ReturnStatus(fd, false, "Missing image filename");
} }
if (!IsValidFilename(filename)) {
return ReturnStatus(fd, false, "Invalid filename '" + filename + "'");
}
string size = GetParam(command, "size"); string size = GetParam(command, "size");
if (size.empty()) { if (size.empty()) {
return ReturnStatus(fd, false, "Missing image size"); return ReturnStatus(fd, false, "Missing image size");
@ -794,6 +803,10 @@ bool DeleteImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Missing image filename"); return ReturnStatus(fd, false, "Missing image filename");
} }
if (!IsValidFilename(filename)) {
return ReturnStatus(fd, false, "Invalid filename '" + filename + "'");
}
if (filename.find('/') != string::npos) { if (filename.find('/') != string::npos) {
return ReturnStatus(fd, false, "The image filename '" + filename + "' must not contain a path"); return ReturnStatus(fd, false, "The image filename '" + filename + "' must not contain a path");
} }
@ -831,11 +844,19 @@ bool RenameImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Missing destination filename"); return ReturnStatus(fd, false, "Missing destination filename");
} }
if (!IsValidFilename(from)) {
return ReturnStatus(fd, false, "Invalid filename '" + from + "'");
}
if (!IsValidFilename(to)) {
return ReturnStatus(fd, false, "Invalid filename '" + to + "'");
}
if (from.find('/') != string::npos) { if (from.find('/') != string::npos) {
return ReturnStatus(fd, false, "The current filename '" + from + "' must not contain a path"); return ReturnStatus(fd, false, "The source filename '" + from + "' must not contain a path");
} }
if (to.find('/') != string::npos) { if (to.find('/') != string::npos) {
return ReturnStatus(fd, false, "The new filename '" + to + "' must not contain a path"); return ReturnStatus(fd, false, "The destination filename '" + to + "' must not contain a path");
} }
from = default_image_folder + "/" + from; from = default_image_folder + "/" + from;
@ -867,11 +888,19 @@ bool CopyImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Missing destination filename"); return ReturnStatus(fd, false, "Missing destination filename");
} }
if (!IsValidFilename(from)) {
return ReturnStatus(fd, false, "Invalid filename '" + from + "'");
}
if (!IsValidFilename(to)) {
return ReturnStatus(fd, false, "Invalid filename '" + to + "'");
}
if (from.find('/') != string::npos) { if (from.find('/') != string::npos) {
return ReturnStatus(fd, false, "The current filename '" + from + "' must not contain a path"); return ReturnStatus(fd, false, "The source filename '" + from + "' must not contain a path");
} }
if (to.find('/') != string::npos) { if (to.find('/') != string::npos) {
return ReturnStatus(fd, false, "The new filename '" + to + "' must not contain a path"); return ReturnStatus(fd, false, "The destination filename '" + to + "' must not contain a path");
} }
from = default_image_folder + "/" + from; from = default_image_folder + "/" + from;
@ -921,6 +950,10 @@ bool SetImagePermissions(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Missing image filename"); return ReturnStatus(fd, false, "Missing image filename");
} }
if (!IsValidFilename(filename)) {
return ReturnStatus(fd, false, "Invalid filename '" + filename + "'");
}
if (filename.find('/') != string::npos) { if (filename.find('/') != string::npos) {
return ReturnStatus(fd, false, "The image filename '" + filename + "' must not contain a path"); return ReturnStatus(fd, false, "The image filename '" + filename + "' must not contain a path");
} }