这是indexloc提供的服务，不要输入任何密码
Skip to content

Bug 231 #312

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
Merged
merged 5 commits into from
Oct 3, 2020
Merged

Bug 231 #312

merged 5 commits into from
Oct 3, 2020

Conversation

bjhulst
Copy link
Contributor

@bjhulst bjhulst commented Sep 28, 2020

Hi, Would this solve bug 231?

@bjhulst bjhulst mentioned this pull request Sep 28, 2020
Closed
@joohoi
Copy link
Member

joohoi commented Oct 1, 2020

This would prevent -ac of having any effect at all in case there already exists a filter of a kind. I think we should figure a way to append the -ac data to the existing filter instead.

@bjhulst
Copy link
Contributor Author

bjhulst commented Oct 1, 2020

Adding the update part is a bit more work than this simple insert if statement. I will add it to this PR...

@bjhulst
Upsert filter options
88f8109 
Insert or update filter options.
@bjhulst
Copy link
Contributor Author

bjhulst commented Oct 2, 2020

Better now?

joohoi
joohoi requested changes Oct 3, 2020
View reviewed changes
Copy link
Member

@joohoi joohoi left a comment

Choose a reason for hiding this comment

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

That solution is really good tbh!

Just a small nitpick: the line indentations seem to be a bit off. You can automatically format the file using go: go fmt pkg/filter/filter.go.

A tip: I have set my development environment to do this automatically on save, as a result I save a lot during development for auto formatting as I'm lazy ;)

If you also could add a short description of the fix to CHANGELOG.md it'd be great!

bjhulst added 2 commits October 3, 2020 11:09
@bjhulst
Indent.
15e5afc
@bjhulst
Updated CHANGELOG.md
4737ac5 
fix for: Option -ac overwriting other existing filters ffuf#231
@bjhulst bjhulst requested a review from joohoi October 3, 2020 08:12
joohoi
joohoi approved these changes Oct 3, 2020
View reviewed changes
Copy link
Member

@joohoi joohoi left a comment

Choose a reason for hiding this comment

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

LGTM!

@joohoi joohoi merged commit 2abc720 into ffuf:master Oct 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joohoi joohoi joohoi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bjhulst @joohoi