inpython-package 1.1.9__tar.gz → 1.1.10__tar.gz

{inpython_package-1.1.9/inpython_package.egg-info → inpython_package-1.1.10}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: inpython-package
-Version: 1.1.9
+Version: 1.1.10
 Summary: # Infodata's IN-Tools U2Python Package
 Home-page: https://bitbucket.org/infodata-dev/inpython
 Author: infodata
 Author-email: jcd@infodata.lu
 License: MIT
-Requires-Python: >=3.4
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: msal>=1.22

inpython_package-1.1.10/inpython/injcd.py

@@ -0,0 +1,15 @@
+import sys
+from inrest import in_jwt
+
+def main(argv):
+    # 
+    try:
+        token = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJDYW14amZKUGw5aXhKWDdTQ3VKMXI0X2JWb2hFbVdkb3RHRmkwYmF5TFNzIn0.eyJleHAiOjE3ODc1NjU5MTcsImlhdCI6MTc4NzU2NTYxNywiYXV0aF90aW1lIjoxNzg3NTU0MzA4LCJqdGkiOiJvbnJ0YWM6MzVjODY2ZGYtNmIzZC02MjVlLTExMTgtNDI1ZmUyNjc3YjY3IiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay5kZXYuaW50cmEucHJpbWVhbGUubmV0L2F1dGgvcmVhbG1zL3ByaW1lYWxlLWNvbm5lY3QiLCJhdWQiOiJhY2NvdW50Iiwic3ViIjoiZDFiMGM5M2MtMjhlMy00YzM4LTk3MTMtNjU1ZTFjM2FkN2Q4IiwidHlwIjoiQmVhcmVyIiwiYXpwIjoicmVmZXJlbnRpZWwtZnJvbnQiLCJzaWQiOiIxUGMteGRHZ21hSmtOelI2NmNOTDRTdGoiLCJhY3IiOiIwIiwiYWxsb3dlZC1vcmlnaW5zIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NDIwMyIsImh0dHBzOi8vcmVmZXJlbnRpZWwuZGV2LmludHJhLnByaW1lYWxlLm5ldCJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsib2ZmbGluZV9hY2Nlc3MiLCJ1bWFfYXV0aG9yaXphdGlvbiIsImRlZmF1bHQtcm9sZXMtYWQgZmxvcsOpYWxlIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgZW1haWwgcHJvZmlsZSIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6Ik5pY29sYXMgU2FiaW4gKFByaW3DqWFsZSBGcmFuY2UpIFNhYmluIiwicHJlZmVycmVkX3VzZXJuYW1lIjoibmlzYWJpbiIsImdpdmVuX25hbWUiOiJOaWNvbGFzIFNhYmluIChQcmltw6lhbGUgRnJhbmNlKSIsImZhbWlseV9uYW1lIjoiU2FiaW4iLCJlbWFpbCI6Im5pc2FiaW5AcHJpbWVhbGUuY29tIn0.nb3ii1SoGiypmZm2tTDsoKEqYPhrjSrQCMs5I4XHca1CJS_c2jwE6sbfJBio98xKwZEwokt9_-7uLxD6LKVxhVZHBI08X-TEs_iNh1XRynJcORsdr2z9oiYc4rW8lq-H_22zo33vbWnrjnQflxLvTwD8-xvnwbTVBqqJKUY7mugZBy9KnR6uOJqMks0D7uon2-XiKJq9idznYOtaoGHbeb9vMZJxrJTHV7gj9SNzOeGOGJQoLxqG2QCbA-uYlBYvp4xV2iUIH9eeUr1hcETw4wHAdn87qxHj5dqsU7zN0oO7fAdcCXzWvXHnx__Wi7pKfVPLUSD0jNSy4ugmGcuoRg"
+        claims = in_jwt.validate_keycloak_jwt(token, "http://localhost:8080/realms/myrealm","myclient-web")
+        print(claims)
+    except ValueError as e:
+        print(f"Erreur: {e}")
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
+    

{inpython_package-1.1.9 → inpython_package-1.1.10}/inpython/inrest/in_jwt.py

@@ -1,142 +1,157 @@
-#--------------------------------------------------------
-# Manipulates a Json web token
-# 
-#--------------------------------------------------------
-# 22/08/2024 (JCD) : Creation fonction generateJwtClientAssertion
-# 21/08/2026 (JCD) : ajout validate_keycloak_jwt et validate_microsoft_jwt
-#--------------------------------------------------------
-from cryptography.hazmat.primitives.serialization import pkcs12
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.backends import default_backend
-import jwt
-import datetime
-from jwt import PyJWKClient
-import json
-
-# Generates a jwt client assertion from a private key
-def generateJwtClientAssertion(mode,path_certificate,private_key,client_id,audience,expirationTime=10):
-    """ Return jwt token assertion
-    
-    Parameters
-    ------------
-        mode:int
-           = 1 : Private key
-           = 2 : Private password
-        path_certificate: string
-            Path crt/cer file if mode = 1
-            Path pfx file if mode = 2
-        private_key: byte
-            Path key file file if mode = 1
-            Private password if mode = 2
-        client_id: string
-        audience: string
-        expirationTime: string, Optional
-            in minutes. Default to 10 minutes
-    """
-    try:
-        if mode != "1" and mode != "2" :
-            raise Exception("Unmanaged mode")
-
-        if not expirationTime:  
-            expirationTime = 10
-        else:    
-            expirationTime = int(expirationTime)
-            
-        # Load the public certificate
-        with open(path_certificate, "rb") as cert_file:
-            certificate_data = cert_file.read()
-            
-        # Load the private key
-        if mode == "1":
-            with open(private_key, "rb") as key_file:
-                private_key = serialization.load_pem_private_key(
-                    key_file.read(),
-                    password=None,
-                    backend=default_backend()
-                )
-        else:
-            private_key, certificate, additional_certs = pkcs12.load_key_and_certificates(
-                certificate_data, private_key.encode(), backend=default_backend()
-            ) 
-        
-        now = datetime.datetime.now(datetime.timezone.utc)
-        # Define the JWT claims
-        claims = {
-            "iss": client_id,        # The issuer, typically your client ID
-            "sub": client_id,        # The subject, typically your client ID
-            "aud": audience,   # The audience, typically the token endpoint URL
-            "exp": now + datetime.timedelta(expirationTime),  # Expiration time
-            "jti": "unique-identifier",     # JWT ID, a unique identifier for the JWT
-        }
-
-        # Create the JWT (client assertion)
-        if mode == 1:
-            client_assertion = jwt.encode(
-                claims,
-                private_key,
-                algorithm="RS256",
-                headers={"x5c": [certificate_data.decode("utf-8").replace("\n", "")]}
-            )
-        else:
-            client_assertion = jwt.encode(
-            claims, private_key, algorithm="RS256", headers={"alg": "RS256","typ": "JWT"}
-        )    
-        return client_assertion
-    except:
-        raise  # so that the caller receives the exception
-
-def validate_keycloak_jwt(token: str,keycloak_url: str,client_id: str):
-    """
-    Valide un JWT Keycloak.
-    """
-    try:
-        jwks_url = (f"{keycloak_url}/protocol/openid-connect/certs")
-        signing_key = PyJWKClient(jwks_url).get_signing_key_from_jwt(token)
-        payload = jwt.decode(
-            token,
-            signing_key.key,
-            algorithms=["RS256"],
-            issuer=keycloak_url,
-            audience=client_id
-        )
-        return json.dumps(payload)
-    except jwt.ExpiredSignatureError:
-        raise ValueError("JWT expiré")
-    except jwt.InvalidIssuerError:
-        raise ValueError("Issuer Keycloak incorrect")
-    except jwt.InvalidAudienceError:
-        raise ValueError("Audience Keycloak incorrect")
-    except jwt.InvalidTokenError as e:
-        raise ValueError(
-            f"JWT Keycloak invalide: {str(e)}"
-        )
-    except Exception as e:
-        raise ValueError(
-            f"Erreur validation Keycloak: {str(e)}"
-        )
-
-def validate_microsoft_jwt(token: str, issuer: str = None, audience: str = None):
-    """
-    Valide un JWT Microsoft en récupérant les clés JWKS depuis:
-    https://login.microsoftonline.com/common/discovery/v2.0/keys
-    """
-    try:
-        jwks_url = "https://login.microsoftonline.com/common/discovery/v2.0/keys"
-        signing_key = PyJWKClient(jwks_url).get_signing_key_from_jwt(token)
-
-        options = {"verify_aud": bool(audience), "verify_iss": bool(issuer)}
-        claims = jwt.decode(
-            token,
-            signing_key.key,
-            algorithms=["RS256"],
-            audience=audience,
-            issuer=issuer,
-            options=options
-        )
-        return json.dumps(claims)
-    except jwt.ExpiredSignatureError:
-        raise ValueError("JWT Microsoft expiré")
-    except jwt.InvalidTokenError as e:
-        raise ValueError(f"JWT Microsoft invalide: {str(e)}")
-    except Exception as e:
-        raise ValueError(f"Erreur validation Microsoft: {str(e)}")
+#--------------------------------------------------------
+# Manipulates a Json web token
+# 
+#--------------------------------------------------------
+# 22/08/2024 (JCD) : Creation fonction generateJwtClientAssertion
+# 21/08/2026 (JCD) : ajout validate_keycloak_jwt et validate_microsoft_jwt
+#--------------------------------------------------------
+from cryptography.hazmat.primitives.serialization import pkcs12
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.backends import default_backend
+import jwt
+import datetime
+from jwt import PyJWKClient
+import json
+
+# Generates a jwt client assertion from a private key
+def generateJwtClientAssertion(mode,path_certificate,private_key,client_id,audience,expirationTime=10):
+    """ Return jwt token assertion
+    
+    Parameters
+    ------------
+        mode:int
+           = 1 : Private key
+           = 2 : Private password
+        path_certificate: string
+            Path crt/cer file if mode = 1
+            Path pfx file if mode = 2
+        private_key: byte
+            Path key file file if mode = 1
+            Private password if mode = 2
+        client_id: string
+        audience: string
+        expirationTime: string, Optional
+            in minutes. Default to 10 minutes
+    """
+    try:
+        if mode != "1" and mode != "2" :
+            raise Exception("Unmanaged mode")
+
+        if not expirationTime:  
+            expirationTime = 10
+        else:    
+            expirationTime = int(expirationTime)
+            
+        # Load the public certificate
+        with open(path_certificate, "rb") as cert_file:
+            certificate_data = cert_file.read()
+            
+        # Load the private key
+        if mode == "1":
+            with open(private_key, "rb") as key_file:
+                private_key = serialization.load_pem_private_key(
+                    key_file.read(),
+                    password=None,
+                    backend=default_backend()
+                )
+        else:
+            private_key, certificate, additional_certs = pkcs12.load_key_and_certificates(
+                certificate_data, private_key.encode(), backend=default_backend()
+            ) 
+        
+        now = datetime.datetime.now(datetime.timezone.utc)
+        # Define the JWT claims
+        claims = {
+            "iss": client_id,        # The issuer, typically your client ID
+            "sub": client_id,        # The subject, typically your client ID
+            "aud": audience,   # The audience, typically the token endpoint URL
+            "exp": now + datetime.timedelta(expirationTime),  # Expiration time
+            "jti": "unique-identifier",     # JWT ID, a unique identifier for the JWT
+        }
+
+        # Create the JWT (client assertion)
+        if mode == 1:
+            client_assertion = jwt.encode(
+                claims,
+                private_key,
+                algorithm="RS256",
+                headers={"x5c": [certificate_data.decode("utf-8").replace("\n", "")]}
+            )
+        else:
+            client_assertion = jwt.encode(
+            claims, private_key, algorithm="RS256", headers={"alg": "RS256","typ": "JWT"}
+        )    
+        return client_assertion
+    except:
+        raise  # so that the caller receives the exception
+
+def validate_keycloak_jwt(token: str,keycloak_url: str,client_id: str):
+    """
+    Valide un JWT Keycloak.
+    Accepte un client_id qui correspond soit a aud, soit a azp.
+    """
+    try:
+        jwks_url = (f"{keycloak_url}/protocol/openid-connect/certs")
+        signing_key = PyJWKClient(jwks_url).get_signing_key_from_jwt(token)
+        payload = jwt.decode(
+            token,
+            signing_key.key,
+            algorithms=["RS256"],
+            issuer=keycloak_url,
+            options={"verify_aud": False}
+        )
+
+        aud = payload.get("aud")
+        azp = payload.get("azp")
+
+        if isinstance(aud, list):
+            audience_matches = client_id in aud
+        else:
+            audience_matches = aud == client_id
+
+        if not audience_matches and azp != client_id:
+            raise ValueError(
+                "Audience Keycloak incorrect: "
+                f"client_id='{client_id}' ne correspond ni a aud='{aud}' "
+                f"ni a azp='{azp}'"
+            )
+
+        return json.dumps(payload)
+    except jwt.ExpiredSignatureError:
+        raise ValueError("Expired JWT")
+    except jwt.InvalidIssuerError:
+        raise ValueError("Issuer Keycloak incorrect")
+    except jwt.InvalidTokenError as e:
+        raise ValueError(
+            f"JWT Keycloak invalide: {str(e)}"
+        )
+    except Exception as e:
+        raise ValueError(
+            f"Erreur validation Keycloak: {str(e)}"
+        )
+
+def validate_microsoft_jwt(token: str, issuer: str = None, audience: str = None):
+    """
+    Valide un JWT Microsoft en récupérant les clés JWKS depuis:
+    https://login.microsoftonline.com/common/discovery/v2.0/keys
+    """
+    try:
+        jwks_url = "https://login.microsoftonline.com/common/discovery/v2.0/keys"
+        signing_key = PyJWKClient(jwks_url).get_signing_key_from_jwt(token)
+
+        options = {"verify_aud": bool(audience), "verify_iss": bool(issuer)}
+        claims = jwt.decode(
+            token,
+            signing_key.key,
+            algorithms=["RS256"],
+            audience=audience,
+            issuer=issuer,
+            options=options
+        )
+        return json.dumps(claims)
+    except jwt.ExpiredSignatureError:
+        raise ValueError("JWT Microsoft expiré")
+    except jwt.InvalidTokenError as e:
+        raise ValueError(f"JWT Microsoft invalide: {str(e)}")
+    except Exception as e:
+        raise ValueError(f"Erreur validation Microsoft: {str(e)}")

{inpython_package-1.1.9 → inpython_package-1.1.10/inpython_package.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: inpython-package
-Version: 1.1.9
+Version: 1.1.10
 Summary: # Infodata's IN-Tools U2Python Package
 Home-page: https://bitbucket.org/infodata-dev/inpython
 Author: infodata
 Author-email: jcd@infodata.lu
 License: MIT
-Requires-Python: >=3.4
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: msal>=1.22

{inpython_package-1.1.9 → inpython_package-1.1.10}/setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
   
 setup(
     name="inpython-package",
-    version="1.1.9",
+    version="1.1.10",
     author="infodata",
     author_email="jcd@infodata.lu",
     packages=find_packages(),
@@ -18,7 +18,7 @@ setup(
     long_description_content_type="text/markdown",
     url="https://bitbucket.org/infodata-dev/inpython",
     license='MIT',
-    python_requires='>=3.4',
+    python_requires='>=3.11',
     install_requires=[
         "msal>=1.22",
         "requests",

inpython_package-1.1.9/inpython/injcd.py

@@ -1,15 +0,0 @@
-import sys
-from inrest import in_jwt
-
-def main(argv):
-    # 
-    try:
-        token = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJTd3JnRjIyV1FVaHZBZUxpQTBhQnhmV2hqNGgtX0hLSXFuVzRpd3JTWnFVIn0.eyJleHAiOjE3ODc0MjM5MzksImlhdCI6MTc4NzQyMzYzOSwiYXV0aF90aW1lIjoxNzg3NDE5OTc2LCJqdGkiOiJiZGUxNjZmZS0wMDc3LTIyNWMtNDRkMi0yOWJkNzlkZTBjZDEiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgwODAvcmVhbG1zL215cmVhbG0iLCJhdWQiOiJteWNsaWVudC13ZWIiLCJzdWIiOiI0MGM1MGI5MS1iYjlmLTQ5MjEtYjg2YS1hYzQ1YWZiYTE1NWYiLCJ0eXAiOiJJRCIsImF6cCI6Im15Y2xpZW50LXdlYiIsInNpZCI6InQwZi1qWm5nVjYxVklQT29RQTJWa3p1VCIsImF0X2hhc2giOiJNN1VoMG12SFZKczdDaDVfN1F1bDZRIiwiYWNyIjoiMCIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6IkpDIERldyIsInByZWZlcnJlZF91c2VybmFtZSI6Im15dXNlciIsImdpdmVuX25hbWUiOiJKQyIsImZhbWlseV9uYW1lIjoiRGV3IiwiZW1haWwiOiJqY2RAaW5mb2RhdGEubHUifQ.AuQWfzPHZjHzdtwMipDsR_VrxR2dl1Q3aHD1Ym5h9hZfHwiVtPH3prZ9ptDAmXkagz29uphx_X--yfOmqGlZiC4ygHsGXBkmohNRteIHRO_hu72iBM9kEaU8QakX_HTZXmhC99HHrSNGjYcdl9koNz9cZSvCd9EysGLGF1Bs2NWV0hwQzQVfYIpeDCgm2vyvLSLhJYH4UJariM4H0D9KhX7tgi5qRFxEn2lYlSam1pBuDTrNFrXoUvE_iN68e-wMQql0ib_WWQKVTmeXvxoLzHM2K_544MqqssWO2gZ5JnnV2ZlB1KgxqHATQxFLyGGZzsWMLLdHb91yIb_lfBIV7Q"
-        claims = in_jwt.validate_keycloak_jwt(token, "http://localhost:8080/realms/myrealm","myclient-web")
-        print(claims)
-    except ValueError as e:
-        print(f"Erreur: {e}")
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
-