Skip to content
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

Jump to bottom

[winrm] say goodbye to SMB #172

Merged
merged 7 commits into from
Feb 28, 2024
Merged

[winrm] say goodbye to SMB #172

merged 7 commits into from
Feb 28, 2024

Conversation

XiaoliChan
Copy link
Contributor

@XiaoliChan XiaoliChan commented Feb 7, 2024 •
edited
Loading

@NeffIsBack NeffIsBack added the enhancement New feature or request label Feb 7, 2024
@mpgn
Copy link
Collaborator

mpgn commented Feb 25, 2024

image

all good for me 🎉

mpgn
mpgn previously approved these changes Feb 25, 2024
View reviewed changes
@mpgn mpgn added the tested label Feb 25, 2024
@mpgn mpgn added this to the v1.2.0 milestone Feb 25, 2024
@NeffIsBack
Copy link
Contributor

One small detail, we need the correct version enumeration from impacket. Then we can merge

@mpgn
Copy link
Collaborator

mpgn commented Feb 26, 2024

The what ? ^^

@NeffIsBack
Copy link
Contributor

The what ? ^^

The windows OS enumeration I added to impacket😁 We can just import the check from impacket so we get the proper OS output

@mpgn
Copy link
Collaborator

mpgn commented Feb 26, 2024

You can add it @NeffIsBack ?

@XiaoliChan
Copy link
Contributor Author

XiaoliChan commented Feb 27, 2024 •
edited
Loading

Now the os verison is usng the WIN_VERSIONS data (with @NeffIsBack suggestion).

And I move the ntlm_parser.py into helpers, then after that, the MSSQL #136 can also invoke the function (codeless).

XiaoliChan and others added 6 commits February 27, 2024 18:40
@XiaoliChan @NeffIsBack
[winrm] say goodbye to SMB
9ceab24 
Signed-off-by: XiaoliChan <30458572+XiaoliChan@users.noreply.github.com>
@XiaoliChan @NeffIsBack
[winrm] Clean args.py
217cf21 
Signed-off-by: XiaoliChan <30458572+XiaoliChan@users.noreply.github.com>
@XiaoliChan @NeffIsBack
[winrm] Ruff
19ee066 
Signed-off-by: XiaoliChan <30458572+XiaoliChan@users.noreply.github.com>
@NeffIsBack
Removed unused conditional function, removed "NT" from windows versio…
1e12cad 
…n so it matches SMB enumeration
@NeffIsBack
Formating
7e0c0e0
@XiaoliChan @NeffIsBack
[winrm] better os info
1d1c03b 
Signed-off-by: XiaoliChan <30458572+XiaoliChan@users.noreply.github.com>
@NeffIsBack NeffIsBack added the reviewed code Label for when a static code review was done label Feb 27, 2024
NeffIsBack
NeffIsBack approved these changes Feb 27, 2024
View reviewed changes
Copy link
Contributor

@NeffIsBack NeffIsBack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍
image

@NeffIsBack NeffIsBack merged commit ac60614 into Pennyw0rth:main Feb 28, 2024
1 check passed
@XiaoliChan XiaoliChan deleted the winrm-ntlm-info branch February 28, 2024 03:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeffIsBack NeffIsBack NeffIsBack approved these changes

@mpgn mpgn mpgn left review comments

@zblurx zblurx Awaiting requested review from zblurx zblurx is a code owner

@Marshall-Hallenbeck Marshall-Hallenbeck Awaiting requested review from Marshall-Hallenbeck Marshall-Hallenbeck is a code owner

Assignees
No one assigned
Labels
enhancement New feature or request reviewed code Label for when a static code review was done tested
Projects
None yet
Milestone
v1.2.0
Development

Successfully merging this pull request may close these issues.
3 participants
@XiaoliChan @mpgn @NeffIsBack