Промежуточно: синхронизировать регистр логинов

This commit is contained in:
AidarKC
2026-10-29 13:10:12 +03:00
parent d2b2876a79
commit 395aa62bda
23 changed files with 312 additions and 42 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ function renderAvatarPreview(slot, avatar, title) {
}
function buildAbsoluteChannelUrl({ ownerBlockchainName = '', channelName = '' } = {}) {
const route = makeShineChannelShortRoute({ ownerBlockchainName, channelName });
const route = makeShineChannelShortRoute({ ownerLogin: state.session.login, ownerBlockchainName, channelName });
if (!route) return '';
try {
return new URL(`/${route}`, window.location.origin).toString();
+2 -1
View File
@@ -251,7 +251,7 @@ function buildSelectorFromRoute(route, channelId) {
function buildThreadRoute(post, selector) {
const messageRef = post?.messageRef;
if (!messageRef || !selector) return '';
const ownerLogin = extractLoginFromBlockchainName(selector.ownerBlockchainName);
const ownerLogin = String(selector.ownerLogin || extractLoginFromBlockchainName(selector.ownerBlockchainName)).trim();
return makeShineMessageRoute({
ownerLogin,
messageBlockchainName: messageRef.blockchainName,
@@ -1503,6 +1503,7 @@ async function loadFromApi(route, channelId) {
const channelTypeCode = Number(payload.channel?.channelTypeCode ?? 1);
// Channel-publication URLs are only unambiguous for public channels, not merged private chats.
selector.channelName = String(payload.channel?.channelName || selector.channelName || '').trim();
selector.ownerLogin = ownerLogin; // для человекочитаемых ссылок сохраняем регистр регистрации
selector.publicOrdinalUrlsAllowed = channelTypeCode !== CHANNEL_TYPE_STORIES && channelTypeCode !== CHANNEL_TYPE_PERSONAL;
if (channelTypeCode === CHANNEL_TYPE_STORIES) {
throw new Error('Канал stories скрыт из пользовательского интерфейса.');
+2
View File
@@ -100,6 +100,7 @@ function buildChannelRouteFromSummary(summary, fallbackId) {
const ownerLogin = String(summary?.channel?.ownerLogin || '').trim();
const channelName = String(summary?.channel?.channelName || '').trim();
return makeShineChannelShortRoute({
ownerLogin,
ownerBlockchainName: ownerBch,
channelName: channelName || fallbackId || ownerLogin,
});
@@ -606,6 +607,7 @@ function mapDeletedOwnedChannels(payload, notificationsState = {}) {
id: rowId,
sourceBucket: 'ownDeleted',
route: makeShineChannelShortRoute({
ownerLogin,
ownerBlockchainName: String(item?.ownerBlockchainName || '').trim(),
channelName,
}),
+3 -2
View File
@@ -22,11 +22,12 @@ export function render({ navigate, chrome }) {
// Ссылка на свой профиль – самое частое «поделиться» в соцсети.
const shareProfile = () => {
const url = new URL(window.location.href);
url.pathname = `/${makeSharedProfileRoute(login)}`;
url.pathname = `/${makeSharedProfileRoute(card?.login || login)}`;
url.search = '';
url.hash = '';
const name = [card?.firstName, card?.lastName].map((part) => String(part || '').trim()).filter(Boolean).join(' ');
openShareSheet({ title: 'Поделиться профилем', kicker: name ? `${name} · ${login}` : login, text: 'Профиль в Сиянии', url: url.toString() });
const displayLogin = String(card?.login || login).trim();
openShareSheet({ title: 'Поделиться профилем', kicker: name ? `${name} · ${displayLogin}` : displayLogin, text: 'Профиль в Сиянии', url: url.toString() });
};
const topbar = createTopBar({
title: 'Профиль',
+3 -1
View File
@@ -18,6 +18,8 @@ export function render({navigate}) {
local.autocomplete='off';local.spellcheck=false;local.autocapitalize='off';
local.value=String(state.registrationDraft.login || '').split('@')[0];
const full=document.createElement('p'); full.className='meta-muted';
const caseNotice=document.createElement('p'); caseNotice.className='meta-muted';
caseNotice.textContent='Регистр букв в логине сохранится навсегда. Например, AlexSmith@shine нельзя будет переименовать в alexsmith@shine. При входе и поиске регистр не важен.';
const password=document.createElement('input'); password.className='input';password.type='password';
password.autocomplete='new-password';password.maxLength=PASSWORD_MAX_LENGTH;
password.placeholder='Пароль';password.value=state.registrationDraft.password || '';
@@ -26,7 +28,7 @@ export function render({navigate}) {
const nsLabel=document.createElement('label');nsLabel.className='stack';nsLabel.textContent='Пространство имён'; nsLabel.append(namespace);
const methodLabel=document.createElement('label');methodLabel.className='stack'; methodLabel.textContent='Способ регистрации';methodLabel.append(method);
const pwLabel=document.createElement('label');pwLabel.className='stack';pwLabel.textContent='Пароль (ключи остаются только у вас)';pwLabel.append(password);
form.append(methodLabel,nsLabel,local,full,pwLabel,status,action);
form.append(methodLabel,nsLabel,local,full,caseNotice,pwLabel,status,action);
let namespaces=[]; let disposed=false; let inputRevision=0; let submission=0;
const feeToSol = fee => (Number(fee || '0')/1e9).toFixed(6);
function selected() { return namespaces.find(n=>n.name===namespace.value); }
+24 -10
View File
@@ -1073,6 +1073,19 @@ export class AuthService {
}
}
// При ЗАПИСИ в блокчейн нельзя использовать fallback из имени цепочки,
// URL или непроверенного сообщения: нужен именно регистр регистрационной записи.
async requireRegisteredDisplayLogin(login) {
const wanted = String(login || '').trim();
if (!wanted) throw new Error('Не указан логин адресата');
const user = await this.getUser(wanted);
const registered = String(user?.login || '').trim();
if (!user?.exists || !registered || registered.toLowerCase() !== wanted.toLowerCase()) {
throw new Error(`Не удалось подтвердить зарегистрированный логин: ${wanted}`);
}
return registered;
}
async ensureLoginFree(login) {
const payload = await this.getUser(login);
return payload.exists !== true;
@@ -1884,15 +1897,16 @@ export class AuthService {
throw new Error('Не удалось определить initial blockchain key для HEADER');
}
const registeredLogin = await this.requireRegisteredDisplayLogin(cleanLogin);
await this.addBlockSigned({
login: cleanLogin,
storagePwd,
msgType: MSG_TYPE_TECH,
msgSubType: MSG_SUBTYPE_TECH_HEADER,
msgVersion: 1,
// Идентификатор цепочки и формат HEADER используют canonical login.
// Отображаемый login может сохранять исходный регистр.
bodyBytes: makeHeaderBodyBytes({ login: cleanLogin.toLowerCase(), initialBlockchainKey32 }),
// HEADER хранит исходный регистр неизменяемого имени из Solana/Arweave.
// Нормализация нужна только для уникальности и имени самой цепочки.
bodyBytes: makeHeaderBodyBytes({ login: registeredLogin, initialBlockchainKey32 }),
_skipHeaderEnsure: true,
});
@@ -1910,7 +1924,7 @@ export class AuthService {
return this.runWriteLocked(key, async () => {
const bodyBytes = makeReactionLikeBodyBytes({
toLogin: target.login,
toLogin: await this.requireRegisteredDisplayLogin(target.login),
toForkNumber: target.forkNumber,
toBlockNumber: target.blockNumber,
toBlockHashHex: target.blockHash,
@@ -1934,7 +1948,7 @@ export class AuthService {
return this.runWriteLocked(key, async () => {
const bodyBytes = makeReactionLikeBodyBytes({
toLogin: target.login,
toLogin: await this.requireRegisteredDisplayLogin(target.login),
toForkNumber: target.forkNumber,
toBlockNumber: target.blockNumber,
toBlockHashHex: target.blockHash,
@@ -1959,7 +1973,7 @@ export class AuthService {
return this.runWriteLocked(key, async () => {
const bodyBytes = makeTextReplyBodyBytes({
toLogin: target.login,
toLogin: await this.requireRegisteredDisplayLogin(target.login),
toForkNumber: target.forkNumber,
toBlockNumber: target.blockNumber,
toBlockHashHex: target.blockHash,
@@ -1985,7 +1999,7 @@ export class AuthService {
return this.runWriteLocked(key, async () => {
const bodyBytes = makeTextRatingBodyBytes({
toLogin: target.login,
toLogin: await this.requireRegisteredDisplayLogin(target.login),
toForkNumber: target.forkNumber,
toBlockNumber: target.blockNumber,
toBlockHashHex: target.blockHash,
@@ -2026,7 +2040,7 @@ export class AuthService {
return this.runWriteLocked(key, async () => {
const bodyBytes = makeStatusActionBodyBytes({
toLogin: target.login,
toLogin: await this.requireRegisteredDisplayLogin(target.login),
toForkNumber: target.forkNumber,
toBlockNumber: target.blockNumber,
toBlockHashHex: target.blockHash,
@@ -2064,7 +2078,7 @@ export class AuthService {
prevLineNumber: tail.prevLineNumber,
prevLineHashHex: tail.prevLineHashHex,
thisLineNumber: tail.thisLineNumber,
toLogin: target.login,
toLogin: await this.requireRegisteredDisplayLogin(target.login),
toForkNumber: target.forkNumber,
toBlockNumber: target.blockNumber,
toBlockHashHex: target.blockHash,
@@ -3427,7 +3441,7 @@ export class AuthService {
prevConnectionBlockNumber: tail.prevLineNumber,
prevConnectionBlockHashHex: tail.prevLineHashHex,
connectionSequence: tail.thisLineNumber,
toLogin,
toLogin: await this.requireRegisteredDisplayLogin(toLogin),
toForkNumber,
toBlockNumber,
toBlockHashHex,
@@ -0,0 +1,92 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import { AuthService } from '../js/services/auth-service.js';
const target = {
login: 'alexsmith@shine', // case из имени цепочки, а не из регистрации
blockchainName: 'alexsmith@shine-001',
blockNumber: 4,
blockHash: 'ab'.repeat(32),
forkNumber: 1,
};
const original = 'AlexSmith@shine';
const input = { login: 'tester@shine', storagePwd: 'test', message: target, text: 'ответ' };
function mockService({ registered = original, exists = true } = {}) {
const service = new AuthService('wss://local.example/ws');
const sent = [];
const requested = [];
service.getUser = async (login) => {
requested.push(login);
return { exists, login: registered, blockchainName: 'alexsmith@shine-001' };
};
service.addBlockSigned = async (args) => {
sent.push(args);
return { serverLastGlobalNumber: 1, serverLastGlobalHash: 'ac'.repeat(32) };
};
return { service, sent, requested };
}
const hasLogin = (bodyBytes, login) => Buffer.from(bodyBytes).includes(Buffer.from(login, 'utf8'));
test('ссылки reply, rating, status, like и unlike подписываются с регистром регистрации', async () => {
for (const method of ['addBlockReply', 'addBlockRating', 'addBlockStatusAction', 'addBlockLike', 'addBlockUnlike']) {
const { service, sent, requested } = mockService();
await service[method]({ ...input, statusSubType: 110 });
assert.equal(sent.length, 1, method);
assert.deepEqual(requested, [target.login], method);
assert.ok(hasLogin(sent[0].bodyBytes, original), `${method}: оригинальный логин отсутствует`);
assert.ok(!hasLogin(sent[0].bodyBytes, target.login), `${method}: записан lowercase`);
}
});
test('если регистрационный логин не подтверждён, клиент не подписывает блок', async () => {
for (const data of [{ exists: false }, { registered: 'Other@shine' }]) {
const { service, sent } = mockService(data);
await assert.rejects(() => service.addBlockReply(input), /Не удалось подтвердить/);
assert.equal(sent.length, 0);
}
});
test('связи между пользователями фиксируют исходный регистр цели', async () => {
const { service, sent } = mockService();
service.ensureChainInitializedForLineOps = async () => ({ blockchainName: 'tester@shine-001' });
service.resolveFixedLineTail = async () => ({ prevLineNumber: 0, prevLineHashHex: 'ac'.repeat(32), thisLineNumber: 1 });
service.rememberLineTail = () => {};
await service.addBlockConnectionTarget({
login: 'tester@shine', storagePwd: 'test', subType: 30,
toLogin: target.login, toForkNumber: 1, toBlockNumber: 0, toBlockHashHex: 'ab'.repeat(32),
});
assert.equal(sent.length, 1);
assert.ok(hasLogin(sent[0].bodyBytes, original));
assert.ok(!hasLogin(sent[0].bodyBytes, target.login));
});
test('HEADER и PostgreSQL требуют неизменяемого регистра, Solana sync отклоняет переименование', () => {
const client = readFileSync(new URL('../js/services/auth-service.js', import.meta.url), 'utf8');
const handler = readFileSync(new URL('../../SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java', import.meta.url), 'utf8');
const header = readFileSync(new URL('../../SHiNE-server/shine-server-blockchain/src/main/java/blockchain/body/HeaderBody.java', import.meta.url), 'utf8');
const migration = readFileSync(new URL('../../SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v37.sql', import.meta.url), 'utf8');
assert.match(client, /bodyBytes: makeHeaderBodyBytes\(\{ login: registeredLogin, initialBlockchainKey32 \}\)/);
assert.doesNotMatch(client, /makeHeaderBodyBytes\(\{ login: cleanLogin\.toLowerCase\(\)/);
assert.match(handler, /headerBody\.login\.equals\(registeredOwner\.getLogin\(\)\)/);
assert.match(header, /\[A-Za-z0-9_\]\+@\[a-z0-9_\]\+/);
assert.match(migration, /old_user\.login <> NEW\.login/);
assert.match(migration, /NEW\.login IS DISTINCT FROM OLD\.login/);
});
test('лента, список подписок и дерево обсуждения возвращают оригинальный регистр автора', () => {
const base = new URL('../../SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/', import.meta.url);
const read = (file) => readFileSync(new URL(file, base), 'utf8');
const channel = read('Net_GetChannelMessages_Handler.java');
const thread = read('Net_GetMessageThread_Handler.java');
const feed = read('Net_ListSubscriptionsFeed_Handler.java');
const helper = read('ChannelsReadSupport.java');
assert.match(channel, /setAuthorLogin\(ChannelsReadSupport\.officialLogin\(/);
assert.match(channel, /setOwnerLogin\(ChannelsReadSupport\.officialLogin\(/);
assert.match(thread, /node\.setAuthorLogin\(ChannelsReadSupport\.officialLogin\(/);
assert.match(feed, /lm\.setAuthorLogin\(ChannelsReadSupport\.officialLogin\(/);
assert.match(feed, /channelRef\.setOwnerLogin\(ChannelsReadSupport\.officialLogin\(/);
assert.match(helper, /value = canonicalLogin\(c, raw\)/);
});