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

ZAP #14

Merged
merged 6 commits into from
Oct 4, 2024
Merged

ZAP #14

merged 6 commits into from
Oct 4, 2024

Conversation

NickLech
Copy link

@NickLech NickLech commented Oct 2, 2024

ZAP files loaded

test.txt Outdated Show resolved Hide resolved
tool/migt.gradle.kts Outdated Show resolved Hide resolved
tool/.gitignore Outdated Show resolved Hide resolved
tool/src/test/java/At_Hash_Test.java Outdated Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

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

The license of samlraider should not be edited or removed, you can append the ZAP one if needed, but i don't think it is needed for these files

Copy link
Author

Choose a reason for hiding this comment

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

ZAP was giving an error due to the lack of a license. I will try to re-add the samlaider licence, which was automatically removed by a built-in feature of ZAP that I used to update the licenses.

Copy link
Author

Choose a reason for hiding this comment

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

It does not allow me to build it if I have the other licence, I will search for a solution but for now could leave it like this, this branch was created so that I could send the link to the ZAP developers for an issue with the code

Copy link
Collaborator

@mattebit mattebit Oct 3, 2024

Choose a reason for hiding this comment

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

Ok. The branch should already be visible, so I would wait to merge the PR until we assess this doubt

Copy link
Collaborator

Choose a reason for hiding this comment

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

Do the ZAP license need to be included in every file of the addon? please check if necessary. I would just put it in the code using ZAP libraries

Copy link
Author

Choose a reason for hiding this comment

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

Yes, otherwise during the build if faild due to format violations

tool/gradle/wrapper/gradle-wrapper.jar Outdated Show resolved Hide resolved
tool/CHANGELOG.md Show resolved Hide resolved
tool/readme.md Outdated Show resolved Hide resolved
@NickLech NickLech requested a review from mattebit October 2, 2024 16:34
Copy link
Collaborator

Choose a reason for hiding this comment

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

the name should be ".gitignore"

Copy link
Collaborator

@mattebit mattebit Oct 3, 2024

Choose a reason for hiding this comment

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

Ok. The branch should already be visible, so I would wait to merge the PR until we assess this doubt

@NickLech
Copy link
Author

NickLech commented Oct 3, 2024

The issue is that we wanted to send the code for the ZAP plugin, so the branch needs to contain the code I submitted in the PR. Initially, I intended to send my repository, but it was later decided to create a dedicated branch for my code. If you think this is a problem, let me know, and I will ask the others how to proceed.

@NickLech NickLech requested a review from mattebit October 3, 2024 10:14
@NickLech
Copy link
Author

NickLech commented Oct 4, 2024

Hy, I was able to change the rules for the build and now the MIT license should be present as well as some changes in the build file

@mattebit
Copy link
Collaborator

mattebit commented Oct 4, 2024

Hy, I was able to change the rules for the build and now the MIT license should be present as well as some changes in the build file

Please then verify with ZAP developers that this is ok for them.

The issue is that we wanted to send the code for the ZAP plugin, so the branch needs to contain the code I submitted in the PR. Initially, I intended to send my repository, but it was later decided to create a dedicated branch for my code. If you think this is a problem, let me know, and I will ask the others how to proceed.

I would just wait to merge and let them see your fork, but if @abisegna prefers to merge it is ok, but please do not merge into main until we assess these doubts

@mattebit mattebit requested a review from abisegna October 4, 2024 09:38
@NickLech
Copy link
Author

NickLech commented Oct 4, 2024

Yes, I already asked them and they said: "The ZAP license header is only needed if you plan to contribute the
add-on and it will live in zap-extensions repo, otherwise you are free
to use whatever license you deem appropriate for your add-on. "

@abisegna abisegna merged commit 7a1b783 into stfbk:zap Oct 4, 2024
1 check failed
@mattebit
Copy link
Collaborator

mattebit commented Oct 4, 2024

Yes, I already asked them and they said: "The ZAP license header is only needed if you plan to contribute the add-on and it will live in zap-extensions repo, otherwise you are free to use whatever license you deem appropriate for your add-on. "

Ok. So you can remove the ZAP licence also from the mig-t files. The Saml Raider files must have their original license notice in their files

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