vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1884 from jzelinskie/fixlicense

Browse source 
license: validate via key instance rather than PEM
This commit is contained in:
Jimmy Zelinskie 2016-09-28 15:52:50 -04:00 committed by GitHub
commit 0d805905dc
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
test/test_license.py
View file

@ -1,11 +1,15 @@
import unittest import unittest
import jwt
from datetime import datetime, timedelta from datetime import datetime, timedelta
from util.config.provider.license import (decode_license, LICENSE_PRODUCT_NAME,
LicenseValidationError) import jwt
from Crypto.PublicKey import RSA from Crypto.PublicKey import RSA
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.serialization import load_der_public_key
from util.config.provider.license import (decode_license, LICENSE_PRODUCT_NAME,
LicenseValidationError)
class TestLicense(unittest.TestCase): class TestLicense(unittest.TestCase):
@ -13,16 +17,18 @@ class TestLicense(unittest.TestCase):
with open('test/data/test.pem') as f: with open('test/data/test.pem') as f:
private_key = f.read() private_key = f.read()
return (RSA.importKey(private_key).publickey().exportKey('PEM'), private_key) public_key = load_der_public_key(RSA.importKey(private_key).publickey().exportKey('DER'),
backend=default_backend())
return (public_key, private_key)
def create_license(self, license_data): def create_license(self, license_data):
(public_key, private_key) = self.keys() (public_key, private_key) = self.keys()
# Encode the license with the JWT key. # Encode the license with the JWT key.
encoded = jwt.encode(license_data, private_key, 'RS256') encoded = jwt.encode(license_data, private_key, algorithm='RS256')
# Decode it into a license object. # Decode it into a license object.
return decode_license(encoded, public_key_contents=public_key) return decode_license(encoded, public_key_instance=public_key)
def get_license(self, expiration_delta=None, **kwargs): def get_license(self, expiration_delta=None, **kwargs):
license_data = { license_data = {

12
util/config/provider/license.py
View file

@ -107,6 +107,7 @@ class License(object):
LICENSE_FILENAME = 'license' LICENSE_FILENAME = 'license'
_PROD_LICENSE_PUBLIC_KEY_DATA = """ _PROD_LICENSE_PUBLIC_KEY_DATA = """
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCkRnkuqox3A0djgRnHR MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCkRnkuqox3A0djgRnHR
@ -119,10 +120,13 @@ qwIDAQAB
-----END PUBLIC KEY----- -----END PUBLIC KEY-----
""" """
def decode_license(license_contents, public_key_contents=None):
_PROD_LICENSE_PUBLIC_KEY = load_pem_public_key(_PROD_LICENSE_PUBLIC_KEY_DATA,
backend=default_backend())
def decode_license(license_contents, public_key_instance=None):
""" Decodes the specified license contents, returning the decoded license. """ """ Decodes the specified license contents, returning the decoded license. """
public_key_data = public_key_contents or _PROD_LICENSE_PUBLIC_KEY_DATA license_public_key = public_key_instance or _PROD_LICENSE_PUBLIC_KEY
license_public_key = load_pem_public_key(public_key_data, backend=default_backend())
try: try:
decoded = jwt.decode(license_contents, key=license_public_key) decoded = jwt.decode(license_contents, key=license_public_key)
except jwt.exceptions.DecodeError as de: except jwt.exceptions.DecodeError as de:
@ -130,5 +134,3 @@ def decode_license(license_contents, public_key_contents=None):
raise LicenseDecodeError('Could not decode license found: %s' % de.message) raise LicenseDecodeError('Could not decode license found: %s' % de.message)
return License(decoded) return License(decoded)