Skip to content

gh-99726: Improves correctness of stat results for Windows, and uses faster API when available #102149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 13 commits into from
Mar 16, 2023
Merged

gh-99726: Improves correctness of stat results for Windows, and uses faster API when available #102149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5187810
gh-99726: Improves correctness of stat results for Windows, and uses …
zooba Feb 22, 2023
4f9695e
Few typos
zooba Feb 22, 2023
00460d8
Whitespace
zooba Feb 22, 2023
a01fb67
Add st_birthtime_ns and deprecate st_ctime instead of changing it
zooba Feb 28, 2023
0314273
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Feb 28, 2023
652dd19
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Mar 3, 2023
e2fa2a5
Update API
zooba Mar 3, 2023
23a4dcc
Remove unnecessary FileId check and fix extension check
zooba Mar 6, 2023
64cc626
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Mar 6, 2023
ce037f3
Merge remote-tracking branch 'cpython/main' into gh-99726-2
zooba Mar 9, 2023
a7c6394
Merge branch 'main' into gh-99726-2
zooba Mar 14, 2023
de11468
Store correct birthtime value
zooba Mar 14, 2023
d168950
Improve whatsnew
zooba Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unnecessary FileId check and fix extension check
  • Loading branch information
@zooba
zooba committed Mar 6, 2023
commit 23a4dcc82fb7dd247d8eb43e76e7cd20e8a9999d
45 changes: 27 additions & 18 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,6 +1808,31 @@ attributes_from_dir(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *re
return TRUE;
}


static void
update_st_mode_from_path(const wchar_t *path, DWORD attr,
struct _Py_stat_struct *result)
{
if (!(attr & FILE_ATTRIBUTE_DIRECTORY)) {
/* Fix the file execute permissions. This hack sets S_IEXEC if
the filename has an extension that is commonly used by files
that CreateProcessW can execute. A real implementation calls
GetSecurityInfo, OpenThreadToken/OpenProcessToken, and
AccessCheck to check for generic read, write, and execute
access. */
const wchar_t *fileExtension = wcsrchr(path, '.');
if (fileExtension) {
if (_wcsicmp(fileExtension, L".exe") == 0 ||
_wcsicmp(fileExtension, L".bat") == 0 ||
_wcsicmp(fileExtension, L".cmd") == 0 ||
_wcsicmp(fileExtension, L".com") == 0) {
result->st_mode |= 0111;
}
}
}
}


static int
win32_xstat_slow_impl(const wchar_t *path, struct _Py_stat_struct *result,
BOOL traverse)
Expand Down Expand Up @@ -1971,24 +1996,7 @@ win32_xstat_slow_impl(const wchar_t *path, struct _Py_stat_struct *result,
}

_Py_attribute_data_to_stat(&fileInfo, tagInfo.ReparseTag, &basicInfo, &idInfo, result);

if (!(fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
/* Fix the file execute permissions. This hack sets S_IEXEC if
the filename has an extension that is commonly used by files
that CreateProcessW can execute. A real implementation calls
GetSecurityInfo, OpenThreadToken/OpenProcessToken, and
AccessCheck to check for generic read, write, and execute
access. */
const wchar_t *fileExtension = wcsrchr(path, '.');
if (fileExtension) {
if (_wcsicmp(fileExtension, L".exe") == 0 ||
_wcsicmp(fileExtension, L".bat") == 0 ||
_wcsicmp(fileExtension, L".cmd") == 0 ||
_wcsicmp(fileExtension, L".com") == 0) {
result->st_mode |= 0111;
}
}
}
update_st_mode_from_path(path, fileInfo.dwFileAttributes, result);

cleanup:
if (hFile != INVALID_HANDLE_VALUE) {
Expand Down Expand Up @@ -2018,6 +2026,7 @@ win32_xstat_impl(const wchar_t *path, struct _Py_stat_struct *result,
|| (!traverse && IsReparseTagNameSurrogate(statInfo.ReparseTag))
) {
_Py_stat_basic_info_to_stat(&statInfo, result);
update_st_mode_from_path(path, statInfo.FileAttributes, result);
return 0;
}
} else {
Expand Down
5 changes: 1 addition & 4 deletions Python/fileutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,14 +1155,11 @@ _Py_stat_basic_info_to_stat(FILE_STAT_BASIC_INFORMATION *info,
LARGE_INTEGER_to_time_t_nsec(&info->LastAccessTime, &result->st_atime, &result->st_atime_nsec);
result->st_nlink = info->NumberOfLinks;
result->st_dev = info->VolumeSerialNumber.QuadPart;
/* File systems with less than 128-bits zero pad into this field */
id_128_to_ino file_id;
file_id.id = info->FileId128;
result->st_ino = file_id.st_ino;
result->st_ino_high = file_id.st_ino_high;
// TODO: Confirm whether FileId128 may be 0 but FileId is set
if (!result->st_ino && !result->st_ino_high) {
result->st_ino = info->FileId.QuadPart;
}
/* bpo-37834: Only actual symlinks set the S_IFLNK flag. But lstat() will
open other name surrogate reparse points without traversing them. To
detect/handle these, check st_file_attributes and st_reparse_tag. */
Expand Down