Проверить вложения и блоки в каналах

This commit is contained in:
AidarKC
2026-11-21 00:24:25 +03:00
parent 859dbee1f1
commit 792f368175
27 changed files with 786 additions and 137 deletions
@@ -0,0 +1,173 @@
import { t } from '../i18n/index.js';
import { formatDateTime } from '../i18n/format.js';
import { escapeHtml } from '../services/attachment-format.js';
import { arweaveBlockUrl, checkArweavePayload, checkSolanaAuthor, readSignedBlock, signedDataItemFilename } from '../services/blockchain-proof-service.js';
import { showToast } from '../services/channels-ux.js';
const validHash = (value) => /^[0-9a-f]{64}$/iu.test(String(value || ''));
const label = (key) => t(`blockchain_details.${key}`);
const safe = (value) => escapeHtml(String(value ?? ''));
const shortened = (value) => String(value || '').length > 24
? `${String(value).slice(0, 12)}…${String(value).slice(-8)}` : String(value || '');
function asVersions(details) {
const raw = Array.isArray(details?.raw?.versions) ? details.raw.versions : [];
if (raw.length) return raw.map((v, i) => ({ ...v, versionIndex: Number(v.versionIndex || i + 1) }));
return [{ versionIndex: 1, blockNumber: details.blockNumber, blockHash: details.blockHash,
createdAtMs: details.createdAtMs, arweaveDataItemId: details.raw?.arweaveDataItemId || '',
arweavePublishPending: details.raw?.arweavePublishPending,
arweavePublishedAtMs: details.raw?.arweavePublishedAtMs,
signedDataItemBytes: details.raw?.signedDataItemBytes }];
}
function field(title, value, { code = false } = {}) {
const valueHtml = code ? `<code title="${safe(value)}">${safe(value)}</code>` : `<strong>${safe(value)}</strong>`;
return `<div class="block-proof-row"><span>${safe(title)}</span>${valueHtml}</div>`;
}
function statusFor(version) {
if (version?.arweavePublishedAtMs > 0) return { color: 'success', text: label('published') };
if (version?.arweavePublishPending === true) return { color: 'pending', text: label('pending') };
return { color: 'unknown', text: label('unknown') };
}
async function copy(value) {
const text = String(value || '');
if (!text) return;
if (navigator.clipboard?.writeText) {
await navigator.clipboard.writeText(text);
} else {
const input = document.createElement('textarea');
input.value = text; input.style.position = 'fixed'; input.style.opacity = '0';
document.body.append(input); input.select(); document.execCommand('copy'); input.remove();
}
showToast(label('copied'));
}
function resultRow(name, status, reason = '') {
const mark = status === 'valid' ? '✓' : status === 'invalid' ? '✕' : '—';
const description = status === 'valid' ? label('verified') : status === 'invalid' ? label('failed') : label('not_verified');
return `<div class="block-proof-check block-proof-check--${status}"><span aria-hidden="true">${mark}</span><div><strong>${safe(name)}: ${safe(description)}</strong>${reason ? `<small>${safe(reason)}</small>` : ''}</div></div>`;
}
/** Единый диалог для ленты канала и страницы обсуждения. */
export function openBlockchainDetailsModal(details, { authService, solanaEndpoint, isActive = () => true } = {}) {
const root = document.getElementById('modal-root');
if (!root) return;
const versions = asVersions(details);
let current = versions.length - 1;
let busy = false;
const rawText = JSON.stringify(details.raw || {}, null, 2);
root.innerHTML = `
<div class="modal" id="blockchain-details-modal">
<section class="modal-card stack blockchain-details-card block-proof-card" role="dialog" aria-modal="true" aria-label="${safe(label('title'))}">
<header class="block-proof-header">
<span class="block-proof-icon" aria-hidden="true">⛓</span>
<div><h3 class="modal-title">${safe(label('title'))}</h3><p class="meta-muted">${safe(label('description'))}</p></div>
</header>
${versions.length > 1 ? `<label class="field-label" for="block-proof-version">${safe(label('version'))}</label>
<select class="input" id="block-proof-version">${versions.map((v, i) => `<option value="${i}" ${i === current ? 'selected' : ''}>${safe(label('version'))} ${i + 1} · #${safe(v.blockNumber)}</option>`).join('')}</select>` : ''}
<div id="block-proof-content"></div>
<div class="block-proof-actions">
<a class="secondary-btn block-proof-link" id="block-proof-open" target="_blank" rel="noopener noreferrer">↗ ${safe(label('open_arweave'))}</a>
<button class="secondary-btn" type="button" id="block-proof-copy-url">${safe(label('copy_url'))}</button>
<button class="secondary-btn" type="button" id="block-proof-download">↓ ${safe(label('download_signed'))}</button>
<button class="secondary-btn block-proof-verify" type="button" id="block-proof-verify">🛡 ${safe(label('verify'))}</button>
</div>
<div id="block-proof-results" class="block-proof-results" hidden aria-live="polite"></div>
<details class="block-proof-raw"><summary>${safe(label('technical'))}</summary>
<pre class="blockchain-raw-block">${safe(rawText)}</pre>
<button class="secondary-btn" id="block-proof-copy-raw" type="button">${safe(label('copy_raw'))}</button>
</details>
<button class="secondary-btn" id="block-proof-close" type="button">${safe(label('close'))}</button>
</section>
</div>`;
const get = (id) => root.querySelector(`#${id}`);
const currentVersion = () => versions[current];
const content = get('block-proof-content');
const results = get('block-proof-results');
const button = get('block-proof-download');
const verify = get('block-proof-verify');
const close = () => { if (get('blockchain-details-modal')) root.innerHTML = ''; };
function renderVersion() {
const v = currentVersion();
const archive = statusFor(v);
const hash = validHash(v.blockHash) ? v.blockHash : '';
const url = arweaveBlockUrl(v.arweaveDataItemId);
const date = Number(v.createdAtMs || details.createdAtMs);
content.innerHTML = `
<div class="block-proof-facts">
${field(label('author'), details.authorLogin || '—')}
${field(label('blockchain'), details.authorBlockchainName || '—', { code: true })}
${field(label('block_number'), v.blockNumber)}
${field(label('created'), date > 0 ? formatDateTime(new Date(date)) : '—')}
${field(label('storage'), 'Arweave')}
${field(label('signed_size'), Number.isInteger(v.signedDataItemBytes) ? `${v.signedDataItemBytes} ${label('bytes')}` : '—')}
</div>
${v.attachmentMetadataValid === false ? `<p class="block-proof-warning">${safe(label('invalid_attachment'))}</p>` : ''}
<div class="block-proof-status block-proof-status--${archive.color}"><span class="block-proof-dot"></span>${safe(archive.text)}</div>
<div class="block-proof-hash"><span>${safe(label('hash'))}</span><div><code title="${safe(hash)}">${safe(shortened(hash) || '—')}</code><button type="button" class="block-proof-copy-icon" id="block-proof-copy-hash" ${hash ? '' : 'disabled'} aria-label="${safe(label('copy_hash'))}" title="${safe(label('copy_hash'))}">⧉</button></div></div>
${url ? `<div class="block-proof-hash"><span>Arweave DataItem ID</span><div><code title="${safe(v.arweaveDataItemId)}">${safe(shortened(v.arweaveDataItemId))}</code><button type="button" class="block-proof-copy-icon" id="block-proof-copy-id" aria-label="${safe(label('copy_id'))}" title="${safe(label('copy_id'))}">⧉</button></div></div>` : ''}`;
get('block-proof-open').href = url || '#';
get('block-proof-open').hidden = !url;
get('block-proof-copy-url').disabled = !url;
get('block-proof-copy-hash')?.addEventListener('click', () => { void copy(hash); });
get('block-proof-copy-id')?.addEventListener('click', () => { void copy(v.arweaveDataItemId); });
results.hidden = true;
results.replaceChildren();
}
async function signedBlock() {
const v = currentVersion();
if (!validHash(v.blockHash)) throw new Error(label('missing_hash'));
return readSignedBlock({ authService, blockchainName: details.authorBlockchainName,
blockNumber: v.blockNumber, blockHash: v.blockHash, dataItemId: v.arweaveDataItemId });
}
get('block-proof-version')?.addEventListener('change', (event) => {
if (busy) { event.target.value = String(current); return; }
current = Number(event.target.value); renderVersion();
});
get('block-proof-copy-url')?.addEventListener('click', () => { void copy(arweaveBlockUrl(currentVersion().arweaveDataItemId)); });
get('block-proof-copy-raw')?.addEventListener('click', () => { void copy(rawText); });
get('block-proof-close')?.addEventListener('click', close);
button.addEventListener('click', async () => {
if (busy) return;
busy = true; button.disabled = true; verify.disabled = true;
try {
const proof = await signedBlock();
if (!isActive() || !get('blockchain-details-modal')) return;
const blobUrl = URL.createObjectURL(new Blob([proof.bytes], { type: 'application/octet-stream' }));
const link = document.createElement('a');
link.href = blobUrl;
link.download = signedDataItemFilename(details.authorBlockchainName, currentVersion().blockNumber);
document.body.append(link); link.click(); link.remove();
setTimeout(() => URL.revokeObjectURL(blobUrl), 30000);
} catch (error) { if (isActive()) showToast(String(error?.message || error), { kind: 'error' }); }
finally { busy = false; button.disabled = false; verify.disabled = false; }
});
verify.addEventListener('click', async () => {
if (busy) return;
busy = true; verify.disabled = true; button.disabled = true;
const select = get('block-proof-version'); if (select) select.disabled = true;
results.hidden = false; results.textContent = label('checking');
try {
const proof = await signedBlock();
const id = currentVersion().arweaveDataItemId || proof.actualId;
const [arweave, solana] = await Promise.all([
checkArweavePayload(id, proof.data),
checkSolanaAuthor({ authorLogin: details.authorLogin, blockchainName: details.authorBlockchainName,
owner32: proof.owner32, solanaEndpoint }),
]);
if (!isActive() || !get('blockchain-details-modal')) return;
results.innerHTML = [
resultRow(label('signature'), 'valid'),
resultRow(label('integrity'), 'valid'),
resultRow(label('arweave_check'), arweave.status, arweave.reason),
resultRow(label('solana_check'), solana.status, solana.reason),
`<p class="meta-muted">${safe(label('proof_note'))}</p>`,
].join('');
} catch (error) {
if (!isActive() || !get('blockchain-details-modal')) return;
results.innerHTML = resultRow(label('signed_check'), 'unavailable', String(error?.message || error));
} finally {
busy = false;
if (get('blockchain-details-modal')) { verify.disabled = false; button.disabled = false; if (select) select.disabled = false; }
}
});
renderVersion();
}
+38
View File
@@ -4856,5 +4856,43 @@
"usdt_limit": "Beta limit: up to 5 USDT per swap. Keep SOL available for fees.",
"wallet_hint": "🧪 Experimental SOL ↔ USDT swaps via Jupiter. Not recommended for real funds; please review the warnings before trying.",
"wallet_button": "Swap · Jupiter β"
},
"blockchain_details": {
"invalid_attachment": "Attachment metadata is invalid; the original block remains unchanged.",
"title": "Blockchain data",
"description": "Original record and independent verification",
"author": "Author",
"blockchain": "Author blockchain",
"block_number": "Block number",
"created": "Created",
"storage": "Storage",
"signed_size": "Signed DataItem size",
"bytes": "bytes",
"published": "Submitted to Arweave",
"pending": "Pending upload to Arweave",
"unknown": "Arweave status not confirmed",
"hash": "SHiNE block SHA-256",
"copy_hash": "Copy hash",
"copy_id": "Copy DataItem ID",
"version": "Version",
"open_arweave": "Open in Arweave",
"copy_url": "Copy link",
"download_signed": "Download signed record",
"verify": "Verify authenticity",
"technical": "Original server response · technical data",
"copy_raw": "Copy JSON",
"close": "Close",
"copied": "Copied",
"missing_hash": "Missing valid block hash",
"checking": "Checking the record, Arweave and Solana…",
"verified": "verified",
"failed": "does not match",
"not_verified": "not verified",
"signature": "Ed25519 signature",
"integrity": "Block integrity and DataItem ID",
"arweave_check": "Data in Arweave",
"solana_check": "Author key in Solana",
"signed_check": "Signed record",
"proof_note": "Verification runs in your browser. Unavailable Arweave or Solana data does not mean forgery. Key ownership does not prove an exact publication time. Free users without a PDA cannot be verified through Solana."
}
}
+38
View File
@@ -4856,5 +4856,43 @@
"usdt_limit": "Бета-лимит: до 5 USDT за обмен. Нужен запас SOL на комиссии.",
"wallet_hint": "🧪 Тестовый обмен SOL ↔ USDT через Jupiter. Функция не рекомендована для реальных средств: откройте предупреждение перед использованием.",
"wallet_button": "Обменять · Jupiter β"
},
"blockchain_details": {
"invalid_attachment": "Вложение содержит некорректные метаданные; исходный блок сохранён без изменений.",
"title": "Данные блокчейна",
"description": "Исходная запись и её независимая проверка",
"author": "Автор",
"blockchain": "Блокчейн автора",
"block_number": "Номер блока",
"created": "Создан",
"storage": "Хранилище",
"signed_size": "Полный подписанный блок",
"bytes": "байт",
"published": "Отправлено в Arweave",
"pending": "Ожидает отправки в Arweave",
"unknown": "Состояние Arweave не подтверждено",
"hash": "SHA-256 блока SHiNE",
"copy_hash": "Скопировать хеш",
"copy_id": "Скопировать DataItem ID",
"version": "Версия",
"open_arweave": "Открыть в Arweave",
"copy_url": "Скопировать ссылку",
"download_signed": "Скачать с подписью",
"verify": "Проверить подлинность",
"technical": "Исходный ответ сервера · технические данные",
"copy_raw": "Скопировать JSON",
"close": "Закрыть",
"copied": "Скопировано",
"missing_hash": "Нет корректного хеша блока",
"checking": "Проверяем оригинал, Arweave и Solana…",
"verified": "подтверждено",
"failed": "не совпадает",
"not_verified": "не проверено",
"signature": "Подпись Ed25519",
"integrity": "Целостность блока и DataItem ID",
"arweave_check": "Данные в Arweave",
"solana_check": "Ключ автора в Solana",
"signed_check": "Подписанный блок",
"proof_note": "Проверка выполняется в браузере. Отсутствие ответа Arweave или Solana не означает подделку. Действительность ключа не подтверждает точное время публикации. Для бесплатных пользователей без PDA проверка авторства через Solana недоступна."
}
}
+4 -49
View File
@@ -4,6 +4,7 @@ import { formatDateTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { appendShineMessageLinks } from '../services/shine-message-links.js';
import { confirmDialog } from '../components/confirm-dialog.js';
import { openBlockchainDetailsModal } from '../components/blockchain-details-dialog.js';
import { confirmLikeAction, showLikeStatistics } from '../components/like-action-sheet.js';
import { iconHtml } from '../components/ui-icon.js';
import { consumeReplyEditorOnOpen, rememberChannelPosition, readChannelPosition, restoreChannelPosition } from '../services/channel-view-state.js';
@@ -460,56 +461,10 @@ function buildBlockchainDetails({ target, authorLogin, timestampMs, text, raw, l
msgSubType: msgSubType ?? source.msgSubType ?? '',
createdAtMs: timestampMs || source.createdAtMs || '',
text: String(text || ''),
signature: source.signature || source.blockSignature || source.authorSignature || t('screens.channel_thread_view.text_080'),
publicKey: source.publicKey || source.authorPublicKey || t('screens.channel_thread_view.text_081'),
raw,
};
}
function openBlockchainDetailsModal(details, { isActive = () => true } = {}) {
const root = document.getElementById('modal-root');
const rawText = JSON.stringify(details.raw || details, null, 2);
root.innerHTML = `
<div class="modal" id="thread-blockchain-details-modal">
<div class="modal-card stack blockchain-details-card">
<h3 class="modal-title">${t('dialogs.modals.channel_thread_view.label_001')}</h3>
<p class="meta-muted">${t('dialogs.modals.channel_thread_view.label_002')}</p>
<div class="blockchain-details-grid">
<span>${t('dialogs.modals.channel_thread_view.label_003')}</span><strong>${escapeHtml(details.authorLogin)}</strong>
<span>${t('dialogs.modals.channel_thread_view.label_004')}</span><code>${escapeHtml(details.authorBlockchainName)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_005')}</span><code>${escapeHtml(details.blockNumber)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_006')}</span><code>${escapeHtml(details.blockHash)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_007')}</span><code>${escapeHtml(details.msgSubType)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_008')}</span><code>${escapeHtml(details.createdAtMs ? formatDateTime(new Date(Number(details.createdAtMs))) : '–')}</code>
<span>Public key</span><code>${escapeHtml(details.publicKey)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_009')}</span><code>${escapeHtml(details.signature)}</code>
</div>
<label class="field-label" for="thread-blockchain-details-text">${t('dialogs.modals.channel_thread_view.label_010')}</label>
<textarea class="input" id="thread-blockchain-details-text" rows="4" readonly>${escapeHtml(details.text)}</textarea>
<pre class="blockchain-raw-block" id="thread-blockchain-raw-block" hidden>${escapeHtml(rawText)}</pre>
<div class="form-actions-grid">
<button class="secondary-btn" id="thread-blockchain-details-copy" type="button">${t('dialogs.modals.channel_thread_view.label_011')}</button>
<button class="secondary-btn" id="thread-blockchain-details-raw" type="button">${t('dialogs.modals.channel_thread_view.label_012')}</button>
</div>
<button class="secondary-btn" id="thread-blockchain-details-close" type="button">${t('dialogs.modals.channel_thread_view.label_013')}</button>
</div>
</div>
`;
root.querySelector('#thread-blockchain-details-close')?.addEventListener('click', () => {
root.innerHTML = '';
});
root.querySelector('#thread-blockchain-details-copy')?.addEventListener('click', async () => {
await copyTextToClipboard(rawText);
if (!isActive()) return;
showToast(t('dialogs.remaining.pages.channel_thread_view.openblockchaindetailsmodal.dannye_blokcheyna_skopirovany'));
});
root.querySelector('#thread-blockchain-details-raw')?.addEventListener('click', () => {
const rawEl = root.querySelector('#thread-blockchain-raw-block');
if (!rawEl) return;
rawEl.hidden = !rawEl.hidden;
});
}
function resolveNodeText(node) {
return firstNonEmptyText(
latestVersionText(node?.versions),
@@ -1020,7 +975,7 @@ function renderNodeCard(node, heading, handlers, localNumber, { focusPost = fals
raw: node,
localNumber,
msgSubType,
}), { isActive: handlers.isActive });
}), { isActive: handlers.isActive, authService, solanaEndpoint: state.entrySettings.solanaServer });
});
menuItems.push({ label: t('screens.channel_thread_view.text_012'), action: () => detailsButton.click() });
if (isOwnMessage) {
@@ -1255,7 +1210,7 @@ function renderComment({ node, parent, focus, channelOwner, handlers, nested = f
try { await navigator.clipboard.writeText(parsed.text); showToast(t('screens.channel_thread_view.text_046')); }
catch { showToast(t('screens.channel_thread_view.text_047'), { kind: 'error' }); }
} },
{ label: t('screens.channel_thread_view.text_020'), iconHtml: iconHtml('info'), action: () => openBlockchainDetailsModal(buildBlockchainDetails({ target, authorLogin: author, timestampMs: node?.createdAtMs, text: resolveNodeText(node), raw: node, localNumber: 0, msgSubType: Number(node?.msgSubType || 0) }), { isActive: handlers.isActive }) },
{ label: t('screens.channel_thread_view.text_020'), iconHtml: iconHtml('info'), action: () => openBlockchainDetailsModal(buildBlockchainDetails({ target, authorLogin: author, timestampMs: node?.createdAtMs, text: resolveNodeText(node), raw: node, localNumber: 0, msgSubType: Number(node?.msgSubType || 0) }), { isActive: handlers.isActive, authService, solanaEndpoint: state.entrySettings.solanaServer }) },
];
if (versions.length > 1) menuItems.push({ label: t('screens.channel_thread_view.text_021'), action: () => openMessageHistoryModal({ versions }) });
if (isOwn) {
@@ -1893,7 +1848,7 @@ export function render({ navigate, route, chrome }) {
const modalRoot = document.getElementById('modal-root');
if (!modalRoot) return;
if (modalRoot.querySelector([
'#thread-blockchain-details-modal',
'#blockchain-details-modal',
'#thread-edit-modal',
'#thread-history-modal',
'#thread-reply-modal',
+2 -47
View File
@@ -5,6 +5,7 @@ import { formatDateTime, getIntlLocale } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { appendShineMessageLinks } from '../services/shine-message-links.js';
import { confirmDialog } from '../components/confirm-dialog.js';
import { openBlockchainDetailsModal } from '../components/blockchain-details-dialog.js';
import { confirmLikeAction, showLikeStatistics } from '../components/like-action-sheet.js';
import { iconHtml } from '../components/ui-icon.js';
import { createOverflowDots } from '../components/overflow-dots.js';
@@ -850,56 +851,10 @@ function buildBlockchainDetails({ messageRef, authorLogin, timestampMs, text, ra
msgSubType: msgSubType ?? source.msgSubType ?? '',
createdAtMs: timestampMs || source.createdAtMs || '',
text: String(text || ''),
signature: source.signature || source.blockSignature || source.authorSignature || t('screens.channel_view.text_114'),
publicKey: source.publicKey || source.authorPublicKey || t('screens.channel_view.text_115'),
raw,
};
}
function openBlockchainDetailsModal(details, { isActive = () => true } = {}) {
const root = document.getElementById('modal-root');
const rawText = JSON.stringify(details.raw || details, null, 2);
root.innerHTML = `
<div class="modal" id="blockchain-details-modal">
<div class="modal-card stack blockchain-details-card">
<h3 class="modal-title">${t('dialogs.modals.channel_view.label_011')}</h3>
<p class="meta-muted">${t('dialogs.modals.channel_view.label_012')}</p>
<div class="blockchain-details-grid">
<span>${t('dialogs.modals.channel_view.label_013')}</span><strong>${escapeHtml(details.authorLogin)}</strong>
<span>${t('dialogs.modals.channel_view.label_014')}</span><code>${escapeHtml(details.authorBlockchainName)}</code>
<span>${t('dialogs.modals.channel_view.label_015')}</span><code>${escapeHtml(details.blockNumber)}</code>
<span>${t('dialogs.modals.channel_view.label_016')}</span><code>${escapeHtml(details.blockHash)}</code>
<span>${t('dialogs.modals.channel_view.label_017')}</span><code>${escapeHtml(details.msgSubType)}</code>
<span>${t('dialogs.modals.channel_view.label_018')}</span><code>${escapeHtml(details.createdAtMs ? formatDateTime(new Date(Number(details.createdAtMs))) : '–')}</code>
<span>Public key</span><code>${escapeHtml(details.publicKey)}</code>
<span>${t('dialogs.modals.channel_view.label_019')}</span><code>${escapeHtml(details.signature)}</code>
</div>
<label class="field-label" for="blockchain-details-text">${t('dialogs.modals.channel_view.label_020')}</label>
<textarea class="input" id="blockchain-details-text" rows="4" readonly>${escapeHtml(details.text)}</textarea>
<pre class="blockchain-raw-block" id="blockchain-raw-block" hidden>${escapeHtml(rawText)}</pre>
<div class="form-actions-grid">
<button class="secondary-btn" id="blockchain-details-copy" type="button">${t('dialogs.modals.channel_view.label_021')}</button>
<button class="secondary-btn" id="blockchain-details-raw" type="button">${t('dialogs.modals.channel_view.label_022')}</button>
</div>
<button class="secondary-btn" id="blockchain-details-close" type="button">${t('dialogs.modals.channel_view.label_005')}</button>
</div>
</div>
`;
root.querySelector('#blockchain-details-close')?.addEventListener('click', () => {
root.innerHTML = '';
});
root.querySelector('#blockchain-details-copy')?.addEventListener('click', async () => {
await copyTextToClipboard(rawText);
if (!isActive()) return;
showToast(t('dialogs.remaining.pages.channel_view.openblockchaindetailsmodal.dannye_blokcheyna_skopirovany'));
});
root.querySelector('#blockchain-details-raw')?.addEventListener('click', () => {
const rawEl = root.querySelector('#blockchain-raw-block');
if (!rawEl) return;
rawEl.hidden = !rawEl.hidden;
});
}
function renderDraftAttachments(container, attachments) {
if (!container) return;
container.innerHTML = '';
@@ -2259,7 +2214,7 @@ function renderPostCard(post, {
raw: post.rawMessage,
localNumber: post.localNumber,
msgSubType: post.msgSubType,
}), { isActive });
}), { isActive, authService, solanaEndpoint: state.entrySettings.solanaServer });
});
menuItems.push({ label: t('screens.channel_view.text_034'), iconHtml: iconHtml('info'), action: () => detailsButton.click() });
if (post.isOwnMessage) {
+11
View File
@@ -201,3 +201,14 @@ export async function createAns104DataItemWithRawParts({
data,
);
}
/** Проверка исходной подписи ANS-104 локально, без доверия к серверному статусу. */
export async function verifyAns104DataItem(rawBytes) {
const item = parseAns104DataItem(rawBytes);
const signedMessage = await ans104SigningMessageRaw(item);
const key = await crypto.subtle.importKey('raw', item.owner32, { name: 'Ed25519' }, false, ['verify']);
const signatureValid = await crypto.subtle.verify('Ed25519', key, item.signature, signedMessage);
const idHash = await digest('SHA-256', item.signature);
const frameHash = await digest('SHA-256', item.data);
return { ...item, signatureValid, dataItemIdBytes: idHash, frameHashBytes: frameHash };
}
+41 -12
View File
@@ -7,7 +7,11 @@ import { resolvePublicFileUrl } from './public-file-service.js';
import { updatedUserFileUrlAfterError } from './user-file-server-service.js';
import { validatePublicPiecesRoot } from './public-pieces-root.js';
const ATTACH_BLOCK_RE = /^<(?:SHiNE|S):(attach|att);([^>]*)>\n?/u;
const ATTACH_BLOCK_RE = /^<(?:SHiNE|S):(attach|att);([^>\n]{1,2048})>\n?/u;
// В v=2 ASCII-разделители и управляющие синтаксисом символы экранируются, UTF-8 остаётся как есть.
const V2_RESERVED = /[%<>=;\r\n]/g;
const V2_ESCAPE = { '%': '%25', '<': '%3C', '>': '%3E', '=': '%3D', ';': '%3B', '\r': '%0D', '\n': '%0A' };
const ATTACH_ALLOWED_FIELDS = new Set(['v', 'nm', 'sz', 'pr', 'sha256', 'mm', 'ar']);
export const MAX_MESSAGE_ATTACHMENTS = 10;
const RECENT_UNAVAILABLE_MS = 20 * 60 * 1000;
const IMAGE_EXTENSIONS = new Set(['apng', 'avif', 'bmp', 'gif', 'jpeg', 'jpg', 'png', 'svg', 'webp']);
@@ -49,21 +53,22 @@ export function normalizeAttachment(input = {}) {
const mm = String(input.mm || '').trim();
const size = Number(input.sz || input.size || input.sizeBytes || 0);
const name = normalizeName(input.nm || input.name || input.fileName || 'file');
if (new TextEncoder().encode(name).length > 255) throw new Error('Имя файла превышает 255 байт UTF-8');
if (txId && !validateArweaveTxId(txId)) throw new Error(t('remaining.attachment_errors.invalid_arweave_transaction_id'));
if (!validatePublicPiecesRoot(pr) && !validateSha256Hex(sha256Hex)) throw new Error('Некорректный идентификатор файла');
if (pr && !validatePublicPiecesRoot(pr)) throw new Error('Некорректный Pieces Root');
if (mm && (!/^[a-z0-9!#$&^_.+-]+\/[a-z0-9!#$&^_.+-]+$/i.test(mm) || mm.length > 127)) throw new Error('Некорректный MIME');
if (!Number.isInteger(size) || size <= 0) throw new Error(t('remaining.attachment_errors.invalid_file_size'));
return { v: 1, name, size, sha256: sha256Hex, pr, mm, ar: txId, uploadedAtMs: Number(input.uploadedAtMs || 0) || Date.now() };
return { v: 2, name, size, sha256: sha256Hex, pr, mm, ar: txId, uploadedAtMs: Number(input.uploadedAtMs || 0) || Date.now() };
}
export function buildAttachmentBlock(attachment) {
const item = normalizeAttachment(attachment);
const encodedName = encodeURIComponent(item.name);
const encodedName = item.name.replace(V2_RESERVED, (char) => V2_ESCAPE[char]);
const id = item.pr ? `;pr=${item.pr}` : `;sha256=${item.sha256}`;
const mmPart = item.mm ? `;mm=${item.mm}` : '';
const arPart = item.ar ? `;ar=${item.ar}` : '';
return `<S:att;v=1;nm=${encodedName};sz=${item.size}${id}${mmPart}${arPart}>`;
return `<S:att;v=2;nm=${encodedName};sz=${item.size}${id}${mmPart}${arPart}>`;
}
export function composeMessageWithAttachments(text, attachments = []) {
@@ -76,15 +81,33 @@ export function composeMessageWithAttachments(text, attachments = []) {
}
function parseFields(rawFields) {
const out = {};
String(rawFields || '').split(';').forEach((part) => {
const parts = String(rawFields || '').split(';');
const fields = Object.create(null);
// Для v=1 сохраняем прежний мягкий разбор. Для v=2 — строгое правило полей.
const strict = parts.some((part) => /^v\s*=\s*(?:0*2)$/u.test(part));
for (const part of parts) {
const eq = part.indexOf('=');
if (eq <= 0) return;
if (eq <= 0) {
if (strict) throw new Error('Некорректное поле вложения');
continue;
}
const key = part.slice(0, eq).trim();
const value = part.slice(eq + 1).trim();
if (key) out[key] = value;
});
return out;
if (strict && (!ATTACH_ALLOWED_FIELDS.has(key) || Object.hasOwn(fields, key))) {
throw new Error('Дублированное либо неизвестное поле вложения');
}
if (key) fields[key] = value;
}
if (strict) {
if (!fields.nm || !fields.sz || !(fields.pr || fields.sha256) || (fields.pr && fields.sha256)) {
throw new Error('Отсутствует обязательное поле вложения');
}
if (!/^(?:[^%]|%(?:25|3[bBcCdDeE]|0[aAdD]))*$/u.test(fields.nm)) {
// Неизвестные и неполные %-коды запрещаем; это исключает неоднозначное толкование.
throw new Error('Неканоническое экранирование имени файла');
}
}
return fields;
}
export function parseMessageAttachments(rawText) {
@@ -94,14 +117,20 @@ export function parseMessageAttachments(rawText) {
while (true) {
const match = rest.match(ATTACH_BLOCK_RE);
if (!match) break;
const fields = parseFields(match[2]);
try {
const fields = parseFields(match[2]);
const version = Number(fields.v || 0);
if (version !== 1 && version !== 2) {
throw new Error('unsupported attachment version');
}
if (version === 2 && (!fields.v || fields.v !== '2')) throw new Error('Неканоническая версия');
if (version === 2 && (/[<>=;]/u.test(fields.nm) || !/^[1-9][0-9]*$/u.test(fields.sz))) {
throw new Error('Неканонические поля вложения');
}
const name = decodeURIComponent(String(fields.nm || fields.name || 'file'));
if (version === 2 && /[\u0000-\u001f\u007f]/u.test(name)) throw new Error('Управляющий символ в имени файла');
attachments.push(normalizeAttachment({
nm: decodeURIComponent(String(fields.nm || fields.name || 'file')),
nm: name,
sz: fields.sz || fields.size,
sha256: fields.sha256,
pr: fields.pr,
@@ -0,0 +1,79 @@
import { verifyAns104DataItem } from './ans104-data-item.js';
import { base64ToBytes, bytesToBase64Url } from './crypto-utils.js';
import { readShineUserPda } from './shine-user-pda-service.js';
const HASH_RE = /^[0-9a-f]{64}$/iu;
const DATA_ITEM_ID_RE = /^[A-Za-z0-9_-]{43}$/u;
const MAX_SIGNED_BYTES = 8 * 1024 * 1024;
function hex(bytes) {
return Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('');
}
function equalBytes(left, right) {
return left.length === right.length && left.every((byte, index) => byte === right[index]);
}
export function arweaveBlockUrl(id) {
return DATA_ITEM_ID_RE.test(String(id || '')) ? `https://arweave.net/raw/${id}` : '';
}
export function signedDataItemFilename(chain, number) {
const safe = String(chain || 'block').replace(/[^a-z0-9@._-]/giu, '_').slice(0, 100);
return `SHiNE-${safe}-${Number(number)}.ans104`;
}
/** Получаем полный оригинал по существующему публичному API (не «от Arweave»). */
export async function readSignedBlock({ authService, blockchainName, blockNumber, blockHash, dataItemId }) {
const resp = await authService.ws.request('GetBlockchainBlock', { blockchainName, blockNumber });
if (Number(resp?.status) !== 200) throw new Error('GetBlockchainBlock: блок недоступен');
const body = resp?.payload || resp;
if (!HASH_RE.test(String(body?.blockHash || '')) || String(body.blockHash).toLowerCase() !== String(blockHash).toLowerCase()) {
throw new Error('Сервер вернул другой хеш блока');
}
const rawText = String(body?.blockBytesB64 || '');
if (rawText.length > Math.ceil(MAX_SIGNED_BYTES * 4 / 3) + 8) throw new Error('Размер подписанного блока превышает лимит');
const bytes = base64ToBytes(rawText);
if (!bytes.length || bytes.length > MAX_SIGNED_BYTES) throw new Error('Некорректный размер блока');
const proof = await verifyAns104DataItem(bytes);
if (!proof.signatureValid) throw new Error('Недействительная подпись ANS-104');
if (hex(proof.frameHashBytes) !== String(blockHash).toLowerCase()) throw new Error('Хеш содержимого блока не совпал');
const actualId = bytesToBase64Url(proof.dataItemIdBytes);
if (dataItemId && actualId !== dataItemId) throw new Error('Идентификатор Arweave отличается от ожидаемого');
return { bytes, ...proof, actualId };
}
/** Вспомогательная независимая сверка: шлюз возвращает payload, а не ANS-104 оболочку. */
export async function checkArweavePayload(dataItemId, signedPayload) {
const url = arweaveBlockUrl(dataItemId);
if (!url) return { status: 'unavailable', reason: 'Нет идентификатора Arweave' };
try {
const response = await fetch(url, { cache: 'no-store', signal: AbortSignal.timeout(15000) });
if (!response.ok) throw new Error(`HTTP ${response.status}`);
const length = Number(response.headers.get('Content-Length') || 0);
if (length > MAX_SIGNED_BYTES) throw new Error('Слишком большой ответ шлюза');
const raw = new Uint8Array(await response.arrayBuffer());
if (raw.length > MAX_SIGNED_BYTES) throw new Error('Слишком большой ответ шлюза');
return equalBytes(raw, signedPayload)
? { status: 'valid' }
: { status: 'invalid', reason: 'Содержимое Arweave не совпадает с подписанным блоком' };
} catch (error) {
return { status: 'unavailable', reason: String(error?.message || error) };
}
}
export async function checkSolanaAuthor({ authorLogin, blockchainName, owner32, solanaEndpoint }) {
const forkMatch = String(blockchainName || '').match(/-(\d{3})$/u);
const forkIndex = forkMatch ? Number(forkMatch[1]) - 1 : -1;
if (forkIndex < 0 || !authorLogin || !solanaEndpoint) {
return { status: 'unavailable', reason: 'Недостаточно данных для проверки Solana' };
}
try {
const pda = await readShineUserPda({ login: authorLogin, solanaEndpoint });
const key = pda?.forks?.[forkIndex]?.blockchainKey;
if (!key) return { status: 'unavailable', reason: 'Исторический ключ форка отсутствует в PDA' };
return equalBytes(new Uint8Array(key), owner32)
? { status: 'valid', reason: `Solana PDA, форк ${forkMatch[1]}` }
: { status: 'invalid', reason: 'Ключ подписанта не совпадает с ключом форка в Solana PDA' };
} catch (error) {
// FREE_CERT может не иметь PDA: это не доказательство подделки.
return { status: 'unavailable', reason: String(error?.message || error) };
}
}