Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace passlib Dependency with bcrypt #201

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Replace passlib Dependency with bcrypt #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eee174
Merge pull request #200 from Shield-Cyber/dev
oliv10 Jan 18, 2024
7348712
Replace passlib with bcrypt
oliv10 Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ python-gvm==24.1.0
fastapi==0.109.0
python-multipart==0.0.6
uvicorn[standard]==0.26.0
passlib[bcrypt]==1.7.4
bcrypt==4.1.2
python-jose[cryptography]==3.3.0
redis[hiredis]==5.0.1
10 changes: 4 additions & 6 deletions app/utils/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from fastapi import Depends, HTTPException, status
from fastapi.security import OAuth2PasswordBearer
from jose import JWTError, jwt
from passlib.context import CryptContext
import bcrypt
from pydantic import BaseModel
import logging
from app import LOGGING_PREFIX, USERNAME, PASSWORD
Expand All @@ -24,7 +24,7 @@
"admin": {
"username": USERNAME,
"password": PASSWORD,
"hashed_password": CryptContext(schemes=["bcrypt"], deprecated="auto").hash(PASSWORD),
"hashed_password": bcrypt.hashpw(PASSWORD.encode('utf-8'), bcrypt.gensalt()),
"disabled": False,
}
}
Expand Down Expand Up @@ -52,17 +52,15 @@ class User(BaseModel):
class UserInDB(User):
hashed_password: str

pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")

oauth2_scheme = OAuth2PasswordBearer(tokenUrl="authenticate")

def verify_password(plain_password, hashed_password):
LOGGER.debug("Verfying Password")
return Auth.pwd_context.verify(plain_password, hashed_password)
return bcrypt.checkpw(plain_password.encode('utf-8'), hashed_password.encode('utf-8'))

def get_password_hash(password):
LOGGER.debug("Getting Password Hash")
return Auth.pwd_context.hash(password)
return bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())

# I hate this, its terrible and it should be changed to make something actually secure and not stupid.
def get_admin_password():
Expand Down