From e8bf56ff4ae782b727dfaed79bd7c282118197dd Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 5 May 2020 13:54:23 +0200 Subject: [PATCH 03/10] misc: remove byte strings in migrations (#42504) --- .../a2_rbac/migrations/0001_initial.py | 2 +- .../migrations/0001_initial.py | 8 ++--- src/authentic2/idp/migrations/0001_initial.py | 4 +-- src/authentic2/migrations/0001_initial.py | 2 +- .../migrations/0022_attribute_scopes.py | 2 +- .../saml/migrations/0001_initial.py | 30 +++++++++---------- .../migrations/0012_auto_20150526_2239.py | 2 +- .../migrations/0015_auto_20150915_2032.py | 6 ++-- .../migrations/0001_initial.py | 2 +- .../migrations/0004_auto_20171017_1522.py | 2 +- .../migrations/0001_initial.py | 6 ++-- .../migrations/0014_auto_20151204_1606.py | 2 +- .../migrations/0001_initial.py | 4 +-- .../migrations/0002_auto_20170121_2346.py | 2 +- .../migrations/0003_auto_20170329_1259.py | 2 +- .../migrations/0012_auto_20200122_2258.py | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git src/authentic2/a2_rbac/migrations/0001_initial.py src/authentic2/a2_rbac/migrations/0001_initial.py index a22f140f..3184065b 100644 --- src/authentic2/a2_rbac/migrations/0001_initial.py +++ src/authentic2/a2_rbac/migrations/0001_initial.py @@ -75,7 +75,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(max_length=64, verbose_name='name')), - ('kind', models.CharField(max_length=32, verbose_name='kind', choices=[(b'string', 'string')])), + ('kind', models.CharField(max_length=32, verbose_name='kind', choices=[('string', 'string')])), ('value', models.TextField(verbose_name='value')), ('role', models.ForeignKey(related_name='attributes', verbose_name='role', to=settings.RBAC_ROLE_MODEL, on_delete=models.CASCADE)), ], diff --git src/authentic2/attribute_aggregator/migrations/0001_initial.py src/authentic2/attribute_aggregator/migrations/0001_initial.py index 3abae4c4..aa178826 100644 --- src/authentic2/attribute_aggregator/migrations/0001_initial.py +++ src/authentic2/attribute_aggregator/migrations/0001_initial.py @@ -16,9 +16,9 @@ class Migration(migrations.Migration): name='AttributeItem', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('attribute_name', models.CharField(default=(b'OpenLDAProotDSE', b'OpenLDAProotDSE'), max_length=100, verbose_name='Attribute name', choices=[(b'OpenLDAProotDSE', b'OpenLDAProotDSE'), (b'aRecord', b'aRecord'), (b'administrativeRole', b'administrativeRole'), (b'alias', b'alias'), (b'aliasedObjectName', b'aliasedObjectName'), (b'altServer', b'altServer'), (b'associatedDomain', b'associatedDomain'), (b'associatedName', b'associatedName'), (b'attributeTypes', b'attributeTypes'), (b'audio', b'audio'), (b'authPassword', b'authPassword'), (b'authorityRevocationList', b'authorityRevocationList'), (b'authzFrom', b'authzFrom'), (b'authzTo', b'authzTo'), (b'bootFile', b'bootFile'), (b'bootParameter', b'bootParameter'), (b'buildingName', b'buildingName'), (b'businessCategory', b'businessCategory'), (b'c', b'c'), (b'cACertificate', b'cACertificate'), (b'cNAMERecord', b'cNAMERecord'), (b'carLicense', b'carLicense'), (b'certificateRevocationList', b'certificateRevocationList'), (b'children', b'children'), (b'cn', b'cn'), (b'co', b'co'), (b'collectiveAttributeSubentries', b'collectiveAttributeSubentries'), (b'collectiveAttributeSubentry', b'collectiveAttributeSubentry'), (b'collectiveExclusions', b'collectiveExclusions'), (b'configContext', b'configContext'), (b'contextCSN', b'contextCSN'), (b'createTimestamp', b'createTimestamp'), (b'creatorsName', b'creatorsName'), (b'crossCertificatePair', b'crossCertificatePair'), (b'dITContentRules', b'dITContentRules'), (b'dITRedirect', b'dITRedirect'), (b'dITStructureRules', b'dITStructureRules'), (b'dSAQuality', b'dSAQuality'), (b'dc', b'dc'), (b'deltaRevocationList', b'deltaRevocationList'), (b'departmentNumber', b'departmentNumber'), (b'description', b'description'), (b'destinationIndicator', b'destinationIndicator'), (b'displayName', b'displayName'), (b'distinguishedName', b'distinguishedName'), (b'dmdName', b'dmdName'), (b'dnQualifier', b'dnQualifier'), (b'documentAuthor', b'documentAuthor'), (b'documentIdentifier', b'documentIdentifier'), (b'documentLocation', b'documentLocation'), (b'documentPublisher', b'documentPublisher'), (b'documentTitle', b'documentTitle'), (b'documentVersion', b'documentVersion'), (b'drink', b'drink'), (b'dynamicObject', b'dynamicObject'), (b'dynamicSubtrees', b'dynamicSubtrees'), (b'eduOrgHomePageURI', b'eduOrgHomePageURI'), (b'eduOrgIdentityAuthNPolicyURI', b'eduOrgIdentityAuthNPolicyURI'), (b'eduOrgLegalName', b'eduOrgLegalName'), (b'eduOrgSuperiorURI', b'eduOrgSuperiorURI'), (b'eduOrgWhitePagesURI', b'eduOrgWhitePagesURI'), (b'eduPersonAffiliation', b'eduPersonAffiliation'), (b'eduPersonAssurance', b'eduPersonAssurance'), (b'eduPersonEntitlement', b'eduPersonEntitlement'), (b'eduPersonNickname', b'eduPersonNickname'), (b'eduPersonOrgDN', b'eduPersonOrgDN'), (b'eduPersonOrgUnitDN', b'eduPersonOrgUnitDN'), (b'eduPersonPrimaryAffiliation', b'eduPersonPrimaryAffiliation'), (b'eduPersonPrimaryOrgUnitDN', b'eduPersonPrimaryOrgUnitDN'), (b'eduPersonPrincipalName', b'eduPersonPrincipalName'), (b'eduPersonScopedAffiliation', b'eduPersonScopedAffiliation'), (b'eduPersonTargetedID', b'eduPersonTargetedID'), (b'email', b'email'), (b'employeeNumber', b'employeeNumber'), (b'employeeType', b'employeeType'), (b'enhancedSearchGuide', b'enhancedSearchGuide'), (b'entry', b'entry'), (b'entryCSN', b'entryCSN'), (b'entryDN', b'entryDN'), (b'entryTtl', b'entryTtl'), (b'entryUUID', b'entryUUID'), (b'extensibleObject', b'extensibleObject'), (b'fax', b'fax'), (b'gecos', b'gecos'), (b'generationQualifier', b'generationQualifier'), (b'gidNumber', b'gidNumber'), (b'givenName', b'givenName'), (b'glue', b'glue'), (b'hasSubordinates', b'hasSubordinates'), (b'homeDirectory', b'homeDirectory'), (b'homePhone', b'homePhone'), (b'homePostalAddress', b'homePostalAddress'), (b'host', b'host'), (b'houseIdentifier', b'houseIdentifier'), (b'info', b'info'), (b'initials', b'initials'), (b'internationaliSDNNumber', b'internationaliSDNNumber'), (b'ipHostNumber', b'ipHostNumber'), (b'ipNetmaskNumber', b'ipNetmaskNumber'), (b'ipNetworkNumber', b'ipNetworkNumber'), (b'ipProtocolNumber', b'ipProtocolNumber'), (b'ipServicePort', b'ipServicePort'), (b'ipServiceProtocolSUPname', b'ipServiceProtocolSUPname'), (b'janetMailbox', b'janetMailbox'), (b'jpegPhoto', b'jpegPhoto'), (b'knowledgeInformation', b'knowledgeInformation'), (b'l', b'l'), (b'labeledURI', b'labeledURI'), (b'ldapSyntaxes', b'ldapSyntaxes'), (b'loginShell', b'loginShell'), (b'mDRecord', b'mDRecord'), (b'mXRecord', b'mXRecord'), (b'macAddress', b'macAddress'), (b'mail', b'mail'), (b'mailForwardingAddress', b'mailForwardingAddress'), (b'mailHost', b'mailHost'), (b'mailLocalAddress', b'mailLocalAddress'), (b'mailPreferenceOption', b'mailPreferenceOption'), (b'mailRoutingAddress', b'mailRoutingAddress'), (b'manager', b'manager'), (b'matchingRuleUse', b'matchingRuleUse'), (b'matchingRules', b'matchingRules'), (b'member', b'member'), (b'memberNisNetgroup', b'memberNisNetgroup'), (b'memberUid', b'memberUid'), (b'mobile', b'mobile'), (b'modifiersName', b'modifiersName'), (b'modifyTimestamp', b'modifyTimestamp'), (b'monitorContext', b'monitorContext'), (b'nSRecord', b'nSRecord'), (b'name', b'name'), (b'nameForms', b'nameForms'), (b'namingCSN', b'namingCSN'), (b'namingContexts', b'namingContexts'), (b'nisMapEntry', b'nisMapEntry'), (b'nisMapNameSUPname', b'nisMapNameSUPname'), (b'nisNetgroupTriple', b'nisNetgroupTriple'), (b'o', b'o'), (b'objectClass', b'objectClass'), (b'objectClasses', b'objectClasses'), (b'oncRpcNumber', b'oncRpcNumber'), (b'organizationalStatus', b'organizationalStatus'), (b'otherMailbox', b'otherMailbox'), (b'ou', b'ou'), (b'owner', b'owner'), (b'pager', b'pager'), (b'personalSignature', b'personalSignature'), (b'personalTitle', b'personalTitle'), (b'photo', b'photo'), (b'physicalDeliveryOfficeName', b'physicalDeliveryOfficeName'), (b'postOfficeBox', b'postOfficeBox'), (b'postalAddress', b'postalAddress'), (b'postalCode', b'postalCode'), (b'preferredDeliveryMethod', b'preferredDeliveryMethod'), (b'preferredLanguage', b'preferredLanguage'), (b'presentationAddress', b'presentationAddress'), (b'protocolInformation', b'protocolInformation'), (b'pseudonym', b'pseudonym'), (b'ref', b'ref'), (b'referral', b'referral'), (b'registeredAddress', b'registeredAddress'), (b'rfc822MailMember', b'rfc822MailMember'), (b'role', b'role'), (b'roleOccupant', b'roleOccupant'), (b'roomNumber', b'roomNumber'), (b'sOARecord', b'sOARecord'), (b'schacHomeOrganization', b'schacHomeOrganization'), (b'schacHomeOrganizationType', b'schacHomeOrganizationType'), (b'searchGuide', b'searchGuide'), (b'secretary', b'secretary'), (b'seeAlso', b'seeAlso'), (b'serialNumber', b'serialNumber'), (b'shadowExpire', b'shadowExpire'), (b'shadowFlag', b'shadowFlag'), (b'shadowInactive', b'shadowInactive'), (b'shadowLastChange', b'shadowLastChange'), (b'shadowMax', b'shadowMax'), (b'shadowMin', b'shadowMin'), (b'shadowWarning', b'shadowWarning'), (b'singleLevelQuality', b'singleLevelQuality'), (b'sn', b'sn'), (b'st', b'st'), (b'street', b'street'), (b'structuralObjectClass', b'structuralObjectClass'), (b'subentry', b'subentry'), (b'subschema', b'subschema'), (b'subschemaSubentry', b'subschemaSubentry'), (b'subtreeMaximumQuality', b'subtreeMaximumQuality'), (b'subtreeMinimumQuality', b'subtreeMinimumQuality'), (b'subtreeSpecification', b'subtreeSpecification'), (b'supannActivite', b'supannActivite'), (b'supannAffectation', b'supannAffectation'), (b'supannAliasLogin', b'supannAliasLogin'), (b'supannAutreMail', b'supannAutreMail'), (b'supannAutreTelephone', b'supannAutreTelephone'), (b'supannCivilite', b'supannCivilite'), (b'supannCodeEntite', b'supannCodeEntite'), (b'supannCodeEntiteParent', b'supannCodeEntiteParent'), (b'supannCodeINE', b'supannCodeINE'), (b'supannEmpCorps', b'supannEmpCorps'), (b'supannEmpId', b'supannEmpId'), (b'supannEntiteAffectation', b'supannEntiteAffectation'), (b'supannEntiteAffectationPrincipale', b'supannEntiteAffectationPrincipale'), (b'supannEtablissement', b'supannEtablissement'), (b'supannEtuAnneeInscription', b'supannEtuAnneeInscription'), (b'supannEtuCursusAnnee', b'supannEtuCursusAnnee'), (b'supannEtuDiplome', b'supannEtuDiplome'), (b'supannEtuElementPedagogique', b'supannEtuElementPedagogique'), (b'supannEtuEtape', b'supannEtuEtape'), (b'supannEtuId', b'supannEtuId'), (b'supannEtuInscription', b'supannEtuInscription'), (b'supannEtuRegimeInscription', b'supannEtuRegimeInscription'), (b'supannEtuSecteurDisciplinaire', b'supannEtuSecteurDisciplinaire'), (b'supannEtuTypeDiplome', b'supannEtuTypeDiplome'), (b'supannGroupeAdminDN', b'supannGroupeAdminDN'), (b'supannGroupeDateFin', b'supannGroupeDateFin'), (b'supannGroupeLecteurDN', b'supannGroupeLecteurDN'), (b'supannListeRouge', b'supannListeRouge'), (b'supannMailPerso', b'supannMailPerso'), (b'supannOrganisme', b'supannOrganisme'), (b'supannParrainDN', b'supannParrainDN'), (b'supannRefId', b'supannRefId'), (b'supannRole', b'supannRole'), (b'supannRoleEntite', b'supannRoleEntite'), (b'supannRoleGenerique', b'supannRoleGenerique'), (b'supannTypeEntite', b'supannTypeEntite'), (b'supannTypeEntiteAffectation', b'supannTypeEntiteAffectation'), (b'superiorUUID', b'superiorUUID'), (b'supportedAlgorithms', b'supportedAlgorithms'), (b'supportedApplicationContext', b'supportedApplicationContext'), (b'supportedAuthPasswordSchemes', b'supportedAuthPasswordSchemes'), (b'supportedControl', b'supportedControl'), (b'supportedExtension', b'supportedExtension'), (b'supportedFeatures', b'supportedFeatures'), (b'supportedLDAPVersion', b'supportedLDAPVersion'), (b'supportedSASLMechanisms', b'supportedSASLMechanisms'), (b'syncConsumerSubentry', b'syncConsumerSubentry'), (b'syncProviderSubentry', b'syncProviderSubentry'), (b'syncTimestamp', b'syncTimestamp'), (b'syncreplCookie', b'syncreplCookie'), (b'telephoneNumber', b'telephoneNumber'), (b'teletexTerminalIdentifier', b'teletexTerminalIdentifier'), (b'telexNumber', b'telexNumber'), (b'textEncodedORAddress', b'textEncodedORAddress'), (b'title', b'title'), (b'top', b'top'), (b'uid', b'uid'), (b'uidNumber', b'uidNumber'), (b'uniqueIdentifier', b'uniqueIdentifier'), (b'uniqueMember', b'uniqueMember'), (b'userCertificate', b'userCertificate'), (b'userClass', b'userClass'), (b'userPKCS12', b'userPKCS12'), (b'userPassword', b'userPassword'), (b'userSMIMECertificate', b'userSMIMECertificate'), (b'vendorName', b'vendorName'), (b'vendorVersion', b'vendorVersion'), (b'x121Address', b'x121Address'), (b'x500UniqueIdentifier', b'x500UniqueIdentifier')])), - ('output_name_format', models.CharField(default=(b'urn:oasis:names:tc:SAML:2.0:attrname-format:uri', b'SAMLv2 URI'), max_length=100, verbose_name='Output name format', choices=[(b'urn:oasis:names:tc:SAML:2.0:attrname-format:uri', b'SAMLv2 URI'), (b'urn:oasis:names:tc:SAML:2.0:attrname-format:basic', b'SAMLv2 BASIC')])), - ('output_namespace', models.CharField(default=(b'Default', b'Default'), max_length=100, verbose_name='Output namespace', choices=[(b'Default', b'Default'), (b'http://schemas.xmlsoap.org/ws/2005/05/identity/claims', b'http://schemas.xmlsoap.org/ws/2005/05/identity/claims')])), + ('attribute_name', models.CharField(default=('OpenLDAProotDSE', 'OpenLDAProotDSE'), max_length=100, verbose_name='Attribute name', choices=[('OpenLDAProotDSE', 'OpenLDAProotDSE'), ('aRecord', 'aRecord'), ('administrativeRole', 'administrativeRole'), ('alias', 'alias'), ('aliasedObjectName', 'aliasedObjectName'), ('altServer', 'altServer'), ('associatedDomain', 'associatedDomain'), ('associatedName', 'associatedName'), ('attributeTypes', 'attributeTypes'), ('audio', 'audio'), ('authPassword', 'authPassword'), ('authorityRevocationList', 'authorityRevocationList'), ('authzFrom', 'authzFrom'), ('authzTo', 'authzTo'), ('bootFile', 'bootFile'), ('bootParameter', 'bootParameter'), ('buildingName', 'buildingName'), ('businessCategory', 'businessCategory'), ('c', 'c'), ('cACertificate', 'cACertificate'), ('cNAMERecord', 'cNAMERecord'), ('carLicense', 'carLicense'), ('certificateRevocationList', 'certificateRevocationList'), ('children', 'children'), ('cn', 'cn'), ('co', 'co'), ('collectiveAttributeSubentries', 'collectiveAttributeSubentries'), ('collectiveAttributeSubentry', 'collectiveAttributeSubentry'), ('collectiveExclusions', 'collectiveExclusions'), ('configContext', 'configContext'), ('contextCSN', 'contextCSN'), ('createTimestamp', 'createTimestamp'), ('creatorsName', 'creatorsName'), ('crossCertificatePair', 'crossCertificatePair'), ('dITContentRules', 'dITContentRules'), ('dITRedirect', 'dITRedirect'), ('dITStructureRules', 'dITStructureRules'), ('dSAQuality', 'dSAQuality'), ('dc', 'dc'), ('deltaRevocationList', 'deltaRevocationList'), ('departmentNumber', 'departmentNumber'), ('description', 'description'), ('destinationIndicator', 'destinationIndicator'), ('displayName', 'displayName'), ('distinguishedName', 'distinguishedName'), ('dmdName', 'dmdName'), ('dnQualifier', 'dnQualifier'), ('documentAuthor', 'documentAuthor'), ('documentIdentifier', 'documentIdentifier'), ('documentLocation', 'documentLocation'), ('documentPublisher', 'documentPublisher'), ('documentTitle', 'documentTitle'), ('documentVersion', 'documentVersion'), ('drink', 'drink'), ('dynamicObject', 'dynamicObject'), ('dynamicSubtrees', 'dynamicSubtrees'), ('eduOrgHomePageURI', 'eduOrgHomePageURI'), ('eduOrgIdentityAuthNPolicyURI', 'eduOrgIdentityAuthNPolicyURI'), ('eduOrgLegalName', 'eduOrgLegalName'), ('eduOrgSuperiorURI', 'eduOrgSuperiorURI'), ('eduOrgWhitePagesURI', 'eduOrgWhitePagesURI'), ('eduPersonAffiliation', 'eduPersonAffiliation'), ('eduPersonAssurance', 'eduPersonAssurance'), ('eduPersonEntitlement', 'eduPersonEntitlement'), ('eduPersonNickname', 'eduPersonNickname'), ('eduPersonOrgDN', 'eduPersonOrgDN'), ('eduPersonOrgUnitDN', 'eduPersonOrgUnitDN'), ('eduPersonPrimaryAffiliation', 'eduPersonPrimaryAffiliation'), ('eduPersonPrimaryOrgUnitDN', 'eduPersonPrimaryOrgUnitDN'), ('eduPersonPrincipalName', 'eduPersonPrincipalName'), ('eduPersonScopedAffiliation', 'eduPersonScopedAffiliation'), ('eduPersonTargetedID', 'eduPersonTargetedID'), ('email', 'email'), ('employeeNumber', 'employeeNumber'), ('employeeType', 'employeeType'), ('enhancedSearchGuide', 'enhancedSearchGuide'), ('entry', 'entry'), ('entryCSN', 'entryCSN'), ('entryDN', 'entryDN'), ('entryTtl', 'entryTtl'), ('entryUUID', 'entryUUID'), ('extensibleObject', 'extensibleObject'), ('fax', 'fax'), ('gecos', 'gecos'), ('generationQualifier', 'generationQualifier'), ('gidNumber', 'gidNumber'), ('givenName', 'givenName'), ('glue', 'glue'), ('hasSubordinates', 'hasSubordinates'), ('homeDirectory', 'homeDirectory'), ('homePhone', 'homePhone'), ('homePostalAddress', 'homePostalAddress'), ('host', 'host'), ('houseIdentifier', 'houseIdentifier'), ('info', 'info'), ('initials', 'initials'), ('internationaliSDNNumber', 'internationaliSDNNumber'), ('ipHostNumber', 'ipHostNumber'), ('ipNetmaskNumber', 'ipNetmaskNumber'), ('ipNetworkNumber', 'ipNetworkNumber'), ('ipProtocolNumber', 'ipProtocolNumber'), ('ipServicePort', 'ipServicePort'), ('ipServiceProtocolSUPname', 'ipServiceProtocolSUPname'), ('janetMailbox', 'janetMailbox'), ('jpegPhoto', 'jpegPhoto'), ('knowledgeInformation', 'knowledgeInformation'), ('l', 'l'), ('labeledURI', 'labeledURI'), ('ldapSyntaxes', 'ldapSyntaxes'), ('loginShell', 'loginShell'), ('mDRecord', 'mDRecord'), ('mXRecord', 'mXRecord'), ('macAddress', 'macAddress'), ('mail', 'mail'), ('mailForwardingAddress', 'mailForwardingAddress'), ('mailHost', 'mailHost'), ('mailLocalAddress', 'mailLocalAddress'), ('mailPreferenceOption', 'mailPreferenceOption'), ('mailRoutingAddress', 'mailRoutingAddress'), ('manager', 'manager'), ('matchingRuleUse', 'matchingRuleUse'), ('matchingRules', 'matchingRules'), ('member', 'member'), ('memberNisNetgroup', 'memberNisNetgroup'), ('memberUid', 'memberUid'), ('mobile', 'mobile'), ('modifiersName', 'modifiersName'), ('modifyTimestamp', 'modifyTimestamp'), ('monitorContext', 'monitorContext'), ('nSRecord', 'nSRecord'), ('name', 'name'), ('nameForms', 'nameForms'), ('namingCSN', 'namingCSN'), ('namingContexts', 'namingContexts'), ('nisMapEntry', 'nisMapEntry'), ('nisMapNameSUPname', 'nisMapNameSUPname'), ('nisNetgroupTriple', 'nisNetgroupTriple'), ('o', 'o'), ('objectClass', 'objectClass'), ('objectClasses', 'objectClasses'), ('oncRpcNumber', 'oncRpcNumber'), ('organizationalStatus', 'organizationalStatus'), ('otherMailbox', 'otherMailbox'), ('ou', 'ou'), ('owner', 'owner'), ('pager', 'pager'), ('personalSignature', 'personalSignature'), ('personalTitle', 'personalTitle'), ('photo', 'photo'), ('physicalDeliveryOfficeName', 'physicalDeliveryOfficeName'), ('postOfficeBox', 'postOfficeBox'), ('postalAddress', 'postalAddress'), ('postalCode', 'postalCode'), ('preferredDeliveryMethod', 'preferredDeliveryMethod'), ('preferredLanguage', 'preferredLanguage'), ('presentationAddress', 'presentationAddress'), ('protocolInformation', 'protocolInformation'), ('pseudonym', 'pseudonym'), ('ref', 'ref'), ('referral', 'referral'), ('registeredAddress', 'registeredAddress'), ('rfc822MailMember', 'rfc822MailMember'), ('role', 'role'), ('roleOccupant', 'roleOccupant'), ('roomNumber', 'roomNumber'), ('sOARecord', 'sOARecord'), ('schacHomeOrganization', 'schacHomeOrganization'), ('schacHomeOrganizationType', 'schacHomeOrganizationType'), ('searchGuide', 'searchGuide'), ('secretary', 'secretary'), ('seeAlso', 'seeAlso'), ('serialNumber', 'serialNumber'), ('shadowExpire', 'shadowExpire'), ('shadowFlag', 'shadowFlag'), ('shadowInactive', 'shadowInactive'), ('shadowLastChange', 'shadowLastChange'), ('shadowMax', 'shadowMax'), ('shadowMin', 'shadowMin'), ('shadowWarning', 'shadowWarning'), ('singleLevelQuality', 'singleLevelQuality'), ('sn', 'sn'), ('st', 'st'), ('street', 'street'), ('structuralObjectClass', 'structuralObjectClass'), ('subentry', 'subentry'), ('subschema', 'subschema'), ('subschemaSubentry', 'subschemaSubentry'), ('subtreeMaximumQuality', 'subtreeMaximumQuality'), ('subtreeMinimumQuality', 'subtreeMinimumQuality'), ('subtreeSpecification', 'subtreeSpecification'), ('supannActivite', 'supannActivite'), ('supannAffectation', 'supannAffectation'), ('supannAliasLogin', 'supannAliasLogin'), ('supannAutreMail', 'supannAutreMail'), ('supannAutreTelephone', 'supannAutreTelephone'), ('supannCivilite', 'supannCivilite'), ('supannCodeEntite', 'supannCodeEntite'), ('supannCodeEntiteParent', 'supannCodeEntiteParent'), ('supannCodeINE', 'supannCodeINE'), ('supannEmpCorps', 'supannEmpCorps'), ('supannEmpId', 'supannEmpId'), ('supannEntiteAffectation', 'supannEntiteAffectation'), ('supannEntiteAffectationPrincipale', 'supannEntiteAffectationPrincipale'), ('supannEtablissement', 'supannEtablissement'), ('supannEtuAnneeInscription', 'supannEtuAnneeInscription'), ('supannEtuCursusAnnee', 'supannEtuCursusAnnee'), ('supannEtuDiplome', 'supannEtuDiplome'), ('supannEtuElementPedagogique', 'supannEtuElementPedagogique'), ('supannEtuEtape', 'supannEtuEtape'), ('supannEtuId', 'supannEtuId'), ('supannEtuInscription', 'supannEtuInscription'), ('supannEtuRegimeInscription', 'supannEtuRegimeInscription'), ('supannEtuSecteurDisciplinaire', 'supannEtuSecteurDisciplinaire'), ('supannEtuTypeDiplome', 'supannEtuTypeDiplome'), ('supannGroupeAdminDN', 'supannGroupeAdminDN'), ('supannGroupeDateFin', 'supannGroupeDateFin'), ('supannGroupeLecteurDN', 'supannGroupeLecteurDN'), ('supannListeRouge', 'supannListeRouge'), ('supannMailPerso', 'supannMailPerso'), ('supannOrganisme', 'supannOrganisme'), ('supannParrainDN', 'supannParrainDN'), ('supannRefId', 'supannRefId'), ('supannRole', 'supannRole'), ('supannRoleEntite', 'supannRoleEntite'), ('supannRoleGenerique', 'supannRoleGenerique'), ('supannTypeEntite', 'supannTypeEntite'), ('supannTypeEntiteAffectation', 'supannTypeEntiteAffectation'), ('superiorUUID', 'superiorUUID'), ('supportedAlgorithms', 'supportedAlgorithms'), ('supportedApplicationContext', 'supportedApplicationContext'), ('supportedAuthPasswordSchemes', 'supportedAuthPasswordSchemes'), ('supportedControl', 'supportedControl'), ('supportedExtension', 'supportedExtension'), ('supportedFeatures', 'supportedFeatures'), ('supportedLDAPVersion', 'supportedLDAPVersion'), ('supportedSASLMechanisms', 'supportedSASLMechanisms'), ('syncConsumerSubentry', 'syncConsumerSubentry'), ('syncProviderSubentry', 'syncProviderSubentry'), ('syncTimestamp', 'syncTimestamp'), ('syncreplCookie', 'syncreplCookie'), ('telephoneNumber', 'telephoneNumber'), ('teletexTerminalIdentifier', 'teletexTerminalIdentifier'), ('telexNumber', 'telexNumber'), ('textEncodedORAddress', 'textEncodedORAddress'), ('title', 'title'), ('top', 'top'), ('uid', 'uid'), ('uidNumber', 'uidNumber'), ('uniqueIdentifier', 'uniqueIdentifier'), ('uniqueMember', 'uniqueMember'), ('userCertificate', 'userCertificate'), ('userClass', 'userClass'), ('userPKCS12', 'userPKCS12'), ('userPassword', 'userPassword'), ('userSMIMECertificate', 'userSMIMECertificate'), ('vendorName', 'vendorName'), ('vendorVersion', 'vendorVersion'), ('x121Address', 'x121Address'), ('x500UniqueIdentifier', 'x500UniqueIdentifier')])), + ('output_name_format', models.CharField(default=('urn:oasis:names:tc:SAML:2.0:attrname-format:uri', 'SAMLv2 URI'), max_length=100, verbose_name='Output name format', choices=[('urn:oasis:names:tc:SAML:2.0:attrname-format:uri', 'SAMLv2 URI'), ('urn:oasis:names:tc:SAML:2.0:attrname-format:basic', 'SAMLv2 BASIC')])), + ('output_namespace', models.CharField(default=('Default', 'Default'), max_length=100, verbose_name='Output namespace', choices=[('Default', 'Default'), ('http://schemas.xmlsoap.org/ws/2005/05/identity/claims', 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims')])), ('required', models.BooleanField(default=False, verbose_name='Required')), ], options={ @@ -45,7 +45,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(unique=True, max_length=200, verbose_name='Name')), - ('namespace', models.CharField(default=(b'Default', b'Default'), max_length=100, verbose_name='Namespace', choices=[(b'Default', b'Default'), (b'http://schemas.xmlsoap.org/ws/2005/05/identity/claims', b'http://schemas.xmlsoap.org/ws/2005/05/identity/claims')])), + ('namespace', models.CharField(default=('Default', 'Default'), max_length=100, verbose_name='Namespace', choices=[('Default', 'Default'), ('http://schemas.xmlsoap.org/ws/2005/05/identity/claims', 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims')])), ], options={ 'verbose_name': 'attribute source', diff --git src/authentic2/idp/migrations/0001_initial.py src/authentic2/idp/migrations/0001_initial.py index b05b0aa6..52e5e86d 100644 --- src/authentic2/idp/migrations/0001_initial.py +++ src/authentic2/idp/migrations/0001_initial.py @@ -21,8 +21,8 @@ class Migration(migrations.Migration): ('allow_attributes_selection', models.BooleanField(default=True, verbose_name='Allow the user to select the forwarding attributes')), ('forward_attributes_from_push_sources', models.BooleanField(default=False, verbose_name='Forward pushed attributes')), ('map_attributes_from_push_sources', models.BooleanField(default=False, verbose_name='Map forwarded pushed attributes')), - ('output_name_format', models.CharField(default=(b'urn:oasis:names:tc:SAML:2.0:attrname-format:uri', b'SAMLv2 URI'), max_length=100, verbose_name='Output name format', choices=[(b'urn:oasis:names:tc:SAML:2.0:attrname-format:uri', b'SAMLv2 URI'), (b'urn:oasis:names:tc:SAML:2.0:attrname-format:basic', b'SAMLv2 BASIC')])), - ('output_namespace', models.CharField(default=(b'Default', b'Default'), max_length=100, verbose_name='Output namespace', choices=[(b'Default', b'Default'), (b'http://schemas.xmlsoap.org/ws/2005/05/identity/claims', b'http://schemas.xmlsoap.org/ws/2005/05/identity/claims')])), + ('output_name_format', models.CharField(default=('urn:oasis:names:tc:SAML:2.0:attrname-format:uri', 'SAMLv2 URI'), max_length=100, verbose_name='Output name format', choices=[('urn:oasis:names:tc:SAML:2.0:attrname-format:uri', 'SAMLv2 URI'), ('urn:oasis:names:tc:SAML:2.0:attrname-format:basic', 'SAMLv2 BASIC')])), + ('output_namespace', models.CharField(default=('Default', 'Default'), max_length=100, verbose_name='Output namespace', choices=[('Default', 'Default'), ('http://schemas.xmlsoap.org/ws/2005/05/identity/claims', 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims')])), ('filter_source_of_filtered_attributes', models.BooleanField(default=False, verbose_name='Filter by source and per attribute the forwarded pushed attributes')), ('map_attributes_of_filtered_attributes', models.BooleanField(default=False, verbose_name='Map filtered attributes')), ('send_error_and_no_attrs_if_missing_required_attrs', models.BooleanField(default=False, verbose_name='Send an error when a required attribute is missing')), diff --git src/authentic2/migrations/0001_initial.py src/authentic2/migrations/0001_initial.py index 828178fd..d6131cfd 100644 --- src/authentic2/migrations/0001_initial.py +++ src/authentic2/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('user_editable', models.BooleanField(default=False, verbose_name='user editable')), ('user_visible', models.BooleanField(default=False, verbose_name='user visible')), ('multiple', models.BooleanField(default=False, verbose_name='multiple')), - ('kind', models.CharField(max_length=16, verbose_name='kind', choices=[(b'string', '')])), + ('kind', models.CharField(max_length=16, verbose_name='kind', choices=[('string', '')])), ], options={ 'verbose_name': 'attribute definition', diff --git src/authentic2/migrations/0022_attribute_scopes.py src/authentic2/migrations/0022_attribute_scopes.py index 862bb6c8..c96591c8 100644 --- src/authentic2/migrations/0022_attribute_scopes.py +++ src/authentic2/migrations/0022_attribute_scopes.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='attribute', name='scopes', - field=models.CharField(default=b'', help_text='scopes separated by spaces', max_length=256, verbose_name='scopes', blank=True), + field=models.CharField(default='', help_text='scopes separated by spaces', max_length=256, verbose_name='scopes', blank=True), ), ] diff --git src/authentic2/saml/migrations/0001_initial.py src/authentic2/saml/migrations/0001_initial.py index 629a0156..38e56eac 100644 --- src/authentic2/saml/migrations/0001_initial.py +++ src/authentic2/saml/migrations/0001_initial.py @@ -66,12 +66,12 @@ class Migration(migrations.Migration): ('name', models.CharField(unique=True, max_length=200, verbose_name='name')), ('enabled', models.BooleanField(default=False, verbose_name='Enabled')), ('no_nameid_policy', models.BooleanField(default=False, verbose_name='Do not send a nameId Policy')), - ('requested_name_id_format', models.CharField(default=b'none', max_length=200, verbose_name='Requested NameID format', choices=[(b'username', 'Username (use with Google Apps)'), (b'none', 'None'), (b'persistent', 'Persistent'), (b'transient', 'Transient'), (b'edupersontargetedid', 'Use eduPersonTargetedID attribute'), (b'email', 'Email')])), + ('requested_name_id_format', models.CharField(default='none', max_length=200, verbose_name='Requested NameID format', choices=[('username', 'Username (use with Google Apps)'), ('none', 'None'), ('persistent', 'Persistent'), ('transient', 'Transient'), ('edupersontargetedid', 'Use eduPersonTargetedID attribute'), ('email', 'Email')])), ('transient_is_persistent', models.BooleanField(default=False, verbose_name='This IdP sends a transient NameID but you want a persistent behaviour for your SP')), ('persistent_identifier_attribute', models.CharField(max_length=200, null=True, verbose_name='Persistent identifier attribute', blank=True)), ('allow_create', models.BooleanField(default=False, verbose_name='Allow IdP to create an identity')), ('enable_binding_for_sso_response', models.BooleanField(default=False, verbose_name='Binding for Authnresponse (taken from metadata by the IdP if not enabled)')), - ('binding_for_sso_response', models.CharField(default=b'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact', max_length=200, verbose_name='Binding for the SSO responses', choices=[(b'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact', 'Artifact binding'), (b'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST', 'POST binding')])), + ('binding_for_sso_response', models.CharField(default='urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact', max_length=200, verbose_name='Binding for the SSO responses', choices=[('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact', 'Artifact binding'), ('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST', 'POST binding')])), ('enable_http_method_for_slo_request', models.BooleanField(default=False, verbose_name='HTTP method for single logout request (taken from metadata if not enabled)')), ('http_method_for_slo_request', models.IntegerField(default=4, max_length=200, verbose_name='HTTP binding for the SLO requests', choices=[(4, 'Redirect binding'), (5, 'SOAP binding')])), ('enable_http_method_for_defederation_request', models.BooleanField(default=False, verbose_name='HTTP method for federation termination request (taken from metadata if not enabled)')), @@ -80,9 +80,9 @@ class Migration(migrations.Migration): ('want_force_authn_request', models.BooleanField(default=False, verbose_name='Force authentication')), ('want_is_passive_authn_request', models.BooleanField(default=False, verbose_name='Passive authentication')), ('want_authn_request_signed', models.BooleanField(default=False, verbose_name='Want AuthnRequest signed')), - ('handle_persistent', models.CharField(default=b'AUTHSAML2_UNAUTH_PERSISTENT_ACCOUNT_LINKING_BY_AUTH', max_length=200, verbose_name='Behavior with persistent NameID', choices=[(b'AUTHSAML2_UNAUTH_PERSISTENT_ACCOUNT_LINKING_BY_AUTH', 'Account linking by authentication'), (b'AUTHSAML2_UNAUTH_PERSISTENT_CREATE_USER_PSEUDONYMOUS', 'Create new account')])), - ('handle_transient', models.CharField(default=b'', max_length=200, verbose_name='Behavior with transient NameID', choices=[(b'AUTHSAML2_UNAUTH_TRANSIENT_ASK_AUTH', 'Ask authentication'), (b'AUTHSAML2_UNAUTH_TRANSIENT_OPEN_SESSION', 'Open a session')])), - ('back_url', models.CharField(default=b'/', max_length=200, verbose_name='Return URL after a successful authentication')), + ('handle_persistent', models.CharField(default='AUTHSAML2_UNAUTH_PERSISTENT_ACCOUNT_LINKING_BY_AUTH', max_length=200, verbose_name='Behavior with persistent NameID', choices=[('AUTHSAML2_UNAUTH_PERSISTENT_ACCOUNT_LINKING_BY_AUTH', 'Account linking by authentication'), ('AUTHSAML2_UNAUTH_PERSISTENT_CREATE_USER_PSEUDONYMOUS', 'Create new account')])), + ('handle_transient', models.CharField(default='', max_length=200, verbose_name='Behavior with transient NameID', choices=[('AUTHSAML2_UNAUTH_TRANSIENT_ASK_AUTH', 'Ask authentication'), ('AUTHSAML2_UNAUTH_TRANSIENT_OPEN_SESSION', 'Open a session')])), + ('back_url', models.CharField(default='/', max_length=200, verbose_name='Return URL after a successful authentication')), ('accept_slo', models.BooleanField(default=True, verbose_name='Accept to receive Single Logout requests')), ('forward_slo', models.BooleanField(default=True, verbose_name='Forward Single Logout requests')), ], @@ -123,10 +123,10 @@ class Migration(migrations.Migration): name='LibertyFederation', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name_id_format', models.CharField(max_length=100, null=True, verbose_name=b'NameIDFormat', blank=True)), - ('name_id_content', models.CharField(max_length=100, verbose_name=b'NameID')), - ('name_id_qualifier', models.CharField(max_length=256, null=True, verbose_name=b'NameQualifier', blank=True)), - ('name_id_sp_name_qualifier', models.CharField(max_length=256, null=True, verbose_name=b'SPNameQualifier', blank=True)), + ('name_id_format', models.CharField(max_length=100, null=True, verbose_name='NameIDFormat', blank=True)), + ('name_id_content', models.CharField(max_length=100, verbose_name='NameID')), + ('name_id_qualifier', models.CharField(max_length=256, null=True, verbose_name='NameQualifier', blank=True)), + ('name_id_sp_name_qualifier', models.CharField(max_length=256, null=True, verbose_name='SPNameQualifier', blank=True)), ('termination_notified', models.BooleanField(default=False)), ('creation', models.DateTimeField(auto_now_add=True)), ('last_modification', models.DateTimeField(auto_now=True)), @@ -159,7 +159,7 @@ class Migration(migrations.Migration): ('entity_id', models.URLField(unique=True, verbose_name='Entity ID')), ('entity_id_sha1', models.CharField(max_length=40, verbose_name='Entity ID SHA1', blank=True)), ('metadata_url', models.URLField(max_length=256, verbose_name='Metadata URL', blank=True)), - ('protocol_conformance', models.IntegerField(max_length=10, verbose_name='Protocol conformance', choices=[(3, b'SAML 2.0')])), + ('protocol_conformance', models.IntegerField(max_length=10, verbose_name='Protocol conformance', choices=[(3, 'SAML 2.0')])), ('metadata', models.TextField(validators=[authentic2.saml.models.metadata_validator])), ('public_key', models.TextField(blank=True)), ('ssl_certificate', models.TextField(blank=True)), @@ -231,7 +231,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('django_session_key', models.CharField(max_length=128)), ('session_dump', models.TextField(blank=True)), - ('kind', models.IntegerField(choices=[(0, b'sp'), (1, b'idp')])), + ('kind', models.IntegerField(choices=[(0, 'sp'), (1, 'idp')])), ], options={ 'verbose_name': 'SAML session dump', @@ -258,7 +258,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('object_id', models.PositiveIntegerField(verbose_name='object identifier')), - ('name_format', models.CharField(default=b'basic', max_length=64, verbose_name='name format', choices=[(b'basic', b'Basic'), (b'uri', b'URI'), (b'unspecified', b'Unspecified')])), + ('name_format', models.CharField(default='basic', max_length=64, verbose_name='name format', choices=[('basic', 'Basic'), ('uri', 'URI'), ('unspecified', 'Unspecified')])), ('name', models.CharField(help_text='the local attribute name is used if left blank', max_length=128, verbose_name='name', blank=True)), ('friendly_name', models.CharField(max_length=64, verbose_name='friendly name', blank=True)), ('attribute_name', models.CharField(max_length=64, verbose_name='attribute name')), @@ -275,13 +275,13 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(unique=True, max_length=80, verbose_name='name')), ('enabled', models.BooleanField(default=False, verbose_name='Enabled')), - ('prefered_assertion_consumer_binding', models.CharField(default=b'meta', max_length=4, verbose_name='Prefered assertion consumer binding', choices=[(b'meta', 'Use the default from the metadata file'), (b'art', 'Artifact binding'), (b'post', 'POST binding')])), + ('prefered_assertion_consumer_binding', models.CharField(default='meta', max_length=4, verbose_name='Prefered assertion consumer binding', choices=[('meta', 'Use the default from the metadata file'), ('art', 'Artifact binding'), ('post', 'POST binding')])), ('encrypt_nameid', models.BooleanField(default=False, verbose_name='Encrypt NameID')), ('encrypt_assertion', models.BooleanField(default=False, verbose_name='Encrypt Assertion')), ('authn_request_signed', models.BooleanField(default=False, verbose_name='Authentication request signed')), ('idp_initiated_sso', models.BooleanField(default=False, verbose_name='Allow IdP initiated SSO')), - ('default_name_id_format', models.CharField(default=b'none', max_length=256, choices=[(b'username', 'Username (use with Google Apps)'), (b'none', 'None'), (b'persistent', 'Persistent'), (b'transient', 'Transient'), (b'edupersontargetedid', 'Use eduPersonTargetedID attribute'), (b'email', 'Email')])), - ('accepted_name_id_format', authentic2.saml.fields.MultiSelectField(blank=True, max_length=1024, verbose_name='NameID formats accepted', choices=[(b'username', 'Username (use with Google Apps)'), (b'none', 'None'), (b'persistent', 'Persistent'), (b'transient', 'Transient'), (b'edupersontargetedid', 'Use eduPersonTargetedID attribute'), (b'email', 'Email')])), + ('default_name_id_format', models.CharField(default='none', max_length=256, choices=[('username', 'Username (use with Google Apps)'), ('none', 'None'), ('persistent', 'Persistent'), ('transient', 'Transient'), ('edupersontargetedid', 'Use eduPersonTargetedID attribute'), ('email', 'Email')])), + ('accepted_name_id_format', authentic2.saml.fields.MultiSelectField(blank=True, max_length=1024, verbose_name='NameID formats accepted', choices=[('username', 'Username (use with Google Apps)'), ('none', 'None'), ('persistent', 'Persistent'), ('transient', 'Transient'), ('edupersontargetedid', 'Use eduPersonTargetedID attribute'), ('email', 'Email')])), ('ask_user_consent', models.BooleanField(default=False, verbose_name='Ask user for consent when creating a federation')), ('accept_slo', models.BooleanField(default=True, verbose_name='Accept to receive Single Logout requests')), ('forward_slo', models.BooleanField(default=True, verbose_name='Forward Single Logout requests')), diff --git src/authentic2/saml/migrations/0012_auto_20150526_2239.py src/authentic2/saml/migrations/0012_auto_20150526_2239.py index 142c8efa..859a9dab 100644 --- src/authentic2/saml/migrations/0012_auto_20150526_2239.py +++ src/authentic2/saml/migrations/0012_auto_20150526_2239.py @@ -24,6 +24,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='libertyprovider', name='protocol_conformance', - field=models.IntegerField(verbose_name='Protocol conformance', choices=[(3, b'SAML 2.0')]), + field=models.IntegerField(verbose_name='Protocol conformance', choices=[(3, 'SAML 2.0')]), ), ] diff --git src/authentic2/saml/migrations/0015_auto_20150915_2032.py src/authentic2/saml/migrations/0015_auto_20150915_2032.py index 5f162c94..d150fb0b 100644 --- src/authentic2/saml/migrations/0015_auto_20150915_2032.py +++ src/authentic2/saml/migrations/0015_auto_20150915_2032.py @@ -15,19 +15,19 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='idpoptionssppolicy', name='requested_name_id_format', - field=models.CharField(default=b'none', max_length=200, verbose_name='Requested NameID format', choices=[(b'username', 'Username (use with Google Apps)'), (b'none', 'None'), (b'uuid', 'UUID'), (b'persistent', 'Persistent'), (b'transient', 'Transient'), (b'edupersontargetedid', 'Use eduPersonTargetedID attribute'), (b'email', 'Email')]), + field=models.CharField(default='none', max_length=200, verbose_name='Requested NameID format', choices=[('username', 'Username (use with Google Apps)'), ('none', 'None'), ('uuid', 'UUID'), ('persistent', 'Persistent'), ('transient', 'Transient'), ('edupersontargetedid', 'Use eduPersonTargetedID attribute'), ('email', 'Email')]), preserve_default=True, ), migrations.AlterField( model_name='spoptionsidppolicy', name='accepted_name_id_format', - field=authentic2.saml.fields.MultiSelectField(blank=True, max_length=1024, verbose_name='NameID formats accepted', choices=[(b'username', 'Username (use with Google Apps)'), (b'none', 'None'), (b'uuid', 'UUID'), (b'persistent', 'Persistent'), (b'transient', 'Transient'), (b'edupersontargetedid', 'Use eduPersonTargetedID attribute'), (b'email', 'Email')]), + field=authentic2.saml.fields.MultiSelectField(blank=True, max_length=1024, verbose_name='NameID formats accepted', choices=[('username', 'Username (use with Google Apps)'), ('none', 'None'), ('uuid', 'UUID'), ('persistent', 'Persistent'), ('transient', 'Transient'), ('edupersontargetedid', 'Use eduPersonTargetedID attribute'), ('email', 'Email')]), preserve_default=True, ), migrations.AlterField( model_name='spoptionsidppolicy', name='default_name_id_format', - field=models.CharField(default=b'none', max_length=256, choices=[(b'username', 'Username (use with Google Apps)'), (b'none', 'None'), (b'uuid', 'UUID'), (b'persistent', 'Persistent'), (b'transient', 'Transient'), (b'edupersontargetedid', 'Use eduPersonTargetedID attribute'), (b'email', 'Email')]), + field=models.CharField(default='none', max_length=256, choices=[('username', 'Username (use with Google Apps)'), ('none', 'None'), ('uuid', 'UUID'), ('persistent', 'Persistent'), ('transient', 'Transient'), ('edupersontargetedid', 'Use eduPersonTargetedID attribute'), ('email', 'Email')]), preserve_default=True, ), ] diff --git src/authentic2_auth_oidc/migrations/0001_initial.py src/authentic2_auth_oidc/migrations/0001_initial.py index 52a32cbd..e3774653 100644 --- src/authentic2_auth_oidc/migrations/0001_initial.py +++ src/authentic2_auth_oidc/migrations/0001_initial.py @@ -54,7 +54,7 @@ class Migration(migrations.Migration): ('scopes', models.CharField(max_length=128, verbose_name='scopes', blank=True)), ('jwkset_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='JSON WebKey set', validators=[authentic2_auth_oidc.models.validate_jwkset])), ('idtoken_algo', models.PositiveIntegerField(default=1, verbose_name='IDToken signature algorithm', choices=[(0, 'none'), (1, 'RSA'), (2, 'HMAC'), (3, 'EC')])), - ('strategy', models.CharField(max_length=32, verbose_name='strategy', choices=[(b'create', 'create'), (b'none', 'none')])), + ('strategy', models.CharField(max_length=32, verbose_name='strategy', choices=[('create', 'create'), ('none', 'none')])), ('max_auth_age', models.PositiveIntegerField(null=True, verbose_name='max authentication age', blank=True)), ('created', models.DateTimeField(auto_now_add=True, verbose_name='created')), ('modified', models.DateTimeField(auto_now=True, verbose_name='modified')), diff --git src/authentic2_auth_oidc/migrations/0004_auto_20171017_1522.py src/authentic2_auth_oidc/migrations/0004_auto_20171017_1522.py index 897a2e0e..19630c07 100644 --- src/authentic2_auth_oidc/migrations/0004_auto_20171017_1522.py +++ src/authentic2_auth_oidc/migrations/0004_auto_20171017_1522.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='oidcprovider', name='strategy', - field=models.CharField(max_length=32, verbose_name='strategy', choices=[(b'create', 'create'), (b'find-uuid', 'use sub to find existing user through UUID'), (b'none', 'none')]), + field=models.CharField(max_length=32, verbose_name='strategy', choices=[('create', 'create'), ('find-uuid', 'use sub to find existing user through UUID'), ('none', 'none')]), ), ] diff --git src/authentic2_idp_cas/migrations/0001_initial.py src/authentic2_idp_cas/migrations/0001_initial.py index 6878443d..13759aff 100644 --- src/authentic2_idp_cas/migrations/0001_initial.py +++ src/authentic2_idp_cas/migrations/0001_initial.py @@ -52,11 +52,11 @@ class Migration(migrations.Migration): ('ticket_id', models.CharField(default=authentic2_idp_cas.models.make_uuid, unique=True, max_length=64, verbose_name='ticket id')), ('renew', models.BooleanField(default=False, verbose_name='fresh authentication')), ('validity', models.BooleanField(default=False, verbose_name='valid')), - ('service_url', models.CharField(default=b'', max_length=256, verbose_name='service URL', blank=True)), + ('service_url', models.CharField(default='', max_length=256, verbose_name='service URL', blank=True)), ('creation', models.DateTimeField(auto_now_add=True, verbose_name='creation')), ('expire', models.DateTimeField(null=True, verbose_name='expire', blank=True)), - ('session_key', models.CharField(default=b'', max_length=64, verbose_name='django session key', db_index=True, blank=True)), - ('proxies', models.TextField(default=b'', verbose_name='proxies', blank=True)), + ('session_key', models.CharField(default='', max_length=64, verbose_name='django session key', db_index=True, blank=True)), + ('proxies', models.TextField(default='', verbose_name='proxies', blank=True)), ('service', models.ForeignKey(verbose_name='service', to='authentic2_idp_cas.Service', on_delete=models.CASCADE)), ('user', models.ForeignKey(blank=True, to='auth.User', max_length=128, null=True, verbose_name='user', on_delete=models.CASCADE)), ], diff --git src/authentic2_idp_cas/migrations/0014_auto_20151204_1606.py src/authentic2_idp_cas/migrations/0014_auto_20151204_1606.py index ca34fa92..f110d29d 100644 --- src/authentic2_idp_cas/migrations/0014_auto_20151204_1606.py +++ src/authentic2_idp_cas/migrations/0014_auto_20151204_1606.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='ticket', name='service_url', - field=models.TextField(default=b'', verbose_name='service URL', blank=True), + field=models.TextField(default='', verbose_name='service URL', blank=True), preserve_default=True, ), ] diff --git src/authentic2_idp_oidc/migrations/0001_initial.py src/authentic2_idp_oidc/migrations/0001_initial.py index fc56bc76..45fc27ce 100644 --- src/authentic2_idp_oidc/migrations/0001_initial.py +++ src/authentic2_idp_oidc/migrations/0001_initial.py @@ -56,8 +56,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('uuid', models.CharField(default=authentic2_idp_oidc.models.generate_uuid, max_length=128, verbose_name='uuid')), ('scopes', models.TextField(verbose_name='scopes')), - ('state', models.TextField(default=b'', verbose_name='state')), - ('nonce', models.TextField(default=b'', verbose_name='nonce')), + ('state', models.TextField(default='', verbose_name='state')), + ('nonce', models.TextField(default='', verbose_name='nonce')), ('redirect_uri', models.URLField(verbose_name='redirect URI')), ('session_key', models.CharField(max_length=128, verbose_name='session key')), ('auth_time', models.DateTimeField(verbose_name='auth time')), diff --git src/authentic2_idp_oidc/migrations/0002_auto_20170121_2346.py src/authentic2_idp_oidc/migrations/0002_auto_20170121_2346.py index bc24bb3d..89b12f3d 100644 --- src/authentic2_idp_oidc/migrations/0002_auto_20170121_2346.py +++ src/authentic2_idp_oidc/migrations/0002_auto_20170121_2346.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='oidcclient', name='post_logout_redirect_uris', - field=models.TextField(default=b'', verbose_name='post logout redirect URIs', validators=[authentic2_idp_oidc.models.validate_https_url]), + field=models.TextField(default='', verbose_name='post logout redirect URIs', validators=[authentic2_idp_oidc.models.validate_https_url]), ), ] diff --git src/authentic2_idp_oidc/migrations/0003_auto_20170329_1259.py src/authentic2_idp_oidc/migrations/0003_auto_20170329_1259.py index 8c000079..f80b3fff 100644 --- src/authentic2_idp_oidc/migrations/0003_auto_20170329_1259.py +++ src/authentic2_idp_oidc/migrations/0003_auto_20170329_1259.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='oidcclient', name='post_logout_redirect_uris', - field=models.TextField(default=b'', blank=True, verbose_name='post logout redirect URIs', validators=[authentic2_idp_oidc.models.validate_https_url]), + field=models.TextField(default='', blank=True, verbose_name='post logout redirect URIs', validators=[authentic2_idp_oidc.models.validate_https_url]), ), ] diff --git src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py index 048d1d3f..c1d53ecc 100644 --- src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py +++ src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py @@ -20,6 +20,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='oidcclient', name='scope', - field=models.TextField(blank=True, default=b'', verbose_name='resource owner credentials grant scope'), + field=models.TextField(blank=True, default='', verbose_name='resource owner credentials grant scope'), ), ] -- 2.26.0