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.

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

Fix the 7z command as 7zip is not a valid command #877

Merged
merged 7 commits into from
Feb 14, 2024

Conversation

rethinksec
Copy link
Contributor

No description provided.

Copy link

google-cla bot commented Jan 30, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

Copy link
Member

@Ana06 Ana06 left a comment

Choose a reason for hiding this comment

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

@rethinksec thanks for the fix! As documented in our Wiki, you need to increase the version in the nuspec every time you update a package:

The version needs to be increased every time you modify an existing package. For example, if you fix a bug in a package, you need to update the nuspec version string. Our guidance is to add the current date to the 4th segment using the format YYYYMMDD. For example, 1.6.2 becomes 1.6.2.20220113 and 3.02 becomes 3.02.0.20220113. If the date is already in the 4th segment, you can increment it to the next day (e.g., 20220113 -> 20220114) and when the PR is merged it should be good to go.

@rethinksec you also need to accept Google CLA for us to be able to merge this PR. Please let us know if you need any assistance.

[nitpick] I think it is also a good idea to request 7zip-15-05.vm >= 15.05.0.20231220 in the nuspec

@@ -38,10 +38,10 @@ try {
$zipPath = $packageArgs.fileFullPath
VM-Assert-Path $zipPath

7zip x $zipPath -o"$toolDir" -y
7z x $zipPath -o"$toolDir" -y
Copy link
Member

Choose a reason for hiding this comment

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

We renamed 7zip to 7z in #803, good catch @rethinksec! 👍

@rethinksec
Copy link
Contributor Author

rethinksec commented Jan 31, 2024

@Ana06 I have updated the nuspec file as requested & accept the Google CLA. Kindly review again.

Copy link
Member

@Ana06 Ana06 left a comment

Choose a reason for hiding this comment

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

Thanks @rethinksec!

@Ana06
Copy link
Member

Ana06 commented Feb 2, 2024

@mandiant/commando-vm we are getting a:

throw "Non-Intel processor detected."

This is already reported in #653 This makes the package failing in the CI and will produce that the package is not pushed to myget if we merge this PR. 😖 @day1player can you assist here? we need to either remove the check if it is not needed or disable this check in the CI.

@Menn1s
Copy link
Contributor

Menn1s commented Feb 2, 2024

Sorry for the delay on this one; please see #892.

@rethinksec
Copy link
Contributor Author

I have updated the script as per #892

Copy link
Member

@Ana06 Ana06 left a comment

Choose a reason for hiding this comment

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

Thanks a lot @rethinksec!! I am going to merge this PR with squash and merge to get rid of the Update hashcat.vm.nuspec and Merge branch 'mandiant:main' into main commits in order to keep a clean commit history. For future contributions it would be appreciated if you could squash your commit instead.

@Ana06 Ana06 merged commit e1c6d22 into mandiant:main Feb 14, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants