Addressed SA-3 by encrypting the sqlite content with a .env secret
This commit is contained in:
@@ -12,6 +12,7 @@ from uuid import uuid4
|
||||
|
||||
from backend.app.core.config import settings
|
||||
from backend.app.database import get_connection
|
||||
from backend.app.services.secret_store import decrypt_secret, encrypt_secret
|
||||
|
||||
|
||||
def normalize_instance(instance: str) -> str:
|
||||
@@ -39,6 +40,8 @@ def start_authorization(user_id: str, instance: str) -> str:
|
||||
with get_connection() as conn:
|
||||
row = conn.execute('SELECT value FROM app_settings WHERE name = ?', (setting_name,)).fetchone()
|
||||
app = json.loads(row['value']) if row else None
|
||||
if app and app.get('client_secret'):
|
||||
app['client_secret'] = decrypt_secret(app['client_secret'])
|
||||
if not app:
|
||||
app = post_form(f'{instance}/api/v1/apps', {
|
||||
'client_name': settings.mastodon_client_name,
|
||||
@@ -50,7 +53,7 @@ def start_authorization(user_id: str, instance: str) -> str:
|
||||
conn.execute(
|
||||
'''INSERT INTO app_settings (name, value, updated_at) VALUES (?, ?, CURRENT_TIMESTAMP)
|
||||
ON CONFLICT(name) DO UPDATE SET value = excluded.value, updated_at = CURRENT_TIMESTAMP''',
|
||||
(setting_name, json.dumps(app)),
|
||||
(setting_name, json.dumps({**app, 'client_secret': encrypt_secret(app['client_secret'])})),
|
||||
)
|
||||
conn.commit()
|
||||
state = token_urlsafe(32)
|
||||
@@ -62,7 +65,7 @@ def start_authorization(user_id: str, instance: str) -> str:
|
||||
(id, user_id, state_hash, instance, client_id, client_secret, redirect_uri, expires_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)''',
|
||||
(str(uuid4()), user_id, sha256(state.encode()).hexdigest(), instance,
|
||||
app['client_id'], app['client_secret'], redirect_uri, expires_at.isoformat()),
|
||||
app['client_id'], encrypt_secret(app['client_secret']), redirect_uri, expires_at.isoformat()),
|
||||
)
|
||||
conn.commit()
|
||||
return f'{instance}/oauth/authorize?' + urlencode({
|
||||
@@ -90,7 +93,7 @@ def finish_authorization(code: str, state: str) -> str:
|
||||
'grant_type': 'authorization_code',
|
||||
'code': code,
|
||||
'client_id': record['client_id'],
|
||||
'client_secret': record['client_secret'],
|
||||
'client_secret': decrypt_secret(record['client_secret']),
|
||||
'redirect_uri': record['redirect_uri'],
|
||||
})
|
||||
access_token = token.get('access_token')
|
||||
@@ -102,7 +105,7 @@ def finish_authorization(code: str, state: str) -> str:
|
||||
(record['user_id'], 'mastodon'),
|
||||
).fetchone()
|
||||
config = json.loads(current['config']) if current and current['config'] else {}
|
||||
config.update({'instance': record['instance'], 'access_token': access_token})
|
||||
config.update({'instance': record['instance'], 'access_token': encrypt_secret(access_token)})
|
||||
if current:
|
||||
conn.execute(
|
||||
'UPDATE user_plugin_config SET config = ?, updated_at = CURRENT_TIMESTAMP WHERE user_id = ? AND plugin_name = ?',
|
||||
|
||||
Reference in New Issue
Block a user