Compare commits

...
Author SHA1 Message Date
PhilandClaude Opus 5.5 94e8c672df release: v2.0.2 (CI registry login)
Build Container / build (push) Successful in 18s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 12:20:01 -06:00
PhilandClaude Opus 5.5 011f7cc87d ci: Log in to the registry with a write:package token
The automatic Actions token is refused by the container registry
(run 107: unauthorized). Use the REGISTRY_TOKEN repository secret.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 12:13:43 -06:00
PhilandClaude Opus 5.5 f46130569f Merge branch 'fix/v2.0.1-ci-and-feed-urls' for v2.0.1 release
Build Container / build (push) Failing after 12s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 12:12:29 -06:00
PhilandClaude Opus 5.5 b4e6cf3cc3 fix: Build absolute URLs from SITE_URL, not the request (v2.0.1)
Behind Caddy the app is reached over plain HTTP, so url_for(_external=True)
produced http:// links on the https site: the RSS/OPML <link>s and the
microformats u-url/u-uid permalinks that IndieWeb parsers treat as
canonical. Templates now use absolute_url_for(), shared with the
IndieAuth metadata.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 12:12:28 -06:00
PhilandClaude Opus 5.5 2d0568d9c2 Build the container image with the server's rootless BuildKit
The runner no longer has a Docker daemon (it gave every workflow root on
the server), and this workflow never worked anyway: it logged in to
gitea:3000, which the daemon couldn't resolve. Log in to
git.thesatelliteoflove.com and build through the BuildKit socket instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 11:53:59 -06:00
PhilandClaude Opus 5.5 f117913797 Merge branch 'feature/v2.0.0-oidc' for v2.0.0 release
Build Container / build (push) Failing after 2m38s
Includes the v1.6.0-rc.2 source recovered from production.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 11:45:20 -06:00
11 changed files with 125 additions and 65 deletions

No files matched your search

+26 -42
View File
@@ -1,58 +1,42 @@
# Gitea Actions workflow for StarPunk
# Builds and pushes container images on version tags
# Builds and pushes container images on version tags.
#
# The runner has no Docker daemon (that would give workflows root on the
# server). Images are built by the rootless BuildKit container next to it,
# reached through its socket.
name: Build Container
on:
# Trigger on version tags
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
# Allow manual trigger from Gitea UI
workflow_dispatch:
env:
REGISTRY: git.thesatelliteoflove.com
BUILDKIT: unix:///run/buildkit/buildkit/buildkitd.sock
jobs:
build:
runs-on: docker
steps:
- name: Install dependencies
run: |
if command -v apk > /dev/null; then
apk add --no-cache nodejs npm docker git
elif command -v apt-get > /dev/null; then
apt-get update && apt-get install -y nodejs npm docker.io git
elif command -v yum > /dev/null; then
yum install -y nodejs npm docker git
fi
run: apk add --no-cache nodejs git docker-cli docker-cli-buildx
- name: Checkout
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Extract registry URL
id: registry
run: |
# Extract hostname from server URL (remove protocol)
REGISTRY_URL=$(echo "${{ github.server_url }}" | sed 's|https://||' | sed 's|http://||')
echo "url=${REGISTRY_URL}" >> $GITHUB_OUTPUT
- name: Login to Gitea Container Registry
uses: docker/login-action@v3
with:
registry: ${{ steps.registry.outputs.url }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
# The automatic Actions token can't log in to the container registry, so
# this uses a personal access token with only the write:package scope,
# stored as the repository secret REGISTRY_TOKEN.
- name: Log in to the Gitea registry
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login "$REGISTRY" -u "${{ github.repository_owner }}" --password-stdin
- name: Use the BuildKit socket
run: docker buildx create --name ci --driver remote "$BUILDKIT" --use
- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
file: ./Containerfile
push: true
tags: |
${{ steps.registry.outputs.url }}/${{ github.repository }}:${{ github.ref_name }}
${{ steps.registry.outputs.url }}/${{ github.repository }}:latest
cache-from: type=gha
cache-to: type=gha,mode=max
run: |
image="$REGISTRY/$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')"
docker buildx build --push -f Containerfile \
-t "$image:${{ github.ref_name }}" -t "$image:latest" .
- name: Clean up
if: always()
run: |
docker buildx rm ci || true
docker logout "$REGISTRY" || true
+18
View File
@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [2.0.2] - 2026-10-31
### Fixed
- Container builds in Gitea Actions log in to the registry with the
`REGISTRY_TOKEN` secret (a `write:package` token); the automatic Actions
token is refused by the registry. No application changes.
## [2.0.1] - 2026-10-31
### Fixed
- Page links built from the request said `http://` behind an HTTPS reverse proxy
(RSS/OPML `<link>`s and microformats `u-url`/`u-uid` permalinks). All absolute
URLs in templates now come from `SITE_URL` via `absolute_url_for()`.
- Container builds in Gitea Actions: build through the server's rootless BuildKit
and log in to the public registry name (the old workflow never succeeded).
## [2.0.0] - 2026-10-31
### Changed (breaking)
+6 -2
View File
@@ -191,6 +191,10 @@ def create_app(config=None):
register_routes(app)
# Template context processor - Inject author profile (v1.2.0 Phase 2)
from starpunk.utils import absolute_url_for
app.jinja_env.globals["absolute_url_for"] = absolute_url_for
@app.context_processor
def inject_author():
"""
@@ -436,5 +440,5 @@ def create_app(config=None):
# Package version (Semantic Versioning 2.0.0)
# See docs/standards/versioning-strategy.md for details
__version__ = "2.0.0"
__version_info__ = (2, 0, 0)
__version__ = "2.0.2"
__version_info__ = (2, 0, 2)
+1 -7
View File
@@ -22,6 +22,7 @@ from bs4 import BeautifulSoup
from flask import current_app
from starpunk.database import get_db
from starpunk.utils import absolute_url_for
CODE_LIFETIME_MINUTES = 10
SUPPORTED_SCOPES = ["create", "update", "delete", "media", "profile"]
@@ -55,13 +56,6 @@ def issuer() -> str:
return current_app.config["SITE_URL"].rstrip("/") + "/"
def site_url_for(endpoint: str) -> str:
"""Absolute URL built from SITE_URL (request host/scheme is unreliable behind a proxy)"""
from flask import url_for
return current_app.config["SITE_URL"].rstrip("/") + url_for(endpoint)
def admin_me() -> str:
"""The single identity StarPunk issues tokens for"""
return current_app.config["ADMIN_ME"]
+4 -4
View File
@@ -34,11 +34,11 @@ from starpunk.indieauth import (
issuer,
redeem_authorization_code,
revoke_access_token,
site_url_for,
validate_authorization_request,
verify_access_token,
)
from starpunk.micropub import extract_bearer_token
from starpunk.utils import absolute_url_for
bp = Blueprint("indieauth", __name__)
@@ -89,9 +89,9 @@ def metadata():
return _json(
{
"issuer": issuer(),
"authorization_endpoint": site_url_for("indieauth.authorize"),
"token_endpoint": site_url_for("indieauth.token"),
"revocation_endpoint": site_url_for("indieauth.revoke"),
"authorization_endpoint": absolute_url_for("indieauth.authorize"),
"token_endpoint": absolute_url_for("indieauth.token"),
"revocation_endpoint": absolute_url_for("indieauth.revoke"),
"revocation_endpoint_auth_methods_supported": ["none"],
"scopes_supported": SUPPORTED_SCOPES,
"response_types_supported": ["code"],
+12
View File
@@ -681,3 +681,15 @@ def parse_iso8601(date_string: str) -> datetime:
# Parse using fromisoformat
return datetime.fromisoformat(date_string)
def absolute_url_for(endpoint: str, **values) -> str:
"""
Absolute URL for an endpoint, built from SITE_URL
Use instead of url_for(..., _external=True): behind a reverse proxy the
request arrives over plain HTTP, so _external URLs would say http://.
"""
from flask import current_app, url_for
return current_app.config["SITE_URL"].rstrip("/") + url_for(endpoint, **values)
+6 -6
View File
@@ -5,16 +5,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}StarPunk{% endblock %}</title>
<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
<link rel="alternate" type="application/rss+xml" title="{{ config.SITE_NAME }} RSS Feed" href="{{ url_for('public.feed', _external=True) }}">
<link rel="alternate" type="application/xml+opml" title="{{ config.SITE_NAME }} Feed Subscription List" href="{{ url_for('public.opml', _external=True) }}">
<link rel="alternate" type="application/rss+xml" title="{{ config.SITE_NAME }} RSS Feed" href="{{ absolute_url_for('public.feed') }}">
<link rel="alternate" type="application/xml+opml" title="{{ config.SITE_NAME }} Feed Subscription List" href="{{ absolute_url_for('public.opml') }}">
{# Webmention endpoint (v1.6.0) #}
{% if config.WEBMENTION_ENABLED %}
<link rel="webmention" href="/webmention">
<link rel="micropub" href="{{ config.SITE_URL.rstrip('/') }}{{ url_for('micropub.micropub_endpoint') }}">
<link rel="indieauth-metadata" href="{{ config.SITE_URL.rstrip('/') }}{{ url_for('indieauth.metadata') }}">
<link rel="authorization_endpoint" href="{{ config.SITE_URL.rstrip('/') }}{{ url_for('indieauth.authorize') }}">
<link rel="token_endpoint" href="{{ config.SITE_URL.rstrip('/') }}{{ url_for('indieauth.token') }}">
<link rel="micropub" href="{{ absolute_url_for('micropub.micropub_endpoint') }}">
<link rel="indieauth-metadata" href="{{ absolute_url_for('indieauth.metadata') }}">
<link rel="authorization_endpoint" href="{{ absolute_url_for('indieauth.authorize') }}">
<link rel="token_endpoint" href="{{ absolute_url_for('indieauth.token') }}">
{% endif %}
{# rel-me links from discovered author profile (v1.2.0 Phase 2) #}
+2 -2
View File
@@ -9,7 +9,7 @@
<h2 class="p-name">{{ config.SITE_NAME or 'Recent Notes' }}</h2>
{# u-url for feed (self-reference) #}
<a class="u-url" href="{{ url_for('public.index', _external=True) }}" style="display: none;">Feed URL</a>
<a class="u-url" href="{{ absolute_url_for('public.index') }}" style="display: none;">Feed URL</a>
{# Feed-level author h-card with all properties #}
{# Hidden because it's semantic-only markup for parsers, not visual content #}
@@ -53,7 +53,7 @@
<footer class="note-meta">
{# u-url for permalink #}
<a class="u-url" href="{{ url_for('public.note', slug=note.slug, _external=True) }}">
<a class="u-url" href="{{ absolute_url_for('public.note', slug=note.slug) }}">
<time class="dt-published" datetime="{{ note.created_at.isoformat() }}">
{{ note.created_at.strftime('%B %d, %Y') }}
</time>
+1 -1
View File
@@ -49,7 +49,7 @@
<footer class="note-meta">
{# u-url and u-uid same for notes (per Q23) #}
<a class="u-url u-uid" href="{{ url_for('public.note', slug=note.slug, _external=True) }}">
<a class="u-url u-uid" href="{{ absolute_url_for('public.note', slug=note.slug) }}">
<time class="dt-published" datetime="{{ note.created_at.isoformat() }}">
{{ note.created_at.strftime('%B %d, %Y at %I:%M %p') }}
</time>
+1 -1
View File
@@ -28,7 +28,7 @@
<footer class="note-meta">
{# u-url for permalink #}
<a class="u-url" href="{{ url_for('public.note', slug=note.slug, _external=True) }}">
<a class="u-url" href="{{ absolute_url_for('public.note', slug=note.slug) }}">
<time class="dt-published" datetime="{{ note.created_at.isoformat() }}">
{{ note.created_at.strftime('%B %d, %Y') }}
</time>
+48
View File
@@ -0,0 +1,48 @@
"""
Absolute URLs come from SITE_URL, not the request (v2.0.1)
Behind a reverse proxy the app is reached over plain HTTP, so URLs built
from the request said http:// on an https site.
"""
import pytest
from starpunk import create_app
from starpunk.notes import create_note
@pytest.fixture
def app(tmp_path):
data = tmp_path / "data"
return create_app(
{
"TESTING": True,
"SITE_URL": "https://blog.example.com",
"ADMIN_ME": "https://example.com",
"SESSION_SECRET": "test-secret",
"DATA_PATH": data,
"NOTES_PATH": data / "notes",
"DATABASE_PATH": data / "starpunk.db",
}
)
def test_pages_use_site_url_behind_http_proxy(app):
with app.app_context():
note = create_note(content="Hello over the proxy", published=True, tags=["proxy"])
client = app.test_client()
pages = ["/", f"/note/{note.slug}", "/tag/proxy"]
for path in pages:
# The test client makes plain http://localhost requests, like Caddy does
response = client.get(path)
assert response.status_code == 200, path
html = response.data.decode()
assert "http://localhost" not in html, path
home = client.get("/").data.decode()
assert 'href="https://blog.example.com/feed"' in home
assert 'href="https://blog.example.com/opml.xml"' in home
note_html = client.get(f"/note/{note.slug}").data.decode()
assert f'href="https://blog.example.com/note/{note.slug}"' in note_html