From bf6aa1b54c2c7d8a946aef133584c2cdd52cf1fe Mon Sep 17 00:00:00 2001 From: bdzim Date: Wed, 11 Oct 2017 14:01:35 -0500 Subject: [PATCH] change the max length of emails to 150 characters everywhere --- Makefile | 2 +- .../migrations/0004_auto_20171011_1322.py | 20 +++++++++++++++++++ .../blue_management/blue_mgnt/views/users.py | 2 +- .../blue_management/blue_mgnt/views/views.py | 2 +- .../openmanage/migrations/0001_initial.py | 2 +- django/apps/openmanage/models.py | 2 +- ...7-10-11_increase_password_email_length.sql | 6 ++++++ sql/base_schema.sql | 2 +- 8 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 django/apps/blue_management/blue_mgnt/migrations/0004_auto_20171011_1322.py create mode 100644 sql/2017-10-11_increase_password_email_length.sql diff --git a/Makefile b/Makefile index 05c65f3..55d3d53 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ apply_scripts: manage: cd ~/netkes/django/omva; \ - . /etc/default/openmanage; python manage.py ${COMMAND} + sudo bash -c ". /etc/default/openmanage; python manage.py ${COMMAND}" test_netkes: . /etc/default/openmanage; python -m netkes/account_mgr/test/test_account_mgr diff --git a/django/apps/blue_management/blue_mgnt/migrations/0004_auto_20171011_1322.py b/django/apps/blue_management/blue_mgnt/migrations/0004_auto_20171011_1322.py new file mode 100644 index 0000000..0bc2670 --- /dev/null +++ b/django/apps/blue_management/blue_mgnt/migrations/0004_auto_20171011_1322.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-10-11 13:22 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blue_mgnt', '0003_invoicenote'), + ] + + operations = [ + migrations.AlterField( + model_name='invoicenote', + name='note', + field=models.TextField(default=b'', help_text=b'An optional note that will appear on your invoices. Use this if you need to add an address, VAT number, or similar.'), + ), + ] diff --git a/django/apps/blue_management/blue_mgnt/views/users.py b/django/apps/blue_management/blue_mgnt/views/users.py index 7d7288d..17cc70a 100644 --- a/django/apps/blue_management/blue_mgnt/views/users.py +++ b/django/apps/blue_management/blue_mgnt/views/users.py @@ -517,7 +517,7 @@ def user_detail(request, api, account_info, config, username, email, saved=False class UserForm(forms.Form): if local_user: name = forms.CharField(max_length=45) - email = forms.EmailField() + email = forms.EmailField(max_length=150) group_id = forms.ChoiceField(local_groups, label='Group') enabled = forms.BooleanField(required=False) else: diff --git a/django/apps/blue_management/blue_mgnt/views/views.py b/django/apps/blue_management/blue_mgnt/views/views.py index b42140d..061dffe 100644 --- a/django/apps/blue_management/blue_mgnt/views/views.py +++ b/django/apps/blue_management/blue_mgnt/views/views.py @@ -102,7 +102,7 @@ def get_base_url(url=None): class LoginForm(forms.Form): - username = forms.CharField(max_length=45) + username = forms.CharField(max_length=150) password = forms.CharField(widget=forms.PasswordInput) diff --git a/django/apps/openmanage/migrations/0001_initial.py b/django/apps/openmanage/migrations/0001_initial.py index a17a7c2..301d284 100644 --- a/django/apps/openmanage/migrations/0001_initial.py +++ b/django/apps/openmanage/migrations/0001_initial.py @@ -13,7 +13,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Password', fields=[ - ('email', models.CharField(max_length=64, serialize=False, primary_key=True)), + ('email', models.CharField(max_length=150, serialize=False, primary_key=True)), ('pw_hash', models.CharField(max_length=128)), ], options={ diff --git a/django/apps/openmanage/models.py b/django/apps/openmanage/models.py index c7d8983..b505a2a 100644 --- a/django/apps/openmanage/models.py +++ b/django/apps/openmanage/models.py @@ -3,7 +3,7 @@ class Password(models.Model): - email = models.CharField(max_length=64, primary_key=True) + email = models.CharField(max_length=150, primary_key=True) pw_hash = models.CharField(max_length=128) def update_email(self, new_email): diff --git a/sql/2017-10-11_increase_password_email_length.sql b/sql/2017-10-11_increase_password_email_length.sql new file mode 100644 index 0000000..1ac31f5 --- /dev/null +++ b/sql/2017-10-11_increase_password_email_length.sql @@ -0,0 +1,6 @@ +begin; + +alter table passwords alter column email type varchar(150); +alter table passwords owner to admin_console; + +commit; diff --git a/sql/base_schema.sql b/sql/base_schema.sql index 7427ee5..4080a33 100644 --- a/sql/base_schema.sql +++ b/sql/base_schema.sql @@ -4,7 +4,7 @@ CREATE USER directory_agent WITH PASSWORD 'initial'; CREATE USER admin_console WITH PASSWORD 'iexyjtso'; CREATE TABLE passwords ( - email varchar(64) primary key, + email varchar(150) primary key, pw_hash varchar(128) ); GRANT SELECT, UPDATE, INSERT, DELETE ON passwords TO directory_agent;