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_jwe/from_jwe fix #374

Merged
merged 7 commits into from
Jun 12, 2017
Merged

to_jwe/from_jwe fix #374

merged 7 commits into from
Jun 12, 2017

Conversation

rohe
Copy link
Collaborator

@rohe rohe commented Jun 8, 2017

Thanks for contributing to this library! Please include the following check
list in your pull request submission (you can delete this message). If your
changes don't need a change log or documentation update, please ignore this.

  • [x ] Any changes relevant to users are recorded in the CHANGELOG.md.

to_jwe/from_jwe using elleptic curve crypto is dependent on pyjwkest to be of version 1.3.3 or later to work.

@rohe
Copy link
Collaborator Author

rohe commented Jun 8, 2017

Actually pyjwkest 1.3.4 is better :-)

@rohe
Copy link
Collaborator Author

rohe commented Jun 8, 2017

Not really sure why Tarvis fails. Works on my machine.

@decentral1se
Copy link
Contributor

decentral1se commented Jun 8, 2017

Not really sure why Tarvis fails. Works on my machine.

If you're relying on the new pyjwktest, it's being installed from the requirements file on the Travis build. Try running a make upgrade and adding it to the PR. We should probably have a discussion on how we want to support requirement.txt vs. setup.py installs. But for another day :)

@rohe
Copy link
Collaborator Author

rohe commented Jun 8, 2017

Damn, OK got it.

@coveralls
Copy link

coveralls commented Jun 9, 2017

Coverage Status

Coverage increased (+0.2%) to 63.13% when pulling 33a6e38 on rohe:jwe_fix into 7dd51a5 on OpenIDC:master.

@rohe
Copy link
Collaborator Author

rohe commented Jun 9, 2017

OK, so the problem was with pyjwkest. Fixed that now.

@coveralls
Copy link

coveralls commented Jun 9, 2017

Coverage Status

Coverage increased (+0.2%) to 63.13% when pulling cce0c18 on rohe:jwe_fix into 7dd51a5 on OpenIDC:master.



def test_to_jwt_rsa():
msg = Message(a='foo', b='bar', c='tjoho')
Copy link
Contributor

Choose a reason for hiding this comment

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

This can be a fixture that goes in conftest.py.

@decentral1se
Copy link
Contributor

LGTM.

@rohe rohe merged commit c64311b into CZ-NIC:master Jun 12, 2017
@rohe rohe deleted the jwe_fix branch June 12, 2017 05:56
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