hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

[win32, io] adding context struct for use in io_open_path_restrict()

This commit is contained in:
martinfouilleul 2023-06-14 18:35:33 +02:00
parent 5d2bf9eab9
commit 49643520ee
1 changed files with 70 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/platform/win32_io.c
View File

@ -339,22 +339,53 @@ typedef struct io_open_restrict_result
HANDLE h; HANDLE h;
} io_open_restrict_result; } io_open_restrict_result;
typedef struct io_open_restrict_context
{
io_error error;
u64 rootUID;
HANDLE rootHandle;
HANDLE handle;
} io_open_restrict_context;
io_error io_open_restrict_enter(io_open_restrict_context* context, str8 name, file_access_rights accessRights, file_open_flags openFlags)
{
HANDLE nextHandle = io_open_relative(context->handle, name, accessRights, openFlags);
if(nextHandle == INVALID_HANDLE_VALUE)
{
context->error = io_convert_win32_error(GetLastError());
}
else
{
if(context->handle != context->rootHandle)
{
CloseHandle(context->handle);
}
context->handle = nextHandle;
}
}
io_open_restrict_result io_open_path_restrict(HANDLE dirHandle, str8 path, file_access_rights accessRights, file_open_flags openFlags) io_open_restrict_result io_open_path_restrict(HANDLE dirHandle, str8 path, file_access_rights accessRights, file_open_flags openFlags)
{ {
io_open_restrict_result result = {0};
mem_arena_scope scratch = mem_scratch_begin(); mem_arena_scope scratch = mem_scratch_begin();
str8_list sep = {0}; str8_list sep = {0};
str8_list_push(scratch.arena, &sep, STR8("/")); str8_list_push(scratch.arena, &sep, STR8("/"));
str8_list pathElements = str8_split(scratch.arena, path, sep); str8_list pathElements = str8_split(scratch.arena, path, sep);
u64 rootUID = io_win32_file_uid(dirHandle); io_open_restrict_context context = {
.error = IO_OK,
HANDLE handle = dirHandle; .rootHandle = dirHandle,
.rootUID = io_win32_file_uid(dirHandle),
.handle = dirHandle,
};
for_list(&pathElements.list, elt, str8_elt, listElt) for_list(&pathElements.list, elt, str8_elt, listElt)
{ {
if(context.error != IO_OK)
{
break;
}
str8 name = elt->string; str8 name = elt->string;
if(!str8_cmp(name, STR8("."))) if(!str8_cmp(name, STR8(".")))
@ -365,64 +396,48 @@ io_open_restrict_result io_open_path_restrict(HANDLE dirHandle, str8 path, file_
else if(!str8_cmp(name, STR8(".."))) else if(!str8_cmp(name, STR8("..")))
{ {
//NOTE: check that we don't escape root dir //NOTE: check that we don't escape root dir
if(io_win32_file_uid(handle) == rootUID) if(io_win32_file_uid(context.handle) == context.rootUID)
{ {
result.error = IO_ERR_WALKOUT; context.error = IO_ERR_WALKOUT;
goto error; break;
} }
else else
{ {
// Open parent and continue io_open_restrict_enter(&context, name, FILE_ACCESS_READ, 0);
HANDLE nextHandle = io_open_relative(handle, STR8(".."), FILE_ACCESS_READ, 0);
if(nextHandle == INVALID_HANDLE_VALUE)
{
result.error = io_convert_win32_error(GetLastError());
goto error;
}
else
{
if(handle != dirHandle)
{
CloseHandle(handle);
}
handle = nextHandle;
}
} }
} }
else else
{ {
//TODO: open that dir, check if dir/symlink/etc HANDLE statHandle = io_open_relative(context.handle, name, FILE_ACCESS_READ, FILE_OPEN_SYMLINK);
HANDLE statHandle = io_open_relative(handle, name, FILE_ACCESS_READ, FILE_OPEN_SYMLINK);
if(statHandle == INVALID_HANDLE_VALUE) if(statHandle == INVALID_HANDLE_VALUE)
{ {
result.error = io_convert_win32_error(GetLastError()); context.error = io_convert_win32_error(GetLastError());
goto error; break;
} }
file_status status = {0}; file_status status = {0};
result.error = io_win32_stat_from_handle(statHandle, &status); context.error = io_win32_stat_from_handle(statHandle, &status);
CloseHandle(statHandle); CloseHandle(statHandle);
if(result.error) if(context.error)
{ {
goto error; break;
} }
if(status.type == MP_FILE_SYMLINK) if(status.type == MP_FILE_SYMLINK)
{ {
//TODO: read link target and add to file //NOTE: read link target and add to file
HANDLE link = io_open_relative(handle, name, FILE_ACCESS_READ, FILE_OPEN_SYMLINK); HANDLE link = io_open_relative(context.handle, name, FILE_ACCESS_READ, FILE_OPEN_SYMLINK);
if(link == INVALID_HANDLE_VALUE) if(link == INVALID_HANDLE_VALUE)
{ {
result.error = io_convert_win32_error(GetLastError()); context.error = io_convert_win32_error(GetLastError());
goto error; break;
} }
io_win32_read_link_result linkResult = io_win32_read_link(scratch.arena, link); io_win32_read_link_result linkResult = io_win32_read_link(scratch.arena, link);
CloseHandle(link); CloseHandle(link);
if(linkResult.error) if(linkResult.error)
{ {
result.error = linkResult.error; context.error = linkResult.error;
goto error; break;
} }
if(linkResult.targetPath.len == 0) if(linkResult.targetPath.len == 0)
{ {
@ -431,8 +446,8 @@ io_open_restrict_result io_open_path_restrict(HANDLE dirHandle, str8 path, file_
else if(linkResult.targetPath.ptr[0] == '/' else if(linkResult.targetPath.ptr[0] == '/'
||linkResult.targetPath.ptr[0] == '\\') ||linkResult.targetPath.ptr[0] == '\\')
{ {
result.error = IO_ERR_WALKOUT; context.error = IO_ERR_WALKOUT;
goto error; break;
} }
else else
{ {
@ -453,68 +468,42 @@ io_open_restrict_result io_open_path_restrict(HANDLE dirHandle, str8 path, file_
else if(status.type == MP_FILE_DIRECTORY) else if(status.type == MP_FILE_DIRECTORY)
{ {
//NOTE: descend in directory //NOTE: descend in directory
HANDLE nextHandle = io_open_relative(handle, name, FILE_ACCESS_READ, 0); io_open_restrict_enter(&context, name, FILE_ACCESS_READ, 0);
if(nextHandle == INVALID_HANDLE_VALUE)
{
result.error = io_convert_win32_error(GetLastError());
goto error;
}
else
{
if(handle != dirHandle)
{
CloseHandle(handle);
}
handle = nextHandle;
}
} }
else if(status.type == MP_FILE_REGULAR) else if(status.type == MP_FILE_REGULAR)
{ {
//TODO: check that we're at the end and open that file //NOTE: check that we're at the end of path and open that file
if(&elt->listElt != list_last(&pathElements.list)) if(&elt->listElt != list_last(&pathElements.list))
{ {
result.error = IO_ERR_NOT_DIR; context.error = IO_ERR_NOT_DIR;
goto error; break;
} }
else else
{ {
//NOTE: open the file io_open_restrict_enter(&context, name, accessRights, openFlags);
HANDLE nextHandle = io_open_relative(handle, name, accessRights, openFlags);
if(nextHandle == INVALID_HANDLE_VALUE)
{
result.error = io_convert_win32_error(GetLastError());
goto error;
}
else
{
if(handle != dirHandle)
{
CloseHandle(handle);
}
handle = nextHandle;
}
} }
} }
else else
{ {
result.error = IO_ERR_NOT_DIR; context.error = IO_ERR_NO_ENTRY;
goto error;
} }
} }
} }
goto end;
error: if(context.error)
{ {
if(handle != dirHandle) if(context.handle != context.rootHandle)
{ {
CloseHandle(handle); CloseHandle(context.handle);
handle = INVALID_HANDLE_VALUE; context.handle = INVALID_HANDLE_VALUE;
} }
} }
end:
result.h = handle; io_open_restrict_result result = {
.error = context.error,
.h = context.handle
};
mem_scratch_end(scratch); mem_scratch_end(scratch);
return(result); return(result);
} }