Skip to content

[Arvion] Security remediation: Update SQLAlchemy to 2.0 and other project dependencies #5

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

Open
arvion-bot-dev-felipe2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Arvion] Security remediation: Update SQLAlchemy to 2.0 and other project dependencies #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions app/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

from sqlalchemy import create_engine, Column, String, Integer
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy import create_engine, Column, String, Integer, select
from sqlalchemy.orm import declarative_base
from sqlalchemy.orm import sessionmaker

Base = declarative_base()
Expand All @@ -15,8 +15,8 @@ class User(Base):
username = Column(String(50))
password = Column(String(50))

def __unicode__(self):
return u"User: %s" % self.username
def __str__(self):
return "User: %s" % self.username


class DatabaseManager(object):
Expand All @@ -34,25 +34,24 @@ def add_user(self, username, password):
return user

def get_user(self, username):
query = "SELECT * FROM users WHERE username = '%s'" % username
result = self.session.execute(query)
return result.first()
stmt = select(User).where(User.username == username)
return self.session.scalars(stmt).first()

def legacy_string_types(self):
text = u"Unicode text"
text = "Unicode text"
byte_string = b"Byte string"

if isinstance(text, unicode):
if isinstance(text, str):
result_unicode = True
else:
result_unicode = False

if isinstance(byte_string, str):
if isinstance(byte_string, bytes):
result_str = True
else:
result_str = False

return {
'unicode_check': result_unicode,
'str_check': result_str
}
}
18 changes: 9 additions & 9 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
author='Test Author',
author_email='test@example.com',
packages=find_packages(),
python_requires='>=2.7, <3',
python_requires='>=3.8, <4',
install_requires=[
'requests==2.5.3',
'PyYAML==3.12',
'Flask==0.12.2',
'Jinja2==2.8',
'SQLAlchemy==1.0.0',
'urllib3==1.20',
'Werkzeug==0.11',
'requests==2.32.5',
'PyYAML==6.0.2',
'Flask==3.1.2',
'Jinja2==3.1.6',
'SQLAlchemy==2.0.43',
'urllib3==2.5.0',
'Werkzeug==3.1.3',
],
tests_require=[
'mock==2.0.0',
'unittest2==1.1.0',
],
test_suite='tests',
)
)
Loading