1 Commits
Author SHA1 Message Date
Olaf 0055cc197e incomming mail processing 2026-09-30 11:53:12 +02:00
14 changed files with 656 additions and 1 deletions
+1
View File
@@ -1,6 +1,7 @@
# Changelog
## Version v0.3.1
### Features
* LinkLog can now poll a configured IMAP mailbox and turn emailed links from a user's verified account address into saved entries with parsed comments and tags
### Fixed
* Made the feed profile summary visually distinct with a contrasting background and slightly smaller text
### Modification
+16
View File
@@ -1527,6 +1527,14 @@ In the mastodon post change the line: From:< URL>
to
Logged on <date> from: <url>
### User
I want to add functionality: a user should be able to send an email from the address associated with their account. When the email contains a link then that link will be stored in the LinkLog for that user. Also parse a potential comment and included tags.
The backend should be polling an IMAP account
### Assistant outcome
Added inbound email ingestion backed by IMAP polling. LinkLog now matches the sender against the user's verified primary or additional email addresses, extracts the first link plus comment and hashtags from the message, stores the link, and records processed message UIDs to avoid duplicates. Added encrypted IMAP settings storage, administrator IMAP configuration endpoints, startup polling integration, and regression coverage for parsing, sender matching, polling, and configuration checks.
Where date format is like: 2026 August 29 - 21:10
### Assistant outcome
@@ -1629,3 +1637,11 @@ Add these findings and recomendations to Privacy.md
### Assistant outcome
Created `Privacy.md` with a source-grounded privacy and fingerprinting assessment covering public activity correlation, URL and query-parameter leakage, Firefox extension website activity, Mastodon correlation, server-side URL fetching, deployment fingerprinting, authentication observability, user guidance, and prioritized mitigations. Validated the document contents; no runtime code was changed.
### User
I want to add functionality: a user should be able to send an email from the address associated with their account. When the email contains a link then that link will be stored in the LinkLog for that user. Also parse a potential comment and included tags.
The backend should be polling an IMAP account
### Assistant outcome
Added inbound email ingestion backed by IMAP polling. LinkLog now matches the sender against the user's verified primary or additional email addresses, extracts the first link plus comment and hashtags from the message, stores the link, and records processed message UIDs to avoid duplicates. Added encrypted IMAP settings storage, administrator IMAP configuration endpoints, startup polling integration, and regression coverage for parsing, sender matching, polling, and configuration checks.
+5
View File
@@ -321,6 +321,11 @@ If the user uses the filters and/or search in the toolbox then those should limi
263. Add these findings and recomendations to Privacy.md
## 2026-09-30
1. I want to add functionality: a user should be able to send an email from the address associated with their account. When the email contains a link then that link will be stored in the LinkLog for that user. Also parse a potential comment and included tags.
2. The backend should be polling an IMAP account
## Future entries
Append each new user prompt here with its date and preserve the chronological order.
Binary file not shown.
+66
View File
@@ -18,6 +18,7 @@ from backend.app.services.email_service import (
send_verification_email,
smtp_configured,
)
from backend.app.services.inbound_email_service import get_imap_settings, imap_configured, save_imap_settings
from backend.app.services.email_verification import create_verification_token
from backend.app.services.theme_service import THEMES, get_enabled_themes, save_enabled_themes
from backend.app.services.secret_store import encrypt_secret
@@ -63,6 +64,16 @@ class AdminThemesUpdate(BaseModel):
themes: list[str]
class AdminImapUpdate(BaseModel):
imap_host: str
imap_port: int = 993
imap_username: str = ''
imap_password: str = ''
imap_mailbox: str = 'INBOX'
imap_use_ssl: bool = True
imap_poll_interval_seconds: int = 60
def validate_smtp_values(payload: AdminSmtpUpdate, current: dict | None = None) -> dict:
smtp_host = payload.smtp_host.strip()
smtp_from = payload.smtp_from.strip()
@@ -80,6 +91,27 @@ def validate_smtp_values(payload: AdminSmtpUpdate, current: dict | None = None)
}
def validate_imap_values(payload: AdminImapUpdate, current: dict | None = None) -> dict:
imap_host = payload.imap_host.strip()
imap_username = payload.imap_username.strip()
imap_mailbox = payload.imap_mailbox.strip() or 'INBOX'
if not imap_host or not imap_username or not imap_mailbox:
raise HTTPException(status_code=422, detail='IMAP host, username, and mailbox are required')
if not 1 <= payload.imap_port <= 65535:
raise HTTPException(status_code=422, detail='IMAP port must be between 1 and 65535')
if payload.imap_poll_interval_seconds < 5:
raise HTTPException(status_code=422, detail='IMAP poll interval must be at least 5 seconds')
return {
'imap_host': imap_host,
'imap_port': payload.imap_port,
'imap_username': imap_username,
'imap_password': payload.imap_password or (current or {}).get('imap_password', ''),
'imap_mailbox': imap_mailbox,
'imap_use_ssl': payload.imap_use_ssl,
'imap_poll_interval_seconds': payload.imap_poll_interval_seconds,
}
def public_user(row):
return {
'id': row['id'],
@@ -166,11 +198,29 @@ def public_smtp_settings(values: dict) -> dict:
}
def public_imap_settings(values: dict) -> dict:
return {
'imap_host': values['imap_host'],
'imap_port': values['imap_port'],
'imap_username': values['imap_username'],
'imap_mailbox': values['imap_mailbox'],
'imap_use_ssl': values['imap_use_ssl'],
'imap_poll_interval_seconds': values['imap_poll_interval_seconds'],
'password_configured': bool(values['imap_password']),
'configured': imap_configured(values),
}
@router.get('/smtp')
def get_admin_smtp_settings(_: dict = Depends(require_admin)):
return public_smtp_settings(get_smtp_settings())
@router.get('/imap')
def get_admin_imap_settings(_: dict = Depends(require_admin)):
return public_imap_settings(get_imap_settings())
@router.get('/themes')
def get_admin_themes(_: dict = Depends(require_admin)):
return {'themes': THEMES, 'enabled': get_enabled_themes()}
@@ -195,6 +245,22 @@ def update_admin_smtp_settings(payload: AdminSmtpUpdate, current_user: dict = De
return public_smtp_settings(values)
@router.put('/imap')
def update_admin_imap_settings(payload: AdminImapUpdate, current_user: dict = Depends(require_admin)):
current = get_imap_settings()
values = validate_imap_values(payload, current)
save_imap_settings(values)
record_audit_event(current_user['id'], 'imap_settings_updated', 'application', details={
'host': values['imap_host'],
'port': values['imap_port'],
'username': values['imap_username'],
'mailbox': values['imap_mailbox'],
'ssl': values['imap_use_ssl'],
'poll_interval_seconds': values['imap_poll_interval_seconds'],
})
return public_imap_settings(values)
@router.post('/smtp/test')
def validate_admin_smtp(payload: AdminSmtpUpdate, request: Request, current_user: dict = Depends(require_admin)):
values = validate_smtp_values(payload, get_smtp_settings())
+7
View File
@@ -47,6 +47,13 @@ class Settings:
smtp_password: str = os.getenv('LINKLOG_SMTP_PASSWORD', '')
smtp_from: str = os.getenv('LINKLOG_SMTP_FROM', 'LinkLog <no-reply@localhost>')
smtp_use_tls: bool = os.getenv('LINKLOG_SMTP_USE_TLS', 'true').lower() in {'1', 'true', 'yes'}
imap_host: str = os.getenv('LINKLOG_IMAP_HOST', '')
imap_port: int = int(os.getenv('LINKLOG_IMAP_PORT', '993'))
imap_username: str = os.getenv('LINKLOG_IMAP_USERNAME', '')
imap_password: str = os.getenv('LINKLOG_IMAP_PASSWORD', '')
imap_mailbox: str = os.getenv('LINKLOG_IMAP_MAILBOX', 'INBOX')
imap_use_ssl: bool = os.getenv('LINKLOG_IMAP_USE_SSL', 'true').lower() in {'1', 'true', 'yes'}
imap_poll_interval_seconds: int = int(os.getenv('LINKLOG_IMAP_POLL_INTERVAL_SECONDS', '60'))
email_verification_expiry_hours: int = int(os.getenv('LINKLOG_EMAIL_VERIFICATION_EXPIRY_HOURS', '24'))
password_reset_expiry_hours: int = int(os.getenv('LINKLOG_PASSWORD_RESET_EXPIRY_HOURS', '1'))
mastodon_client_name: str = os.getenv('LINKLOG_MASTODON_CLIENT_NAME', 'LinkLog')
+16
View File
@@ -259,6 +259,22 @@ CREATE TABLE IF NOT EXISTS security_audit_events (
);
CREATE INDEX IF NOT EXISTS idx_security_audit_events_created_at ON security_audit_events(created_at);
CREATE INDEX IF NOT EXISTS idx_security_audit_events_actor_id ON security_audit_events(actor_id);
'''),
(18, '''
CREATE TABLE IF NOT EXISTS inbound_email_messages (
mailbox TEXT NOT NULL,
uid TEXT NOT NULL,
message_id TEXT,
user_id TEXT,
link_id TEXT,
status TEXT NOT NULL,
details TEXT NOT NULL DEFAULT '{}',
created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (mailbox, uid),
FOREIGN KEY(user_id) REFERENCES users(id) ON DELETE SET NULL,
FOREIGN KEY(link_id) REFERENCES links(id) ON DELETE SET NULL
);
CREATE INDEX IF NOT EXISTS idx_inbound_email_messages_message_id ON inbound_email_messages(message_id);
''')
]
+22 -1
View File
@@ -1,8 +1,10 @@
## Copyright © 2026 Olaf Kolkman
## SPDX-License-Identifier: GPL-3.0-or-later
from contextlib import asynccontextmanager
from fastapi import FastAPI, Request
import logging
from threading import Event, Thread
from uuid import uuid4
from fastapi.responses import HTMLResponse
from fastapi.responses import RedirectResponse
@@ -20,12 +22,31 @@ from backend.app.api.setup import has_administrator
from backend.app.api.user_config import router as user_config_router
from backend.app.core.config import settings, validate_configuration
from backend.app.database import AVATARS_DIR
from backend.app.services.inbound_email_service import run_imap_polling
from backend.app.services.link_service import get_public_profile
logging.basicConfig(level=getattr(logging, settings.log_level, logging.INFO))
validate_configuration(settings)
app = FastAPI(title='LinkLog API', version=settings.version)
@asynccontextmanager
async def lifespan(_: FastAPI):
stop_event = Event()
worker = Thread(
target=run_imap_polling,
args=(stop_event, logging.getLogger('backend.app.services.inbound_email_service')),
name='linklog-imap-poller',
daemon=True,
)
worker.start()
try:
yield
finally:
stop_event.set()
worker.join(timeout=2)
app = FastAPI(title='LinkLog API', version=settings.version, lifespan=lifespan)
@app.middleware('http')
@@ -0,0 +1,308 @@
## Copyright © 2026 Olaf Kolkman
## SPDX-License-Identifier: GPL-3.0-or-later
from email import policy
from email.header import decode_header, make_header
from email.parser import BytesParser
from email.utils import getaddresses
from html.parser import HTMLParser
import imaplib
import json
import logging
import re
from threading import Event
from backend.app.core.config import settings
from backend.app.database import get_connection
from backend.app.services.link_service import create_link, normalize_tags
from backend.app.services.secret_store import decrypt_secret, encrypt_secret
URL_PATTERN = re.compile(r'https?://[^\s<>()"\']+')
HASHTAG_PATTERN = re.compile(r'(?<!\w)#([A-Za-z0-9][\w-]*)')
class _HTMLTextExtractor(HTMLParser):
def __init__(self) -> None:
super().__init__()
self.text_parts: list[str] = []
self.hrefs: list[str] = []
def handle_data(self, data: str) -> None:
if data:
self.text_parts.append(data)
def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None:
if tag.lower() != 'a':
return
for name, value in attrs:
if name.lower() == 'href' and value:
self.hrefs.append(value)
def _decode_header_value(value: str | None) -> str:
if not value:
return ''
return str(make_header(decode_header(value))).strip()
def _extract_message_text(message) -> tuple[str, list[str]]:
plain_parts: list[str] = []
html_parts: list[str] = []
html_hrefs: list[str] = []
parts = message.walk() if message.is_multipart() else [message]
for part in parts:
if part.get_content_maintype() == 'multipart':
continue
content_type = part.get_content_type()
try:
content = part.get_content()
except (LookupError, UnicodeDecodeError):
continue
if not isinstance(content, str):
continue
if content_type == 'text/plain':
plain_parts.append(content)
elif content_type == 'text/html':
parser = _HTMLTextExtractor()
parser.feed(content)
html_parts.append(' '.join(parser.text_parts))
html_hrefs.extend(parser.hrefs)
text = '\n\n'.join(part.strip() for part in (plain_parts or html_parts) if part.strip())
urls = list(dict.fromkeys([*html_hrefs, *URL_PATTERN.findall(text)]))
return text, urls
def _extract_comment(text: str) -> str:
without_links = URL_PATTERN.sub(' ', text)
without_tags = HASHTAG_PATTERN.sub(' ', without_links)
lines = []
for raw_line in without_tags.splitlines():
line = ' '.join(raw_line.split()).strip()
if line:
lines.append(line)
return '\n'.join(lines)
def _extract_tags(*values: str) -> list[str]:
return normalize_tags([match.group(0) for value in values for match in HASHTAG_PATTERN.finditer(value or '')])
def _resolve_sender_email(message) -> str:
addresses = getaddresses(message.get_all('from', []))
for _, email in addresses:
if email:
return email.strip().lower()
return ''
def parse_incoming_email(raw_message: bytes) -> dict:
message = BytesParser(policy=policy.default).parsebytes(raw_message)
subject = _decode_header_value(message.get('Subject'))
text, urls = _extract_message_text(message)
subject_without_tags = HASHTAG_PATTERN.sub(' ', subject)
subject_without_link = URL_PATTERN.sub(' ', subject_without_tags)
title = ' '.join(subject_without_link.split()).strip()
tags = _extract_tags(subject, text)
return {
'message_id': _decode_header_value(message.get('Message-ID')),
'from_email': _resolve_sender_email(message),
'subject': subject,
'title': title,
'comment': _extract_comment(text),
'tags': tags,
'url': urls[0] if urls else None,
}
def get_imap_settings() -> dict:
values = {
'imap_host': settings.imap_host,
'imap_port': settings.imap_port,
'imap_username': settings.imap_username,
'imap_password': settings.imap_password,
'imap_mailbox': settings.imap_mailbox,
'imap_use_ssl': settings.imap_use_ssl,
'imap_poll_interval_seconds': settings.imap_poll_interval_seconds,
}
with get_connection() as conn:
row = conn.execute('SELECT value FROM app_settings WHERE name = ?', ('imap',)).fetchone()
if row:
values.update(json.loads(row['value']))
values['imap_password'] = decrypt_secret(values['imap_password'])
return values
def save_imap_settings(values: dict) -> None:
stored_values = {
**values,
'imap_password': encrypt_secret(values['imap_password']),
}
with get_connection() as conn:
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''',
('imap', json.dumps(stored_values)),
)
conn.commit()
def imap_configured(imap_values: dict | None = None) -> bool:
imap = imap_values or get_imap_settings()
return bool(imap['imap_host'] and imap['imap_username'] and imap['imap_password'] and imap['imap_mailbox'])
def _find_user_by_email(address: str) -> dict | None:
email = address.strip().lower()
if not email:
return None
with get_connection() as conn:
row = conn.execute(
'SELECT id, username FROM users WHERE lower(email) = ? AND email_verified = 1',
(email,),
).fetchone()
if row is None:
row = conn.execute(
'''SELECT users.id, users.username
FROM user_email_addresses
JOIN users ON users.id = user_email_addresses.user_id
WHERE lower(user_email_addresses.email) = ? AND user_email_addresses.verified = 1''',
(email,),
).fetchone()
return dict(row) if row else None
def _already_processed(mailbox: str, uid: str) -> bool:
with get_connection() as conn:
row = conn.execute(
'SELECT 1 FROM inbound_email_messages WHERE mailbox = ? AND uid = ? LIMIT 1',
(mailbox, uid),
).fetchone()
return row is not None
def _record_message(mailbox: str, uid: str, status: str, parsed: dict, user_id: str | None = None, link_id: str | None = None, details: dict | None = None) -> None:
payload = details or {}
with get_connection() as conn:
conn.execute(
'''INSERT INTO inbound_email_messages (mailbox, uid, message_id, user_id, link_id, status, details)
VALUES (?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(mailbox, uid) DO UPDATE SET
message_id = excluded.message_id,
user_id = excluded.user_id,
link_id = excluded.link_id,
status = excluded.status,
details = excluded.details''',
(mailbox, uid, parsed.get('message_id'), user_id, link_id, status, json.dumps(payload)),
)
conn.commit()
def ingest_message(mailbox: str, uid: str, raw_message: bytes) -> dict:
if _already_processed(mailbox, uid):
return {'status': 'duplicate', 'mailbox': mailbox, 'uid': uid}
parsed = parse_incoming_email(raw_message)
sender = parsed['from_email']
if not sender:
_record_message(mailbox, uid, 'ignored_missing_sender', parsed)
return {'status': 'ignored_missing_sender', 'mailbox': mailbox, 'uid': uid}
user = _find_user_by_email(sender)
if user is None:
_record_message(mailbox, uid, 'ignored_unknown_sender', parsed, details={'from_email': sender})
return {'status': 'ignored_unknown_sender', 'mailbox': mailbox, 'uid': uid, 'from_email': sender}
if not parsed['url']:
_record_message(mailbox, uid, 'ignored_no_link', parsed, user_id=user['id'])
return {'status': 'ignored_no_link', 'mailbox': mailbox, 'uid': uid, 'user_id': user['id']}
title = parsed['title'] or parsed['url']
record = create_link(user['id'], title, parsed['url'], parsed['comment'], None, parsed['tags'])
_record_message(mailbox, uid, 'stored', parsed, user_id=user['id'], link_id=record['id'])
return {
'status': 'stored',
'mailbox': mailbox,
'uid': uid,
'user_id': user['id'],
'link_id': record['id'],
'link': record,
}
def _open_imap_client(imap_values: dict):
client_class = imaplib.IMAP4_SSL if imap_values['imap_use_ssl'] else imaplib.IMAP4
return client_class(imap_values['imap_host'], imap_values['imap_port'])
def _fetch_message_bytes(response_data) -> bytes | None:
for item in response_data or []:
if isinstance(item, tuple) and len(item) > 1 and isinstance(item[1], (bytes, bytearray)):
return bytes(item[1])
return None
def poll_inbox_once(imap_values: dict | None = None, client_factory=None) -> dict:
values = imap_values or get_imap_settings()
if not imap_configured(values):
return {'status': 'not_configured', 'processed': 0, 'stored': 0, 'ignored': 0}
mailbox = values['imap_mailbox']
client = (client_factory or _open_imap_client)(values)
processed = 0
stored = 0
ignored = 0
try:
client.login(values['imap_username'], values['imap_password'])
status, _ = client.select(mailbox)
if status != 'OK':
raise RuntimeError(f'Could not select IMAP mailbox {mailbox}')
status, data = client.uid('search', None, 'UNSEEN')
if status != 'OK':
raise RuntimeError('Could not list unseen IMAP messages')
raw_uids = data[0].split() if data and data[0] else []
for uid in raw_uids:
uid_value = uid.decode('utf-8') if isinstance(uid, bytes) else str(uid)
status, message_data = client.uid('fetch', uid, '(BODY.PEEK[])')
if status != 'OK':
raise RuntimeError(f'Could not fetch IMAP message {uid_value}')
raw_message = _fetch_message_bytes(message_data)
if raw_message is None:
continue
result = ingest_message(mailbox, uid_value, raw_message)
processed += 1
if result['status'] == 'stored':
stored += 1
else:
ignored += 1
if result['status'] in {
'stored', 'duplicate', 'ignored_missing_sender', 'ignored_unknown_sender', 'ignored_no_link',
}:
client.uid('store', uid, '+FLAGS', '(\\Seen)')
return {'status': 'ok', 'processed': processed, 'stored': stored, 'ignored': ignored}
finally:
try:
client.logout()
except Exception:
pass
def run_imap_polling(stop_event: Event, logger: logging.Logger | None = None) -> None:
active_logger = logger or logging.getLogger(__name__)
while not stop_event.is_set():
values = get_imap_settings()
interval = max(5, int(values.get('imap_poll_interval_seconds', settings.imap_poll_interval_seconds or 60)))
if not imap_configured(values):
stop_event.wait(interval)
continue
try:
summary = poll_inbox_once(values)
if summary['processed']:
active_logger.info(
'IMAP poll processed=%s stored=%s ignored=%s mailbox=%s',
summary['processed'], summary['stored'], summary['ignored'], values['imap_mailbox'],
)
except Exception as error:
active_logger.warning('IMAP polling failed mailbox=%s error=%s', values.get('imap_mailbox'), error)
stop_event.wait(interval)
+102
View File
@@ -15,6 +15,7 @@ from backend.app.main import app
from backend.app.core.config import settings
from backend.app.database import get_connection, hash_password
from backend.app.services.email_service import get_smtp_settings
from backend.app.services.inbound_email_service import get_imap_settings, poll_inbox_once
from backend.app.services.login_throttle import clear_login_failures
from backend.app.services.otp_service import current_code
from backend.app.services.password_reset import create_reset_token
@@ -147,6 +148,8 @@ def test_configuration_requires_authentication_and_admin_role():
assert client.get('/api/admin/users', headers=login_headers('bob')).status_code == 403
assert client.get('/api/admin/smtp').status_code == 401
assert client.get('/api/admin/smtp', headers=login_headers('bob')).status_code == 403
assert client.get('/api/admin/imap').status_code == 401
assert client.get('/api/admin/imap', headers=login_headers('bob')).status_code == 403
def test_admin_can_select_multiple_themes():
@@ -234,6 +237,105 @@ def test_admin_reports_smtp_validation_errors():
assert failed_validation.headers['X-Request-ID']
def test_admin_can_save_imap_settings():
headers = login_headers()
original = get_imap_settings()
with get_connection() as conn:
original_row = conn.execute('SELECT value FROM app_settings WHERE name = ?', ('imap',)).fetchone()
response = client.put('/api/admin/imap', headers=headers, json={
'imap_host': 'imap.example.com',
'imap_port': 993,
'imap_username': 'collector@example.com',
'imap_password': 'secret-imap-password',
'imap_mailbox': 'INBOX',
'imap_use_ssl': True,
'imap_poll_interval_seconds': 60,
})
assert response.status_code == 200
assert response.json()['imap_host'] == 'imap.example.com'
assert response.json()['password_configured'] is True
assert response.json()['configured'] is True
assert 'imap_password' not in response.json()
if original_row is None:
with get_connection() as conn:
conn.execute('DELETE FROM app_settings WHERE name = ?', ('imap',))
conn.commit()
else:
with get_connection() as conn:
conn.execute(
'UPDATE app_settings SET value = ?, updated_at = CURRENT_TIMESTAMP WHERE name = ?',
(original_row['value'], 'imap'),
)
conn.commit()
def test_poll_inbox_once_reads_unseen_messages_and_marks_them_seen():
class FakeImapClient:
def __init__(self):
self.actions = []
self.raw_message = (
b'From: Alice <alice@example.com>\n'
b'To: capture@linklog.example\n'
b'Subject: Polled inbox entry #AI\n'
b'Message-ID: <poll-1@example.com>\n'
b'Content-Type: text/plain; charset="utf-8"\n\n'
b'Collected from IMAP.\nhttps://example.com/polled\n'
)
def login(self, username, password):
self.actions.append(('login', username, password))
return 'OK', [b'Logged in']
def select(self, mailbox):
self.actions.append(('select', mailbox))
return 'OK', [b'1']
def uid(self, command, *args):
self.actions.append(('uid', command, *args))
if command == 'search':
return 'OK', [b'200']
if command == 'fetch':
return 'OK', [(b'200 (BODY[] {42}', self.raw_message), b')']
if command == 'store':
return 'OK', [b'200 (FLAGS (\\Seen))']
raise AssertionError(command)
def logout(self):
self.actions.append(('logout',))
return 'BYE', [b'Logged out']
summary = poll_inbox_once(
{
'imap_host': 'imap.example.com',
'imap_port': 993,
'imap_username': 'collector@example.com',
'imap_password': 'secret',
'imap_mailbox': 'INBOX',
'imap_use_ssl': True,
'imap_poll_interval_seconds': 60,
},
client_factory=lambda _: FakeImapClient(),
)
assert summary == {'status': 'ok', 'processed': 1, 'stored': 1, 'ignored': 0}
with get_connection() as conn:
link = conn.execute(
'SELECT title, url, comment, user_id FROM links WHERE url = ?',
('https://example.com/polled',),
).fetchone()
inbound = conn.execute(
'SELECT status FROM inbound_email_messages WHERE mailbox = ? AND uid = ?',
('INBOX', '200'),
).fetchone()
assert link['user_id'] == 'user-1'
assert link['title'] == 'Polled inbox entry'
assert link['comment'] == 'Collected from IMAP.'
assert inbound['status'] == 'stored'
def test_request_id_is_preserved_and_sensitive_error_text_is_not_returned():
headers = login_headers()
with get_connection() as conn:
@@ -0,0 +1,92 @@
## Copyright © 2026 Olaf Kolkman
## SPDX-License-Identifier: GPL-3.0-or-later
from email.message import EmailMessage
from backend.app.database import get_connection
from backend.app.services.inbound_email_service import ingest_message, parse_incoming_email
def _raw_message(sender: str, subject: str, body: str, message_id: str) -> bytes:
message = EmailMessage()
message['From'] = sender
message['To'] = 'capture@linklog.example'
message['Subject'] = subject
message['Message-ID'] = message_id
message.set_content(body)
return message.as_bytes()
def test_parse_incoming_email_extracts_title_comment_tags_and_link():
parsed = parse_incoming_email(_raw_message(
'Alice <alice@example.com>',
'A useful article #AI',
'Interesting summary about the protocol.\nhttps://example.com/posts/1\n#Security',
'<msg-1@example.com>',
))
assert parsed['from_email'] == 'alice@example.com'
assert parsed['title'] == 'A useful article'
assert parsed['url'] == 'https://example.com/posts/1'
assert parsed['comment'] == 'Interesting summary about the protocol.'
assert parsed['tags'] == ['#AI', '#Security']
def test_ingest_message_stores_link_for_primary_email_sender():
result = ingest_message(
'INBOX',
'101',
_raw_message(
'Alice <alice@example.com>',
'Email sourced link #Fediverse',
'A comment from the inbox.\nhttps://example.com/inbox-link',
'<msg-2@example.com>',
),
)
assert result['status'] == 'stored'
with get_connection() as conn:
link = conn.execute(
'SELECT title, url, comment, user_id FROM links WHERE id = ?',
(result['link_id'],),
).fetchone()
tags = conn.execute(
'''SELECT tags.name
FROM tags
JOIN link_tags ON link_tags.tag_id = tags.id
WHERE link_tags.link_id = ?
ORDER BY tags.name''',
(result['link_id'],),
).fetchall()
audit = conn.execute(
'SELECT status FROM inbound_email_messages WHERE mailbox = ? AND uid = ?',
('INBOX', '101'),
).fetchone()
assert link['user_id'] == 'user-1'
assert link['title'] == 'Email sourced link'
assert link['url'] == 'https://example.com/inbox-link'
assert link['comment'] == 'A comment from the inbox.'
assert [row['name'] for row in tags] == ['#Fediverse']
assert audit['status'] == 'stored'
def test_ingest_message_accepts_verified_additional_address_and_ignores_duplicates():
with get_connection() as conn:
conn.execute(
'INSERT INTO user_email_addresses (id, user_id, email, verified) VALUES (?, ?, ?, 1)',
('alt-email-test', 'user-1', 'alice-alt@example.com'),
)
conn.commit()
raw_message = _raw_message(
'Alice Alt <alice-alt@example.com>',
'Secondary sender #Links',
'https://example.com/secondary',
'<msg-3@example.com>',
)
first = ingest_message('INBOX', '102', raw_message)
second = ingest_message('INBOX', '102', raw_message)
assert first['status'] == 'stored'
assert second['status'] == 'duplicate'
+7
View File
@@ -20,6 +20,13 @@ services:
LINKLOG_SMTP_PASSWORD: ${LINKLOG_SMTP_PASSWORD:?Set LINKLOG_SMTP_PASSWORD in .env}
LINKLOG_SMTP_FROM: ${LINKLOG_SMTP_FROM:-LinkLog <no-reply@example.com>}
LINKLOG_SMTP_USE_TLS: ${LINKLOG_SMTP_USE_TLS:-true}
LINKLOG_IMAP_HOST: ${LINKLOG_IMAP_HOST:-imap.example.com}
LINKLOG_IMAP_PORT: ${LINKLOG_IMAP_PORT:-993}
LINKLOG_IMAP_USERNAME: ${LINKLOG_IMAP_USERNAME:?Set LINKLOG_IMAP_USERNAME in .env}
LINKLOG_IMAP_PASSWORD: ${LINKLOG_IMAP_PASSWORD:?Set LINKLOG_IMAP_PASSWORD in .env}
LINKLOG_IMAP_MAILBOX: ${LINKLOG_IMAP_MAILBOX:-INBOX}
LINKLOG_IMAP_USE_SSL: ${LINKLOG_IMAP_USE_SSL:-true}
LINKLOG_IMAP_POLL_INTERVAL_SECONDS: ${LINKLOG_IMAP_POLL_INTERVAL_SECONDS:-60}
LINKLOG_EMAIL_VERIFICATION_EXPIRY_HOURS: ${LINKLOG_EMAIL_VERIFICATION_EXPIRY_HOURS:-24}
LINKLOG_PASSWORD_RESET_EXPIRY_HOURS: ${LINKLOG_PASSWORD_RESET_EXPIRY_HOURS:-1}
LINKLOG_MASTODON_CLIENT_NAME: ${LINKLOG_MASTODON_CLIENT_NAME:-LinkLog}
+7
View File
@@ -19,6 +19,13 @@ services:
LINKLOG_PUBLIC_URL: ${LINKLOG_PUBLIC_URL:-http://localhost:8000}
LINKLOG_TOKEN_EXPIRY_MINUTES: ${LINKLOG_TOKEN_EXPIRY_MINUTES:-15}
LINKLOG_REFRESH_TOKEN_EXPIRY_DAYS: ${LINKLOG_REFRESH_TOKEN_EXPIRY_DAYS:-30}
LINKLOG_IMAP_HOST: ${LINKLOG_IMAP_HOST:-}
LINKLOG_IMAP_PORT: ${LINKLOG_IMAP_PORT:-993}
LINKLOG_IMAP_USERNAME: ${LINKLOG_IMAP_USERNAME:-}
LINKLOG_IMAP_PASSWORD: ${LINKLOG_IMAP_PASSWORD:-}
LINKLOG_IMAP_MAILBOX: ${LINKLOG_IMAP_MAILBOX:-INBOX}
LINKLOG_IMAP_USE_SSL: ${LINKLOG_IMAP_USE_SSL:-true}
LINKLOG_IMAP_POLL_INTERVAL_SECONDS: ${LINKLOG_IMAP_POLL_INTERVAL_SECONDS:-60}
LINKLOG_LOG_LEVEL: ${LINKLOG_LOG_LEVEL:-DEBUG}
LINKLOG_TRACKING_PARAMS: ${LINKLOG_TRACKING_PARAMS:-}
restart: ${APP_RESTART_POLICY:-unless-stopped}
+7
View File
@@ -19,6 +19,13 @@ services:
LINKLOG_LOG_LEVEL: ${LINKLOG_LOG_LEVEL:-INFO}
LINKLOG_TOKEN_EXPIRY_MINUTES: ${LINKLOG_TOKEN_EXPIRY_MINUTES:-15}
LINKLOG_REFRESH_TOKEN_EXPIRY_DAYS: ${LINKLOG_REFRESH_TOKEN_EXPIRY_DAYS:-30}
LINKLOG_IMAP_HOST: ${LINKLOG_IMAP_HOST:-}
LINKLOG_IMAP_PORT: ${LINKLOG_IMAP_PORT:-993}
LINKLOG_IMAP_USERNAME: ${LINKLOG_IMAP_USERNAME:-}
LINKLOG_IMAP_PASSWORD: ${LINKLOG_IMAP_PASSWORD:-}
LINKLOG_IMAP_MAILBOX: ${LINKLOG_IMAP_MAILBOX:-INBOX}
LINKLOG_IMAP_USE_SSL: ${LINKLOG_IMAP_USE_SSL:-true}
LINKLOG_IMAP_POLL_INTERVAL_SECONDS: ${LINKLOG_IMAP_POLL_INTERVAL_SECONDS:-60}
LINKLOG_TRACKING_PARAMS: ${LINKLOG_TRACKING_PARAMS:-}
restart: ${APP_RESTART_POLICY:-unless-stopped}
healthcheck: