Skip to content

x-pack/filebeat/input/entityanalytics/provider/activedirectory: do not convert special values of accountExpires #43364

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
efd6 merged 3 commits into from
Mar 20, 2025
Merged

x-pack/filebeat/input/entityanalytics/provider/activedirectory: do not convert special values of accountExpires #43364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8fac7a
x-pack/filebeat/input/entityanalytics/provider/activedirectory: do no…
w0rk3r Mar 19, 2025
5187bad
Merge branch 'main' into rt_collection_2
w0rk3r Mar 19, 2025
aed9e5a
Apply suggestions from code review
w0rk3r Mar 20, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ otherwise no tag is added. {issue}42208[42208] {pull}42403[42403]
- Prevent computer details being returned for user queries by Activedirectory Entity Analytics provider. {issue}11818[11818] {pull}42796[42796]
- Handle unexpectedEOF error in aws-s3 input and enforce retrying using download failed error {pull}42420[42756]
- Prevent azureblobstorage input from logging key details during blob fetch operations. {pull}43169[43169]
- Handle special values of accountExpires in the Activedirectory Entity Analytics provider. {pull}43364[43364]

*Heartbeat*

Expand Down
5 changes: 5 additions & 0 deletions ...nput/entityanalytics/provider/activedirectory/internal/activedirectory/activedirectory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@ func entype(attr *ldap.EntryAttribute) any {
if err != nil {
return attr.Values
}
// Check for special values of accountExpires.
// See https://learn.microsoft.com/en-us/windows/win32/adschema/a-accountexpires.
if attr.Name == "accountExpires" && (ts == 0 || ts == 0x7fff_ffff_ffff_ffff) {
return v // Return the raw string instead of converting to time
}
if len(attr.Values) == 1 {
return fromWindowsNT(ts)
}
Expand Down
Loading