Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2025-01-10 17:30:47 +00:00
Code Issues Projects Releases Wiki Activity

Check image file nesting level

Browse Source
This commit is contained in:
Uwe Seimet 2021-12-20 19:33:01 +01:00
parent c98a2b9069
commit 66c380bd97
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/raspberrypi/rascsi.cpp
View File

@ -1250,6 +1250,7 @@ bool ParseArgument(int argc, char* argv[], int& port)
cerr << "Invalid image file scan depth " << optarg << endl;
return false;
}
rascsi_image.SetDepth(scan_depth);
continue;
case 'n':

37
src/raspberrypi/rascsi_image.cpp
View File

@ -44,6 +44,13 @@ RascsiImage::RascsiImage()
else {
default_image_folder = "/home/pi/images";
}
depth = 0;
}
bool RascsiImage::CheckDepth(const string& folder)
{
return count(folder.begin(), folder.end(), '/') <= depth;
}
bool RascsiImage::CreateImageFolder(int fd, const string& filename)
@ -122,6 +129,10 @@ bool RascsiImage::CreateImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Can't create image file: Missing image filename");
}
if (!CheckDepth(filename)) {
return ReturnStatus(fd, false, ("Invalid folder hierarchy depth '" + filename + "'").c_str());
}
string full_filename = default_image_folder + "/" + filename;
if (!IsValidDstFilename(full_filename)) {
return ReturnStatus(fd, false, "Can't create image file: '" + full_filename + "': File already exists");
@ -186,6 +197,10 @@ bool RascsiImage::DeleteImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Missing image filename");
}
if (!CheckDepth(filename)) {
return ReturnStatus(fd, false, ("Invalid folder hierarchy depth '" + filename + "'").c_str());
}
string full_filename = default_image_folder + "/" + filename;
int id;
@ -242,6 +257,14 @@ bool RascsiImage::RenameImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Can't rename image file '" + from + "': Missing destination filename");
}
if (!CheckDepth(from)) {
return ReturnStatus(fd, false, ("Invalid folder hierarchy depth '" + from + "'").c_str());
}
if (!CheckDepth(to)) {
return ReturnStatus(fd, false, ("Invalid folder hierarchy depth '" + to + "'").c_str());
}
to = default_image_folder + "/" + to;
if (!IsValidDstFilename(to)) {
return ReturnStatus(fd, false, "Can't rename image file '" + from + "' to '" + to + "': File already exists");
@ -277,6 +300,14 @@ bool RascsiImage::CopyImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Can't copy image file '" + from + "': Missing destination filename");
}
if (!CheckDepth(from)) {
return ReturnStatus(fd, false, ("Invalid folder hierarchy depth '" + from + "'").c_str());
}
if (!CheckDepth(to)) {
return ReturnStatus(fd, false, ("Invalid folder hierarchy depth '" + to + "'").c_str());
}
to = default_image_folder + "/" + to;
if (!IsValidDstFilename(to)) {
return ReturnStatus(fd, false, "Can't copy image file '" + from + "' to '" + to + "': File already exists");
@ -342,9 +373,11 @@ bool RascsiImage::SetImagePermissions(int fd, const PbCommand& command)
if (filename.empty()) {
return ReturnStatus(fd, false, "Missing image filename");
}
if (filename.find('/') != string::npos) {
return ReturnStatus(fd, false, "The image filename '" + filename + "' must not contain a path");
if (!CheckDepth(filename)) {
return ReturnStatus(fd, false, ("Invalid folder hierarchy depth '" + filename + "'").c_str());
}
filename = default_image_folder + "/" + filename;
if (!IsValidSrcFilename(filename)) {
return ReturnStatus(fd, false, "Can't modify image file '" + filename + "': Invalid name or type");

3
src/raspberrypi/rascsi_image.h
View File

@ -22,6 +22,8 @@ public:
RascsiImage();
~RascsiImage() {};
void SetDepth(int depth) { this->depth = depth; }
bool CheckDepth(const string&);
bool CreateImageFolder(int, const string&);
string GetDefaultImageFolder() const { return default_image_folder; }
string SetDefaultImageFolder(const string&);
@ -36,4 +38,5 @@ public:
private:
string default_image_folder;
int depth;
};