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

document rule branches #1006

Merged
merged 16 commits into from
Jun 28, 2022
Merged

document rule branches #1006

merged 16 commits into from
Jun 28, 2022

Conversation

williballenthin
Copy link
Collaborator

@williballenthin williballenthin commented Apr 27, 2022

add documentation to the readmes explaining mandiant/capa-rules#556

closes #764
closes #529

Checklist

  • No CHANGELOG update needed
  • No new tests needed
  • No documentation update needed

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Please add bug fixes, new features, breaking changes and anything else you think is worthwhile mentioning to the master (unreleased) section of CHANGELOG.md. If no CHANGELOG update is needed add the following to the PR description: [x] No CHANGELOG update needed

@mr-tz mr-tz force-pushed the feature/document-rule-branches branch 3 times, most recently from 5a746f5 to e1aaea9 Compare May 6, 2022 15:21
@github-actions github-actions bot dismissed their stale review May 6, 2022 15:21

CHANGELOG updated or no update needed, thanks! 😄

@mr-tz mr-tz force-pushed the feature/document-rule-branches branch from e1aaea9 to 9b89c84 Compare May 6, 2022 15:24
.github/workflows/tag.yml Outdated Show resolved Hide resolved
.github/workflows/tag.yml Outdated Show resolved Hide resolved
doc/rules.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@mr-tz mr-tz left a comment

Choose a reason for hiding this comment

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

I've pushed some changes to this branch and added a few comments based on what Ana suggested earlier this week.

doc/rules.md Outdated Show resolved Hide resolved
doc/rules.md Show resolved Hide resolved
doc/rules.md Show resolved Hide resolved
capa/version.py Show resolved Hide resolved
@mr-tz
Copy link
Collaborator

mr-tz commented May 9, 2022

I've fixed/updates the tags on capa-rules

Before

$ git --no-pager tag -l -n
v1              Update rules number badge
v1.0.0          v1.0.0
v1.1.0          Update rules number badge
v1.2.0          v1.2.0
v1.3.0          Merge pull request #120 from fireeye/fix/comment-out-block-description
v1.4.0          Update rules number badge
v1.5.0          Update rules number badge
v1.5.1          v1.5.1
v1.6.0          v1.6.0
v1.6.1          Update rules number badge
v2              bypass UAC via ICMLuaUtil: fix ATT&CK mapping
v2.0.0          https://github.com/fireeye/capa/releases/v2.0.0
v3              Merge pull request #536 from mandiant/call5-update
v3.0.0          https://github.com/fireeye/capa/releases/v3.0.0
v3.0.1          https://github.com/fireeye/capa/releases/v3.0.1
v3.0.2          https://github.com/mandiant/capa/releases/v3.0.2
v3.0.3          https://github.com/mandiant/capa/releases/v3.0.3
v3.1.0          https://github.com/mandiant/capa/releases/v3.1.0
v3.2.0          https://github.com/mandiant/capa/releases/v3.2.0

After

$ git --no-pager tag -l -n
v1              https://github.com/mandiant/capa/releases/v1.6.3
v1.0.0          https://github.com/mandiant/capa/releases/v1.0.0
v1.1.0          https://github.com/mandiant/capa/releases/v1.1.0
v1.2.0          https://github.com/mandiant/capa/releases/v1.2.0
v1.3.0          https://github.com/mandiant/capa/releases/v1.3.0
v1.4.0          https://github.com/mandiant/capa/releases/v1.4.0
v1.5.0          https://github.com/mandiant/capa/releases/v1.5.0
v1.5.1          https://github.com/mandiant/capa/releases/v1.5.1
v1.6.0          https://github.com/mandiant/capa/releases/v1.6.0
v1.6.1          https://github.com/mandiant/capa/releases/v1.6.1
v2              https://github.com/mandiant/capa/releases/v2.0.0
v2.0.0          https://github.com/mandiant/capa/releases/v2.0.0
v3              https://github.com/mandiant/capa/releases/v3.2.0
v3.0.0          https://github.com/mandiant/capa/releases/v3.0.0
v3.0.1          https://github.com/mandiant/capa/releases/v3.0.1
v3.0.2          https://github.com/mandiant/capa/releases/v3.0.2
v3.0.3          https://github.com/mandiant/capa/releases/v3.0.3
v3.1.0          https://github.com/mandiant/capa/releases/v3.1.0
v3.2.0          https://github.com/mandiant/capa/releases/v3.2.0

Used commands (see first reference)

git checkout v1.2.0
# delete local
git tag -d v1.2.0
# delete remote
git push origin :refs/tags/v1.2.0
# see date
echo $(git show --format=%aD | head -1)
# use date from commit
GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag -a v1.2.0 -m "https://github.com/mandiant/capa/releases/v1.2.0"
# OR use hard-coded date
GIT_COMMITTER_DATE="2020-09-01 06:13:17 +0200" git tag -a v1.2.0 -m "https://github.com/mandiant/capa/releases/v1.2.0"
git push --tags

References

@mr-tz mr-tz added this to the 4.0.0 milestone May 9, 2022
@mr-tz mr-tz force-pushed the feature/document-rule-branches branch from 0d25494 to 8fa5017 Compare May 9, 2022 12:21
@williballenthin
Copy link
Collaborator Author

I'm really happy with the decisions and work that were made while I was out - thank you!

My only feedback is that, personally, I don't think of tags as things that change. I think of branches as things that get updated over time with new content. So it feels like v1/v2/v3 are more like branches. But, feelings aren't enough :-)

So, Im happy with the changes here and think we should go forward with them. If they don't work over the next releases, we can always update our processes again.

@mr-tz
Copy link
Collaborator

mr-tz commented May 12, 2022

Per the default tags should not change, so I'm fine using branches if we can update them automatically like proposed in this PR for tags currently: https://github.com/mandiant/capa/pull/1006/files#diff-84dff8d1094ca39c02ac0e48d951ca22f4da29c76b50ae517f5bd2d50f94c2f6R25

TODO:

  • auto-update branch (or leave on tag)
  • accept/reject suggestions
  • use version code / help output
  • ready for review
  • merge

@mr-tz mr-tz force-pushed the feature/document-rule-branches branch from 2e5544a to 51be18a Compare June 28, 2022 09:33
doc/release.md Show resolved Hide resolved
@mr-tz mr-tz marked this pull request as ready for review June 28, 2022 10:18
@mr-tz mr-tz requested a review from Ana06 June 28, 2022 10:19
capa/main.py Outdated Show resolved Hide resolved
Co-authored-by: Willi Ballenthin <[email protected]>
capa/main.py Outdated Show resolved Hide resolved
Copy link
Collaborator Author

@williballenthin williballenthin left a comment

Choose a reason for hiding this comment

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

looks great, lets merge this soon.

(apparently i cannot approve my own PR, but please consider it approved)

@mr-tz mr-tz merged commit 400e28c into master Jun 28, 2022
@mr-tz mr-tz deleted the feature/document-rule-branches branch June 28, 2022 16:38
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.

Better Documentation On Rule Version Compatibility ci: tag released commit of capa rules instead of master
3 participants