From a6e60bc23bca8a9afaca8285980aa1c69b8199d2 Mon Sep 17 00:00:00 2001 From: Ariel Rin Date: Sun, 11 Oct 2020 20:11:56 +1000 Subject: [PATCH] expand mumble certhash to allow for hmac-sha-256 --- .../migrations/0011_auto_20201011_1009.py | 18 ++++++++++++++++++ allianceauth/services/modules/mumble/models.py | 2 +- allianceauth/services/modules/mumble/tests.py | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 allianceauth/services/modules/mumble/migrations/0011_auto_20201011_1009.py diff --git a/allianceauth/services/modules/mumble/migrations/0011_auto_20201011_1009.py b/allianceauth/services/modules/mumble/migrations/0011_auto_20201011_1009.py new file mode 100644 index 00000000..1c166b56 --- /dev/null +++ b/allianceauth/services/modules/mumble/migrations/0011_auto_20201011_1009.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.2 on 2020-10-11 10:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mumble', '0010_mumbleuser_certhash'), + ] + + operations = [ + migrations.AlterField( + model_name='mumbleuser', + name='pwhash', + field=models.CharField(max_length=90), + ), + ] diff --git a/allianceauth/services/modules/mumble/models.py b/allianceauth/services/modules/mumble/models.py index 4f00f6c8..773c644f 100644 --- a/allianceauth/services/modules/mumble/models.py +++ b/allianceauth/services/modules/mumble/models.py @@ -63,7 +63,7 @@ class MumbleManager(models.Manager): class MumbleUser(AbstractServiceModel): username = models.CharField(max_length=254, unique=True) - pwhash = models.CharField(max_length=80) + pwhash = models.CharField(max_length=90) hashfn = models.CharField(max_length=20, default='sha1') groups = models.TextField(blank=True, null=True) certhash = models.CharField( diff --git a/allianceauth/services/modules/mumble/tests.py b/allianceauth/services/modules/mumble/tests.py index 06c961c1..c7099111 100644 --- a/allianceauth/services/modules/mumble/tests.py +++ b/allianceauth/services/modules/mumble/tests.py @@ -211,4 +211,4 @@ class MumbleManagerTestCase(TestCase): pwhash = self.manager.gen_pwhash('test') self.assertEqual(pwhash[:15], '$bcrypt-sha256$') - self.assertEqual(len(pwhash), 75) + self.assertEqual(len(pwhash), 83)