app/config.py

@@ -126,7 +126,6 @@ class Config(pydantic.BaseModel):
     key_path: str | None = None
 
     session_timeout: int = 3600 * 24 * 3  # in seconds, 3 days by default
-    csrf_token_exp: int = 3600
 
     disabled_notifications: list[str] = []
 
@@ -266,7 +265,7 @@ def verify_csrf_token(
     if redirect_url:
         please_try_again = f'<a href="{redirect_url}">please try again</a>'
     try:
-        csrf_serializer.loads(csrf_token, max_age=CONFIG.csrf_token_exp)
+        csrf_serializer.loads(csrf_token, max_age=1800)
     except (itsdangerous.BadData, itsdangerous.SignatureExpired):
         logger.exception("Failed to verify CSRF token")
         raise HTTPException(

app/incoming_activities.py

@@ -60,7 +60,7 @@ def _set_next_try(
     if not outgoing_activity.tries:
         raise ValueError("Should never happen")
 
-    if outgoing_activity.tries >= _MAX_RETRIES:
+    if outgoing_activity.tries == _MAX_RETRIES:
         outgoing_activity.is_errored = True
         outgoing_activity.next_try = None
     else:

app/indieauth.py

@@ -10,8 +10,6 @@ from fastapi import Form
 from fastapi import HTTPException
 from fastapi import Request
 from fastapi.responses import JSONResponse
-from fastapi.security import HTTPBasic
-from fastapi.security import HTTPBasicCredentials
 from loguru import logger
 from pydantic import BaseModel
 from sqlalchemy import select
@@ -28,8 +26,6 @@ from app.redirect import redirect
 from app.utils import indieauth
 from app.utils.datetime import now
 
-basic_auth = HTTPBasic()
-
 router = APIRouter()
 
 
@@ -45,7 +41,6 @@ async def well_known_authorization_server(
         "revocation_endpoint": request.url_for("indieauth_revocation_endpoint"),
         "revocation_endpoint_auth_methods_supported": ["none"],
         "registration_endpoint": request.url_for("oauth_registration_endpoint"),
-        "introspection_endpoint": request.url_for("oauth_introspection_endpoint"),
     }
 
 
@@ -383,8 +378,6 @@ async def _check_access_token(
 class AccessTokenInfo:
     scopes: list[str]
     client_id: str | None
-    access_token: str
-    exp: int
 
 
 async def verify_access_token(
@@ -416,13 +409,6 @@ async def verify_access_token(
             if access_token.indieauth_authorization_request
             else None
         ),
-        access_token=access_token.access_token,
-        exp=int(
-            (
-                access_token.created_at.replace(tzinfo=timezone.utc)
-                + timedelta(seconds=access_token.expires_in)
-            ).timestamp()
-        ),
     )
 
 
@@ -448,13 +434,6 @@ async def check_access_token(
             if access_token.indieauth_authorization_request
             else None
         ),
-        access_token=access_token.access_token,
-        exp=int(
-            (
-                access_token.created_at.replace(tzinfo=timezone.utc)
-                + timedelta(seconds=access_token.expires_in)
-            ).timestamp()
-        ),
     )
 
     logger.info(
@@ -495,58 +474,3 @@ async def indieauth_revocation_endpoint(
         content={},
         status_code=200,
     )
-
-
-@router.post("/token_introspection")
-async def oauth_introspection_endpoint(
-    request: Request,
-    credentials: HTTPBasicCredentials = Depends(basic_auth),
-    db_session: AsyncSession = Depends(get_db_session),
-    token: str = Form(),
-) -> JSONResponse:
-    registered_client = (
-        await db_session.scalars(
-            select(models.OAuthClient).where(
-                models.OAuthClient.client_id == credentials.username,
-                models.OAuthClient.client_secret == credentials.password,
-            )
-        )
-    ).one_or_none()
-    if not registered_client:
-        raise HTTPException(status_code=401, detail="unauthenticated")
-
-    access_token = (
-        await db_session.scalars(
-            select(models.IndieAuthAccessToken)
-            .where(models.IndieAuthAccessToken.access_token == token)
-            .join(
-                models.IndieAuthAuthorizationRequest,
-                models.IndieAuthAccessToken.indieauth_authorization_request_id
-                == models.IndieAuthAuthorizationRequest.id,
-            )
-            .where(
-                models.IndieAuthAuthorizationRequest.client_id == credentials.username
-            )
-        )
-    ).one_or_none()
-    if not access_token:
-        return JSONResponse(content={"active": False})
-
-    is_token_valid, _ = await _check_access_token(db_session, token)
-    if not is_token_valid:
-        return JSONResponse(content={"active": False})
-
-    return JSONResponse(
-        content={
-            "active": True,
-            "client_id": credentials.username,
-            "scope": access_token.scope,
-            "exp": int(
-                (
-                    access_token.created_at.replace(tzinfo=timezone.utc)
-                    + timedelta(seconds=access_token.expires_in)
-                ).timestamp()
-            ),
-        },
-        status_code=200,
-    )

app/main.py

@@ -1426,7 +1426,6 @@ async def serve_proxy_media(
             _filter_proxy_resp_headers(
                 proxy_resp,
                 [
-                    "content-encoding",
                     "content-length",
                     "content-type",
                     "content-range",
@@ -1733,7 +1732,7 @@ async def _gen_rss_feed(
         fe.id(outbox_object.url)
         if outbox_object.name is not None:
             fe.title(outbox_object.name)
-        elif not is_rss:  # Atom feeds require a title
+        elif not is_rss: # Atom feeds require a title
             fe.title(outbox_object.url)
 
         fe.link(href=outbox_object.url)

app/micropub.py

@@ -132,7 +132,7 @@ async def post_micropub_endpoint(
             h = form_data["h"]
         entry_type = f"h-{h}"
 
-    logger.info(f"Creating {entry_type=} with {access_token_info=}")
+    logger.info(f"Creating {entry_type}")
 
     if entry_type != "h-entry":
         return JSONResponse(
@@ -150,7 +150,7 @@ async def post_micropub_endpoint(
     else:
         content = form_data["content"]
 
-    public_id, _ = await send_create(
+    public_id = await send_create(
         db_session,
         "Note",
         content,

app/models.py

@@ -1,5 +1,4 @@
 import enum
-from datetime import datetime
 from typing import Any
 from typing import Optional
 from typing import Union
@@ -437,7 +436,7 @@ class OutboxObjectAttachment(Base):
     outbox_object_id = Column(Integer, ForeignKey("outbox.id"), nullable=False)
 
     upload_id = Column(Integer, ForeignKey("upload.id"), nullable=False)
-    upload: Mapped["Upload"] = relationship(Upload, uselist=False)
+    upload = relationship(Upload, uselist=False)
 
 
 class IndieAuthAuthorizationRequest(Base):
@@ -460,9 +459,7 @@ class IndieAuthAccessToken(Base):
     __tablename__ = "indieauth_access_token"
 
     id = Column(Integer, primary_key=True, index=True)
-    created_at: Mapped[datetime] = Column(
-        DateTime(timezone=True), nullable=False, default=now
-    )
+    created_at = Column(DateTime(timezone=True), nullable=False, default=now)
 
     # Will be null for personal access tokens
     indieauth_authorization_request_id = Column(
@@ -473,9 +470,9 @@ class IndieAuthAccessToken(Base):
         uselist=False,
     )
 
-    access_token: Mapped[str] = Column(String, nullable=False, unique=True, index=True)
+    access_token = Column(String, nullable=False, unique=True, index=True)
     refresh_token = Column(String, nullable=True, unique=True, index=True)
-    expires_in: Mapped[int] = Column(Integer, nullable=False)
+    expires_in = Column(Integer, nullable=False)
     scope = Column(String, nullable=False)
     is_revoked = Column(Boolean, nullable=False, default=False)
     was_refreshed = Column(Boolean, nullable=False, default=False, server_default="0")

app/outgoing_activities.py

@@ -151,7 +151,7 @@ def _set_next_try(
     if not outgoing_activity.tries:
         raise ValueError("Should never happen")
 
-    if outgoing_activity.tries >= _MAX_RETRIES:
+    if outgoing_activity.tries == _MAX_RETRIES:
         outgoing_activity.is_errored = True
         outgoing_activity.next_try = None
     else:

app/prune.py

@@ -102,8 +102,6 @@ async def _prune_old_inbox_objects(
                     models.InboxObject.ap_type.in_(["Note"]),
                 )
             ),
-            # Keep Move object as they are linked to notifications
-            models.InboxObject.ap_type.not_in(["Move"]),
             # Filter by retention days
             models.InboxObject.ap_published_at
             < now() - timedelta(days=INBOX_RETENTION_DAYS),

app/templates/notifications.html

@@ -51,7 +51,7 @@
             {% elif notif.notification_type.value == "unblock" %}
                 {{ notif_actor_action(notif, "was unblocked") }}
                 {{ utils.display_actor(notif.actor, actors_metadata) }}
-            {%- elif notif.notification_type.value == "move" and notif.inbox_object %}
+            {%- elif notif.notification_type.value == "move" %}
                 {# for move notif, the actor is the target and the inbox object the Move activity #}
                 <div class="actor-action">
                     <a href="{{ url_for("admin_profile") }}?actor_id={{ notif.inbox_object.actor.ap_id }}">

app/uploads.py

@@ -60,7 +60,7 @@ async def save_upload(db_session: AsyncSession, f: UploadFile) -> models.Upload:
             destination_image.putdata(original_image.getdata())
             destination_image.save(
                 dest_filename,
-                format=_original_image.format,  # type: ignore
+                format=_original_image.format,
             )
 
             with open(dest_filename, "rb") as dest_f: