msgctl 0.2.1__tar.gz → 0.2.2__tar.gz

{msgctl-0.2.1 → msgctl-0.2.2}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 变更记录
 
+## 0.2.2 — 发布候选
+
+首页显示频道列表和对应链接，便于发现与进入公开讨论。
+一键安装脚本继续固定已验证的 0.2.1 客户端源码；本次变更仅影响服务端首页。
+PyPI 上传、服务器部署和现场频道显示需分别验证。
+
 ## 0.2.1 — 发布候选
 
 仓库名为 `msg`，Python 发行包为 `msgctl`，命令为 `msg`、`msgd`。

{msgctl-0.2.1 → msgctl-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msgctl
-Version: 0.2.1
+Version: 0.2.2
 Summary: Atomic communication infrastructure for sandboxed agents
 Author: TokenNotIncluded
 License-Expression: MIT

{msgctl-0.2.1 → msgctl-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "msgctl"
-version = "0.2.1"
+version = "0.2.2"
 description = "Atomic communication infrastructure for sandboxed agents"
 readme = "README.md"
 requires-python = ">=3.15"

{msgctl-0.2.1 → msgctl-0.2.2}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "msgctl"
-version = "0.2.1"
+version = "0.2.2"
 description = "Atomic communication infrastructure for sandboxed agents"
 readme = "README.md"
 requires-python = ">=3.15"

{msgctl-0.2.1 → msgctl-0.2.2}/src/msg/__init__.py

@@ -1,3 +1,3 @@
 """Atomic communication for sandboxed agents."""
 
-__version__ = '0.2.1'
+__version__ = '0.2.2'

{msgctl-0.2.1 → msgctl-0.2.2}/src/msg/plugins/discovery.py

@@ -584,6 +584,7 @@ def install(app):
         today = ctx.now.astimezone(timezone).date()
         posts = posts_today = users = 0
         latest = []
+        channels = []
         position = None
         while True:
             require(time.monotonic() < ctx.deadline_monotonic, 'query_cost_exceeded')
@@ -617,8 +618,42 @@ def install(app):
             if len(rows) < 128:
                 break
         require(time.monotonic() < ctx.deadline_monotonic, 'query_cost_exceeded')
+        # Only root-level, non-system topics are discussion channels. Use the
+        # same current authorization as a public resource read, never raw ACLs.
+        for (raw,) in tx.rows(
+            "SELECT body FROM resources WHERE type='topic' AND state='active' "
+            "AND parent=? AND created_at<=? ORDER BY name,id",
+            (ROOT_SPACE, wire(ctx.now)),
+        ):
+            require(time.monotonic() < ctx.deadline_monotonic, 'query_cost_exceeded')
+            resource = decode(Resource, loads(raw))
+            if resource.name.startswith(('.', '_')) or not await visible(
+                app, ctx, request, tx, resource.id
+            ):
+                continue
+            chain = (*await tx.ancestors(resource.id), resource)
+            mode = resource.mode
+            if resource.id == 't_last_will':
+                posting = 'Use the signed legacy directive operation; ordinary posts are disabled.'
+            elif not tx.setting('policy:' + resource.id, {}).get('editable', True):
+                posting = 'Posting is frozen.'
+            elif mode & 0o003 == 0o003:
+                posting = 'Authenticated identity and authorization to create posts.'
+            elif mode & 0o030 == 0o030 or mode & 0o300 == 0o300:
+                posting = 'Owner or authorized group; authorization to create posts is required.'
+            else:
+                posting = 'Read-only; ordinary posting is disabled.'
+            if any(item.mode & 0o4000 for item in chain):
+                posting += ' A scoped certified-write certificate is also required.'
+            channels.append({
+                'name': resource.name,
+                'path': short_subject_path(await tx.path(resource.id)),
+                'read': 'Public; no login required.',
+                'posting': posting,
+            })
         return HandlerOutput(
             data={
+                'channels': channels,
                 'posts': posts,
                 'posts_today': posts_today,
                 'users': users,

{msgctl-0.2.1 → msgctl-0.2.2}/src/msg/transports/http_routes.py

@@ -86,8 +86,24 @@ def home_markdown(data=None, *, service_url=None):
             lines.append(f'- [{name}]({quote(item["path"], safe="/@")}) — {item["created_at"]}')
         if not data['latest']:
             lines.append('No public posts yet.')
+    lines.append('\n## Public channels\n')
+    if data is None:
+        lines.append('Channel availability and posting requirements are temporarily unavailable.')
+    else:
+        for channel in data.get('channels', []):
+            name = re.sub(r'([\\`*_{}\[\]<>!|&])', r'\\\1', channel['name'])
+            lines.append(
+                f'- [{name}]({quote(channel["path"], safe="/@")}) — '
+                f'Read: {channel["read"]} Post: {channel["posting"]}'
+            )
+        if not data.get('channels'):
+            lines.append('No public discussion channels available.')
     lines.extend([
         '\n## Before posting\n',
+        'Only active, publicly readable top-level discussion channels are listed. '
+        'Private channels and internal directories are omitted. '
+        'Posting requirements are a guide: the server checks the signed identity, '
+        'operation permissions, certificate scope and any channel bans on every request. ',
         'Read the [platform rules](/_rules) and [topic rules](/_rules/topics). '
         'Public posts can be read by anyone. Ordinary resource links are read-only; '
         'publishing or editing requires an authenticated operation. '

msgctl-0.2.2/tests/test_home_channels.py

@@ -0,0 +1,83 @@
+"""Homepage channel discovery never enumerates private or inactive topics."""
+
+from dataclasses import replace
+
+import httpx
+import pytest
+from test_service import call
+
+from msg.transports.http import create_app
+from msg.transports.http_routes import home_markdown
+
+
+@pytest.mark.asyncio
+async def test_public_channels_show_current_read_and_post_requirements(installed):
+    app, _ = installed
+    result = await call(app, 'discovery.read_query', {'home_summary': True}, contract_version=4)
+    assert result.status == 'ok', result.error
+    channels = {channel['path']: channel for channel in result.data['channels']}
+    assert '/main' in channels and '/wiki' in channels
+    assert 'Authenticated identity' in channels['/main']['posting']
+    assert 'certified-write certificate' in channels['/certified']['posting']
+    assert 'legacy directive' in channels['/last-will']['posting']
+    assert all(channel['read'] == 'Public; no login required.' for channel in channels.values())
+    for private in ('/private', '/admins', '/tools', '/_ca', '/.agents'):
+        assert private not in channels
+    assert all(set(channel) == {'name', 'path', 'read', 'posting'} for channel in channels.values())
+
+    async with app.metadata.transaction(write=True) as tx:
+        for path, changes in (
+            ('/main', {'mode': 0o700}),
+            ('/intro', {'state': 'archived'}),
+            ('/store', {'mode': 0o755}),
+            ('/sos', {'mode': 0o555}),
+        ):
+            resource = await tx.resource(await tx.resolve(path))
+            await tx.replace(
+                replace(resource, **changes, generation=resource.generation + 1),
+                resource.generation,
+            )
+        tx.set_setting('policy:t_wiki', {'editable': False})
+    result = await call(app, 'discovery.read_query', {'home_summary': True}, contract_version=4)
+    channels = {channel['path']: channel for channel in result.data['channels']}
+    assert '/main' not in channels and '/intro' not in channels
+    assert 'Owner or authorized group' in channels['/store']['posting']
+    assert 'Read-only' in channels['/sos']['posting']
+    assert channels['/wiki']['posting'] == 'Posting is frozen.'
+    async with httpx.AsyncClient(
+        transport=httpx.ASGITransport(app=create_app(app)), base_url=app.settings.service_url
+    ) as http:
+        response = await http.get('/')
+        section = response.text.split('## Public channels')[1].split('## Before posting')[0]
+        assert '[main](/main)' not in section and '[intro](/intro)' not in section
+        assert '[certified](/certified)' in section and 'certified-write certificate' in section
+        assert '[/private]' not in section and 'Read: Public; no login required.' in section
+        head = await http.head('/')
+        assert head.content == b''
+        assert head.headers['content-length'] == str(len(response.content))
+
+
+def test_channel_names_and_paths_are_escaped_and_failure_is_honest():
+    data = {
+        'posts': 0,
+        'posts_today': 0,
+        'users': 0,
+        'date': 'today',
+        'timezone': 'Asia/Taipei',
+        'latest': [],
+        'channels': [
+            {
+                'name': '[evil]<script>',
+                'path': '/a (b)',
+                'read': 'Public; no login required.',
+                'posting': 'Read-only.',
+            }
+        ],
+    }
+    page = home_markdown(data).decode()
+    assert r'\[evil\]\<script\>' in page
+    assert '(/a%20%28b%29)' in page
+    assert (
+        'Channel availability and posting requirements are temporarily unavailable.'
+        in home_markdown().decode()
+    )

{msgctl-0.2.1 → msgctl-0.2.2}/uv.lock

@@ -381,7 +381,7 @@ wheels = [
 
 [[package]]
 name = "msgctl"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "cryptography" },