altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions6 Packages Projects Releases Wiki Activity

Updated patch for oicd_provider char field size

Browse source 
- Legacy-Id: 17923
This commit is contained in:
Henrik Levkowetz 2020-06-07 11:42:57 +00:00
parent 48d1cd8bb6
commit f9ad2346bc
1 changed files with 83 additions and 31 deletions

114
patch/change-oidc-provider-field-sizes-228.patch
View file

@ -1,6 +1,6 @@
diff -ur oidc_provider.orig/migrations/0001_initial.py oidc_provider/migrations/0001_initial.py diff -ur oidc_provider.orig/migrations/0001_initial.py oidc_provider/migrations/0001_initial.py
--- oidc_provider.orig/migrations/0001_initial.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0001_initial.py 2018-04-13 21:43:28.000000000 +0200
+++ oidc_provider/migrations/0001_initial.py 2020-05-22 15:09:40.305603247 +0200 +++ oidc_provider/migrations/0001_initial.py 2020-06-07 13:34:26.826716519 +0200
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
fields=[ fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
@ -69,8 +69,8 @@ diff -ur oidc_provider.orig/migrations/0001_initial.py oidc_provider/migrations/
], ],
options={ options={
diff -ur oidc_provider.orig/migrations/0003_code_nonce.py oidc_provider/migrations/0003_code_nonce.py diff -ur oidc_provider.orig/migrations/0003_code_nonce.py oidc_provider/migrations/0003_code_nonce.py
--- oidc_provider.orig/migrations/0003_code_nonce.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0003_code_nonce.py 2018-03-08 14:55:41.000000000 +0100
+++ oidc_provider/migrations/0003_code_nonce.py 2020-05-22 15:09:40.297603016 +0200 +++ oidc_provider/migrations/0003_code_nonce.py 2020-06-07 13:34:26.826716519 +0200
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
migrations.AddField( migrations.AddField(
model_name='code', model_name='code',
@ -80,8 +80,8 @@ diff -ur oidc_provider.orig/migrations/0003_code_nonce.py oidc_provider/migratio
), ),
] ]
diff -ur oidc_provider.orig/migrations/0005_token_refresh_token.py oidc_provider/migrations/0005_token_refresh_token.py diff -ur oidc_provider.orig/migrations/0005_token_refresh_token.py oidc_provider/migrations/0005_token_refresh_token.py
--- oidc_provider.orig/migrations/0005_token_refresh_token.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0005_token_refresh_token.py 2018-03-22 16:47:44.000000000 +0100
+++ oidc_provider/migrations/0005_token_refresh_token.py 2020-05-22 15:09:40.269602205 +0200 +++ oidc_provider/migrations/0005_token_refresh_token.py 2020-06-07 13:34:26.826716519 +0200
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
migrations.AddField( migrations.AddField(
model_name='token', model_name='token',
@ -92,8 +92,8 @@ diff -ur oidc_provider.orig/migrations/0005_token_refresh_token.py oidc_provider
), ),
] ]
diff -ur oidc_provider.orig/migrations/0012_auto_20160405_2041.py oidc_provider/migrations/0012_auto_20160405_2041.py diff -ur oidc_provider.orig/migrations/0012_auto_20160405_2041.py oidc_provider/migrations/0012_auto_20160405_2041.py
--- oidc_provider.orig/migrations/0012_auto_20160405_2041.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0012_auto_20160405_2041.py 2018-03-22 16:48:06.000000000 +0100
+++ oidc_provider/migrations/0012_auto_20160405_2041.py 2020-05-22 15:09:40.289602784 +0200 +++ oidc_provider/migrations/0012_auto_20160405_2041.py 2020-06-07 13:34:26.826716519 +0200
@@ -15,6 +15,6 @@ @@ -15,6 +15,6 @@
migrations.AlterField( migrations.AlterField(
model_name='client', model_name='client',
@ -103,8 +103,8 @@ diff -ur oidc_provider.orig/migrations/0012_auto_20160405_2041.py oidc_provider/
), ),
] ]
diff -ur oidc_provider.orig/migrations/0013_auto_20160407_1912.py oidc_provider/migrations/0013_auto_20160407_1912.py diff -ur oidc_provider.orig/migrations/0013_auto_20160407_1912.py oidc_provider/migrations/0013_auto_20160407_1912.py
--- oidc_provider.orig/migrations/0013_auto_20160407_1912.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0013_auto_20160407_1912.py 2018-03-22 16:48:06.000000000 +0100
+++ oidc_provider/migrations/0013_auto_20160407_1912.py 2020-05-22 15:09:40.277602437 +0200 +++ oidc_provider/migrations/0013_auto_20160407_1912.py 2020-06-07 13:34:26.826716519 +0200
@@ -15,11 +15,11 @@ @@ -15,11 +15,11 @@
migrations.AddField( migrations.AddField(
model_name='code', model_name='code',
@ -120,8 +120,8 @@ diff -ur oidc_provider.orig/migrations/0013_auto_20160407_1912.py oidc_provider/
), ),
] ]
diff -ur oidc_provider.orig/migrations/0015_change_client_code.py oidc_provider/migrations/0015_change_client_code.py diff -ur oidc_provider.orig/migrations/0015_change_client_code.py oidc_provider/migrations/0015_change_client_code.py
--- oidc_provider.orig/migrations/0015_change_client_code.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0015_change_client_code.py 2018-04-13 21:43:28.000000000 +0200
+++ oidc_provider/migrations/0015_change_client_code.py 2020-05-22 15:09:40.281602552 +0200 +++ oidc_provider/migrations/0015_change_client_code.py 2020-06-07 13:34:26.826716519 +0200
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
migrations.AlterField( migrations.AlterField(
model_name='client', model_name='client',
@ -141,17 +141,8 @@ diff -ur oidc_provider.orig/migrations/0015_change_client_code.py oidc_provider/
migrations.AlterField( migrations.AlterField(
model_name='token', model_name='token',
diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc_provider/migrations/0016_userconsent_and_verbosenames.py diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc_provider/migrations/0016_userconsent_and_verbosenames.py
--- oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py 2018-04-13 21:43:28.000000000 +0200
+++ oidc_provider/migrations/0016_userconsent_and_verbosenames.py 2020-05-22 15:14:37.858221152 +0200 +++ oidc_provider/migrations/0016_userconsent_and_verbosenames.py 2020-06-07 13:34:26.826716519 +0200
@@ -20,7 +20,7 @@
model_name='userconsent',
name='date_given',
field=models.DateTimeField(
- default=datetime.datetime(2016, 6, 10, 17, 53, 48, 889808, tzinfo=utc), verbose_name='Date Given'),
+ default=datetime.datetime(2016, 6, 10, 17, 53, 48, 889808), verbose_name='Date Given'),
preserve_default=False,
),
migrations.AlterField(
@@ -32,12 +32,12 @@ @@ -32,12 +32,12 @@
migrations.AlterField( migrations.AlterField(
model_name='client', model_name='client',
@ -216,8 +207,8 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc
migrations.AlterField( migrations.AlterField(
model_name='token', model_name='token',
diff -ur oidc_provider.orig/migrations/0017_auto_20160811_1954.py oidc_provider/migrations/0017_auto_20160811_1954.py diff -ur oidc_provider.orig/migrations/0017_auto_20160811_1954.py oidc_provider/migrations/0017_auto_20160811_1954.py
--- oidc_provider.orig/migrations/0017_auto_20160811_1954.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0017_auto_20160811_1954.py 2018-04-13 21:43:28.000000000 +0200
+++ oidc_provider/migrations/0017_auto_20160811_1954.py 2020-05-22 15:09:40.329603942 +0200 +++ oidc_provider/migrations/0017_auto_20160811_1954.py 2020-06-07 13:34:26.826716519 +0200
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
migrations.AlterField( migrations.AlterField(
model_name='client', model_name='client',
@ -237,8 +228,8 @@ diff -ur oidc_provider.orig/migrations/0017_auto_20160811_1954.py oidc_provider/
migrations.AlterField( migrations.AlterField(
model_name='token', model_name='token',
diff -ur oidc_provider.orig/migrations/0018_hybridflow_and_clientattrs.py oidc_provider/migrations/0018_hybridflow_and_clientattrs.py diff -ur oidc_provider.orig/migrations/0018_hybridflow_and_clientattrs.py oidc_provider/migrations/0018_hybridflow_and_clientattrs.py
--- oidc_provider.orig/migrations/0018_hybridflow_and_clientattrs.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0018_hybridflow_and_clientattrs.py 2018-04-13 21:43:28.000000000 +0200
+++ oidc_provider/migrations/0018_hybridflow_and_clientattrs.py 2020-05-22 15:09:40.317603595 +0200 +++ oidc_provider/migrations/0018_hybridflow_and_clientattrs.py 2020-06-07 13:34:26.826716519 +0200
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
migrations.AddField( migrations.AddField(
model_name='client', model_name='client',
@ -265,8 +256,8 @@ diff -ur oidc_provider.orig/migrations/0018_hybridflow_and_clientattrs.py oidc_p
migrations.AlterField( migrations.AlterField(
model_name='client', model_name='client',
diff -ur oidc_provider.orig/migrations/0019_auto_20161005_1552.py oidc_provider/migrations/0019_auto_20161005_1552.py diff -ur oidc_provider.orig/migrations/0019_auto_20161005_1552.py oidc_provider/migrations/0019_auto_20161005_1552.py
--- oidc_provider.orig/migrations/0019_auto_20161005_1552.py 2020-05-22 15:09:21.005044205 +0200 --- oidc_provider.orig/migrations/0019_auto_20161005_1552.py 2018-03-22 16:48:30.000000000 +0100
+++ oidc_provider/migrations/0019_auto_20161005_1552.py 2020-05-22 15:09:40.325603827 +0200 +++ oidc_provider/migrations/0019_auto_20161005_1552.py 2020-06-07 13:34:26.826716519 +0200
@@ -15,6 +15,6 @@ @@ -15,6 +15,6 @@
migrations.AlterField( migrations.AlterField(
model_name='client', model_name='client',
@ -276,8 +267,8 @@ diff -ur oidc_provider.orig/migrations/0019_auto_20161005_1552.py oidc_provider/
), ),
] ]
diff -ur oidc_provider.orig/migrations/0021_refresh_token_not_unique.py oidc_provider/migrations/0021_refresh_token_not_unique.py diff -ur oidc_provider.orig/migrations/0021_refresh_token_not_unique.py oidc_provider/migrations/0021_refresh_token_not_unique.py
--- oidc_provider.orig/migrations/0021_refresh_token_not_unique.py 2020-05-22 15:09:21.009044320 +0200 --- oidc_provider.orig/migrations/0021_refresh_token_not_unique.py 2018-03-22 16:48:30.000000000 +0100
+++ oidc_provider/migrations/0021_refresh_token_not_unique.py 2020-05-22 15:09:40.309603363 +0200 +++ oidc_provider/migrations/0021_refresh_token_not_unique.py 2020-06-07 13:34:26.826716519 +0200
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
migrations.AlterField( migrations.AlterField(
model_name='token', model_name='token',
@ -287,3 +278,64 @@ diff -ur oidc_provider.orig/migrations/0021_refresh_token_not_unique.py oidc_pro
preserve_default=False, preserve_default=False,
), ),
] ]
diff -ur oidc_provider.orig/models.py oidc_provider/models.py
--- oidc_provider.orig/models.py 2018-09-14 21:34:52.000000000 +0200
+++ oidc_provider/models.py 2020-06-07 13:34:26.830716635 +0200
@@ -67,8 +67,8 @@
verbose_name=_(u'Client Type'),
help_text=_(u'<b>Confidential</b> clients are capable of maintaining the confidentiality'
u' of their credentials. <b>Public</b> clients are incapable.'))
- client_id = models.CharField(max_length=255, unique=True, verbose_name=_(u'Client ID'))
- client_secret = models.CharField(max_length=255, blank=True, verbose_name=_(u'Client SECRET'))
+ client_id = models.CharField(max_length=228, unique=True, verbose_name=_(u'Client ID'))
+ client_secret = models.CharField(max_length=228, blank=True, verbose_name=_(u'Client SECRET'))
response_types = models.ManyToManyField(ResponseType)
jwt_alg = models.CharField(
max_length=10,
@@ -78,15 +78,15 @@
help_text=_(u'Algorithm used to encode ID Tokens.'))
date_created = models.DateField(auto_now_add=True, verbose_name=_(u'Date Created'))
website_url = models.CharField(
- max_length=255, blank=True, default='', verbose_name=_(u'Website URL'))
+ max_length=228, blank=True, default='', verbose_name=_(u'Website URL'))
terms_url = models.CharField(
- max_length=255,
+ max_length=228,
blank=True,
default='',
verbose_name=_(u'Terms URL'),
help_text=_(u'External reference to the privacy policy of the client.'))
contact_email = models.CharField(
- max_length=255, blank=True, default='', verbose_name=_(u'Contact Email'))
+ max_length=228, blank=True, default='', verbose_name=_(u'Contact Email'))
logo = models.FileField(
blank=True, default='', upload_to='oidc_provider/clients', verbose_name=_(u'Logo Image'))
reuse_consent = models.BooleanField(
@@ -186,12 +186,12 @@
user = models.ForeignKey(
settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE)
- code = models.CharField(max_length=255, unique=True, verbose_name=_(u'Code'))
- nonce = models.CharField(max_length=255, blank=True, default='', verbose_name=_(u'Nonce'))
+ code = models.CharField(max_length=228, unique=True, verbose_name=_(u'Code'))
+ nonce = models.CharField(max_length=228, blank=True, default='', verbose_name=_(u'Nonce'))
is_authentication = models.BooleanField(default=False, verbose_name=_(u'Is Authentication?'))
- code_challenge = models.CharField(max_length=255, null=True, verbose_name=_(u'Code Challenge'))
+ code_challenge = models.CharField(max_length=228, null=True, verbose_name=_(u'Code Challenge'))
code_challenge_method = models.CharField(
- max_length=255, null=True, verbose_name=_(u'Code Challenge Method'))
+ max_length=228, null=True, verbose_name=_(u'Code Challenge Method'))
class Meta:
verbose_name = _(u'Authorization Code')
@@ -205,8 +205,8 @@
user = models.ForeignKey(
settings.AUTH_USER_MODEL, null=True, verbose_name=_(u'User'), on_delete=models.CASCADE)
- access_token = models.CharField(max_length=255, unique=True, verbose_name=_(u'Access Token'))
- refresh_token = models.CharField(max_length=255, unique=True, verbose_name=_(u'Refresh Token'))
+ access_token = models.CharField(max_length=228, unique=True, verbose_name=_(u'Access Token'))
+ refresh_token = models.CharField(max_length=228, unique=True, verbose_name=_(u'Refresh Token'))
_id_token = models.TextField(verbose_name=_(u'ID Token'))
class Meta: