refac
This commit is contained in:
1 parent
2b9b956dad
commit
7b29834d42
2 files changed
+6
-7
No files matched your search
@@ -6,9 +6,9 @@ import logging
|
|||||||
import uuid
|
import uuid
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
|
import bcrypt
|
||||||
from open_webui.internal.db import Base, JSONField, get_async_db_context
|
from open_webui.internal.db import Base, JSONField, get_async_db_context
|
||||||
from open_webui.models.users import User, UserModel, UserProfileImageResponse, Users
|
from open_webui.models.users import User, UserModel, UserProfileImageResponse, Users
|
||||||
from open_webui.utils.auth import PLACEHOLDER_HASH
|
|
||||||
from open_webui.utils.validate import validate_profile_image_url
|
from open_webui.utils.validate import validate_profile_image_url
|
||||||
from pydantic import BaseModel, field_validator
|
from pydantic import BaseModel, field_validator
|
||||||
from sqlalchemy import Boolean, Column, String, Text, delete, select, update
|
from sqlalchemy import Boolean, Column, String, Text, delete, select, update
|
||||||
@@ -16,6 +16,11 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
|||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Pre-computed hash verified on signin paths that lack a real credential
|
||||||
|
# (unknown user, inactive account) so response timing cannot reveal
|
||||||
|
# whether an account exists (CWE-208).
|
||||||
|
PLACEHOLDER_HASH = bcrypt.hashpw(b'placeholder', bcrypt.gensalt()).decode('utf-8')
|
||||||
|
|
||||||
|
|
||||||
class Auth(Base): # credential ↔ user linkage
|
class Auth(Base): # credential ↔ user linkage
|
||||||
"""Maps a user ID to an email/password pair with an active flag."""
|
"""Maps a user ID to an email/password pair with an active flag."""
|
||||||
|
|||||||
@@ -162,12 +162,6 @@ def get_password_hash(password: str) -> str:
|
|||||||
return bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()).decode('utf-8')
|
return bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()).decode('utf-8')
|
||||||
|
|
||||||
|
|
||||||
# Pre-computed hash verified on signin paths that lack a real credential
|
|
||||||
# (unknown user, inactive account) so response timing cannot reveal
|
|
||||||
# whether an account exists (CWE-208).
|
|
||||||
PLACEHOLDER_HASH = get_password_hash('placeholder')
|
|
||||||
|
|
||||||
|
|
||||||
def validate_password(password: str) -> bool:
|
def validate_password(password: str) -> bool:
|
||||||
# The password passed to bcrypt must be 72 bytes or fewer. If it is longer, it will be truncated before hashing.
|
# The password passed to bcrypt must be 72 bytes or fewer. If it is longer, it will be truncated before hashing.
|
||||||
if len(password.encode('utf-8')) > 72:
|
if len(password.encode('utf-8')) > 72:
|
||||||
|
|||||||
Reference in new issue
Block a user