From 943c565a7488e52402fae6e809d689fa06bdf468 Mon Sep 17 00:00:00 2001 From: Josue Kouka Date: Mon, 11 Jan 2016 18:47:48 +0100 Subject: [PATCH] fix crypted password import (#9588) --- mandayejs/mandaye/management/commands/migrate-ldap-users.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mandayejs/mandaye/management/commands/migrate-ldap-users.py b/mandayejs/mandaye/management/commands/migrate-ldap-users.py index ea9f4e8..afbd057 100644 --- a/mandayejs/mandaye/management/commands/migrate-ldap-users.py +++ b/mandayejs/mandaye/management/commands/migrate-ldap-users.py @@ -2,6 +2,7 @@ from __future__ import absolute_import import json import ldif +import logging from django.core.management.base import BaseCommand, CommandError from django.db import IntegrityError @@ -9,6 +10,7 @@ from django.contrib.auth import get_user_model from mandayejs.mandaye.models import UserCredentials +logger = logging.getLogger(__name__) class Command(BaseCommand): args = '' @@ -33,11 +35,15 @@ class Command(BaseCommand): for data in parsed_data: data = { k : ''.join(v) for k,v in data.items()} try: - user = User(username=data.get('idpUniqueID'), last_name=data.get('spLogin')) + user, created = User.objects.get_or_create(username=data.get('idpUniqueID'), + last_name=data.get('spLogin')) user.save() uc = UserCredentials(user=user, locators=json.loads(data.get('spPostValues'))) + uc.decrypt() uc.save() self.stdout.write('{idpUniqueID} imported'.format(**data)) + logger.debug('{idpUniqueID} imported'.format(**data)) except (IntegrityError,) as e: + logger.debug(e) continue -- 2.6.4