Skip to content

fix(site): 网页上传去掉邮箱限制，改为按 GitHub 账号先到先得 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eggfly merged 1 commit into from
Jul 21, 2026
Merged

fix(site): 网页上传去掉邮箱限制，改为按 GitHub 账号先到先得 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions site/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* CardputerZero developer portal front-end. Same-origin API (see worker/). */

import { parseDeb, compareDebVersions, extractEmail } from "/debparse.js";
import { parseDeb, compareDebVersions, extractEmail, loginFromNoreply } from "/debparse.js";

// All decompression libraries are vendored at /vendor/ and served same-origin,
// so there is zero runtime dependency on a third-party CDN (availability,
Expand Down Expand Up @@ -198,26 +198,26 @@ async function renderPreview() {
$("p-noicon").classList.remove("hidden");
}

// 邮箱归属预检
const email = (parsed.email || "").toLowerCase();
const mine = me && me.emails.includes(email);
$("p-emailmatch").innerHTML = mine
? `<span class="lv-pass">Maintainer 邮箱与你的 GitHub 已验证邮箱匹配</span>`
: `<span class="lv-danger">Maintainer 邮箱 (${email || "缺失"}) 不在你的 GitHub 已验证邮箱里 — 提交会被拒绝${me && me.is_admin ? "（你是管理员，可豁免）" : ""}</span>`;
// 上传者归属（包名先到先得，以 GitHub 账号为准，与 deb 里的 Maintainer 邮箱无关）
$("p-emailmatch").innerHTML = me
? `<span class="lv-pass">将以 @${me.login} 的身份记录为上传者</span>`
: `<span class="lv-danger">请先登录 GitHub 再提交</span>`;

// 版本 / 包名占用预检
// 版本 / 包名占用预检（所有权按上传者 GitHub 账号先到先得）
const idx = await loadIndex();
const entries = idx.get(c.Package) || [];
let verState = "", verOk = true;
if (!entries.length) {
verState = `<span class="lv-pass">新包名，首次提交后归属于你</span>`;
verState = `<span class="lv-pass">新包名，首次提交后归属于你${me ? `（@${me.login}）` : ""}</span>`;
} else {
const owner = extractEmail(entries[0].Maintainer || "").toLowerCase();
const owned = me && (me.emails.includes(owner) || me.is_admin);
// 前端只能读到线上索引里的 Maintainer，尽力从 noreply 地址反推 owner；
// 服务端会按记录的 uploaded_by 权威复核。
const ownerLogin = loginFromNoreply(entries[0].Maintainer || "");
const owned = me && (me.is_admin || (ownerLogin && ownerLogin === me.login.toLowerCase()));
const latest = entries.map((e) => e.Version).sort(compareDebVersions).pop();
if (!owned) {
if (ownerLogin && !owned) {
verOk = false;
verState = `<span class="lv-danger">包名已被他人占用（Maintainer: ${owner.slice(0, 2)}***），无法提交</span>`;
verState = `<span class="lv-danger">包名已被 @${ownerLogin} 占用，只有其本人或管理员可以更新</span>`;
} else if (compareDebVersions(c.Version, latest) <= 0) {
verOk = false;
verState = `<span class="lv-danger">版本 ${c.Version} 不高于线上已发布的 ${latest}，请提升版本号</span>`;
Expand Down Expand Up @@ -251,7 +251,7 @@ async function renderPreview() {
$("p-scripts-box").classList.add("hidden");
}

const blocked = parsed.verdict === "danger" || (!mine && !(me && me.is_admin)) || !verOk;
const blocked = parsed.verdict === "danger" || !me || !verOk;
$("submit-btn").disabled = blocked;
$("submit-btn").textContent = blocked ? "存在阻断性问题，无法提交" : "提交到 AppStore";
$("preview-box").classList.remove("hidden");
Expand Down Expand Up @@ -292,8 +292,10 @@ async function renderMine() {
const mine = [];
for (const [name, entries] of idx) {
for (const e of entries) {
const email = extractEmail(e.Maintainer || "").toLowerCase();
if (me.emails.includes(email) || me.is_admin) mine.push({ name, ...e, email });
const ownerLogin = loginFromNoreply(e.Maintainer || "");
if (me.is_admin || (ownerLogin && ownerLogin === me.login.toLowerCase())) {
mine.push({ name, ...e, email: extractEmail(e.Maintainer || "").toLowerCase() });
}
}
}
if (!mine.length) {
Expand Down
6 changes: 3 additions & 3 deletions site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ <h1>CardputerZero 开发者中心</h1>
<!-- 未登录 -->
<section id="login-view" class="panel login-box hidden">
<p>上传 / 管理 AppStore 软件包需要 GitHub 登录。<br>
<span class="muted">我们通过 GitHub 校验你的已验证邮箱：包的 Maintainer 邮箱必须是你本人，<br>
同名包只有原作者（或管理员）可以更新和下架。</span></p>
<span class="muted">包名先到先得：谁先上传某个包名，就归属于其 GitHub 账号，<br>
之后同名包只有原上传者（或管理员）可以更新和下架。</span></p>
<button class="primary" onclick="location.href='/auth/login'">使用 GitHub 登录</button>
</section>

Expand Down Expand Up @@ -151,7 +151,7 @@ <h1>CardputerZero 开发者中心</h1>
<thead><tr><th>包名</th><th>版本</th><th>Maintainer</th><th></th></tr></thead>
<tbody id="mine-rows"><tr><td colspan="4" class="muted">加载中…</td></tr></tbody>
</table>
<p class="muted">列表来自线上 APT 索引，只显示 Maintainer 邮箱属于你的包。可直接下载已发布的 .deb；下架会生成移除 PR。</p>
<p class="muted">列表来自线上 APT 索引，只显示归属于你的包。可直接下载已发布的 .deb；下架会生成移除 PR。</p>
</div>
</section>
</main>
Expand Down
Loading