Преглед на файлове

Merge branch 'fix/hash-password' of piernov/jm2l into master

master
JM2L преди 7 години
committed by Gogs
родител
ревизия
cec9ea7d9c
променени са 3 файла, в които са добавени 13 реда и са изтрити 3 реда
  1. +7
    -1
      jm2l/models.py
  2. +3
    -1
      jm2l/views.py
  3. +3
    -1
      setup.py

+ 7
- 1
jm2l/models.py Целия файл

@@ -33,6 +33,8 @@ from sqlalchemy.orm import (
from zope.sqlalchemy import ZopeTransactionExtension
from jm2l.const import CurrentYear

from passlib.hash import argon2

DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
Base = declarative_base()

@@ -247,7 +249,11 @@ class User(Base):
return MediaPath().get_thumb('users', self.uid)
def verify_password(self, password):
return self.password == password
if not argon2.identify(self.password): # Update existing clear-text password
self.password = argon2.using(rounds=4).hash(self.password)
DBSession.merge(self)

return argon2.verify(password, self.password)

class TiersOpt(Base):
__tablename__ = 'tiers_opt'


+ 3
- 1
jm2l/views.py Целия файл

@@ -33,6 +33,8 @@ import shutil
import glob
from jm2l.const import CurrentYear

from passlib.hash import argon2

## =-=- Here, We keep some usefull function -=-=
def remove_accents(input_str):
""" This function is intended to remove all accent from input unicode string """
@@ -1155,7 +1157,7 @@ def Modal(request):
response = render_to_response('jm2l:templates/modals_js.mako',
{'modtype':modtype},
request=request)
request.user.password = form.password.data
request.user.password = argon2.using(rounds=4).hash(form.password.data)
DBSession.merge(request.user)
response.content_type = 'text/javascript'
return response


+ 3
- 1
setup.py Целия файл

@@ -32,7 +32,9 @@ requires = [
'pyramid_mailer',
'apscheduler',
'qrcode',
'reportlab'
'reportlab',
'passlib',
'argon2_cffi'
]

setup(name='JM2L',


Зареждане…
Отказ
Запис