From 61c9e472377a1995b94e35fc73c4687cef7d080d Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Sun, 9 Mar 2025 21:28:07 +0100 Subject: [PATCH 01/30] added endpoint '/leasing/v1/config-token' --- app/main.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/main.py b/app/main.py index f11ba5c..fd1a0ce 100644 --- a/app/main.py +++ b/app/main.py @@ -412,6 +412,16 @@ async def auth_v1_token(request: Request): return JSONr(response) +# NLS 3.4.0 - venv/lib/python3.12/site-packages/nls_services_lease/test/test_lease_single_controller.py +@app.post('/leasing/v1/config-token', description='request to get config token for lease operations') +async def leasing_v1_config_token(request: Request): + response = { + "service_instance_ref": INSTANCE_REF, + } + + return JSONr(response) + + # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py @app.post('/leasing/v1/lessor', description='request multiple leases (borrow) for current origin') async def leasing_v1_lessor(request: Request): From d71b66d1928c15051ca3d1563cdb91985a378d5f Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Sun, 9 Mar 2025 22:02:51 +0100 Subject: [PATCH 02/30] added debugging --- app/main.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/main.py b/app/main.py index fd1a0ce..22a6275 100644 --- a/app/main.py +++ b/app/main.py @@ -415,10 +415,17 @@ async def auth_v1_token(request: Request): # NLS 3.4.0 - venv/lib/python3.12/site-packages/nls_services_lease/test/test_lease_single_controller.py @app.post('/leasing/v1/config-token', description='request to get config token for lease operations') async def leasing_v1_config_token(request: Request): + j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC) + + logging.debug('CALLED /leasing/v1/config-token') + logging.debug(j) + response = { "service_instance_ref": INSTANCE_REF, } + logging.debug(response) + return JSONr(response) From e438de62816871e1244f99e388731fb5abde1ac6 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Sun, 9 Mar 2025 22:10:26 +0100 Subject: [PATCH 03/30] added logging --- test/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/main.py b/test/main.py index 653548f..cf1f5db 100644 --- a/test/main.py +++ b/test/main.py @@ -166,6 +166,8 @@ def test_auth_v1_token(): assert payload.get('origin_ref') == ORIGIN_REF +# todo: /leasing/v1/config-token + def test_leasing_v1_lessor(): payload = { 'fulfillment_context': { From 88fbd0861032c67470a6cb01452cfaeea34bef80 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 10 Mar 2025 23:19:16 +0100 Subject: [PATCH 04/30] implemented initial endpoint for /leasing/v1/config-token --- app/main.py | 55 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/app/main.py b/app/main.py index 22a6275..c2c9f52 100644 --- a/app/main.py +++ b/app/main.py @@ -417,16 +417,63 @@ async def auth_v1_token(request: Request): async def leasing_v1_config_token(request: Request): j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC) - logging.debug('CALLED /leasing/v1/config-token') - logging.debug(j) + logger.debug(f'CALLED /leasing/v1/config-token') + logger.debug(f'Headers: {request.headers}') + logger.debug(f'Request: {j}') + + cur_time = datetime.now(UTC) + exp_time = cur_time + CLIENT_TOKEN_EXPIRE_DELTA + + payload = { + "iss": "NLS Service Instance", + "aud": "NLS Licensed Client", + "iat": timegm(cur_time.timetuple()), + "nbf": timegm(cur_time.timetuple()), + "exp": timegm(exp_time.timetuple()), + "protocol_version": "2.0", + "d_name": "DLS", + "service_instance_ref": j.get('service_instance_ref'), + "service_instance_public_key_configuration": { + "service_instance_public_key_me": { + "mod": hex(INSTANCE_KEY_PUB.public_key().n)[2:], + "exp": int(INSTANCE_KEY_PUB.public_key().e), + }, + "service_instance_public_key_pem": INSTANCE_KEY_PUB.export_key().decode('utf-8'), + "key_retention_mode": "LATEST_ONLY" + }, + } + + config_token = jws.sign(payload, key=jwt_encode_key, headers=None, algorithm=ALGORITHMS.RS256) + + root_crt = load_file(join(dirname(__file__), 'cert\\root-ca.crt.pem')).decode('utf-8').replace('\n', '\r\n')[:-2] + intermediate_crt = load_file(join(dirname(__file__), 'cert\\intermediate.crt.pem')).decode('utf-8').replace('\n', '\r\n')[:-2] + public_crt = load_file(join(dirname(__file__), 'cert\\webserver.crt.pem')).decode('utf-8').replace('\n', '\r\n')[:-2] + #public_key = load_key(join(dirname(__file__), 'cert\\webserver.pub.pem')) response = { - "service_instance_ref": INSTANCE_REF, + "certificateConfiguration": { + #"caChain": [public_crt], + "caChain": [intermediate_crt], + #"caChain": ["-----BEGIN CERTIFICATE-----\r\nMIIF3TCCA8WgAwIBAgIUCpVszfecRrnPa3EGwPKuyWESBmMwDQYJKoZIhvcNAQELBQAwcjELMAkG\r\nA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAoTBk52aWRpYTEnMCUGA1UECxMe\r\nTnZpZGlhIExpY2Vuc2luZyBTZXJ2aWNlIChOTFMpMRQwEgYDVQQDEwtOTFMgUm9vdCBDQTAeFw0y\r\nNDA5MjYwNzM4MTlaFw0zNDA5MjQwNzM4NDlaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp\r\nZm9ybmlhMQ8wDQYDVQQKEwZOdmlkaWExJzAlBgNVBAsTHk52aWRpYSBMaWNlbnNpbmcgU2Vydmlj\r\nZSAoTkxTKTEcMBoGA1UEAxMTTkxTIEludGVybWVkaWF0ZSBDQTCCAiIwDQYJKoZIhvcNAQEBBQAD\r\nggIPADCCAgoCggIBAOIb5ZcYWR78WkJipEW4cOB2d3WkXhjzA9Omj0SBnA6fJad+zObguInmkgyB\r\nUC/0xMnHeEH1WQpZ0yZE1rdH0ziwPy07hmCgjMSC8iXSfV4QXoHzsQy80HSbD3dr0A5Fk9UrWdJu\r\nIlLnwqTfUjxMSqiVYbGI2JLVLDIPjnrCKgZ//vVTFWiMDQaGInDz5Qo3azHIt1Sw3u47/b88TzmK\r\ni3TMbjtAR3djlhQfJBY6nUdP8wWy2Fntx9fO7U723sp6cnGtHnbXGpon/QqxlPjT4RXXm1QmFQ/d\r\nyUmvmjoiJsCQ3v2KFJNei2bkUS29ZKPr4TGokojOilESQAQTLo+5s0cN7ZtPWvwZ4uets84GCRP5\r\ndC+aKoNQ7cg06A1tA3SxEL9r6D2LaTiheuWKFNiIJZzfmmbTPExsKt4Nzmv72wfG2i2+sY6l4f5x\r\nEFiKybn2EY1Hjpt0J3vL/goOOt/ejRtS5qKco3pu6zZBBWqB1qesA813AGgqbscht4y4m414rPmQ\r\naHA2PTe0JRDcradK75chFUOvLeIYD1Hy0XTxNxlhRA/5mFd2GkWZmtsW3D1iAV73VHAEvWDS0hXB\r\ng60B0y4d3fyYxI+pOTaZzsh0PAC2jUqDOhQ7dKELeYUKWsEDDMq9mg2bxqSNoQnQbITIsbu7IELu\r\nvmxIWT1omRptd5LrAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G\r\nA1UdDgQWBBRKNST8UPeZYQgLZLEKMBGklaADHjAfBgNVHSMEGDAWgBRiEXE0RonjkPN+XBjnSQbo\r\nA8X3ajANBgkqhkiG9w0BAQsFAAOCAgEAEq5FaQWhTWt1hNfoz/BeDQ68O9PEGGveCPouElE8s/uG\r\nPHYSJpmg7dq5Qoxb5dpdq1mJX2rTgixJu/iC3uRUsirdH6wsVjjqz4YsoAz5VqjlkriFJpXlfOpp\r\nw18ex5C5p4x3TrlPCowMgf9h6VBR1iCq3VikVVguqSPP/zf9G3Qhitvqs0+m7KJnbwFA/bDLMET8\r\nTJS/r4XKQYisXfu95XrG2TTCaOwytqx+uepqwB74tFMznfdjzKyztqGwniKLrcZ3kOuM4cyo5ZT4\r\nOORCV6FWmbRq2OtttI4o85zsVNkY1JF8hvyvjygRiX5dQROza5EStkXvGO6532atFU43KNJvLanZ\r\nZTaxIJvZGWeKvrH+HTCANp11cgq5qcRRltQHb7KWweYNM4nyCjyBQm5vTm7g1uVI7llVm2Txx5dT\r\n5OtenaohmJIr6POeq8Y2Z+DJ8s3UpZoZCc3Vj5PQyNZiAx2ErN6XgrsmljG3w6+k2ooLpT9Sr1Ql\r\nKc8okN5SJGUOLuFI+h8jX1hHqpQejjNKy3UkTzjosYNq6Kk0h2Tl1i8iO+wY4Wb3GbL6GtP1rcjI\r\np/d9mxPNJONlp4a0koaMEpHTODT/xyVjU7FkUyKE9Uj1O/1lBEANYsFrQGfmuHAZTGf9J+cvkrz3\r\n56OFWPHcA7gxkpU8wftrVMLFeDvLIGc=\r\n-----END CERTIFICATE-----"], + "publicCert": public_crt, + #"publicCert": "-----BEGIN CERTIFICATE-----\r\nMIIE2zCCAsOgAwIBAgIUCX7sjz8B3HSAxRSPHAdNP/NCByEwDQYJKoZIhvcNAQELBQAwejELMAkG\r\nA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAoTBk52aWRpYTEnMCUGA1UECxMe\r\nTnZpZGlhIExpY2Vuc2luZyBTZXJ2aWNlIChOTFMpMRwwGgYDVQQDExNOTFMgSW50ZXJtZWRpYXRl\r\nIENBMB4XDTI1MDMxMDA3NDA1NloXDTI4MDMwOTA3NDEyNlowLzEtMCsGA1UEAxMkYTE3ZTA3OWUt\r\nNmE3My00ZWJmLThkM2ItOGM4OTYxMWI5YTI3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\r\nAQEAuNfIEDxAbgpeeac1dDacwHBMEWNyr6bdWLcRRWrbXA1TUcsNpvmRN6ZgznDSG3JsGxaO5hhr\r\nI1UHwzTKwu/sAusYPPc354zW7i9aPS0izGoFKHDD2QgRQ/ECHzgoQirHWW6GecXlwoTDWBGtObWb\r\nVcPVcuxMMFIZ4Rt9Ru6S1qwdual7rdWG+Z7fWmBGMy9Xpn/+hmL1hRmqJRec7LVP7ejCQ5OtQp72\r\nKq8pm61WddEpw1Z148gXiflUlakjHbWmvAh5QTahkY2PBy7/1J+7Y6Ukj3aq7z/rrg4NaCJUvL7Q\r\nEr6qafujOLXsEMFFJxN5WIPm23Lvj8NQLJZO4zUtXwIDAQABo4GjMIGgMA4GA1UdDwEB/wQEAwID\r\nqDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFPfOsX87tbYT3irva9Tl\r\nWtLhYGccMB8GA1UdIwQYMBaAFEo1JPxQ95lhCAtksQowEaSVoAMeMC8GA1UdEQQoMCaCJGExN2Uw\r\nNzllLTZhNzMtNGViZi04ZDNiLThjODk2MTFiOWEyNzANBgkqhkiG9w0BAQsFAAOCAgEAa0Z0E0NW\r\n0KgpAgLLJ+6nGXfMVfG8sauXz9AQmobvuRsOvQi2DpTbfjrP4uT7q33Qw1vyQl2jlxoI0G1Ul1TO\r\nBVM/XYhs/Qp8TXSFFngCNQspAmDPCjSqnoeH3h6yW1EEfQY3R1hKac/krzuJs+Y4G2y1WLNmQiqF\r\now9FG2+APimLtPBDHCydn0tkAKRbDa9i5izty0qtAr+tlrSV6AOnn0fagJ5JjrVkGgAaO1GXwpWB\r\nEAteRDfsCIIMtPujZU0BAIYuXvxaX5zYiCN3KadBzheDh5IVZcTyOkHIRDvFl10exhMjcDjvAAfV\r\nHUUBliGAaIFBrgXz0y3CVcRNP7xp3PW1F/HZVBcQgi+cnqQfIF6us8+u8xLG51VtFHAUxP3NzSgU\r\nI54sIJmmNP30o8RRevD3wclk26A9PB+9MFBm6KFZb4Ue55cFqeI85ICKPoCfsBzP4CYNoNX3fscA\r\nhrJgXxbAVB9NC6rpEmpniyo7FGEPyQV41nuwqf8Y7SwAzPspGo0orynjrbJyr+N/l5oA0OblsqLw\r\nb963k2ssDS/YIQ79KaP1TWXl1e9WI46mgyPWha3Zm9P5FS1MedORwANafh+4PVo3JfaruUvSqQK/\r\nEwIjAdhNNrs2xMgQkGffl8cQF3TDbXAAstRQySKvt1cj3lTbhD+vNiidbQaZSxLGzPI=\r\n-----END CERTIFICATE-----", + "publicKey": { + "exp": int(INSTANCE_KEY_PUB.public_key().e), + "mod": [hex(INSTANCE_KEY_PUB.public_key().n)[2:]], + }, + #"publicKey": { + # "exp": 65537, + # "mod": [ + # "b8d7c8103c406e0a5e79a73574369cc0704c116372afa6dd58b711456adb5c0d5351cb0da6f99137a660ce70d21b726c1b168ee6186b235507c334cac2efec02eb183cf737e78cd6ee2f5a3d2d22cc6a052870c3d9081143f1021f3828422ac7596e8679c5e5c284c35811ad39b59b55c3d572ec4c305219e11b7d46ee92d6ac1db9a97badd586f99edf5a6046332f57a67ffe8662f58519aa25179cecb54fede8c24393ad429ef62aaf299bad5675d129c35675e3c81789f95495a9231db5a6bc08794136a1918d8f072effd49fbb63a5248f76aaef3febae0e0d682254bcbed012beaa69fba338b5ec10c1452713795883e6db72ef8fc3502c964ee3352d5f" + # ], + #}, + }, + "configToken": config_token, } logging.debug(response) - return JSONr(response) + return JSONr(response, status_code=200) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py From 7ce79ec95b94cad2f2da4a6382c17540b41d577b Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 10 Apr 2025 08:48:45 +0200 Subject: [PATCH 05/30] added test and code for /leasing/v1/config-token ref. https://git.collinwebdesigns.de/nvidia/nls/-/blob/main/src/test/test_config_token.py --- app/main.py | 178 +++++++++++++++++++++++++++++++++++++++++++++------ test/main.py | 31 ++++++++- 2 files changed, 185 insertions(+), 24 deletions(-) diff --git a/app/main.py b/app/main.py index c2c9f52..b3d5247 100644 --- a/app/main.py +++ b/app/main.py @@ -421,6 +421,149 @@ async def leasing_v1_config_token(request: Request): logger.debug(f'Headers: {request.headers}') logger.debug(f'Request: {j}') + # todo: THIS IS A DEMO ONLY - THIS ENDPOINT GENERATES A NEW ROOT-CA EVERY TIME IT IS CALLED !!! + + ### + # + # https://git.collinwebdesigns.de/nvidia/nls/-/blob/main/src/test/test_config_token.py + # + ### + + from cryptography import x509 + from cryptography.hazmat._oid import NameOID + from cryptography.hazmat.primitives import serialization, hashes + from cryptography.hazmat.primitives.asymmetric.rsa import generate_private_key + from cryptography.hazmat.primitives.serialization import Encoding + + """ Create Root Key and Certificate """ + + # create root keypair + my_root_private_key = generate_private_key(public_exponent=65537, key_size=4096) + my_root_public_key = my_root_private_key.public_key() + + # create root-certificate subject + my_root_subject = x509.Name([ + x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'), + x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'), + x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Root CA'), + ]) + + # create self-signed root-certificate + my_root_certificate = ( + x509.CertificateBuilder() + .subject_name(my_root_subject) + .issuer_name(my_root_subject) + .public_key(my_root_public_key) + .serial_number(x509.random_serial_number()) + .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) + .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) + .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True) + .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_root_public_key), critical=False) + .sign(my_root_private_key, hashes.SHA256())) + + """ Create CA (Intermediate) Key and Certificate """ + + # create ca keypair + my_ca_private_key = generate_private_key(public_exponent=65537, key_size=4096) + my_ca_public_key = my_ca_private_key.public_key() + + # create ca-certificate subject + my_ca_subject = x509.Name([ + x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'), + x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'), + x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Intermediate CA'), + ]) + + # create self-signed ca-certificate + my_ca_certificate = ( + x509.CertificateBuilder() + .subject_name(my_ca_subject) + .issuer_name(my_root_subject) + .public_key(my_ca_public_key) + .serial_number(x509.random_serial_number()) + .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) + .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) + .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True) + .add_extension(x509.KeyUsage(digital_signature=False, key_encipherment=False, key_cert_sign=True, + key_agreement=False, content_commitment=False, data_encipherment=False, + crl_sign=True, encipher_only=False, decipher_only=False), critical=True) + .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_ca_public_key), critical=False) + # .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_root_public_key), critical=False) + .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier( + my_root_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value + ), critical=False) + .sign(my_root_private_key, hashes.SHA256())) + + # with open('caChain_my.pem', 'wb') as f: + # f.write(my_ca_certificate.public_bytes(encoding=Encoding.PEM)) + + """ Create Service-Instance Key and Certificate """ + + # create si keypair + my_si_private_key = generate_private_key(public_exponent=65537, key_size=2048) + my_si_public_key = my_si_private_key.public_key() + + my_si_private_key_as_pem = my_si_private_key.private_bytes( + encoding=serialization.Encoding.PEM, + format=serialization.PrivateFormat.TraditionalOpenSSL, + encryption_algorithm=serialization.NoEncryption(), + ) + my_si_public_key_as_pem = my_si_public_key.public_bytes( + encoding=serialization.Encoding.PEM, + format=serialization.PublicFormat.SubjectPublicKeyInfo, + ) + + # with open('instance.private.pem', 'wb') as f: + # f.write(my_si_private_key_as_pem) + + # with open('instance.public.pem', 'wb') as f: + # f.write(my_si_public_key_as_pem) + + # create si-certificate subject + my_si_subject = x509.Name([ + #x509.NameAttribute(NameOID.COMMON_NAME, INSTANCE_REF), + x509.NameAttribute(NameOID.COMMON_NAME, j.get('service_instance_ref')), + ]) + + # create self-signed si-certificate + my_si_certificate = ( + x509.CertificateBuilder() + .subject_name(my_si_subject) + .issuer_name(my_ca_subject) + .public_key(my_si_public_key) + .serial_number(x509.random_serial_number()) + .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) + .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) + .add_extension(x509.KeyUsage(digital_signature=True, key_encipherment=True, key_cert_sign=False, + key_agreement=True, content_commitment=False, data_encipherment=False, + crl_sign=False, encipher_only=False, decipher_only=False), critical=True) + .add_extension(x509.ExtendedKeyUsage([ + x509.oid.ExtendedKeyUsageOID.SERVER_AUTH, + x509.oid.ExtendedKeyUsageOID.CLIENT_AUTH] + ), critical=False) + .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_si_public_key), critical=False) + # .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_ca_public_key), critical=False) + .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier( + my_ca_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value + ), critical=False) + .add_extension(x509.SubjectAlternativeName([ + #x509.DNSName(INSTANCE_REF) + x509.DNSName(j.get('service_instance_ref')) + ]), critical=False) + .sign(my_ca_private_key, hashes.SHA256())) + + my_si_public_key_exp = my_si_certificate.public_key().public_numbers().e + my_si_public_key_mod = f'{my_si_certificate.public_key().public_numbers().n:x}' # hex value without "0x" prefix + + # with open('cert_my.pem', 'wb') as f: + # f.write(my_si_certificate.public_bytes(encoding=Encoding.PEM)) + + """ build out payload """ + cur_time = datetime.now(UTC) exp_time = cur_time + CLIENT_TOKEN_EXPIRE_DELTA @@ -435,38 +578,31 @@ async def leasing_v1_config_token(request: Request): "service_instance_ref": j.get('service_instance_ref'), "service_instance_public_key_configuration": { "service_instance_public_key_me": { - "mod": hex(INSTANCE_KEY_PUB.public_key().n)[2:], - "exp": int(INSTANCE_KEY_PUB.public_key().e), + "mod": hex(my_si_public_key.public_numbers().n)[2:], + "exp": int(my_si_public_key.public_numbers().e), }, - "service_instance_public_key_pem": INSTANCE_KEY_PUB.export_key().decode('utf-8'), + # 64 chars per line (pem default) + "service_instance_public_key_pem": my_si_public_key_as_pem.decode('utf-8').strip(), "key_retention_mode": "LATEST_ONLY" }, } - config_token = jws.sign(payload, key=jwt_encode_key, headers=None, algorithm=ALGORITHMS.RS256) + my_jwt_encode_key = jwk.construct(my_si_private_key_as_pem.decode('utf-8'), algorithm=ALGORITHMS.RS256) + config_token = jws.sign(payload, key=my_jwt_encode_key, headers=None, algorithm=ALGORITHMS.RS256) - root_crt = load_file(join(dirname(__file__), 'cert\\root-ca.crt.pem')).decode('utf-8').replace('\n', '\r\n')[:-2] - intermediate_crt = load_file(join(dirname(__file__), 'cert\\intermediate.crt.pem')).decode('utf-8').replace('\n', '\r\n')[:-2] - public_crt = load_file(join(dirname(__file__), 'cert\\webserver.crt.pem')).decode('utf-8').replace('\n', '\r\n')[:-2] - #public_key = load_key(join(dirname(__file__), 'cert\\webserver.pub.pem')) + response_ca_chain = my_ca_certificate.public_bytes(encoding=Encoding.PEM).decode('utf-8') + response_si_certificate = my_si_certificate.public_bytes(encoding=Encoding.PEM).decode('utf-8') response = { "certificateConfiguration": { - #"caChain": [public_crt], - "caChain": [intermediate_crt], - #"caChain": ["-----BEGIN CERTIFICATE-----\r\nMIIF3TCCA8WgAwIBAgIUCpVszfecRrnPa3EGwPKuyWESBmMwDQYJKoZIhvcNAQELBQAwcjELMAkG\r\nA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAoTBk52aWRpYTEnMCUGA1UECxMe\r\nTnZpZGlhIExpY2Vuc2luZyBTZXJ2aWNlIChOTFMpMRQwEgYDVQQDEwtOTFMgUm9vdCBDQTAeFw0y\r\nNDA5MjYwNzM4MTlaFw0zNDA5MjQwNzM4NDlaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp\r\nZm9ybmlhMQ8wDQYDVQQKEwZOdmlkaWExJzAlBgNVBAsTHk52aWRpYSBMaWNlbnNpbmcgU2Vydmlj\r\nZSAoTkxTKTEcMBoGA1UEAxMTTkxTIEludGVybWVkaWF0ZSBDQTCCAiIwDQYJKoZIhvcNAQEBBQAD\r\nggIPADCCAgoCggIBAOIb5ZcYWR78WkJipEW4cOB2d3WkXhjzA9Omj0SBnA6fJad+zObguInmkgyB\r\nUC/0xMnHeEH1WQpZ0yZE1rdH0ziwPy07hmCgjMSC8iXSfV4QXoHzsQy80HSbD3dr0A5Fk9UrWdJu\r\nIlLnwqTfUjxMSqiVYbGI2JLVLDIPjnrCKgZ//vVTFWiMDQaGInDz5Qo3azHIt1Sw3u47/b88TzmK\r\ni3TMbjtAR3djlhQfJBY6nUdP8wWy2Fntx9fO7U723sp6cnGtHnbXGpon/QqxlPjT4RXXm1QmFQ/d\r\nyUmvmjoiJsCQ3v2KFJNei2bkUS29ZKPr4TGokojOilESQAQTLo+5s0cN7ZtPWvwZ4uets84GCRP5\r\ndC+aKoNQ7cg06A1tA3SxEL9r6D2LaTiheuWKFNiIJZzfmmbTPExsKt4Nzmv72wfG2i2+sY6l4f5x\r\nEFiKybn2EY1Hjpt0J3vL/goOOt/ejRtS5qKco3pu6zZBBWqB1qesA813AGgqbscht4y4m414rPmQ\r\naHA2PTe0JRDcradK75chFUOvLeIYD1Hy0XTxNxlhRA/5mFd2GkWZmtsW3D1iAV73VHAEvWDS0hXB\r\ng60B0y4d3fyYxI+pOTaZzsh0PAC2jUqDOhQ7dKELeYUKWsEDDMq9mg2bxqSNoQnQbITIsbu7IELu\r\nvmxIWT1omRptd5LrAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G\r\nA1UdDgQWBBRKNST8UPeZYQgLZLEKMBGklaADHjAfBgNVHSMEGDAWgBRiEXE0RonjkPN+XBjnSQbo\r\nA8X3ajANBgkqhkiG9w0BAQsFAAOCAgEAEq5FaQWhTWt1hNfoz/BeDQ68O9PEGGveCPouElE8s/uG\r\nPHYSJpmg7dq5Qoxb5dpdq1mJX2rTgixJu/iC3uRUsirdH6wsVjjqz4YsoAz5VqjlkriFJpXlfOpp\r\nw18ex5C5p4x3TrlPCowMgf9h6VBR1iCq3VikVVguqSPP/zf9G3Qhitvqs0+m7KJnbwFA/bDLMET8\r\nTJS/r4XKQYisXfu95XrG2TTCaOwytqx+uepqwB74tFMznfdjzKyztqGwniKLrcZ3kOuM4cyo5ZT4\r\nOORCV6FWmbRq2OtttI4o85zsVNkY1JF8hvyvjygRiX5dQROza5EStkXvGO6532atFU43KNJvLanZ\r\nZTaxIJvZGWeKvrH+HTCANp11cgq5qcRRltQHb7KWweYNM4nyCjyBQm5vTm7g1uVI7llVm2Txx5dT\r\n5OtenaohmJIr6POeq8Y2Z+DJ8s3UpZoZCc3Vj5PQyNZiAx2ErN6XgrsmljG3w6+k2ooLpT9Sr1Ql\r\nKc8okN5SJGUOLuFI+h8jX1hHqpQejjNKy3UkTzjosYNq6Kk0h2Tl1i8iO+wY4Wb3GbL6GtP1rcjI\r\np/d9mxPNJONlp4a0koaMEpHTODT/xyVjU7FkUyKE9Uj1O/1lBEANYsFrQGfmuHAZTGf9J+cvkrz3\r\n56OFWPHcA7gxkpU8wftrVMLFeDvLIGc=\r\n-----END CERTIFICATE-----"], - "publicCert": public_crt, - #"publicCert": "-----BEGIN CERTIFICATE-----\r\nMIIE2zCCAsOgAwIBAgIUCX7sjz8B3HSAxRSPHAdNP/NCByEwDQYJKoZIhvcNAQELBQAwejELMAkG\r\nA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAoTBk52aWRpYTEnMCUGA1UECxMe\r\nTnZpZGlhIExpY2Vuc2luZyBTZXJ2aWNlIChOTFMpMRwwGgYDVQQDExNOTFMgSW50ZXJtZWRpYXRl\r\nIENBMB4XDTI1MDMxMDA3NDA1NloXDTI4MDMwOTA3NDEyNlowLzEtMCsGA1UEAxMkYTE3ZTA3OWUt\r\nNmE3My00ZWJmLThkM2ItOGM4OTYxMWI5YTI3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\r\nAQEAuNfIEDxAbgpeeac1dDacwHBMEWNyr6bdWLcRRWrbXA1TUcsNpvmRN6ZgznDSG3JsGxaO5hhr\r\nI1UHwzTKwu/sAusYPPc354zW7i9aPS0izGoFKHDD2QgRQ/ECHzgoQirHWW6GecXlwoTDWBGtObWb\r\nVcPVcuxMMFIZ4Rt9Ru6S1qwdual7rdWG+Z7fWmBGMy9Xpn/+hmL1hRmqJRec7LVP7ejCQ5OtQp72\r\nKq8pm61WddEpw1Z148gXiflUlakjHbWmvAh5QTahkY2PBy7/1J+7Y6Ukj3aq7z/rrg4NaCJUvL7Q\r\nEr6qafujOLXsEMFFJxN5WIPm23Lvj8NQLJZO4zUtXwIDAQABo4GjMIGgMA4GA1UdDwEB/wQEAwID\r\nqDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFPfOsX87tbYT3irva9Tl\r\nWtLhYGccMB8GA1UdIwQYMBaAFEo1JPxQ95lhCAtksQowEaSVoAMeMC8GA1UdEQQoMCaCJGExN2Uw\r\nNzllLTZhNzMtNGViZi04ZDNiLThjODk2MTFiOWEyNzANBgkqhkiG9w0BAQsFAAOCAgEAa0Z0E0NW\r\n0KgpAgLLJ+6nGXfMVfG8sauXz9AQmobvuRsOvQi2DpTbfjrP4uT7q33Qw1vyQl2jlxoI0G1Ul1TO\r\nBVM/XYhs/Qp8TXSFFngCNQspAmDPCjSqnoeH3h6yW1EEfQY3R1hKac/krzuJs+Y4G2y1WLNmQiqF\r\now9FG2+APimLtPBDHCydn0tkAKRbDa9i5izty0qtAr+tlrSV6AOnn0fagJ5JjrVkGgAaO1GXwpWB\r\nEAteRDfsCIIMtPujZU0BAIYuXvxaX5zYiCN3KadBzheDh5IVZcTyOkHIRDvFl10exhMjcDjvAAfV\r\nHUUBliGAaIFBrgXz0y3CVcRNP7xp3PW1F/HZVBcQgi+cnqQfIF6us8+u8xLG51VtFHAUxP3NzSgU\r\nI54sIJmmNP30o8RRevD3wclk26A9PB+9MFBm6KFZb4Ue55cFqeI85ICKPoCfsBzP4CYNoNX3fscA\r\nhrJgXxbAVB9NC6rpEmpniyo7FGEPyQV41nuwqf8Y7SwAzPspGo0orynjrbJyr+N/l5oA0OblsqLw\r\nb963k2ssDS/YIQ79KaP1TWXl1e9WI46mgyPWha3Zm9P5FS1MedORwANafh+4PVo3JfaruUvSqQK/\r\nEwIjAdhNNrs2xMgQkGffl8cQF3TDbXAAstRQySKvt1cj3lTbhD+vNiidbQaZSxLGzPI=\r\n-----END CERTIFICATE-----", + # 76 chars per line + "caChain": [response_ca_chain], + # 76 chars per line + "publicCert": response_si_certificate, "publicKey": { - "exp": int(INSTANCE_KEY_PUB.public_key().e), - "mod": [hex(INSTANCE_KEY_PUB.public_key().n)[2:]], + "exp": int(my_si_certificate.public_key().public_numbers().e), + "mod": [hex(my_si_certificate.public_key().public_numbers().n)[2:]], }, - #"publicKey": { - # "exp": 65537, - # "mod": [ - # "b8d7c8103c406e0a5e79a73574369cc0704c116372afa6dd58b711456adb5c0d5351cb0da6f99137a660ce70d21b726c1b168ee6186b235507c334cac2efec02eb183cf737e78cd6ee2f5a3d2d22cc6a052870c3d9081143f1021f3828422ac7596e8679c5e5c284c35811ad39b59b55c3d572ec4c305219e11b7d46ee92d6ac1db9a97badd586f99edf5a6046332f57a67ffe8662f58519aa25179cecb54fede8c24393ad429ef62aaf299bad5675d129c35675e3c81789f95495a9231db5a6bc08794136a1918d8f072effd49fbb63a5248f76aaef3febae0e0d682254bcbed012beaa69fba338b5ec10c1452713795883e6db72ef8fc3502c964ee3352d5f" - # ], - #}, }, "configToken": config_token, } diff --git a/test/main.py b/test/main.py index cf1f5db..014a86f 100644 --- a/test/main.py +++ b/test/main.py @@ -1,3 +1,4 @@ +import json import sys from base64 import b64encode as b64enc from calendar import timegm @@ -7,7 +8,7 @@ from os.path import dirname, join from uuid import uuid4, UUID from dateutil.relativedelta import relativedelta -from jose import jwt, jwk +from jose import jwt, jwk, jws from jose.constants import ALGORITHMS from starlette.testclient import TestClient @@ -20,6 +21,7 @@ from util import PrivateKey, PublicKey client = TestClient(main.app) +INSTANCE_REF = '10000000-0000-0000-0000-000000000001' ORIGIN_REF, ALLOTMENT_REF, SECRET = str(uuid4()), '20000000-0000-0000-0000-000000000001', 'HelloWorld' # INSTANCE_KEY_RSA = generate_key() @@ -69,6 +71,31 @@ def test_client_token(): assert response.status_code == 200 +def test_config_token(): # todo: /leasing/v1/config-token + # https://git.collinwebdesigns.de/nvidia/nls/-/blob/main/src/test/test_config_token.py + + response = client.post('/leasing/v1/config-token', json={"service_instance_ref": INSTANCE_REF}) + assert response.status_code == 200 + + nv_response_certificate_configuration = response.json().get('certificateConfiguration') + nv_response_public_cert = nv_response_certificate_configuration.get('publicCert').encode('utf-8') + nv_jwt_decode_key = jwk.construct(nv_response_public_cert, algorithm=ALGORITHMS.RS256) + + nv_response_config_token = response.json().get('configToken') + + payload = jws.verify(nv_response_config_token, key=nv_jwt_decode_key, algorithms=ALGORITHMS.RS256) + payload = json.loads(payload) + assert payload.get('iss') == 'NLS Service Instance' + assert payload.get('aud') == 'NLS Licensed Client' + assert payload.get('service_instance_ref') == INSTANCE_REF + + nv_si_public_key_configuration = payload.get('service_instance_public_key_configuration') + nv_si_public_key_me = nv_si_public_key_configuration.get('service_instance_public_key_me') + # assert nv_si_public_key_me.get('mod') == 1 #nv_si_public_key_mod + assert len(nv_si_public_key_me.get('mod')) == 512 + assert nv_si_public_key_me.get('exp') == 65537 # nv_si_public_key_exp + + def test_origins(): pass @@ -166,8 +193,6 @@ def test_auth_v1_token(): assert payload.get('origin_ref') == ORIGIN_REF -# todo: /leasing/v1/config-token - def test_leasing_v1_lessor(): payload = { 'fulfillment_context': { From c15cdee6103c5dcd439f439d1a1dcda0e0aef210 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 10 Apr 2025 21:38:25 +0200 Subject: [PATCH 06/30] created "init_config_token_demo" --- app/main.py | 288 ++++++++++++++++++++++++++++++---------------------- app/util.py | 24 +++++ 2 files changed, 190 insertions(+), 122 deletions(-) diff --git a/app/main.py b/app/main.py index b3d5247..17bff68 100644 --- a/app/main.py +++ b/app/main.py @@ -6,7 +6,7 @@ from datetime import datetime, timedelta, UTC from hashlib import sha256 from json import loads as json_loads from os import getenv as env -from os.path import join, dirname +from os.path import join, dirname, isfile from uuid import uuid4 from dateutil.relativedelta import relativedelta @@ -18,10 +18,11 @@ from jose.constants import ALGORITHMS from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker from starlette.middleware.cors import CORSMiddleware -from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse +from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, \ + RedirectResponse from orm import Origin, Lease, init as db_init, migrate -from util import PrivateKey, PublicKey, load_file +from util import PrivateKey, PublicKey, load_file, Cert # Load variables load_dotenv('../version.env') @@ -421,7 +422,7 @@ async def leasing_v1_config_token(request: Request): logger.debug(f'Headers: {request.headers}') logger.debug(f'Request: {j}') - # todo: THIS IS A DEMO ONLY - THIS ENDPOINT GENERATES A NEW ROOT-CA EVERY TIME IT IS CALLED !!! + # todo: THIS IS A DEMO ONLY ### # @@ -429,138 +430,181 @@ async def leasing_v1_config_token(request: Request): # ### - from cryptography import x509 - from cryptography.hazmat._oid import NameOID - from cryptography.hazmat.primitives import serialization, hashes - from cryptography.hazmat.primitives.asymmetric.rsa import generate_private_key - from cryptography.hazmat.primitives.serialization import Encoding + root_private_key_filename = join(dirname(__file__), 'cert/my_demo_root_private_key.pem') + root_certificate_filename = join(dirname(__file__), 'cert/my_demo_root_certificate.pem') + ca_private_key_filename = join(dirname(__file__), 'cert/my_demo_ca_private_key.pem') + ca_certificate_filename = join(dirname(__file__), 'cert/my_demo_ca_certificate.pem') + si_private_key_filename = join(dirname(__file__), 'cert/my_demo_si_private_key.pem') + si_certificate_filename = join(dirname(__file__), 'cert/my_demo_si_certificate.pem') - """ Create Root Key and Certificate """ + def init_config_token_demo(): + from cryptography import x509 + from cryptography.hazmat._oid import NameOID + from cryptography.hazmat.primitives import serialization, hashes + from cryptography.hazmat.primitives.asymmetric.rsa import generate_private_key + from cryptography.hazmat.primitives.serialization import Encoding - # create root keypair - my_root_private_key = generate_private_key(public_exponent=65537, key_size=4096) - my_root_public_key = my_root_private_key.public_key() + """ Create Root Key and Certificate """ - # create root-certificate subject - my_root_subject = x509.Name([ - x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), - x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'), - x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'), - x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'), - x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Root CA'), - ]) + # create root keypair + my_root_private_key = generate_private_key(public_exponent=65537, key_size=4096) + my_root_public_key = my_root_private_key.public_key() - # create self-signed root-certificate - my_root_certificate = ( - x509.CertificateBuilder() - .subject_name(my_root_subject) - .issuer_name(my_root_subject) - .public_key(my_root_public_key) - .serial_number(x509.random_serial_number()) - .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) - .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) - .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True) - .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_root_public_key), critical=False) - .sign(my_root_private_key, hashes.SHA256())) + # create root-certificate subject + my_root_subject = x509.Name([ + x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'), + x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'), + x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Root CA'), + ]) - """ Create CA (Intermediate) Key and Certificate """ + # create self-signed root-certificate + my_root_certificate = ( + x509.CertificateBuilder() + .subject_name(my_root_subject) + .issuer_name(my_root_subject) + .public_key(my_root_public_key) + .serial_number(x509.random_serial_number()) + .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) + .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) + .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True) + .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_root_public_key), critical=False) + .sign(my_root_private_key, hashes.SHA256())) - # create ca keypair - my_ca_private_key = generate_private_key(public_exponent=65537, key_size=4096) - my_ca_public_key = my_ca_private_key.public_key() + my_root_private_key_as_pem = my_root_private_key.private_bytes( + encoding=serialization.Encoding.PEM, + format=serialization.PrivateFormat.TraditionalOpenSSL, + encryption_algorithm=serialization.NoEncryption(), + ) - # create ca-certificate subject - my_ca_subject = x509.Name([ - x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), - x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'), - x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'), - x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'), - x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Intermediate CA'), - ]) + with open(root_private_key_filename, 'wb') as f: + f.write(my_root_private_key_as_pem) - # create self-signed ca-certificate - my_ca_certificate = ( - x509.CertificateBuilder() - .subject_name(my_ca_subject) - .issuer_name(my_root_subject) - .public_key(my_ca_public_key) - .serial_number(x509.random_serial_number()) - .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) - .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) - .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True) - .add_extension(x509.KeyUsage(digital_signature=False, key_encipherment=False, key_cert_sign=True, - key_agreement=False, content_commitment=False, data_encipherment=False, - crl_sign=True, encipher_only=False, decipher_only=False), critical=True) - .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_ca_public_key), critical=False) - # .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_root_public_key), critical=False) - .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier( - my_root_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value - ), critical=False) - .sign(my_root_private_key, hashes.SHA256())) + with open(root_certificate_filename, 'wb') as f: + f.write(my_root_certificate.public_bytes(encoding=Encoding.PEM)) - # with open('caChain_my.pem', 'wb') as f: - # f.write(my_ca_certificate.public_bytes(encoding=Encoding.PEM)) + """ Create CA (Intermediate) Key and Certificate """ - """ Create Service-Instance Key and Certificate """ + # create ca keypair + my_ca_private_key = generate_private_key(public_exponent=65537, key_size=4096) + my_ca_public_key = my_ca_private_key.public_key() - # create si keypair - my_si_private_key = generate_private_key(public_exponent=65537, key_size=2048) - my_si_public_key = my_si_private_key.public_key() + # create ca-certificate subject + my_ca_subject = x509.Name([ + x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'), + x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'), + x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Intermediate CA'), + ]) - my_si_private_key_as_pem = my_si_private_key.private_bytes( - encoding=serialization.Encoding.PEM, - format=serialization.PrivateFormat.TraditionalOpenSSL, - encryption_algorithm=serialization.NoEncryption(), - ) - my_si_public_key_as_pem = my_si_public_key.public_bytes( - encoding=serialization.Encoding.PEM, - format=serialization.PublicFormat.SubjectPublicKeyInfo, - ) + # create self-signed ca-certificate + my_ca_certificate = ( + x509.CertificateBuilder() + .subject_name(my_ca_subject) + .issuer_name(my_root_subject) + .public_key(my_ca_public_key) + .serial_number(x509.random_serial_number()) + .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) + .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) + .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True) + .add_extension(x509.KeyUsage(digital_signature=False, key_encipherment=False, key_cert_sign=True, + key_agreement=False, content_commitment=False, data_encipherment=False, + crl_sign=True, encipher_only=False, decipher_only=False), critical=True) + .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_ca_public_key), critical=False) + # .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_root_public_key), critical=False) + .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier( + my_root_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value + ), critical=False) + .sign(my_root_private_key, hashes.SHA256())) - # with open('instance.private.pem', 'wb') as f: - # f.write(my_si_private_key_as_pem) + my_ca_private_key_as_pem = my_ca_private_key.private_bytes( + encoding=serialization.Encoding.PEM, + format=serialization.PrivateFormat.TraditionalOpenSSL, + encryption_algorithm=serialization.NoEncryption(), + ) - # with open('instance.public.pem', 'wb') as f: - # f.write(my_si_public_key_as_pem) + with open(ca_private_key_filename, 'wb') as f: + f.write(my_ca_private_key_as_pem) - # create si-certificate subject - my_si_subject = x509.Name([ - #x509.NameAttribute(NameOID.COMMON_NAME, INSTANCE_REF), - x509.NameAttribute(NameOID.COMMON_NAME, j.get('service_instance_ref')), - ]) + with open(ca_certificate_filename, 'wb') as f: + f.write(my_ca_certificate.public_bytes(encoding=Encoding.PEM)) - # create self-signed si-certificate - my_si_certificate = ( - x509.CertificateBuilder() - .subject_name(my_si_subject) - .issuer_name(my_ca_subject) - .public_key(my_si_public_key) - .serial_number(x509.random_serial_number()) - .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) - .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) - .add_extension(x509.KeyUsage(digital_signature=True, key_encipherment=True, key_cert_sign=False, - key_agreement=True, content_commitment=False, data_encipherment=False, - crl_sign=False, encipher_only=False, decipher_only=False), critical=True) - .add_extension(x509.ExtendedKeyUsage([ - x509.oid.ExtendedKeyUsageOID.SERVER_AUTH, - x509.oid.ExtendedKeyUsageOID.CLIENT_AUTH] - ), critical=False) - .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_si_public_key), critical=False) - # .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_ca_public_key), critical=False) - .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier( - my_ca_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value - ), critical=False) - .add_extension(x509.SubjectAlternativeName([ - #x509.DNSName(INSTANCE_REF) - x509.DNSName(j.get('service_instance_ref')) - ]), critical=False) - .sign(my_ca_private_key, hashes.SHA256())) + """ Create Service-Instance Key and Certificate """ - my_si_public_key_exp = my_si_certificate.public_key().public_numbers().e - my_si_public_key_mod = f'{my_si_certificate.public_key().public_numbers().n:x}' # hex value without "0x" prefix + # create si keypair + my_si_private_key = generate_private_key(public_exponent=65537, key_size=2048) + my_si_public_key = my_si_private_key.public_key() - # with open('cert_my.pem', 'wb') as f: - # f.write(my_si_certificate.public_bytes(encoding=Encoding.PEM)) + my_si_private_key_as_pem = my_si_private_key.private_bytes( + encoding=serialization.Encoding.PEM, + format=serialization.PrivateFormat.TraditionalOpenSSL, + encryption_algorithm=serialization.NoEncryption(), + ) + my_si_public_key_as_pem = my_si_public_key.public_bytes( + encoding=serialization.Encoding.PEM, + format=serialization.PublicFormat.SubjectPublicKeyInfo, + ) + + with open(si_private_key_filename, 'wb') as f: + f.write(my_si_private_key_as_pem) + + # with open('instance.public.pem', 'wb') as f: + # f.write(my_si_public_key_as_pem) + + # create si-certificate subject + my_si_subject = x509.Name([ + # x509.NameAttribute(NameOID.COMMON_NAME, INSTANCE_REF), + x509.NameAttribute(NameOID.COMMON_NAME, j.get('service_instance_ref')), + ]) + + # create self-signed si-certificate + my_si_certificate = ( + x509.CertificateBuilder() + .subject_name(my_si_subject) + .issuer_name(my_ca_subject) + .public_key(my_si_public_key) + .serial_number(x509.random_serial_number()) + .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1)) + .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10)) + .add_extension(x509.KeyUsage(digital_signature=True, key_encipherment=True, key_cert_sign=False, + key_agreement=True, content_commitment=False, data_encipherment=False, + crl_sign=False, encipher_only=False, decipher_only=False), critical=True) + .add_extension(x509.ExtendedKeyUsage([ + x509.oid.ExtendedKeyUsageOID.SERVER_AUTH, + x509.oid.ExtendedKeyUsageOID.CLIENT_AUTH] + ), critical=False) + .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_si_public_key), critical=False) + # .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_ca_public_key), critical=False) + .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier( + my_ca_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value + ), critical=False) + .add_extension(x509.SubjectAlternativeName([ + # x509.DNSName(INSTANCE_REF) + x509.DNSName(j.get('service_instance_ref')) + ]), critical=False) + .sign(my_ca_private_key, hashes.SHA256())) + + my_si_public_key_exp = my_si_certificate.public_key().public_numbers().e + my_si_public_key_mod = f'{my_si_certificate.public_key().public_numbers().n:x}' # hex value without "0x" prefix + + with open(si_certificate_filename, 'wb') as f: + f.write(my_si_certificate.public_bytes(encoding=Encoding.PEM)) + + if not (isfile(root_private_key_filename) + and isfile(ca_private_key_filename) + and isfile(ca_certificate_filename) + and isfile(si_private_key_filename) + and isfile(si_certificate_filename)): + init_config_token_demo() + + my_ca_certificate = Cert.from_file(ca_certificate_filename) + my_si_certificate = Cert.from_file(si_certificate_filename) + my_si_private_key = PrivateKey.from_file(si_private_key_filename) + my_si_private_key_as_pem = my_si_private_key.pem() + my_si_public_key = my_si_private_key.public_key().raw() + my_si_public_key_as_pem = my_si_private_key.public_key().pem() """ build out payload """ @@ -590,8 +634,8 @@ async def leasing_v1_config_token(request: Request): my_jwt_encode_key = jwk.construct(my_si_private_key_as_pem.decode('utf-8'), algorithm=ALGORITHMS.RS256) config_token = jws.sign(payload, key=my_jwt_encode_key, headers=None, algorithm=ALGORITHMS.RS256) - response_ca_chain = my_ca_certificate.public_bytes(encoding=Encoding.PEM).decode('utf-8') - response_si_certificate = my_si_certificate.public_bytes(encoding=Encoding.PEM).decode('utf-8') + response_ca_chain = my_ca_certificate.pem().decode('utf-8') + response_si_certificate = my_si_certificate.pem().decode('utf-8') response = { "certificateConfiguration": { @@ -600,8 +644,8 @@ async def leasing_v1_config_token(request: Request): # 76 chars per line "publicCert": response_si_certificate, "publicKey": { - "exp": int(my_si_certificate.public_key().public_numbers().e), - "mod": [hex(my_si_certificate.public_key().public_numbers().n)[2:]], + "exp": int(my_si_certificate.raw().public_key().public_numbers().e), + "mod": [hex(my_si_certificate.raw().public_key().public_numbers().n)[2:]], }, }, "configToken": config_token, diff --git a/app/util.py b/app/util.py index 1aae17b..14f20f2 100644 --- a/app/util.py +++ b/app/util.py @@ -3,6 +3,7 @@ import logging from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey, generate_private_key from cryptography.hazmat.primitives.serialization import load_pem_private_key, load_pem_public_key +from cryptography.x509 import load_pem_x509_certificate, Certificate logging.basicConfig() @@ -76,6 +77,29 @@ class PublicKey: format=serialization.PublicFormat.SubjectPublicKeyInfo ) + +class Cert: + + def __init__(self, data: bytes): + self.__cert = load_pem_x509_certificate(data) + + @staticmethod + def from_file(filename: str) -> "Cert": + log = logging.getLogger(__name__) + log.debug(f'Importing Certificate from "{filename}"') + + with open(filename, 'rb') as f: + data = f.read() + + return Cert(data=data.strip()) + + def raw(self) -> Certificate: + return self.__cert + + def pem(self) -> bytes: + return self.__cert.public_bytes(encoding=serialization.Encoding.PEM) + + def load_file(filename: str) -> bytes: log = logging.getLogger(f'{__name__}') log.debug(f'Loading contents of file "{filename}') From 0982106b4f39d488986f8175e6e95b943308f890 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 18:51:17 +0200 Subject: [PATCH 07/30] updated new responses for 18.x drivers --- app/main.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index 17bff68..ea32547 100644 --- a/app/main.py +++ b/app/main.py @@ -299,9 +299,14 @@ async def auth_v1_origin(request: Request): Origin.create_or_update(db, data) + environment = { + 'raw_env': j.get('environment') + } + environment.update(j.get('environment')) + response = { "origin_ref": origin_ref, - "environment": j.get('environment'), + "environment": environment, "svc_port_set_list": None, "node_url_list": None, "node_query_order": None, @@ -408,6 +413,7 @@ async def auth_v1_token(request: Request): "expires": access_expires_on.isoformat(), "auth_token": auth_token, "sync_timestamp": cur_time.isoformat(), + "prompts": None } return JSONr(response) @@ -679,6 +685,7 @@ async def leasing_v1_lessor(request: Request): expires = cur_time + LEASE_EXPIRE_DELTA lease_result_list.append({ "ordinal": 0, + "error": 0, # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html "lease": { "ref": lease_ref, @@ -687,6 +694,9 @@ async def leasing_v1_lessor(request: Request): "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, "offline_lease": "true", "license_type": "CONCURRENT_COUNTED_SINGLE" + "license_type": "CONCURRENT_COUNTED_SINGLE", + "lease_intent_id": None, + "metadata": None, } }) @@ -694,6 +704,7 @@ async def leasing_v1_lessor(request: Request): Lease.create_or_update(db, data) response = { + "client_challenge": None, "lease_result_list": lease_result_list, "result_code": "SUCCESS", "sync_timestamp": cur_time.isoformat(), From 1908b44bedb9f1e72b93c32eabb36feca9090b36 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 18:51:33 +0200 Subject: [PATCH 08/30] added debugging --- app/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/main.py b/app/main.py index ea32547..a53f514 100644 --- a/app/main.py +++ b/app/main.py @@ -667,6 +667,8 @@ async def leasing_v1_config_token(request: Request): async def leasing_v1_lessor(request: Request): j, token, cur_time = json_loads((await request.body()).decode('utf-8')), __get_token(request), datetime.now(UTC) + logger.debug(j) + try: token = __get_token(request) except JWTError: From 30ef56f956a2df1566b927f5e17500d443441e8d Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 19:08:41 +0200 Subject: [PATCH 09/30] fixes --- app/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/main.py b/app/main.py index a53f514..3820c3a 100644 --- a/app/main.py +++ b/app/main.py @@ -695,7 +695,6 @@ async def leasing_v1_lessor(request: Request): "expires": expires.isoformat(), "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, "offline_lease": "true", - "license_type": "CONCURRENT_COUNTED_SINGLE" "license_type": "CONCURRENT_COUNTED_SINGLE", "lease_intent_id": None, "metadata": None, From c7e8414934cdf7692826d31153b3fdb6fb1bae88 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 19:36:25 +0200 Subject: [PATCH 10/30] added missing lessor attributes --- app/main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/main.py b/app/main.py index 3820c3a..4fe2c82 100644 --- a/app/main.py +++ b/app/main.py @@ -679,6 +679,7 @@ async def leasing_v1_lessor(request: Request): logger.info(f'> [ create ]: {origin_ref}: create leases for scope_ref_list {scope_ref_list}') lease_result_list = [] + # todo: for lease_proposal in lease_proposal_list for scope_ref in scope_ref_list: # if scope_ref not in [ALLOTMENT_REF]: # return JSONr(status_code=500, detail=f'no service instances found for scopes: ["{scope_ref}"]') @@ -698,6 +699,8 @@ async def leasing_v1_lessor(request: Request): "license_type": "CONCURRENT_COUNTED_SINGLE", "lease_intent_id": None, "metadata": None, + "feature_name": "GRID-Virtual-WS", # todo + "product_name": "NVIDIA RTX Virtual Workstation", # todo } }) From 5eb0c55f3f7ff5e0b200e231296008f7cc388fbe Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 20:14:17 +0200 Subject: [PATCH 11/30] fixed datetime format --- app/main.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/app/main.py b/app/main.py index 4fe2c82..6fa1c9a 100644 --- a/app/main.py +++ b/app/main.py @@ -51,6 +51,7 @@ LEASE_RENEWAL_PERIOD = float(env('LEASE_RENEWAL_PERIOD', 0.15)) LEASE_RENEWAL_DELTA = timedelta(days=int(env('LEASE_EXPIRE_DAYS', 90)), hours=int(env('LEASE_EXPIRE_HOURS', 0))) CLIENT_TOKEN_EXPIRE_DELTA = relativedelta(years=12) CORS_ORIGINS = str(env('CORS_ORIGINS', '')).split(',') if (env('CORS_ORIGINS')) else [f'https://{DLS_URL}'] +DT_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' jwt_encode_key = jwk.construct(INSTANCE_KEY_RSA.pem(), algorithm=ALGORITHMS.RS256) jwt_decode_key = jwk.construct(INSTANCE_KEY_PUB.pem(), algorithm=ALGORITHMS.RS256) @@ -311,7 +312,7 @@ async def auth_v1_origin(request: Request): "node_url_list": None, "node_query_order": None, "prompts": None, - "sync_timestamp": cur_time.isoformat() + "sync_timestamp": cur_time.strftime(DT_FORMAT) } return JSONr(response) @@ -337,7 +338,7 @@ async def auth_v1_origin_update(request: Request): response = { "environment": j.get('environment'), "prompts": None, - "sync_timestamp": cur_time.isoformat() + "sync_timestamp": cur_time.strftime(DT_FORMAT) } return JSONr(response) @@ -368,7 +369,7 @@ async def auth_v1_code(request: Request): response = { "auth_code": auth_code, - "sync_timestamp": cur_time.isoformat(), + "sync_timestamp": cur_time.strftime(DT_FORMAT), "prompts": None } @@ -410,9 +411,9 @@ async def auth_v1_token(request: Request): auth_token = jwt.encode(new_payload, key=jwt_encode_key, headers={'kid': payload.get('kid')}, algorithm=ALGORITHMS.RS256) response = { - "expires": access_expires_on.isoformat(), + "expires": access_expires_on.strftime(DT_FORMAT), "auth_token": auth_token, - "sync_timestamp": cur_time.isoformat(), + "sync_timestamp": cur_time.strftime(DT_FORMAT), "prompts": None } @@ -692,8 +693,8 @@ async def leasing_v1_lessor(request: Request): # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html "lease": { "ref": lease_ref, - "created": cur_time.isoformat(), - "expires": expires.isoformat(), + "created": cur_time.strftime(DT_FORMAT), + "expires": expires.strftime(DT_FORMAT), "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, "offline_lease": "true", "license_type": "CONCURRENT_COUNTED_SINGLE", @@ -710,8 +711,8 @@ async def leasing_v1_lessor(request: Request): response = { "client_challenge": None, "lease_result_list": lease_result_list, - "result_code": "SUCCESS", - "sync_timestamp": cur_time.isoformat(), + "result_code": None, + "sync_timestamp": cur_time.strftime(DT_FORMAT), "prompts": None } @@ -731,7 +732,7 @@ async def leasing_v1_lessor_lease(request: Request): response = { "active_lease_list": active_lease_list, - "sync_timestamp": cur_time.isoformat(), + "sync_timestamp": cur_time.strftime(DT_FORMAT), "prompts": None } @@ -754,11 +755,11 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str): expires = cur_time + LEASE_EXPIRE_DELTA response = { "lease_ref": lease_ref, - "expires": expires.isoformat(), + "expires": expires.strftime(DT_FORMAT), "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, "offline_lease": True, "prompts": None, - "sync_timestamp": cur_time.isoformat(), + "sync_timestamp": cur_time.strftime(DT_FORMAT), } Lease.renew(db, entity, expires, cur_time) @@ -786,7 +787,7 @@ async def leasing_v1_lease_delete(request: Request, lease_ref: str): response = { "lease_ref": lease_ref, "prompts": None, - "sync_timestamp": cur_time.isoformat(), + "sync_timestamp": cur_time.strftime(DT_FORMAT), } return JSONr(response) @@ -806,7 +807,7 @@ async def leasing_v1_lessor_lease_remove(request: Request): response = { "released_lease_list": released_lease_list, "release_failure_list": None, - "sync_timestamp": cur_time.isoformat(), + "sync_timestamp": cur_time.strftime(DT_FORMAT), "prompts": None } @@ -828,7 +829,7 @@ async def leasing_v1_lessor_shutdown(request: Request): response = { "released_lease_list": released_lease_list, "release_failure_list": None, - "sync_timestamp": cur_time.isoformat(), + "sync_timestamp": cur_time.strftime(DT_FORMAT), "prompts": None } From 2ffee4aee172c5023b1d0d8488881c84bd1e1017 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 20:35:10 +0200 Subject: [PATCH 12/30] also debug response --- app/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/main.py b/app/main.py index 6fa1c9a..ffb4513 100644 --- a/app/main.py +++ b/app/main.py @@ -716,6 +716,8 @@ async def leasing_v1_lessor(request: Request): "prompts": None } + logger.debug(response) + return JSONr(response) From 601d733addb0c093d47d2e7c60b59f196e6a47af Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 20:38:58 +0200 Subject: [PATCH 13/30] fixes --- app/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/main.py b/app/main.py index ffb4513..2f9fc95 100644 --- a/app/main.py +++ b/app/main.py @@ -688,8 +688,8 @@ async def leasing_v1_lessor(request: Request): lease_ref = str(uuid4()) expires = cur_time + LEASE_EXPIRE_DELTA lease_result_list.append({ - "ordinal": 0, - "error": 0, + "ordinal": None, + "error": None, # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html "lease": { "ref": lease_ref, From 743c702921c434f02c7ef0c136507cf7ad4355d9 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 21:01:36 +0200 Subject: [PATCH 14/30] added new "protocol_version" to client-token --- app/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/main.py b/app/main.py index 2f9fc95..7e08bf3 100644 --- a/app/main.py +++ b/app/main.py @@ -250,6 +250,7 @@ async def _client_token(): "iat": timegm(cur_time.timetuple()), "nbf": timegm(cur_time.timetuple()), "exp": timegm(exp_time.timetuple()), + "protocol_version": "2.0", "update_mode": "ABSOLUTE", "scope_ref_list": [ALLOTMENT_REF], "fulfillment_class_ref_list": [], From beebf9e81255f253793e1e01787fcfe1f28dffb8 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 21:22:44 +0200 Subject: [PATCH 15/30] code styling --- app/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/main.py b/app/main.py index 7e08bf3..297e940 100644 --- a/app/main.py +++ b/app/main.py @@ -18,8 +18,7 @@ from jose.constants import ALGORITHMS from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker from starlette.middleware.cors import CORSMiddleware -from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, \ - RedirectResponse +from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse from orm import Origin, Lease, init as db_init, migrate from util import PrivateKey, PublicKey, load_file, Cert From 672ddb16c7c6fae29830cb2fb79d33066487e711 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 21:22:56 +0200 Subject: [PATCH 16/30] added debug headers --- app/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/main.py b/app/main.py index 297e940..c672b09 100644 --- a/app/main.py +++ b/app/main.py @@ -669,6 +669,7 @@ async def leasing_v1_lessor(request: Request): j, token, cur_time = json_loads((await request.body()).decode('utf-8')), __get_token(request), datetime.now(UTC) logger.debug(j) + logger.debug(request.headers) try: token = __get_token(request) From 60f7e40ca4c0c01b7fd3339e12578e6f4b0cfc1c Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 21:23:15 +0200 Subject: [PATCH 17/30] added EMPTY (!!!) X-NLS-Signature response header --- app/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index c672b09..5f606f9 100644 --- a/app/main.py +++ b/app/main.py @@ -719,7 +719,7 @@ async def leasing_v1_lessor(request: Request): logger.debug(response) - return JSONr(response) + return JSONr(response, headers={'X-NLS-Signature': '?'}) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py From d8cddd4b296fe56a109f2e49d2cb67a751c3d4f7 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 11 Apr 2025 22:22:22 +0200 Subject: [PATCH 18/30] set "offline_lease" to false --- app/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index 5f606f9..60f56a2 100644 --- a/app/main.py +++ b/app/main.py @@ -697,7 +697,7 @@ async def leasing_v1_lessor(request: Request): "created": cur_time.strftime(DT_FORMAT), "expires": expires.strftime(DT_FORMAT), "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, - "offline_lease": "true", + "offline_lease": "false", # todo "license_type": "CONCURRENT_COUNTED_SINGLE", "lease_intent_id": None, "metadata": None, From 685e1ce0bb5d0c7c3df6c7636333cad591c5ac3d Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 07:34:07 +0200 Subject: [PATCH 19/30] implemented client_challenge on lease apis --- app/main.py | 6 ++++-- test/main.py | 10 +++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/main.py b/app/main.py index 60f56a2..6c6935a 100644 --- a/app/main.py +++ b/app/main.py @@ -710,7 +710,7 @@ async def leasing_v1_lessor(request: Request): Lease.create_or_update(db, data) response = { - "client_challenge": None, + "client_challenge": j.get('client_challenge'), "lease_result_list": lease_result_list, "result_code": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), @@ -746,7 +746,7 @@ async def leasing_v1_lessor_lease(request: Request): # venv/lib/python3.9/site-packages/nls_core_lease/lease_single.py @app.put('/leasing/v1/lease/{lease_ref}', description='renew a lease') async def leasing_v1_lease_renew(request: Request, lease_ref: str): - token, cur_time = __get_token(request), datetime.now(UTC) + j, token, cur_time = json_loads((await request.body()).decode('utf-8')), __get_token(request), datetime.now(UTC) origin_ref = token.get('origin_ref') logger.info(f'> [ renew ]: {origin_ref}: renew {lease_ref}') @@ -757,6 +757,7 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str): expires = cur_time + LEASE_EXPIRE_DELTA response = { + "client_challenge": j.get('client_challenge'), "lease_ref": lease_ref, "expires": expires.strftime(DT_FORMAT), "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, @@ -788,6 +789,7 @@ async def leasing_v1_lease_delete(request: Request, lease_ref: str): return JSONr(status_code=404, content={'status': 404, 'detail': 'lease not found'}) response = { + "client_challenge": None, "lease_ref": lease_ref, "prompts": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), diff --git a/test/main.py b/test/main.py index 014a86f..681d538 100644 --- a/test/main.py +++ b/test/main.py @@ -195,6 +195,7 @@ def test_auth_v1_token(): def test_leasing_v1_lessor(): payload = { + 'client_challenge': 'my_unique_string', 'fulfillment_context': { 'fulfillment_class_ref_list': [] }, @@ -209,6 +210,9 @@ def test_leasing_v1_lessor(): response = client.post('/leasing/v1/lessor', json=payload, headers={'authorization': __bearer_token(ORIGIN_REF)}) assert response.status_code == 200 + client_challenge = response.json().get('client_challenge') + assert client_challenge == payload.get('client_challenge') + lease_result_list = response.json().get('lease_result_list') assert len(lease_result_list) == 1 assert len(lease_result_list[0]['lease']['ref']) == 36 @@ -232,9 +236,13 @@ def test_leasing_v1_lease_renew(): ### - response = client.put(f'/leasing/v1/lease/{active_lease_ref}', headers={'authorization': __bearer_token(ORIGIN_REF)}) + payload = {'client_challenge': 'my_unique_string'} + response = client.put(f'/leasing/v1/lease/{active_lease_ref}', json=payload, headers={'authorization': __bearer_token(ORIGIN_REF)}) assert response.status_code == 200 + client_challenge = response.json().get('client_challenge') + assert client_challenge == payload.get('client_challenge') + lease_ref = response.json().get('lease_ref') assert len(lease_ref) == 36 assert lease_ref == active_lease_ref From d7c29f834c4d8fde61bcee403c8173886bb98bd4 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 10:09:27 +0200 Subject: [PATCH 20/30] test with "X-NLS-Signature" --- app/main.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index 6c6935a..cb8b007 100644 --- a/app/main.py +++ b/app/main.py @@ -719,7 +719,12 @@ async def leasing_v1_lessor(request: Request): logger.debug(response) - return JSONr(response, headers={'X-NLS-Signature': '?'}) + si_certificate_filename = join(dirname(__file__), 'cert/my_demo_si_certificate.pem') + my_si_certificate = Cert.from_file(si_certificate_filename) + signature = my_si_certificate.signature().hex() + signature = f'b\'{signature}\'' + + return JSONr(response, headers={'X-NLS-Signature': signature}) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py From e69e93bcb4bfd8800429a77c1be938f34521ba4f Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 10:20:22 +0200 Subject: [PATCH 21/30] fixed missing code --- app/util.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/util.py b/app/util.py index 14f20f2..9287336 100644 --- a/app/util.py +++ b/app/util.py @@ -99,6 +99,9 @@ class Cert: def pem(self) -> bytes: return self.__cert.public_bytes(encoding=serialization.Encoding.PEM) + def signature(self) -> bytes: + return self.__cert.signature + def load_file(filename: str) -> bytes: log = logging.getLogger(f'{__name__}') From 3871dfe6a61c27d05a2080ae5d33a547aaf44218 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 10:48:43 +0200 Subject: [PATCH 22/30] test "x-nls-signature" --- app/main.py | 7 +++---- test/main.py | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/main.py b/app/main.py index cb8b007..3c7d47e 100644 --- a/app/main.py +++ b/app/main.py @@ -7,6 +7,7 @@ from hashlib import sha256 from json import loads as json_loads from os import getenv as env from os.path import join, dirname, isfile +from random import randbytes from uuid import uuid4 from dateutil.relativedelta import relativedelta @@ -719,12 +720,10 @@ async def leasing_v1_lessor(request: Request): logger.debug(response) - si_certificate_filename = join(dirname(__file__), 'cert/my_demo_si_certificate.pem') - my_si_certificate = Cert.from_file(si_certificate_filename) - signature = my_si_certificate.signature().hex() + signature = randbytes(256).hex() signature = f'b\'{signature}\'' - return JSONr(response, headers={'X-NLS-Signature': signature}) + return JSONr(response, headers={'access-control-expose-headers': 'x-nls-signature', 'x-nls-signature': signature}) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py diff --git a/test/main.py b/test/main.py index 681d538..269f0fd 100644 --- a/test/main.py +++ b/test/main.py @@ -212,6 +212,8 @@ def test_leasing_v1_lessor(): client_challenge = response.json().get('client_challenge') assert client_challenge == payload.get('client_challenge') + signature = eval(response.headers.get('x-nls-signature')) + assert len(signature) == 512 lease_result_list = response.json().get('lease_result_list') assert len(lease_result_list) == 1 From 54d38953bff52bb7ef118899f12b888280d9f1e5 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 11:05:17 +0200 Subject: [PATCH 23/30] x-nls-signature --- app/main.py | 9 ++++----- test/main.py | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/main.py b/app/main.py index 3c7d47e..933b43c 100644 --- a/app/main.py +++ b/app/main.py @@ -720,10 +720,8 @@ async def leasing_v1_lessor(request: Request): logger.debug(response) - signature = randbytes(256).hex() - signature = f'b\'{signature}\'' - - return JSONr(response, headers={'access-control-expose-headers': 'x-nls-signature', 'x-nls-signature': signature}) + signature = f'b\'{randbytes(256).hex()}\'' + return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'x-nls-signature': signature}) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py @@ -772,7 +770,8 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str): Lease.renew(db, entity, expires, cur_time) - return JSONr(response) + signature = f'b\'{randbytes(256).hex()}\'' + return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'x-nls-signature': signature}) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_single_controller.py diff --git a/test/main.py b/test/main.py index 269f0fd..cbba5aa 100644 --- a/test/main.py +++ b/test/main.py @@ -244,6 +244,8 @@ def test_leasing_v1_lease_renew(): client_challenge = response.json().get('client_challenge') assert client_challenge == payload.get('client_challenge') + signature = eval(response.headers.get('x-nls-signature')) + assert len(signature) == 512 lease_ref = response.json().get('lease_ref') assert len(lease_ref) == 36 From 94a7772c7b92be3d99487ca0ac2b4340a00a2332 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 12:13:18 +0200 Subject: [PATCH 24/30] updated attributes to match nvidia-nls response order --- app/main.py | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/app/main.py b/app/main.py index 933b43c..220aeea 100644 --- a/app/main.py +++ b/app/main.py @@ -370,8 +370,8 @@ async def auth_v1_code(request: Request): response = { "auth_code": auth_code, + "prompts": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), - "prompts": None } return JSONr(response) @@ -404,18 +404,18 @@ async def auth_v1_token(request: Request): 'iss': 'https://cls.nvidia.org', 'aud': 'https://cls.nvidia.org', 'exp': timegm(access_expires_on.timetuple()), - 'origin_ref': origin_ref, 'key_ref': SITE_KEY_XID, 'kid': SITE_KEY_XID, + 'origin_ref': origin_ref, } auth_token = jwt.encode(new_payload, key=jwt_encode_key, headers={'kid': payload.get('kid')}, algorithm=ALGORITHMS.RS256) response = { - "expires": access_expires_on.strftime(DT_FORMAT), "auth_token": auth_token, + "expires": access_expires_on.strftime(DT_FORMAT), + "prompts": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), - "prompts": None } return JSONr(response) @@ -694,17 +694,18 @@ async def leasing_v1_lessor(request: Request): "error": None, # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html "lease": { - "ref": lease_ref, "created": cur_time.strftime(DT_FORMAT), "expires": expires.strftime(DT_FORMAT), - "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, - "offline_lease": "false", # todo - "license_type": "CONCURRENT_COUNTED_SINGLE", - "lease_intent_id": None, - "metadata": None, "feature_name": "GRID-Virtual-WS", # todo + "lease_intent_id": None, + "license_type": "CONCURRENT_COUNTED_SINGLE", + "metadata": None, + "offline_lease": False, # todo "product_name": "NVIDIA RTX Virtual Workstation", # todo - } + "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, + "ref": lease_ref, + }, + "ordinal": None, }) data = Lease(origin_ref=origin_ref, lease_ref=lease_ref, lease_created=cur_time, lease_expires=expires) @@ -713,9 +714,9 @@ async def leasing_v1_lessor(request: Request): response = { "client_challenge": j.get('client_challenge'), "lease_result_list": lease_result_list, + "prompts": None, "result_code": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), - "prompts": None } logger.debug(response) @@ -737,8 +738,8 @@ async def leasing_v1_lessor_lease(request: Request): response = { "active_lease_list": active_lease_list, + "prompts": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), - "prompts": None } return JSONr(response) @@ -760,11 +761,13 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str): expires = cur_time + LEASE_EXPIRE_DELTA response = { "client_challenge": j.get('client_challenge'), - "lease_ref": lease_ref, "expires": expires.strftime(DT_FORMAT), - "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, + "feature_expired": False, + "lease_ref": lease_ref, + "metadata": None, "offline_lease": True, "prompts": None, + "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, "sync_timestamp": cur_time.strftime(DT_FORMAT), } @@ -815,8 +818,8 @@ async def leasing_v1_lessor_lease_remove(request: Request): response = { "released_lease_list": released_lease_list, "release_failure_list": None, + "prompts": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), - "prompts": None } return JSONr(response) @@ -837,8 +840,8 @@ async def leasing_v1_lessor_shutdown(request: Request): response = { "released_lease_list": released_lease_list, "release_failure_list": None, + "prompts": None, "sync_timestamp": cur_time.strftime(DT_FORMAT), - "prompts": None } return JSONr(response) From fbb73c73ab6c969c29c77e716e0bda9c6c90b531 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 13:03:47 +0200 Subject: [PATCH 25/30] changed "feature_name" --- app/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/main.py b/app/main.py index 220aeea..0dbee24 100644 --- a/app/main.py +++ b/app/main.py @@ -690,13 +690,12 @@ async def leasing_v1_lessor(request: Request): lease_ref = str(uuid4()) expires = cur_time + LEASE_EXPIRE_DELTA lease_result_list.append({ - "ordinal": None, "error": None, # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html "lease": { "created": cur_time.strftime(DT_FORMAT), "expires": expires.strftime(DT_FORMAT), - "feature_name": "GRID-Virtual-WS", # todo + "feature_name": "Quadro-Virtual-DWS", # todo "lease_intent_id": None, "license_type": "CONCURRENT_COUNTED_SINGLE", "metadata": None, From 70cac5bbf3a4d6f18ccfdd25ba079d2211550c23 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 13:26:58 +0200 Subject: [PATCH 26/30] test "X-NLS-Signature" upper/lowercase --- app/main.py | 6 +++--- test/main.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/main.py b/app/main.py index 0dbee24..36a2641 100644 --- a/app/main.py +++ b/app/main.py @@ -695,7 +695,7 @@ async def leasing_v1_lessor(request: Request): "lease": { "created": cur_time.strftime(DT_FORMAT), "expires": expires.strftime(DT_FORMAT), - "feature_name": "Quadro-Virtual-DWS", # todo + "feature_name": "GRID-Virtual-WS", # todo "lease_intent_id": None, "license_type": "CONCURRENT_COUNTED_SINGLE", "metadata": None, @@ -721,7 +721,7 @@ async def leasing_v1_lessor(request: Request): logger.debug(response) signature = f'b\'{randbytes(256).hex()}\'' - return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'x-nls-signature': signature}) + return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'X-NLS-Signature': signature}) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py @@ -773,7 +773,7 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str): Lease.renew(db, entity, expires, cur_time) signature = f'b\'{randbytes(256).hex()}\'' - return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'x-nls-signature': signature}) + return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'X-NLS-Signature': signature}) # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_single_controller.py diff --git a/test/main.py b/test/main.py index cbba5aa..d3ef989 100644 --- a/test/main.py +++ b/test/main.py @@ -212,7 +212,7 @@ def test_leasing_v1_lessor(): client_challenge = response.json().get('client_challenge') assert client_challenge == payload.get('client_challenge') - signature = eval(response.headers.get('x-nls-signature')) + signature = eval(response.headers.get('X-NLS-Signature')) assert len(signature) == 512 lease_result_list = response.json().get('lease_result_list') @@ -244,7 +244,7 @@ def test_leasing_v1_lease_renew(): client_challenge = response.json().get('client_challenge') assert client_challenge == payload.get('client_challenge') - signature = eval(response.headers.get('x-nls-signature')) + signature = eval(response.headers.get('X-NLS-Signature')) assert len(signature) == 512 lease_ref = response.json().get('lease_ref') From f9fccd55027823377d984b70f129854e9e8524da Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 20:05:10 +0200 Subject: [PATCH 27/30] implemented product_mapping support --- app/main.py | 20 +- app/static/product_mapping.json | 643 ++++++++++++++++++++++++++++++++ app/util.py | 31 ++ test/main.py | 7 +- 4 files changed, 693 insertions(+), 8 deletions(-) create mode 100644 app/static/product_mapping.json diff --git a/app/main.py b/app/main.py index 36a2641..a30d205 100644 --- a/app/main.py +++ b/app/main.py @@ -22,7 +22,7 @@ from starlette.middleware.cors import CORSMiddleware from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse from orm import Origin, Lease, init as db_init, migrate -from util import PrivateKey, PublicKey, load_file, Cert +from util import PrivateKey, PublicKey, load_file, Cert, ProductMapping # Load variables load_dotenv('../version.env') @@ -52,6 +52,8 @@ LEASE_RENEWAL_DELTA = timedelta(days=int(env('LEASE_EXPIRE_DAYS', 90)), hours=in CLIENT_TOKEN_EXPIRE_DELTA = relativedelta(years=12) CORS_ORIGINS = str(env('CORS_ORIGINS', '')).split(',') if (env('CORS_ORIGINS')) else [f'https://{DLS_URL}'] DT_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' +PRODUCT_MAPPING = ProductMapping(filename=join(dirname(__file__), 'static/product_mapping.json')) + jwt_encode_key = jwk.construct(INSTANCE_KEY_RSA.pem(), algorithm=ALGORITHMS.RS256) jwt_decode_key = jwk.construct(INSTANCE_KEY_PUB.pem(), algorithm=ALGORITHMS.RS256) @@ -679,28 +681,34 @@ async def leasing_v1_lessor(request: Request): origin_ref = token.get('origin_ref') scope_ref_list = j.get('scope_ref_list') + lease_proposal_list = j.get('lease_proposal_list') logger.info(f'> [ create ]: {origin_ref}: create leases for scope_ref_list {scope_ref_list}') - lease_result_list = [] - # todo: for lease_proposal in lease_proposal_list for scope_ref in scope_ref_list: # if scope_ref not in [ALLOTMENT_REF]: # return JSONr(status_code=500, detail=f'no service instances found for scopes: ["{scope_ref}"]') + pass + lease_result_list = [] + for lease_proposal in lease_proposal_list: lease_ref = str(uuid4()) expires = cur_time + LEASE_EXPIRE_DELTA + + product_name = lease_proposal.get('product').get('name') + feature_name = PRODUCT_MAPPING.get_feature_name(product_name=product_name) + lease_result_list.append({ "error": None, # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html "lease": { "created": cur_time.strftime(DT_FORMAT), - "expires": expires.strftime(DT_FORMAT), - "feature_name": "GRID-Virtual-WS", # todo + "expires": expires.strftime(DT_FORMAT), # todo: lease_proposal.get('duration') => "P0Y0M0DT12H0M0S + "feature_name": feature_name, "lease_intent_id": None, "license_type": "CONCURRENT_COUNTED_SINGLE", "metadata": None, "offline_lease": False, # todo - "product_name": "NVIDIA RTX Virtual Workstation", # todo + "product_name": product_name, "recommended_lease_renewal": LEASE_RENEWAL_PERIOD, "ref": lease_ref, }, diff --git a/app/static/product_mapping.json b/app/static/product_mapping.json new file mode 100644 index 0000000..1235e31 --- /dev/null +++ b/app/static/product_mapping.json @@ -0,0 +1,643 @@ +{ + "product": [ + { + "xid": "c0ce7114-d8a5-40d4-b8b0-df204f4ff631", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA-vComputeServer-9.0", + "name": "NVIDIA-vComputeServer-9.0", + "description": null + }, + { + "xid": "2a99638e-493f-424b-bc3a-629935307490", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "vGaming_Flexera_License-0.1", + "name": "vGaming_Flexera_License-0.1", + "description": null + }, + { + "xid": "a013d60c-3cd6-4e61-ae51-018b5e342178", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID-Virtual-Apps-3.0", + "name": "GRID-Virtual-Apps-3.0", + "description": null + }, + { + "xid": "bb99c6a3-81ce-4439-aef5-9648e75dd878", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID-vGaming-NLS-Metered-8.0", + "name": "GRID-vGaming-NLS-Metered-8.0", + "description": null + }, + { + "xid": "c653e131-695c-4477-b77c-42ade3dcb02c", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID-Virtual-WS-Ext-2.0", + "name": "GRID-Virtual-WS-Ext-2.0", + "description": null + }, + { + "xid": "6fc224ef-e0b5-467b-9bbb-d31c9eb7c6fc", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID-vGaming-8.0", + "name": "GRID-vGaming-8.0", + "description": null + }, + { + "xid": "3c88888d-ebf3-4df7-9e86-c97d5b29b997", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID-Virtual-PC-2.0", + "name": "GRID-Virtual-PC-2.0", + "description": null + }, + { + "xid": "66744b41-1fff-49be-a5a6-4cbd71b1117e", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVAIE_Licensing-1.0", + "name": "NVAIE_Licensing-1.0", + "description": null + }, + { + "xid": "1d4e9ebc-a78c-41f4-a11a-de38a467b2ba", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA-vComputeServer NLS Metered-9.0", + "name": "NVIDIA-vComputeServer NLS Metered-9.0", + "description": null + }, + { + "xid": "2152f8aa-d17b-46f5-8f5f-6f8c0760ce9c", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "vGaming_FB_License-0.1", + "name": "vGaming_FB_License-0.1", + "description": null + }, + { + "xid": "54cbe0e8-7b35-4068-b058-e11f5b367c66", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "Quadro-Virtual-DWS-5.0", + "name": "Quadro-Virtual-DWS-5.0", + "description": null + }, + { + "xid": "07a1d2b5-c147-48bc-bf44-9390339ca388", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID-Virtual-WS-2.0", + "name": "GRID-Virtual-WS-2.0", + "description": null + }, + { + "xid": "82d7a5f0-0c26-11ef-b3b6-371045c70906", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "vGaming_Flexera_License-0.1", + "name": "vGaming_Flexera_License-0.1", + "description": null + }, + { + "xid": "bdfbde00-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA Virtual Applications", + "name": "NVIDIA Virtual Applications", + "description": null + }, + { + "xid": "bdfbe16d-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA Virtual PC", + "name": "NVIDIA Virtual PC", + "description": null + }, + { + "xid": "bdfbe308-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA RTX Virtual Workstation", + "name": "NVIDIA RTX Virtual Workstation", + "description": null + }, + { + "xid": "bdfbe405-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA vGaming", + "name": "NVIDIA vGaming", + "description": null + }, + { + "xid": "bdfbe509-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID Virtual Applications", + "name": "GRID Virtual Applications", + "description": null + }, + { + "xid": "bdfbe5c6-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID Virtual PC", + "name": "GRID Virtual PC", + "description": null + }, + { + "xid": "bdfbe6e8-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "Quadro Virtual Data Center Workstation", + "name": "Quadro Virtual Data Center Workstation", + "description": null + }, + { + "xid": "bdfbe7c8-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "GRID vGaming", + "name": "GRID vGaming", + "description": null + }, + { + "xid": "bdfbe884-2cdb-11ec-9838-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA Virtual Compute Server", + "name": "NVIDIA Virtual Compute Server", + "description": null + }, + { + "xid": "f09b5c33-5c07-11ed-9fa6-061a22468b59", + "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59", + "identifier": "NVIDIA OVE Licensing", + "name": "NVIDIA Omniverse Nucleus", + "description": null + } + ], + "product_fulfillment": [ + { + "xid": "cf0a5330-b583-4d9f-84bb-cfc8ce0917bb", + "product_xid": "07a1d2b5-c147-48bc-bf44-9390339ca388", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "90d0f05f-9431-4a15-86e7-740a4f08d457", + "product_xid": "1d4e9ebc-a78c-41f4-a11a-de38a467b2ba", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "327385dd-4ba8-4b3c-bc56-30bcf58ae9a3", + "product_xid": "2152f8aa-d17b-46f5-8f5f-6f8c0760ce9c", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "6733f2cc-0736-47ee-bcc8-20c4c624ce37", + "product_xid": "2a99638e-493f-424b-bc3a-629935307490", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "f35396a9-24f8-44b6-aa6a-493b335f4d56", + "product_xid": "3c88888d-ebf3-4df7-9e86-c97d5b29b997", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "6c7981d3-7192-4bfd-b7ec-ea2ad0b466dc", + "product_xid": "54cbe0e8-7b35-4068-b058-e11f5b367c66", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "9bd09610-6190-4684-9be6-3d9503833e80", + "product_xid": "66744b41-1fff-49be-a5a6-4cbd71b1117e", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "a4282e5b-ea08-4e0a-b724-7f4059ba99de", + "product_xid": "6fc224ef-e0b5-467b-9bbb-d31c9eb7c6fc", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "5cf793fc-1fb3-45c0-a711-d3112c775cbe", + "product_xid": "a013d60c-3cd6-4e61-ae51-018b5e342178", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "eb2d39a4-6370-4464-8a6a-ec3f42c69cb5", + "product_xid": "bb99c6a3-81ce-4439-aef5-9648e75dd878", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "e9df1c70-7fac-4c84-b54c-66e922b9791a", + "product_xid": "c0ce7114-d8a5-40d4-b8b0-df204f4ff631", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "6a4d5bcd-7b81-4e22-a289-ce3673e5cabf", + "product_xid": "c653e131-695c-4477-b77c-42ade3dcb02c", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "9e162d3c-0c26-11ef-b3b6-371045c70906", + "product_xid": "82d7a5f0-0c26-11ef-b3b6-371045c70906", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be2769b9-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbde00-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be276d7b-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe16d-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be276efe-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe308-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be276ff0-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe405-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be2770af-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe509-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be277164-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe5c6-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be277214-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe6e8-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be2772c8-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe7c8-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "be277379-2cdb-11ec-9838-061a22468b59", + "product_xid": "bdfbe884-2cdb-11ec-9838-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + }, + { + "xid": "c4284597-5c09-11ed-9fa6-061a22468b59", + "product_xid": "f09b5c33-5c07-11ed-9fa6-061a22468b59", + "qualifier_specification": null, + "evaluation_order_index": 0 + } + ], + "product_fulfillment_feature": [ + { + "xid": "9ca32d2b-736e-4e4f-8f5a-895a755b4c41", + "product_fulfillment_xid": "5cf793fc-1fb3-45c0-a711-d3112c775cbe", + "feature_identifier": "GRID-Virtual-Apps", + "feature_version": "3.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "d8b25329-f47f-43dc-a278-f2d38f9e939b", + "product_fulfillment_xid": "f35396a9-24f8-44b6-aa6a-493b335f4d56", + "feature_identifier": "GRID-Virtual-PC", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "e7102df8-d88a-4bd0-aa79-9a53d8b77888", + "product_fulfillment_xid": "cf0a5330-b583-4d9f-84bb-cfc8ce0917bb", + "feature_identifier": "GRID-Virtual-WS", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "30761db3-0afe-454d-b284-efba6d9b13a3", + "product_fulfillment_xid": "6a4d5bcd-7b81-4e22-a289-ce3673e5cabf", + "feature_identifier": "GRID-Virtual-WS-Ext", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "10fd7701-83ae-4caf-a27f-75880fab23f6", + "product_fulfillment_xid": "a4282e5b-ea08-4e0a-b724-7f4059ba99de", + "feature_identifier": "GRID-vGaming", + "feature_version": "8.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "cbd61276-fb1e-42e1-b844-43e94465da8f", + "product_fulfillment_xid": "9bd09610-6190-4684-9be6-3d9503833e80", + "feature_identifier": "NVAIE_Licensing", + "feature_version": "1.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "6b1c74b5-1511-46ee-9f12-8bc6d5636fef", + "product_fulfillment_xid": "90d0f05f-9431-4a15-86e7-740a4f08d457", + "feature_identifier": "NVIDIA-vComputeServer NLS Metered", + "feature_version": "9.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "db53af09-7295-48b7-b927-24b23690c959", + "product_fulfillment_xid": "e9df1c70-7fac-4c84-b54c-66e922b9791a", + "feature_identifier": "NVIDIA-vComputeServer", + "feature_version": "9.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "1f62be61-a887-4e54-a34e-61cfa7b2db30", + "product_fulfillment_xid": "6c7981d3-7192-4bfd-b7ec-ea2ad0b466dc", + "feature_identifier": "Quadro-Virtual-DWS", + "feature_version": "5.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "8a4b5e98-f1ca-4c18-b0d4-8f4f9f0462e2", + "product_fulfillment_xid": "327385dd-4ba8-4b3c-bc56-30bcf58ae9a3", + "feature_identifier": "vGaming_FB_License", + "feature_version": "0.1", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be531e98-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be2769b9-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-Apps", + "feature_version": "3.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be53219e-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-PC", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be5322f0-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "Quadro-Virtual-DWS", + "feature_version": "5.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 1 + }, + { + "xid": "be5323d8-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 2 + }, + { + "xid": "be5324a6-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS-Ext", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 3 + }, + { + "xid": "be532568-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276efe-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "Quadro-Virtual-DWS", + "feature_version": "5.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be532630-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276efe-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 1 + }, + { + "xid": "be5326e7-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276efe-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS-Ext", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 2 + }, + { + "xid": "be5327a7-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-vGaming", + "feature_version": "8.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be532923-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be2770af-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-Apps", + "feature_version": "3.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be5329e0-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-PC", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be532aa0-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "Quadro-Virtual-DWS", + "feature_version": "5.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 1 + }, + { + "xid": "be532b5c-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 2 + }, + { + "xid": "be532c19-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS-Ext", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 3 + }, + { + "xid": "be532ccb-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277214-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "Quadro-Virtual-DWS", + "feature_version": "5.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be532d92-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277214-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 1 + }, + { + "xid": "be532e45-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277214-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-Virtual-WS-Ext", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 2 + }, + { + "xid": "be532efa-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-vGaming", + "feature_version": "8.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be53306d-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "NVIDIA-vComputeServer", + "feature_version": "9.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "be533228-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "NVIDIA-vComputeServer NLS Metered", + "feature_version": "9.0", + "license_type_identifier": "CONCURRENT_UNCOUNTED_SINGLE", + "evaluation_order_index": 2 + }, + { + "xid": "be5332f6-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "NVAIE_Licensing", + "feature_version": "1.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 3 + }, + { + "xid": "15ff4f16-57a8-4593-93ec-58352a256f12", + "product_fulfillment_xid": "eb2d39a4-6370-4464-8a6a-ec3f42c69cb5", + "feature_identifier": "GRID-vGaming-NLS-Metered", + "feature_version": "8.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 3 + }, + { + "xid": "0c1552ca-3ef8-11ed-9fa6-061a22468b59", + "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "vGaming_Flexera_License", + "feature_version": "0.1", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 1 + }, + { + "xid": "31c3be8c-5c0a-11ed-9fa6-061a22468b59", + "product_fulfillment_xid": "c4284597-5c09-11ed-9fa6-061a22468b59", + "feature_identifier": "OVE_Licensing", + "feature_version": "1.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + }, + { + "xid": "6caeb4cf-360f-11ee-b67d-02f279bf2bff", + "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "NVAIE_Licensing", + "feature_version": "2.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 4 + }, + { + "xid": "7fb1d01d-3f0e-11ed-9fa6-061a22468b59", + "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "vGaming_FB_License", + "feature_version": "0.1", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 2 + }, + { + "xid": "8eabcb08-3f0e-11ed-9fa6-061a22468b59", + "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "vGaming_FB_License", + "feature_version": "0.1", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 2 + }, + { + "xid": "a1dfe741-3e49-11ed-9fa6-061a22468b59", + "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "vGaming_Flexera_License", + "feature_version": "0.1", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 1 + }, + { + "xid": "be53286a-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-vGaming-NLS-Metered", + "feature_version": "8.0", + "license_type_identifier": "CONCURRENT_UNCOUNTED_SINGLE", + "evaluation_order_index": 3 + }, + { + "xid": "be532fb2-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "GRID-vGaming-NLS-Metered", + "feature_version": "8.0", + "license_type_identifier": "CONCURRENT_UNCOUNTED_SINGLE", + "evaluation_order_index": 3 + }, + { + "xid": "be533144-2cdb-11ec-9838-061a22468b59", + "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59", + "feature_identifier": "Quadro-Virtual-DWS", + "feature_version": "0.0", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 1 + }, + { + "xid": "bf105e18-0c26-11ef-b3b6-371045c70906", + "product_fulfillment_xid": "9e162d3c-0c26-11ef-b3b6-371045c70906", + "feature_identifier": "vGaming_Flexera_License", + "feature_version": "0.1", + "license_type_identifier": "CONCURRENT_COUNTED_SINGLE", + "evaluation_order_index": 0 + } + ] +} diff --git a/app/util.py b/app/util.py index 9287336..a8288de 100644 --- a/app/util.py +++ b/app/util.py @@ -153,3 +153,34 @@ class NV: 'is_latest': is_latest, } return None + + +class ProductMapping: + + def __init__(self, filename: str): + with open(filename, 'r') as file: + self.data = json_loads(file.read()) + + + def get_feature_name(self, product_name: str) -> (str, str): + product = self.__get_product(product_name) + product_fulfillment = self.__get_product_fulfillment(product.get('xid')) + feature = self.__get_product_fulfillment_feature(product_fulfillment.get('xid')) + + return feature.get('feature_identifier') + + + def __get_product(self, product_name: str): + product_list = self.data.get('product') + return next(filter(lambda _: _.get('identifier') == product_name, product_list)) + + + def __get_product_fulfillment(self, product_xid: str): + product_fulfillment_list = self.data.get('product_fulfillment') + return next(filter(lambda _: _.get('product_xid') == product_xid, product_fulfillment_list)) + + def __get_product_fulfillment_feature(self, product_fulfillment_xid: str): + feature_list = self.data.get('product_fulfillment_feature') + features = list(filter(lambda _: _.get('product_fulfillment_xid') == product_fulfillment_xid, feature_list)) + features.sort(key=lambda _: _.get('evaluation_order_index')) + return features[0] diff --git a/test/main.py b/test/main.py index d3ef989..f9c44d6 100644 --- a/test/main.py +++ b/test/main.py @@ -201,7 +201,7 @@ def test_leasing_v1_lessor(): }, 'lease_proposal_list': [{ 'license_type_qualifiers': {'count': 1}, - 'product': {'name': 'NVIDIA RTX Virtual Workstation'} + 'product': {'name': 'NVIDIA Virtual Applications'} }], 'proposal_evaluation_mode': 'ALL_OF', 'scope_ref_list': [ALLOTMENT_REF] @@ -219,6 +219,9 @@ def test_leasing_v1_lessor(): assert len(lease_result_list) == 1 assert len(lease_result_list[0]['lease']['ref']) == 36 assert str(UUID(lease_result_list[0]['lease']['ref'])) == lease_result_list[0]['lease']['ref'] + assert lease_result_list[0]['lease']['product_name'] == 'NVIDIA Virtual Applications' + assert lease_result_list[0]['lease']['feature_name'] == 'GRID-Virtual-Apps' + def test_leasing_v1_lessor_lease(): @@ -275,7 +278,7 @@ def test_leasing_v1_lessor_lease_remove(): }, 'lease_proposal_list': [{ 'license_type_qualifiers': {'count': 1}, - 'product': {'name': 'NVIDIA RTX Virtual Workstation'} + 'product': {'name': 'NVIDIA Virtual Applications'} }], 'proposal_evaluation_mode': 'ALL_OF', 'scope_ref_list': [ALLOTMENT_REF] From 7b2d61b3293c1c2f2583d6b16312af92575777ca Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 20:05:43 +0200 Subject: [PATCH 28/30] fixed signature --- app/main.py | 9 +++++---- app/util.py | 7 ++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/main.py b/app/main.py index a30d205..29e5c95 100644 --- a/app/main.py +++ b/app/main.py @@ -4,10 +4,9 @@ from calendar import timegm from contextlib import asynccontextmanager from datetime import datetime, timedelta, UTC from hashlib import sha256 -from json import loads as json_loads +from json import loads as json_loads, dumps as json_dumps from os import getenv as env from os.path import join, dirname, isfile -from random import randbytes from uuid import uuid4 from dateutil.relativedelta import relativedelta @@ -728,7 +727,8 @@ async def leasing_v1_lessor(request: Request): logger.debug(response) - signature = f'b\'{randbytes(256).hex()}\'' + signature = INSTANCE_KEY_RSA.generate_signature(json_dumps(response).encode('utf-8')) + signature = f'b\'{signature.hex()}\'' return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'X-NLS-Signature': signature}) @@ -780,7 +780,8 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str): Lease.renew(db, entity, expires, cur_time) - signature = f'b\'{randbytes(256).hex()}\'' + signature = INSTANCE_KEY_RSA.generate_signature(json_dumps(response).encode('utf-8')) + signature = f'b\'{signature.hex()}\'' return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'X-NLS-Signature': signature}) diff --git a/app/util.py b/app/util.py index a8288de..c5b0187 100644 --- a/app/util.py +++ b/app/util.py @@ -1,7 +1,9 @@ import logging - +from json import loads as json_loads from cryptography.hazmat.primitives import serialization +from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey, generate_private_key +from cryptography.hazmat.primitives.hashes import SHA256 from cryptography.hazmat.primitives.serialization import load_pem_private_key, load_pem_public_key from cryptography.x509 import load_pem_x509_certificate, Certificate @@ -40,6 +42,9 @@ class PrivateKey: ) return PublicKey(data=data) + def generate_signature(self, data: bytes) -> bytes: + return self.__key.sign(data, PKCS1v15(), SHA256()) + @staticmethod def generate(public_exponent: int = 65537, key_size: int = 2048) -> "PrivateKey": log = logging.getLogger(__name__) From 79f1015a8667e3accb75b17c741c1001af78a50c Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 21:37:26 +0200 Subject: [PATCH 29/30] code styling --- app/main.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/main.py b/app/main.py index 29e5c95..f32301e 100644 --- a/app/main.py +++ b/app/main.py @@ -13,12 +13,12 @@ from dateutil.relativedelta import relativedelta from dotenv import load_dotenv from fastapi import FastAPI from fastapi.requests import Request +from fastapi.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse from jose import jws, jwk, jwt, JWTError from jose.constants import ALGORITHMS from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker from starlette.middleware.cors import CORSMiddleware -from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse from orm import Origin, Lease, init as db_init, migrate from util import PrivateKey, PublicKey, load_file, Cert, ProductMapping @@ -670,9 +670,6 @@ async def leasing_v1_config_token(request: Request): async def leasing_v1_lessor(request: Request): j, token, cur_time = json_loads((await request.body()).decode('utf-8')), __get_token(request), datetime.now(UTC) - logger.debug(j) - logger.debug(request.headers) - try: token = __get_token(request) except JWTError: @@ -698,7 +695,6 @@ async def leasing_v1_lessor(request: Request): lease_result_list.append({ "error": None, - # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html "lease": { "created": cur_time.strftime(DT_FORMAT), "expires": expires.strftime(DT_FORMAT), # todo: lease_proposal.get('duration') => "P0Y0M0DT12H0M0S @@ -727,8 +723,8 @@ async def leasing_v1_lessor(request: Request): logger.debug(response) - signature = INSTANCE_KEY_RSA.generate_signature(json_dumps(response).encode('utf-8')) - signature = f'b\'{signature.hex()}\'' + signature = INSTANCE_KEY_RSA.generate_signature(json_dumps(response, ensure_ascii=False, allow_nan=False, indent=None, separators=(",", ":")).encode('utf-8')) + signature = f'{signature.hex().encode()}' return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'X-NLS-Signature': signature}) @@ -780,8 +776,8 @@ async def leasing_v1_lease_renew(request: Request, lease_ref: str): Lease.renew(db, entity, expires, cur_time) - signature = INSTANCE_KEY_RSA.generate_signature(json_dumps(response).encode('utf-8')) - signature = f'b\'{signature.hex()}\'' + signature = INSTANCE_KEY_RSA.generate_signature(json_dumps(response, ensure_ascii=False, allow_nan=False, indent=None, separators=(",", ":")).encode('utf-8')) + signature = f'{signature.hex().encode()}' return JSONr(response, headers={'access-control-expose-headers': 'X-NLS-Signature', 'X-NLS-Signature': signature}) From 445a3039558495e70ec4f8110e6868c86e816419 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 14 Apr 2025 21:38:01 +0200 Subject: [PATCH 30/30] added signature tests --- app/util.py | 5 ++++- test/main.py | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/util.py b/app/util.py index c5b0187..953b928 100644 --- a/app/util.py +++ b/app/util.py @@ -43,7 +43,7 @@ class PrivateKey: return PublicKey(data=data) def generate_signature(self, data: bytes) -> bytes: - return self.__key.sign(data, PKCS1v15(), SHA256()) + return self.__key.sign(data, padding=PKCS1v15(), algorithm=SHA256()) @staticmethod def generate(public_exponent: int = 65537, key_size: int = 2048) -> "PrivateKey": @@ -82,6 +82,9 @@ class PublicKey: format=serialization.PublicFormat.SubjectPublicKeyInfo ) + def verify_signature(self, signature: bytes, data: bytes) -> bytes: + return self.__key.verify(signature, data, padding=PKCS1v15(), algorithm=SHA256()) + class Cert: diff --git a/test/main.py b/test/main.py index f9c44d6..664b754 100644 --- a/test/main.py +++ b/test/main.py @@ -40,6 +40,23 @@ def __bearer_token(origin_ref: str) -> str: return token +def test_signing(): + signature_set_header = INSTANCE_KEY_RSA.generate_signature(b'Hello') + + # test plain + INSTANCE_KEY_PUB.verify_signature(signature_set_header, b'Hello') + + # test "X-NLS-Signature: b'....' + x_nls_signature_header_value = f'{signature_set_header.hex().encode()}' + assert f'{x_nls_signature_header_value}'.startswith('b\'') + assert f'{x_nls_signature_header_value}'.endswith('\'') + + # test eval + signature_get_header = eval(x_nls_signature_header_value) + signature_get_header = bytes.fromhex(signature_get_header.decode('ascii')) + INSTANCE_KEY_PUB.verify_signature(signature_get_header, b'Hello') + + def test_index(): response = client.get('/') assert response.status_code == 200 @@ -214,6 +231,9 @@ def test_leasing_v1_lessor(): assert client_challenge == payload.get('client_challenge') signature = eval(response.headers.get('X-NLS-Signature')) assert len(signature) == 512 + signature = bytes.fromhex(signature.decode('ascii')) + assert len(signature) == 256 + INSTANCE_KEY_PUB.verify_signature(signature, response.content) lease_result_list = response.json().get('lease_result_list') assert len(lease_result_list) == 1 @@ -249,6 +269,9 @@ def test_leasing_v1_lease_renew(): assert client_challenge == payload.get('client_challenge') signature = eval(response.headers.get('X-NLS-Signature')) assert len(signature) == 512 + signature = bytes.fromhex(signature.decode('ascii')) + assert len(signature) == 256 + INSTANCE_KEY_PUB.verify_signature(signature, response.content) lease_ref = response.json().get('lease_ref') assert len(lease_ref) == 36