fix(scap): move machine/agent info to generic platform #1204
Conversation
poiana
added
release-note-none
kind/bug
|
cc @incertum |
gnosek
force-pushed
the
platform-machine-info
branch
from
5b57b65
to
cfcc98b
Compare
|
also cc @geraldcombs since you seem to be involved with the non-Linux side of things :) |
gnosek
force-pushed
the
platform-machine-info
branch
2 times, most recently
from
8db5e54
to
1b06b7d
Compare
|
LGTM label has been added. Git tree hash: e4a29cd7f6d0b6da8bcf5b9dd1de73fc496ea05e
|
| { | ||
| OSVERSIONINFOA os_info; | ||
| os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); | ||
| if(GetVersionExA(&os_info)) |
There was a problem hiding this comment.
Note that this probably won't return the correct version on modern versions of Windows. We use RtlGetVersion in Wireshark, but it looks like you can also call GetFileVersionInfo on one of the kernel DLLs.
There was a problem hiding this comment.
I'm happy it compiled without me seeing a Windows machine ;) I'm even happier to replace it with something that actually works.
For future me: https://github.com/wireshark/wireshark/blob/dcc9cbffefe0598eadec11cbc1869943a26219c5/wsutil/os_version_info.c#L192
(I don't think we need anything that fancy but I'll use it for inspiration ;])
There was a problem hiding this comment.
@geraldcombs and @gnosek is this a blocker or a note for a future PR? The primary fix this PR addresses is around plugins and linux ...
There was a problem hiding this comment.
@incertum I think this falls in the "future PR" category.
There was a problem hiding this comment.
@gnosek I'll re-approve tomorrow as we need a rebase now!
|
/milestone 0.12.0 |
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
This still needs macOS and Windows support Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
gnosek
force-pushed
the
platform-machine-info
branch
from
1b06b7d
to
a59592c
Compare
|
@incertum, rebased. @geraldcombs, I did a yolo implementation using RtlGetVersion, please take a look if you can :) (taken from Wireshark, simplified a lot with less detail) |
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
The generic platform handles machine_info now. Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
gnosek
force-pushed
the
platform-machine-info
branch
from
a59592c
to
5613af1
Compare
|
LGTM label has been added. Git tree hash: 76b7e2955e38508dbd2c75ce9865bfd7ca7e1747
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: FedeDP, gnosek, incertum The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/kind bug
Any specific area of the project related to this PR?
/area build
/area libscap
What this PR does / why we need it:
The generic platform didn't expose machine_info or agent_info, while we do need this even for source plugins.
Also, allow source plugins to use the live platform (for upcoming syscall plugins).
Special notes for your reviewer:
macOS and Windows support is completely untested, fingers crossed for the CI doing its job.
Does this PR introduce a user-facing change?: