From 3d59f9af2158b2acd63dd213dad427f8e17dec16 Mon Sep 17 00:00:00 2001 From: Ilya Etingof Date: Thu, 25 Apr 2019 08:36:39 +0200 Subject: PEP8 latest additions --- pyasn1_modules/rfc8226.py | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'pyasn1_modules/rfc8226.py') diff --git a/pyasn1_modules/rfc8226.py b/pyasn1_modules/rfc8226.py index cd9bfd1..1f18389 100644 --- a/pyasn1_modules/rfc8226.py +++ b/pyasn1_modules/rfc8226.py @@ -11,8 +11,11 @@ # ASN.1 source from: # https://www.rfc-editor.org/rfc/rfc8226.txt (with errata corrected) -from pyasn1.type import univ, char, namedtype, namedval, tag, constraint, useful - +from pyasn1.type import char +from pyasn1.type import constraint +from pyasn1.type import namedtype +from pyasn1.type import tag +from pyasn1.type import univ MAX = float('inf') @@ -37,7 +40,7 @@ class JWTClaimNames(univ.SequenceOf): JWTClaimNames.componentType = JWTClaimName() -JWTClaimNames.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) +JWTClaimNames.subtypeSpec = constraint.ValueSizeConstraint(1, MAX) class JWTClaimPermittedValues(univ.Sequence): @@ -46,7 +49,8 @@ class JWTClaimPermittedValues(univ.Sequence): JWTClaimPermittedValues.componentType = namedtype.NamedTypes( namedtype.NamedType('claim', JWTClaimName()), - namedtype.NamedType('permitted', univ.SequenceOf(componentType=char.UTF8String()).subtype(subtypeSpec=constraint.ValueSizeConstraint(1, MAX))) + namedtype.NamedType('permitted', univ.SequenceOf(componentType=char.UTF8String()).subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))) ) @@ -55,7 +59,7 @@ class JWTClaimPermittedValuesList(univ.SequenceOf): JWTClaimPermittedValuesList.componentType = JWTClaimPermittedValues() -JWTClaimPermittedValuesList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) +JWTClaimPermittedValuesList.subtypeSpec = constraint.ValueSizeConstraint(1, MAX) class JWTClaimConstraints(univ.Sequence): @@ -63,14 +67,14 @@ class JWTClaimConstraints(univ.Sequence): JWTClaimConstraints.componentType = namedtype.NamedTypes( - namedtype.OptionalNamedType('mustInclude', JWTClaimNames().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))), - namedtype.OptionalNamedType('permittedValues', JWTClaimPermittedValuesList().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))) + namedtype.OptionalNamedType('mustInclude', JWTClaimNames().subtype( + explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))), + namedtype.OptionalNamedType('permittedValues', JWTClaimPermittedValuesList().subtype( + explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))) ) - JWTClaimConstraints.sizeSpec = univ.Sequence.sizeSpec + constraint.ValueSizeConstraint(1, 2) - id_pe_JWTClaimConstraints = _OID(1, 3, 6, 1, 5, 5, 7, 1, 27) @@ -103,9 +107,12 @@ class TNEntry(univ.Choice): TNEntry.componentType = namedtype.NamedTypes( - namedtype.NamedType('spc', ServiceProviderCode().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))), - namedtype.NamedType('range', TelephoneNumberRange().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatConstructed, 1))), - namedtype.NamedType('one', TelephoneNumber().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 2))) + namedtype.NamedType('spc', ServiceProviderCode().subtype( + explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))), + namedtype.NamedType('range', TelephoneNumberRange().subtype( + explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatConstructed, 1))), + namedtype.NamedType('one', + TelephoneNumber().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 2))) ) @@ -114,10 +121,8 @@ class TNAuthorizationList(univ.SequenceOf): TNAuthorizationList.componentType = TNEntry() -TNAuthorizationList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) - +TNAuthorizationList.subtypeSpec = constraint.ValueSizeConstraint(1, MAX) id_pe_TNAuthList = _OID(1, 3, 6, 1, 5, 5, 7, 1, 26) - id_ad_stirTNList = _OID(1, 3, 6, 1, 5, 5, 7, 48, 14) -- cgit v1.2.3 From 23608be1bc0ce8a4ac5fbaba92af905c88ea4ab6 Mon Sep 17 00:00:00 2001 From: Russ Housley Date: Sat, 20 Jul 2019 06:58:55 -0400 Subject: Added maps for use with openType (#53) --- pyasn1_modules/rfc8226.py | 66 +++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 25 deletions(-) (limited to 'pyasn1_modules/rfc8226.py') diff --git a/pyasn1_modules/rfc8226.py b/pyasn1_modules/rfc8226.py index 1f18389..b7df0b5 100644 --- a/pyasn1_modules/rfc8226.py +++ b/pyasn1_modules/rfc8226.py @@ -1,7 +1,8 @@ # This file is being contributed to pyasn1-modules software. # # Created by Russ Housley with assistance from the asn1ate tool, with manual -# changes to implement appropriate constraints and added comments +# changes to implement appropriate constraints and added comments. +# Modified by Russ Housley to add maps for use with opentypes. # # Copyright (c) 2019, Vigil Security, LLC # License: http://snmplabs.com/pyasn1/license.html @@ -17,6 +18,7 @@ from pyasn1.type import namedtype from pyasn1.type import tag from pyasn1.type import univ + MAX = float('inf') @@ -38,43 +40,44 @@ class JWTClaimName(char.IA5String): class JWTClaimNames(univ.SequenceOf): pass - JWTClaimNames.componentType = JWTClaimName() -JWTClaimNames.subtypeSpec = constraint.ValueSizeConstraint(1, MAX) +JWTClaimNames.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) class JWTClaimPermittedValues(univ.Sequence): pass - JWTClaimPermittedValues.componentType = namedtype.NamedTypes( namedtype.NamedType('claim', JWTClaimName()), - namedtype.NamedType('permitted', univ.SequenceOf(componentType=char.UTF8String()).subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))) + namedtype.NamedType('permitted', univ.SequenceOf( + componentType=char.UTF8String()).subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))) ) class JWTClaimPermittedValuesList(univ.SequenceOf): pass - JWTClaimPermittedValuesList.componentType = JWTClaimPermittedValues() -JWTClaimPermittedValuesList.subtypeSpec = constraint.ValueSizeConstraint(1, MAX) +JWTClaimPermittedValuesList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) class JWTClaimConstraints(univ.Sequence): pass - JWTClaimConstraints.componentType = namedtype.NamedTypes( - namedtype.OptionalNamedType('mustInclude', JWTClaimNames().subtype( - explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))), - namedtype.OptionalNamedType('permittedValues', JWTClaimPermittedValuesList().subtype( - explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))) + namedtype.OptionalNamedType('mustInclude', + JWTClaimNames().subtype(explicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 0))), + namedtype.OptionalNamedType('permittedValues', + JWTClaimPermittedValuesList().subtype(explicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 1))) ) + JWTClaimConstraints.sizeSpec = univ.Sequence.sizeSpec + constraint.ValueSizeConstraint(1, 2) + id_pe_JWTClaimConstraints = _OID(1, 3, 6, 1, 5, 5, 7, 1, 27) @@ -85,44 +88,57 @@ class ServiceProviderCode(char.IA5String): class TelephoneNumber(char.IA5String): pass - TelephoneNumber.subtypeSpec = constraint.ConstraintsIntersection( constraint.ValueSizeConstraint(1, 15), - constraint.PermittedAlphabetConstraint('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '#', '*') + constraint.PermittedAlphabetConstraint( + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '#', '*') ) class TelephoneNumberRange(univ.Sequence): pass - TelephoneNumberRange.componentType = namedtype.NamedTypes( namedtype.NamedType('start', TelephoneNumber()), - namedtype.NamedType('count', univ.Integer().subtype(subtypeSpec=constraint.ValueRangeConstraint(2, MAX))) + namedtype.NamedType('count', + univ.Integer().subtype(subtypeSpec=constraint.ValueRangeConstraint(2, MAX))) ) class TNEntry(univ.Choice): pass - TNEntry.componentType = namedtype.NamedTypes( - namedtype.NamedType('spc', ServiceProviderCode().subtype( - explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))), - namedtype.NamedType('range', TelephoneNumberRange().subtype( - explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatConstructed, 1))), + namedtype.NamedType('spc', + ServiceProviderCode().subtype(explicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 0))), + namedtype.NamedType('range', + TelephoneNumberRange().subtype(explicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatConstructed, 1))), namedtype.NamedType('one', - TelephoneNumber().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 2))) + TelephoneNumber().subtype(explicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 2))) ) class TNAuthorizationList(univ.SequenceOf): pass - TNAuthorizationList.componentType = TNEntry() -TNAuthorizationList.subtypeSpec = constraint.ValueSizeConstraint(1, MAX) +TNAuthorizationList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) + id_pe_TNAuthList = _OID(1, 3, 6, 1, 5, 5, 7, 1, 26) + id_ad_stirTNList = _OID(1, 3, 6, 1, 5, 5, 7, 48, 14) + + +# Map of Certificate Extension OIDs to Extensions +# To be added to the ones that are in rfc5280.py + +certificateExtensionsMapUpdate = { + id_pe_TNAuthList: TNAuthorizationList(), + id_pe_JWTClaimConstraints: JWTClaimConstraints(), +} + -- cgit v1.2.3 From 3e2e4419553287df3f6a4071b49c6049f78be4be Mon Sep 17 00:00:00 2001 From: Ilya Etingof Date: Wed, 31 Jul 2019 10:36:45 +0200 Subject: Make SIZE OF constraint operational (#46) Changes `ValueSizeConstraint` erroneously applied to `SequenceOf` and `SetOf` objects via `subtypeConstraint` attribute to be applied via `sizeSpec` attribute. Although `sizeSpec` takes the same constraint objects as `subtypeConstraint`, the former is only verified on de/serialization i.e. when the [constructed] object at hand is fully populated, while the latter is applied to [scalar] types at the moment of instantiation. This change also bumps pyasn1 requirement to 0.4.6. --- pyasn1_modules/rfc8226.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pyasn1_modules/rfc8226.py') diff --git a/pyasn1_modules/rfc8226.py b/pyasn1_modules/rfc8226.py index b7df0b5..0c3dc21 100644 --- a/pyasn1_modules/rfc8226.py +++ b/pyasn1_modules/rfc8226.py @@ -41,7 +41,7 @@ class JWTClaimNames(univ.SequenceOf): pass JWTClaimNames.componentType = JWTClaimName() -JWTClaimNames.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) +JWTClaimNames.sizeSpec = constraint.ValueSizeConstraint(1, MAX) class JWTClaimPermittedValues(univ.Sequence): @@ -51,7 +51,7 @@ JWTClaimPermittedValues.componentType = namedtype.NamedTypes( namedtype.NamedType('claim', JWTClaimName()), namedtype.NamedType('permitted', univ.SequenceOf( componentType=char.UTF8String()).subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))) + sizeSpec=constraint.ValueSizeConstraint(1, MAX))) ) @@ -59,7 +59,7 @@ class JWTClaimPermittedValuesList(univ.SequenceOf): pass JWTClaimPermittedValuesList.componentType = JWTClaimPermittedValues() -JWTClaimPermittedValuesList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) +JWTClaimPermittedValuesList.sizeSpec = constraint.ValueSizeConstraint(1, MAX) class JWTClaimConstraints(univ.Sequence): @@ -125,8 +125,7 @@ class TNAuthorizationList(univ.SequenceOf): pass TNAuthorizationList.componentType = TNEntry() -TNAuthorizationList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX) - +TNAuthorizationList.sizeSpec = constraint.ValueSizeConstraint(1, MAX) id_pe_TNAuthList = _OID(1, 3, 6, 1, 5, 5, 7, 1, 26) -- cgit v1.2.3