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

to-hex payloadprocessor #178

Merged
merged 1 commit into from
Feb 25, 2020
Merged

to-hex payloadprocessor #178

merged 1 commit into from
Feb 25, 2020

Conversation

EN10
Copy link
Contributor

@EN10 EN10 commented Feb 20, 2020

Useful script I used for Natas 19 Challenge:
https://youtu.be/aZ3ZfAhdqT8

@lgtm-com
Copy link

lgtm-com bot commented Feb 20, 2020

This pull request introduces 2 alerts when merging 367410f into f711c0d - view on LGTM.com

new alerts:

  • 2 for Missing variable declaration

@psiinon
Copy link
Member

psiinon commented Feb 20, 2020

Thanks for sharing this :)
Could you add some details in the script, maybe including a link to that video?
Once its merged people wont see this commit so a bit of context would be useful.

@lgtm-com
Copy link

lgtm-com bot commented Feb 20, 2020

This pull request introduces 1 alert when merging 1bf5fe4 into f711c0d - view on LGTM.com

new alerts:

  • 1 for Missing variable declaration

@EN10
Copy link
Contributor Author

EN10 commented Feb 20, 2020

Thanks for sharing this :)
Could you add some details in the script, maybe including a link to that video?
Once its merged people wont see this commit so a bit of context would be useful.

thanks, this is my first ever pull :)

@EN10
Copy link
Contributor Author

EN10 commented Feb 20, 2020

I think I'm done with edits?

@psiinon
Copy link
Member

psiinon commented Feb 20, 2020

Looks good to me :)
Just one more thing, could you add a comment to the changelog: https://github.com/zaproxy/community-scripts/blob/master/CHANGELOG.md

payloadprocessor/to_hex.js Outdated Show resolved Hide resolved
payloadprocessor/to_hex.js Outdated Show resolved Hide resolved
@EN10
Copy link
Contributor Author

EN10 commented Feb 20, 2020

fixed typo, function name and added to changelog

@EN10 EN10 changed the title to_hex payloadprocessor to-hex payloadprocessor Feb 20, 2020
@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

is there anything else required?

@thc202
Copy link
Member

thc202 commented Feb 25, 2020

Could you squash the commits? (The first is using your email, fine if you want it public though.)

@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

Could you squash the commits? (The first is using your email, fine if you want it public though.)

how do I do that?

@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

Here you go:

ok thanks, I'm using Bash rather than Eclipse.
So I used: git rebase --autostash
i think i have not squashed the commit, i'm on that now

@kingthorin
Copy link
Member

@kingthorin
Copy link
Member

If you're having trouble, let me know I can tackle it.

@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

If you're having trouble, let me know I can tackle it.

thanks, for the help.

I used:
git rebase -i HEAD~8

but i'm getting this issue when i try to push:

To [email protected]:EN10/community-scripts.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:EN10/community-scripts.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@thc202
Copy link
Member

thc202 commented Feb 25, 2020

You need to force push (-f flag).

@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

You need to force push (-f flag).

Keep getting:
Cannot rebase: You have unstaged changes. Please commit or stash them.
i've moved back to a previous commit but still get the same error.

tried:
git stash
and
git reset --hard

@kingthorin
Copy link
Member

Check git status to see what it thinks is pending.

@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

Check git status to see what it thinks is pending.

git status

On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
modified:   src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help_tr_TR/contents/images/script-share.png
modified:   src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help_ur_PK/contents/images/script-share.png
modified:   src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help_zh_CN/contents/images/script-share.png

after several attempts and a few rm ./community-scripts -fr and clone again i think i almost got it.

@EN10 EN10 force-pushed the master branch 2 times, most recently from 36df5b6 to f6cf23d Compare February 25, 2020 16:01
@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

ok i think i've squashed the commits, and removed email.

Copy link
Member

@kingthorin kingthorin left a comment

Choose a reason for hiding this comment

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

Thanks!

@thc202
Copy link
Member

thc202 commented Feb 25, 2020

The committer name/email is probably not correct.

@EN10
Copy link
Contributor Author

EN10 commented Feb 25, 2020

The committer name/email is probably not correct.

thanks, I used this to fix for reference.

https://stackoverflow.com/questions/3042437/how-to-change-the-commit-author-for-one-specific-commit

@thc202 thc202 merged commit 94014d3 into zaproxy:master Feb 25, 2020
@thc202
Copy link
Member

thc202 commented Feb 25, 2020

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants