Skip to content

[Java][jersey2] fix query parameters in applyToParams#7028

Merged
wing328 merged 3 commits intomasterfrom
fix_null_query
Jul 24, 2020
Merged

[Java][jersey2] fix query parameters in applyToParams#7028
wing328 merged 3 commits intomasterfrom
fix_null_query

Conversation

@wing328
Copy link
Copy Markdown
Member

@wing328 wing328 commented Jul 23, 2020

Fix query parameters in applyToParams with null check and using .equals for string comparison

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @bkabrda (2020/01)


client.updateParamsForAuth(authNames, queryParams, headerParams, null, null, "post", uri);

// hard to test as expire will always be different
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I spent far too long yesterday thinking about exactly this test. I think this may be sufficient:

        Signature requestSignature = Signature.fromString(headerParams.get("Authorization"), Algorithm.RSA_SHA512);
        Verifier verify = new Verifier(PEM.readPublicKey(new ByteArrayInputStream(publicKeyPem.getBytes())), requestSignature);
        assert verify.verify("post", uri.toString(), headerParams);

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Thanks. Let me try.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@timgclark I've merged this PR into master. I wonder if you can file a separate PR to enhance the test. Thank you.

@wing328 wing328 merged commit 04c41d4 into master Jul 24, 2020
@wing328 wing328 deleted the fix_null_query branch July 24, 2020 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants