コミットを比較

..
5 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker cb1f947a36 AI: address issue #483 2026-11-16 13:11:57 +09:00
みてるぞとCodex Night Worker dda3d87073 外部タグの履歴管理方式を変更 (#445) (#480)
Co-authored-by: Codex Night Worker <codex-night@localhost>
Reviewed-on: #480
Co-authored-by: miteruzo <miteruzo@naver.com>
2026-11-15 16:18:27 +09:00
テツノニジカとCodex Night Worker e13a52db9a AI: #454 広場のタグ検索,スマホ版だとサゼストが途中で見切れる問題 (#456)
Refs #454

## Automated implementation (requires human review)
[SidebarComponent.tsx](frontend/src/components/layout/SidebarComponent.tsx) の1行を修正しました。`overflow-y-auto` を `md` 以上に限定し、スマホでサゼストがサイドバーの領域外で切られる原因を取り除きました。

差分を確認済みです。指定に従い、テスト・lint・ビルドは未実行です。実画面でのスマホ表示とPC表示の確認も未実施です。

## Automated review (not a guarantee of correctness)
```text
The change restricts sidebar scrolling to medium and larger viewports. No actionable regression was identified in the current diff.

```

## Verification
- Tests/builds/migrations were not authorized and were not invoked by the controller.
- Codex was instructed not to run them; its command transcript should be inspected.
- Do not merge before manual acceptance and required checks.

---------

Co-authored-by: Codex Night Worker <codex-night@localhost>
Reviewed-on: #456
Co-authored-by: テツノニジカ <969+codex-bot@noreply.localhost>
2026-11-14 17:09:38 +09:00
みてるぞ f05d8a4b3a 集計で独裁者以外がほとんど検索条件を指定できないバグ (#444) (#452)
Reviewed-on: #452
Co-authored-by: miteruzo <miteruzo@naver.com>
2026-11-09 00:03:26 +09:00
みてるぞ dbae864f24 広場のタグ検索がスマホで利かない問題 (#435) (#453)
Reviewed-on: #453
Co-authored-by: miteruzo <miteruzo@naver.com>
2026-11-08 14:52:38 +09:00
54個のファイルの変更、5648行の追加、193行の削除
-35
ファイルの表示
@@ -1,35 +0,0 @@
## 背景
なぜ必要か。
## 対象範囲
- backend:
- frontend:
- docs:
- migration:
## やること
- [ ]
## 受け入れ条件
- [ ]
## 実行すべき確認
- [ ] `cd backend && bundle exec rspec`
- [ ] `cd frontend && npm run build`
- [ ] `cd frontend && npm run lint`
## 禁止事項
- unrelated refactor はしない
- 既存 API response shape を壊さない
- 認証・認可・BAN を弱めない
## Codex への指示
この issue を読んで実装してください。
不明点があれば、実装前に調査結果と選択肢を提示してください。
+1 -10
ファイルの表示
@@ -100,18 +100,9 @@ class PostVersionsController < ApplicationController
def external_tag_names_for snapshots def external_tag_names_for snapshots
ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq
names = ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name| ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
[id, "#{ platform }:#{ name }"] [id, "#{ platform }:#{ name }"]
} }
missing_ids = ids - names.keys
HistoryAccess.visible(NicoTagVersion.all)
.where(tag_id: missing_ids)
.order(:tag_id, version_no: :desc)
.pluck(:tag_id, :name)
.each { |id, name| names[id] ||= name }
names
end end
def snapshot_tag_literals snapshots, tag_names, external_tag_names def snapshot_tag_literals snapshots, tag_names, external_tag_names
+55
ファイルの表示
@@ -0,0 +1,55 @@
class StaticMirrorsController < ApplicationController
before_action :development_only
wrap_parameters false
def show
render json: { resource_limit: StaticMirror::RESOURCE_LIMIT,
name_limit: StaticMirror::NAME_LIMIT, max_bytes: StaticMirror::MAX_BYTES,
max_seconds: StaticMirrorJob::MAX_SECONDS, concurrency: 1,
cooldown_seconds: StaticMirrorJob::COOLDOWN,
expiry_seconds: StaticMirrorJob::EXPIRY.to_i, exclusions: StaticMirror::EXCLUSIONS }
end
def create
# No date input is accepted: this endpoint cannot promise historical restoration.
payload = request.request_parameters.except('authenticity_token')
.merge(request.query_parameters)
return head :bad_request unless (payload.keys - ['locale']).empty?
locale = resolve_locale!
session[:static_mirror_owner] ||= SecureRandom.hex(32)
job = StaticMirrorJob.start(owner: session[:static_mirror_owner], locale: locale.code,
origin: request.base_url)
render json: { job: }, status: :accepted
rescue StaticMirrorJob::Busy
response.headers['Retry-After'] = StaticMirrorJob::COOLDOWN.to_s
head :too_many_requests
rescue ActiveJob::EnqueueError
render json: { error: 'generation_failed' }, status: :service_unavailable
end
def status
value = StaticMirrorJob.status(params[:id], session[:static_mirror_owner])
return head :not_found unless value
render json: value
rescue StaticMirrorJob::Busy
head :service_unavailable
end
def download
bytes = StaticMirrorJob.download(params[:id], session[:static_mirror_owner])
return head :not_found unless bytes
send_data bytes, filename: 'static-mirror.zip', type: 'application/zip',
disposition: 'attachment'
rescue StaticMirrorJob::Busy
head :service_unavailable
end
private
def development_only
head :not_found unless Rails.env.development?
end
end
+155
ファイルの表示
@@ -0,0 +1,155 @@
require 'fileutils'
require 'timeout'
# Development PoC: one filesystem slot and Rails' in-process async executor.
# A process restart loses queued work; stale state fails rather than reporting success.
class StaticMirrorJob < ApplicationJob
self.queue_adapter = :async
EXPIRY = 10.minutes
COOLDOWN = 60
MAX_SECONDS = 60
class Busy < StandardError; end
def self.directory = Rails.root.join('tmp/static_mirror')
def self.synchronise(blocking: false)
FileUtils.mkdir_p(directory, mode: 0o700)
File.open(directory.join('.registry.lock'), File::RDWR | File::CREAT, 0o600) do |lock|
mode = blocking ? File::LOCK_EX : File::LOCK_EX | File::LOCK_NB
raise Busy unless lock.flock(mode)
yield
end
end
def self.state
JSON.parse(directory.join('state.json').read)
rescue Errno::ENOENT
nil
end
def self.write(value)
path = directory.join('state.tmp')
File.open(path, 'w', 0o600) { _1.write(JSON.generate(value)) }
File.rename(path, directory.join('state.json'))
ensure
File.unlink(path) if path&.exist?
end
def self.start(owner:, locale:, origin:)
id = synchronise do
previous = state
if previous && Time.current.to_f - previous.fetch('created_at') < COOLDOWN
raise Busy
end
File.open(directory.join('.generation.lock'), File::RDWR | File::CREAT, 0o600) do |lock|
raise Busy unless lock.flock(File::LOCK_EX | File::LOCK_NB)
FileUtils.rm_f(directory.join('archive.zip'))
FileUtils.rm_f(directory.join('archive.part'))
identifier = SecureRandom.hex(24)
write({ 'id' => identifier, 'owner' => owner, 'locale' => locale, 'origin' => origin,
'created_at' => Time.current.to_f, 'expiry_at' => (Time.current + EXPIRY).to_f,
'status' => 'queued', 'processed' => 0, 'total' => nil, 'data_at' => nil })
identifier
end
end
perform_later(id)
id
rescue ActiveJob::EnqueueError
update(id) { _1.merge!('status' => 'failed', 'error' => 'generation_failed') } if id
raise
end
def self.authorised_state(id, owner)
value = state
return unless owner.present? && value && value['id'] == id && value['owner'] == owner
return unless value['expiry_at'] > Time.current.to_f
if (['queued', 'running'].include?(value['status']) &&
Time.current.to_f - value['created_at'] > MAX_SECONDS + 15)
value.merge!('status' => 'failed', 'error' => 'worker_stopped')
write(value)
end
if value['status'] == 'ready'
permitted = HistoryAccess.set(user: nil) { HistoryAccess.authorised_artifact?(value) }
return unless permitted && directory.join('archive.zip').file?
end
value
end
def self.status(id, owner)
synchronise do
authorised_state(id, owner)&.slice('status', 'processed', 'total', 'data_at', 'error')
end
end
def self.download(id, owner)
synchronise do
value = authorised_state(id, owner)
return unless value && value['status'] == 'ready'
bytes = directory.join('archive.zip').binread
# Revalidate after reading; send_data avoids delayed sendfile reuse of a stale path.
permitted = HistoryAccess.set(user: nil) { HistoryAccess.authorised_artifact?(value) }
permitted ? bytes : nil
end
end
def self.update(id)
# Worker updates may wait for a short status/download read; request intake never waits.
synchronise(blocking: true) do
value = state
return unless value && value['id'] == id
yield value
write(value)
end
end
def perform(id)
File.open(self.class.directory.join('.generation.lock'), File::RDWR) do |lock|
return unless lock.flock(File::LOCK_EX | File::LOCK_NB)
value = self.class.state
return unless value && value['id'] == id && value['status'] == 'queued'
generate(id, value)
end
end
private
def generate(id, value)
self.class.update(id) { _1['status'] = 'running' }
remaining = MAX_SECONDS - (Time.current.to_f - value.fetch('created_at'))
raise Timeout::Error unless remaining.positive?
Timeout.timeout(remaining) do
locale = Locale.find_by!(code: value.fetch('locale'), deprecated_at: nil)
mirror = StaticMirror.new(locale:, origin: value.fetch('origin'))
bytes = mirror.export do |processed, total|
self.class.update(id) do |metadata|
metadata.merge!('processed' => processed, 'total' => total, 'data_at' => mirror.data_at)
end
end
part = self.class.directory.join('archive.part')
File.open(part, 'wb', 0o600) { _1.write(bytes) }
File.rename(part, self.class.directory.join('archive.zip'))
self.class.update(id) do |metadata|
metadata.merge!(mirror.authority).merge!('status' => 'ready', 'data_at' => mirror.data_at)
end
end
rescue StandardError => error
FileUtils.rm_f(self.class.directory.join('archive.part'))
FileUtils.rm_f(self.class.directory.join('archive.zip'))
code = case error
when StaticMirror::TooLarge then 'too_large'
when Timeout::Error then 'generation_timeout'
when HistoryAccess::Forbidden then 'publication_changed'
else 'generation_failed'
end
self.class.update(id) { _1.merge!('status' => 'failed', 'error' => code) }
Rails.logger.warn("static_mirror_failure: #{ error.class }")
end
end
+19 -6
ファイルの表示
@@ -1,8 +1,11 @@
class ExternalTag < ApplicationRecord class ExternalTag < ApplicationRecord
before_create { SharedResourceIdAllocator.assign!(self) } before_create { SharedResourceIdAllocator.assign!(self) }
# Must run before dependent association callbacks.
before_destroy :prevent_destroy
enum :platform, nico: 'nico' enum :platform, nico: 'nico'
validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys } validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys }
validate :immutable_identity, on: :update
has_many :post_external_tags, dependent: :delete_all has_many :post_external_tags, dependent: :delete_all
has_many :posts, through: :post_external_tags has_many :posts, through: :post_external_tags
@@ -16,11 +19,21 @@ class ExternalTag < ApplicationRecord
has_many :linked_tags, through: :nico_tag_relations, source: :tag has_many :linked_tags, through: :nico_tag_relations, source: :tag
def snapshot_linked_tag_names language_code = 'ja' def snapshot_linked_tag_ids = linked_tags.distinct.order(:id).pluck(:id)
linked_tags
.joins(:tag_names) def delete
.where(tag_names: { language_code:, primary_flg: true }) raise ActiveRecord::ReadOnlyRecord, '外部タグは削除できません.'
.order('tag_names.name') end
.pluck('tag_names.name')
private
def immutable_identity
errors.add(:platform, 'は変更できません.') if will_save_change_to_platform?
errors.add(:name, 'は変更できません.') if will_save_change_to_name?
end
def prevent_destroy
errors.add(:base, '外部タグは削除できません.')
throw(:abort)
end end
end end
+2 -16
ファイルの表示
@@ -4,7 +4,7 @@ require 'digest'
class HistoryAccess < ActiveSupport::CurrentAttributes class HistoryAccess < ActiveSupport::CurrentAttributes
attribute :user attribute :user
class Forbidden < StandardError; end class Forbidden < StandardError; end
ARTIFACT_POLICY = 'counts-masked-summary-1'.freeze ARTIFACT_POLICY = 'counts-private-predicates-4'.freeze
KEYS = { 'post_versions' => ['post_id'], 'tag_versions' => ['tag_id'], KEYS = { 'post_versions' => ['post_id'], 'tag_versions' => ['tag_id'],
'nico_tag_versions' => ['tag_id'], 'nico_tag_versions' => ['tag_id'],
@@ -106,21 +106,7 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
snapshot_reference(TagVersion, row), snapshot_reference(TagVersion, row),
snapshot_reference(NicoTagVersion, row, external: true)] snapshot_reference(NicoTagVersion, row, external: true)]
when 'nico_tag_versions' when 'nico_tag_versions'
# Legacy linked_tags snapshots contain names, not IDs. Match recorded names [list_reference('tag_versions', 'tag_id', "#{ row }.linked_tag_ids")]
# conservatively; never expose a private linked name through an external tag.
names = "JSON_MERGE_PRESERVE(JSON_ARRAY(private_tag.name), " +
"COALESCE(JSON_EXTRACT(private_tag.names, '$**.name'), JSON_ARRAY()))"
# DISTINCT prevents merging this independent name set into the correlated scan.
# Keep byte-distinct names even when the column collation considers them equal.
private_names = 'SELECT DISTINCT private_name.name, ' +
'CAST(private_name.name AS BINARY) AS name_bytes FROM tag_versions private_tag ' +
"JOIN (#{ discarded_keys('tag_versions', 'tag_id') }) blocked " +
'ON blocked.tag_id = private_tag.tag_id ' +
"JOIN JSON_TABLE(#{ names }, '$[*]' COLUMNS (name TEXT PATH '$')) private_name " +
"WHERE private_name.name <> ''"
["NOT EXISTS (SELECT 1 FROM (#{ private_names }) private_name WHERE " +
"LOCATE(CONCAT(' ', private_name.name, ' '), " +
"CONCAT(' ', COALESCE(#{ row }.linked_tags, ''), ' ')) > 0)"]
when 'tag_versions' when 'tag_versions'
[list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")] [list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")]
when 'tag_description_versions' when 'tag_description_versions'
+6 -1
ファイルの表示
@@ -3,5 +3,10 @@ class NicoTagVersion < ApplicationRecord
belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions
validates :name, presence: true validates :event_type, inclusion: { in: ['create', 'update'] }
def name
tag = external_tag
"#{ tag.platform }:#{ tag.name }" if tag
end
end end
+4 -1
ファイルの表示
@@ -139,6 +139,8 @@ class CountsVersionRepr
result = {} result = {}
table = model.table_name table = model.table_name
comparison = @inclusive ? '<=' : '<' comparison = @inclusive ? '<=' : '<'
name = model == NicoTagVersion ?
CountsResourceDefinition.new('nico_tags').expression('name', table) : 'name'
requests.each_slice(100) do |batch| requests.each_slice(100) do |batch|
queries = batch.map do |id, point| queries = batch.map do |id, point|
scope = HistoryAccess.visible(model.where(tag_id: id)) scope = HistoryAccess.visible(model.where(tag_id: id))
@@ -148,7 +150,8 @@ class CountsVersionRepr
"AND newer.version_no > #{ table }.version_no)", point) "AND newer.version_no > #{ table }.version_no)", point)
quoted = model.connection.quote(point.iso8601(6)) quoted = model.connection.quote(point.iso8601(6))
names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names' names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names'
scope.select("tag_id, name, #{ names }, #{ quoted } AS reference_point").to_sql scope.select("tag_id, #{ name } AS name, #{ names }, " +
"#{ quoted } AS reference_point").to_sql
end end
next if queries.empty? next if queries.empty?
+56 -13
ファイルの表示
@@ -1,12 +1,41 @@
class CountsAxes class CountsAxes
MAX_AXES = 8 MAX_AXES = 8
MASKED_TEXT = '********'.freeze
MASKED_VALUE = '__counts_private__'.freeze MASKED_VALUE = '__counts_private__'.freeze
PUBLIC_FIELDS = ['created_at', 'event_type'].freeze PUBLIC_FIELDS = ['resource_id', 'version_no', 'event_type', 'user',
'created_at'].freeze
class TooManyAxes < ArgumentError; end class TooManyAxes < ArgumentError; end
class PrivateCondition < ArgumentError; end class PrivateCondition < ArgumentError; end
GRAINS = ['year', 'quarter', 'month', 'week', 'day', 'hour'].freeze GRAINS = ['year', 'quarter', 'month', 'week', 'day', 'hour'].freeze
def self.private_field?(field)
!PUBLIC_FIELDS.include?(field) && field != 'user.id'
end
def self.visible_ids_sql(definition)
"SELECT counts_visible.id FROM #{ definition.table } counts_visible WHERE " +
HistoryAccess.sql(definition.model, 'counts_visible')
end
def self.visibility_sql(definition, field)
return 'TRUE' if HistoryAccess.admin?
source = visible_ids_sql(definition)
visible = "v.id IN (#{ source })"
return visible unless field == 'changed_field'
"(#{ visible }) AND (previous.id IS NULL OR previous.id IN (#{ source }))"
end
def self.masked_sql(expression, definition, field)
return expression if HistoryAccess.admin? || !private_field?(field)
visible = visibility_sql(definition, field)
quoted = ApplicationRecord.connection.quote(MASKED_VALUE)
"CASE WHEN #{ visible } THEN #{ expression } ELSE #{ quoted } END"
end
def self.time_expression(expression, grain, timezone) def self.time_expression(expression, grain, timezone)
raise ArgumentError unless GRAINS.include?(grain) raise ArgumentError unless GRAINS.include?(grain)
@@ -60,13 +89,9 @@ class CountsAxes
@definition.fields[field] == :datetime ? self.class.time_expression( @definition.fields[field] == :datetime ? self.class.time_expression(
expression, axis.fetch('grain', 'month'), @population.timezone) : expression expression, axis.fetch('grain', 'month'), @population.timezone) : expression
end end
if !HistoryAccess.admin? && !PUBLIC_FIELDS.include?(field) if !HistoryAccess.admin? && self.class.private_field?(field)
visible = HistoryAccess.sql(@definition.model, 'v') expression = self.class.masked_sql(
if field == 'changed_field' "CAST((#{ expression }) AS CHAR)", @definition, field)
visible = "(#{ visible }) AND (#{ HistoryAccess.sql(@definition.model, 'previous') })"
end
expression = "CASE WHEN #{ visible } " +
"THEN CAST((#{ expression }) AS CHAR) ELSE '#{ MASKED_VALUE }' END"
end end
expression expression
end end
@@ -77,10 +102,12 @@ class CountsAxes
selected = indexes.map { "#{ expressions[_1] } AS a#{ _1 }" } selected = indexes.map { "#{ expressions[_1] } AS a#{ _1 }" }
identities = ['v.id'] identities = ['v.id']
if rows.any? { _1['field'] == 'tags' } if rows.any? { _1['field'] == 'tags' }
# Raw identities stay inside COUNT; masked tag occurrences remain additive. identities << self.class.masked_sql(
identities << "COALESCE(CONCAT('internal:', tag_entry.tag_id), " + "COALESCE(CONCAT('internal:', tag_entry.tag_id), " +
"CONCAT('external:', tag_entry.external_tag_id))" "CONCAT('external:', tag_entry.external_tag_id))", @definition, 'tags')
identities << 'changed.field_key' if rows.any? { _1['field'] == 'changed_field' } if rows.any? { _1['field'] == 'changed_field' }
identities << self.class.masked_sql('changed.field_key', @definition, 'changed_field')
end
end end
members = identities.each_index.map { "counts_member_#{ _1 }" } members = identities.each_index.map { "counts_member_#{ _1 }" }
selected += identities.each_with_index.map { |expression, index| selected += identities.each_with_index.map { |expression, index|
@@ -98,8 +125,17 @@ class CountsAxes
def joins(fields = all.map { _1['field'] }) def joins(fields = all.map { _1['field'] })
result = '' result = ''
if fields.include?('tags') if fields.include?('tags')
document = 'CAST(v.tags_json AS JSON)'
unless HistoryAccess.admin?
visible = self.class.visible_ids_sql(@definition)
result += " LEFT JOIN (#{ visible }) counts_tags_visible " +
'ON counts_tags_visible.id = v.id '
document = "CASE WHEN counts_tags_visible.id IS NOT NULL " +
"THEN #{ document } ELSE JSON_ARRAY(" +
"JSON_OBJECT('tag_id', 0)) END"
end
result += <<~SQL.squish result += <<~SQL.squish
JOIN JSON_TABLE(CAST(v.tags_json AS JSON), '$[*]' COLUMNS ( JOIN JSON_TABLE(#{ document }, '$[*]' COLUMNS (
tag_id BIGINT PATH '$.tag_id' NULL ON EMPTY, tag_id BIGINT PATH '$.tag_id' NULL ON EMPTY,
external_tag_id BIGINT PATH '$.external_tag_id' NULL ON EMPTY)) tag_entry external_tag_id BIGINT PATH '$.external_tag_id' NULL ON EMPTY)) tag_entry
@@ -112,6 +148,13 @@ class CountsAxes
condition = @definition.changes.map do |field| condition = @definition.changes.map do |field|
"(changed.field_key = '#{ field }' AND #{ @population.changed_sql(field) })" "(changed.field_key = '#{ field }' AND #{ @population.changed_sql(field) })"
end.join(' OR ') end.join(' OR ')
unless HistoryAccess.admin?
visible = self.class.visibility_sql(@definition, 'changed_field')
marker = ApplicationRecord.connection.quote(MASKED_VALUE)
fields += " UNION ALL SELECT #{ marker } AS field_key"
condition = "((#{ visible }) AND (#{ condition })) OR " +
"(NOT (#{ visible }) AND changed.field_key = #{ marker })"
end
result += " JOIN (#{ fields }) changed ON (#{ condition })" result += " JOIN (#{ fields }) changed ON (#{ condition })"
end end
result result
+4 -2
ファイルの表示
@@ -28,16 +28,18 @@ class CountsCandidates
[external, 'external', 'NULL', 'JSON_OBJECT()']] [external, 'external', 'NULL', 'JSON_OBJECT()']]
sources = sources.map do |population, kind, category, names| sources = sources.map do |population, kind, category, names|
scope = population.scope.except(:select) scope = population.scope.except(:select)
name = population.definition.expression('name')
if @params['query'].present? if @params['query'].present?
pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%" pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
scope = scope.where("(v.name LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" + scope = scope.where("(#{ name } LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
"SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " + "SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
"JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " + "JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern) 'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
end end
scope.select(Arel.sql( scope.select(Arel.sql(
"CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " + "CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
"v.name AS name, #{ names } AS names, #{ category } AS category, '#{ kind }' AS kind")) "#{ name } AS name, #{ names } AS names, " +
"#{ category } AS category, '#{ kind }' AS kind"))
.to_sql .to_sql
end end
clauses = [] clauses = []
+41 -2
ファイルの表示
@@ -82,14 +82,32 @@ class CountsCondition
def apply(scope, entry) def apply(scope, entry)
raise ArgumentError unless entry.is_a?(Hash) raise ArgumentError unless entry.is_a?(Hash)
if entry['operator'] == 'axis_eq' if entry['operator'] == 'axis_eq'
raise ArgumentError unless (entry.keys - ['field', 'operator', 'grain', 'value']).empty? raise ArgumentError unless (entry.keys - ['field', 'operator', 'grain', 'value']).empty?
value = entry['value'] value = entry['value']
unless value.nil? || value.is_a?(String) || value.is_a?(Numeric) || [true, false].include?(value) unless (value.nil? || value.is_a?(String) || value.is_a?(Numeric) ||
[true, false].include?(value))
raise ArgumentError raise ArgumentError
end end
raise ArgumentError if value.is_a?(String) && value.bytesize > 8192 raise ArgumentError if value.is_a?(String) && value.bytesize > 8192
if (!HistoryAccess.admin? && CountsAxes.private_field?(entry['field']) &&
(value == CountsAxes::MASKED_VALUE ||
(value == CountsAxes::MASKED_TEXT &&
(@definition.fields[entry['field']] != :string ||
['tags', 'changed_field'].include?(entry['field'])))))
field = entry.fetch('field')
raise ArgumentError unless @definition.axes(@population.history).include?(field)
if entry.key?('grain')
unless (@definition.fields[field] == :datetime &&
CountsAxes::GRAINS.include?(entry['grain']))
raise ArgumentError
end
end
return scope.none
end
scope = @population.condition_scope(scope, entry.fetch('field'))
return @population.axis_condition(scope, entry) return @population.axis_condition(scope, entry)
end end
allowed = ['field', 'operator', 'value', 'end', 'blank', 'input', 'values'] allowed = ['field', 'operator', 'value', 'end', 'blank', 'input', 'values']
@@ -111,6 +129,13 @@ class CountsCondition
source, expression = source_for(field[:key]) source, expression = source_for(field[:key])
type = field[:type] type = field[:type]
# Preserve typed input compatibility; display markers are never real typed values.
if (!HistoryAccess.admin? && CountsAxes.private_field?(field[:key]) &&
entry['value'] == CountsAxes::MASKED_TEXT && type != :string && !entry['blank'])
return scope.none unless entry['operator'] == 'ne'
return @population.condition_scope(scope, field[:key])
end
blank = blank_sql(expression, type) blank = blank_sql(expression, type)
if entry['blank'] if entry['blank']
sql = if source && field[:collection] sql = if source && field[:collection]
@@ -119,6 +144,7 @@ class CountsCondition
"NOT EXISTS (SELECT 1 FROM #{ source } WHERE NOT (#{ blank }))" "NOT EXISTS (SELECT 1 FROM #{ source } WHERE NOT (#{ blank }))"
else blank else blank
end end
scope = @population.condition_scope(scope, field[:key])
return scope.where(Arel.sql(sql)) return scope.where(Arel.sql(sql))
end end
if ['in', 'not_in', 'any', 'all', 'none'].include?(entry['operator']) if ['in', 'not_in', 'any', 'all', 'none'].include?(entry['operator'])
@@ -131,6 +157,7 @@ class CountsCondition
validate_enum!(field[:key], parsed.first) if type == :enum validate_enum!(field[:key], parsed.first) if type == :enum
operator = entry['operator'] operator = entry['operator']
if type == :interval if type == :interval
scope = @population.condition_scope(scope, field[:key])
return interval(scope, source, expression, parsed) return interval(scope, source, expression, parsed)
end end
clauses = [] clauses = []
@@ -158,6 +185,7 @@ class CountsCondition
elsif operator == 'ne' elsif operator == 'ne'
predicate = "(NOT (#{ predicate }) OR #{ blank })" predicate = "(NOT (#{ predicate }) OR #{ blank })"
end end
scope = @population.condition_scope(scope, field[:key])
scope.where(predicate, *binds) scope.where(predicate, *binds)
end end
@@ -168,6 +196,13 @@ class CountsCondition
values = entry['values'] values = entry['values']
raise ArgumentError unless values.is_a?(Array) && values.length <= 100 raise ArgumentError unless values.is_a?(Array) && values.length <= 100
if (!HistoryAccess.admin? && CountsAxes.private_field?(field[:key]) &&
values.include?(CountsAxes::MASKED_TEXT) &&
(field[:type] != :string || field[:set_type] == 'tag_reference'))
return scope.none if entry['operator'] == 'all'
values = values - [CountsAxes::MASKED_TEXT]
end
raise ArgumentError if [entry['value'], entry['end']].any? { !_1.nil? && _1 != '' } raise ArgumentError if [entry['value'], entry['end']].any? { !_1.nil? && _1 != '' }
parsed = values.map do |value| parsed = values.map do |value|
@@ -191,7 +226,10 @@ class CountsCondition
operator = entry['operator'] operator = entry['operator']
if parsed.empty? if parsed.empty?
return ['in', 'any'].include?(operator) ? scope.none : scope return scope.none if ['in', 'any'].include?(operator)
return scope if entry['values'].empty?
return @population.condition_scope(scope, field[:key])
end end
source, expression = source_for(field[:key]) source, expression = source_for(field[:key])
if field[:set_type] == 'tag_reference' if field[:set_type] == 'tag_reference'
@@ -212,6 +250,7 @@ class CountsCondition
predicate = source ? "NOT #{ predicate }" : predicate = source ? "NOT #{ predicate }" :
"(NOT #{ predicate } OR #{ blank_sql(expression, field[:type]) })" "(NOT #{ predicate } OR #{ blank_sql(expression, field[:type]) })"
end end
scope = @population.condition_scope(scope, field[:key])
scope.where(predicate, *parsed) scope.where(predicate, *parsed)
end end
+9 -1
ファイルの表示
@@ -70,6 +70,13 @@ class CountsPopulation
@authorisation_flg ? HistoryAccess.sql(model, row) : 'TRUE' @authorisation_flg ? HistoryAccess.sql(model, row) : 'TRUE'
end end
# Each predicate keeps its own visibility restriction, including OR branches.
def condition_scope(scope, field)
return scope if HistoryAccess.admin? || !CountsAxes.private_field?(field)
scope.where(Arel.sql(CountsAxes.visibility_sql(definition, field)))
end
def axis_condition(scope, entry) def axis_condition(scope, entry)
raise CountsAxes::PrivateCondition if entry['value'] == CountsAxes::MASKED_VALUE raise CountsAxes::PrivateCondition if entry['value'] == CountsAxes::MASKED_VALUE
@@ -106,7 +113,7 @@ class CountsPopulation
else else
raise ArgumentError unless definition.axes(history).include?(key) raise ArgumentError unless definition.axes(history).include?(key)
scope = scope.where(definition.expression(key) => entry['value']) scope = scope.where("#{ definition.expression(key) } <=> ?", entry['value'])
end end
scope scope
end end
@@ -209,6 +216,7 @@ class CountsPopulation
def apply_tags def apply_tags
raise ArgumentError unless definition.resource == 'posts' raise ArgumentError unless definition.resource == 'posts'
@scope = condition_scope(@scope, 'tags')
if params['tag'].present? if params['tag'].present?
@scope = @scope.where(snapshot_membership( @scope = @scope.where(snapshot_membership(
"#{ params.fetch('kind', 'internal') }:#{ params['tag'] }")) "#{ params.fetch('kind', 'internal') }:#{ params['tag'] }"))
+18 -3
ファイルの表示
@@ -105,12 +105,25 @@ class CountsResourceDefinition
def time_column = 'created_at' def time_column = 'created_at'
def column(key) def column(key)
raise ArgumentError unless fields.key?(key) raise ArgumentError unless fields.key?(key)
# Keep the V1 Counts field name at the API boundary only.
return 'linked_tag_ids' if resource == 'nico_tags' && key == 'linked_tags'
{ 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key) { 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key)
end end
def expression(key, row = 'v') = "#{ row }.#{ column(key) }" def expression(key, row = 'v')
def changes = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id'] if resource == 'nico_tags' && key == 'name'
return "(SELECT CONCAT(external_tags.platform, ':', external_tags.name) " +
"FROM external_tags WHERE external_tags.id = #{ row }.tag_id)"
end
"#{ row }.#{ column(key) }"
end
def changes
columns = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
resource == 'nico_tags' ? columns - ['name'] : columns
end
def axes(history) def axes(history)
fields.reject { |_key, type| type == :json }.keys + fields.reject { |_key, type| type == :json }.keys +
(resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : []) (resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : [])
@@ -118,7 +131,9 @@ class CountsResourceDefinition
def metadata def metadata
fields.map do |key, type| fields.map do |key, type|
{ key:, type:, nullable: model.columns_hash.fetch(column(key)).null, nullable = (resource == 'nico_tags' && key == 'name') ||
model.columns_hash.fetch(column(key)).null
{ key:, type:, nullable:,
operators: OPERATORS.fetch(type, []) } operators: OPERATORS.fetch(type, []) }
end end
end end
+3 -1
ファイルの表示
@@ -201,6 +201,8 @@ class CountsStateQuery
end end
def listing def listing
external_name = CountsResourceDefinition.new('nico_tags')
.expression('name', 'external_version')
catalog = <<~SQL catalog = <<~SQL
, tag_counts AS ( , tag_counts AS (
SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count
@@ -209,7 +211,7 @@ class CountsStateQuery
SELECT 'internal' AS kind, tag_id, name, names, SELECT 'internal' AS kind, tag_id, name, names,
deprecated_at FROM tag_at WHERE event_type <> 'discard' deprecated_at FROM tag_at WHERE event_type <> 'discard'
UNION ALL UNION ALL
SELECT tc.kind, tc.tag_id, external_version.name, JSON_OBJECT() AS names, SELECT tc.kind, tc.tag_id, #{ external_name } AS name, JSON_OBJECT() AS names,
NULL AS deprecated_at NULL AS deprecated_at
FROM tag_counts tc FROM tag_counts tc
LEFT JOIN tag_at internal_version LEFT JOIN tag_at internal_version
+1 -1
ファイルの表示
@@ -253,7 +253,7 @@ class CountsTableExport
end end
def summary_value(value, index, page) def summary_value(value, index, page)
return '********' if value == CountsAxes::MASKED_VALUE return CountsAxes::MASKED_TEXT if value == CountsAxes::MASKED_VALUE
field = @query.axes.all.fetch(index).fetch('field') field = @query.axes.all.fetch(index).fetch('field')
return @labels.fetch('bot', '') if field == 'user' && value.nil? return @labels.fetch('bot', '') if field == 'user' && value.nil?
+4 -10
ファイルの表示
@@ -182,6 +182,7 @@ class CountsTableQuery
order = sort_sql { detail_expression(_1) } order = sort_sql { detail_expression(_1) }
query = query.order(Arel.sql((order + ['v.id ASC']).join(', '))) query = query.order(Arel.sql((order + ['v.id ASC']).join(', ')))
.limit(limit).offset((page - 1) * limit) .limit(limit).offset((page - 1) * limit)
query = query.preload(:external_tag) if @definition.resource == 'nico_tags'
rows = query.to_a rows = query.to_a
if ['posts', 'tags'].include?(@definition.resource) if ['posts', 'tags'].include?(@definition.resource)
point = population.history ? population.at : point = population.history ? population.at :
@@ -220,19 +221,11 @@ class CountsTableQuery
private private
# Public timeline predicates may include hidden records. Private predicates must # Private predicates require visibility independently of their operator.
# never become a count oracle, even when the selected axes themselves are public. # Ordering/measure state must not select a server-only masked coordinate.
def validate_summary_conditions! def validate_summary_conditions!
return if mode != 'summary' || HistoryAccess.admin? return if mode != 'summary' || HistoryAccess.admin?
fields = QueryState.records(@params, 'conditions') + QueryState.records(@params, 'drill')
private_fields = fields.any? { !CountsAxes::PUBLIC_FIELDS.include?(_1['field']) }
keys = ['tags', 'tag', 'kind', 'resource_id', 'user_id']
private_parameters = keys.any? do |key|
@params.any? { |name, value| (name == key || name.start_with?("#{ key }.")) && value != '' }
end
raise CountsAxes::PrivateCondition if private_fields || private_parameters
['column_order', 'measures'].each do |key| ['column_order', 'measures'].each do |key|
# Coordinates are compared only to already masked expressions, never raw # Coordinates are compared only to already masked expressions, never raw
# values. Public coordinates remain sortable; a guessed private ID cannot match. # values. Public coordinates remain sortable; a guessed private ID cannot match.
@@ -494,6 +487,7 @@ class CountsTableQuery
table = model.table_name table = model.table_name
scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point) scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point)
scope = scope.includes(:external_tag) if model == NicoTagVersion
bound = @connection.quote(point) bound = @connection.quote(point)
if population.history && @definition.resource == 'posts' if population.history && @definition.resource == 'posts'
key = kind == 'internal' ? 'tag_id' : 'external_tag_id' key = kind == 'internal' ? 'tag_id' : 'external_tag_id'
+2 -2
ファイルの表示
@@ -1,4 +1,5 @@
class NicoTagVersionRecorder < VersionRecorder class NicoTagVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update'].freeze
def self.record! external_tag:, event_type:, created_by_user: def self.record! external_tag:, event_type:, created_by_user:
new(external_tag:, event_type:, created_by_user:).record! new(external_tag:, event_type:, created_by_user:).record!
end end
@@ -14,8 +15,7 @@ class NicoTagVersionRecorder < VersionRecorder
def record_key = :external_tag def record_key = :external_tag
def snapshot_attributes def snapshot_attributes
{ name: "#{ @record.platform }:#{ @record.name }", { linked_tag_ids: @record.snapshot_linked_tag_ids.join(' ') }
linked_tags: @record.snapshot_linked_tag_names.join(' ') }
end end
def tracks_version_no_on_record? = false def tracks_version_no_on_record? = false
+201
ファイルの表示
@@ -0,0 +1,201 @@
require 'cgi'
require 'digest'
require 'erb'
require 'pathname'
require 'uri'
# A deliberately small current-state projection, always under public authority.
class StaticMirror
RESOURCE_LIMIT = 100
NAME_LIMIT = 2_000
MAX_BYTES = 8.megabytes
EXCLUSIONS = [
'historical_state', 'unversioned_resources', 'tag_descriptions', 'help', 'materials',
'external_tags', 'parent_relations', 'tag_sections', 'users', 'audit_data',
'authentication', 'editing', 'images', 'videos', 'resources_beyond_limits'].freeze
class TooLarge < StandardError; end
class UnsafeUrl < StandardError; end
attr_reader :data_at, :authority, :counts
def initialize(locale:, origin:)
@locale = locale
@origin = validated_url(origin).sub(%r{/+\z}, '')
end
def export(&progress)
@files = { }
@bytes = 0
HistoryAccess.set(user: nil) do
capture
progress&.call(0, @posts.length + @tags.length)
generate_pages(&progress)
raise HistoryAccess::Forbidden unless HistoryAccess.authorised_artifact?(authority)
generated_at = Time.current.utc
manifest = { format_version: 1, generated_at: generated_at.iso8601(6),
data_at:, locale: @locale.code, resources: counts, exclusions: EXCLUSIONS,
fields: { posts: ['id', 'title', 'url', 'tags'], tags: ['id', 'category', 'names'] },
limits: { posts: RESOURCE_LIMIT, tags: RESOURCE_LIMIT, names: NAME_LIMIT,
bytes: MAX_BYTES },
external_assets: 'not_included', checksum_scope: 'all_files_except_manifest.json',
files: @files.map { |path, data| { path:, sha256: Digest::SHA256.hexdigest(data) } } }
add_file('manifest.json', JSON.pretty_generate(manifest))
entries = @files.map do |path, data|
MaterialZipExporter::Entry.new(path: "archive/#{ path }", data:, mtime: generated_at)
end
bytes = MaterialZipExporter::ZipWriter.write(entries)
raise TooLarge if bytes.bytesize > MAX_BYTES
bytes
end
end
private
def capture
CountsExporter.with_read_snapshot do
@data_at = Time.current.utc.iso8601(6)
@authority = HistoryAccess.authority
# Requiring a matching immutable revision closes the legacy unversioned gap.
@posts = confirmed(Post, PostVersion, :post_versions).order(:id)
.limit(RESOURCE_LIMIT).select(:id, :title, :url).to_a
@tags = confirmed(Tag, TagVersion, :tag_versions).where(deprecated_at: nil)
.order(:id).limit(RESOURCE_LIMIT).select(:id, :category).to_a
@names = TagName.where(tag_id: @tags.map(&:id)).order(:tag_id, :language_code, :id)
.limit(NAME_LIMIT + 1).pluck(:tag_id, :language_code, :script_code, :name, :primary_flg)
raise TooLarge if @names.length > NAME_LIMIT
@names = @names.group_by(&:first)
@relations = PostTag.where(post_id: @posts.map(&:id), tag_id: @tags.map(&:id))
.order(:post_id, :tag_id).pluck(:post_id, :tag_id)
@counts = { posts: @posts.length, tags: @tags.length }
end
end
def confirmed(model, version_model, association)
HistoryAccess.current(model.all, version_model).joins(association)
.where("#{ version_model.table_name }.version_no = #{ model.table_name }.version_no")
end
def generate_pages
assets = Rails.root.join('app/views/static_mirror')
['archive.css', 'archive.js'].each do |name|
add_file("assets/#{ name }", assets.join(name).read)
end
add_file('robots.txt', "User-agent: *\nDisallow: /\n")
add_file('archive-config.js', 'window.archiveConfig = { origin: null };')
page('index.html', 'Static Mirror 生成機能', '', search_form + limitations)
page("#{ @locale.code }/posts/index.html", 'Post', '/posts', post_list(@posts))
page("#{ @locale.code }/tags/index.html", 'Tag', '/tags', tag_list(@tags))
processed = 0
@posts.each do |post|
tags = @tags.select { |tag| @relations.include?([post.id, tag.id]) }
content = "<p>#{ external_link(post.url) }</p>#{ tag_list(tags) }"
page(resource_path('posts', post.id), post.title.presence || post.id.to_s,
"/posts/#{ post.id }", content)
processed += 1
yield(processed, @posts.length + @tags.length) if block_given?
end
@tags.each do |tag|
posts = @posts.select { |post| @relations.include?([post.id, tag.id]) }
names = @names.fetch(tag.id, []).map do |_, language, script, name, _primary|
"<li><span lang=\"#{ h(language) }\">#{ h(name) }</span> (#{ h(script) })</li>"
end.join
content = "<p>#{ h(tag.category) }</p><ul>#{ names }</ul>#{ post_list(posts) }"
page(resource_path('tags', tag.id), tag_name(tag), "/tags/#{ tag.id }", content)
processed += 1
yield(processed, @posts.length + @tags.length) if block_given?
end
index = @posts.map { |post|
{ path: resource_path('posts', post.id), title: post.title.presence || post.id.to_s }
} + @tags.map { |tag|
{ path: resource_path('tags', tag.id), title: tag_name(tag),
names: @names.fetch(tag.id, []).map { _1[3] } }
}
add_file('search-index.json', JSON.generate(index))
end
def page(path, title, original_path, content)
@path = path
@title = title
@original_path = "/#{ @locale.code }#{ original_path }"
@content = content
template = Rails.root.join('app/views/static_mirror/page.html.erb').read
add_file(path, ERB.new(template).result(binding))
end
def add_file(path, data)
@bytes += data.bytesize
raise TooLarge if @bytes > MAX_BYTES
@files[path] = data
end
def resource_path(resource, id) = "#{ @locale.code }/#{ resource }/#{ id }/index.html"
def relative(path)
Pathname.new(path).relative_path_from(Pathname.new(@path).dirname).to_s
end
def h(value) = CGI.escapeHTML(value.to_s)
def tag_name(tag)
@names.fetch(tag.id, []).find { _1[1] == @locale.language_code && _1[4] }&.fetch(3) ||
tag.id.to_s
end
# Links are resolved after the page path is known; only generated numeric IDs enter paths.
def post_list(posts)
'<h2>Post</h2><ul>' + posts.map { |post|
title = post.title.presence || post.id.to_s
"<li><a data-path=\"#{ resource_path('posts', post.id) }\">#{ h(title) }</a></li>"
}.join + '</ul>'
end
def tag_list(tags)
'<h2>Tag</h2><ul>' + tags.map { |tag|
"<li><a data-path=\"#{ resource_path('tags', tag.id) }\">#{ h(tag_name(tag)) }</a></li>"
}.join + '</ul>'
end
def linked_content
@content.gsub(/data-path="([^"]+)"/) { "href=\"#{ h(relative(Regexp.last_match(1))) }\"" }
end
def validated_url(value)
uri = URI.parse(value.to_s)
unless uri.is_a?(URI::HTTP) && uri.host.present? && uri.userinfo.nil?
raise UnsafeUrl
end
uri.to_s
rescue URI::InvalidURIError
raise UnsafeUrl
end
def external_link(value)
url = validated_url(value)
"<a href=\"#{ h(url) }\" target=\"_blank\" rel=\"noopener noreferrer\">#{ h(url) }</a>"
rescue UnsafeUrl
''
end
def search_form
'<form id="archive-search"><label>検索 <input name="q" type="search"></label>' +
'<button type="submit">検索</button></form><ul id="search-results"></ul>'
end
def limitations
<<~HTML
<h2>未対応機能</h2>
<p>Tag Description, Help, Material, 外部タグ, 親子関係, 区間, 履歴, ログイン, 作成, 編輯</p>
<h2>出力件数の制限</h2><p>Post: #{ RESOURCE_LIMIT }, Tag: #{ RESOURCE_LIMIT }</p>
<p>TagName: #{ NAME_LIMIT }, #{ MAX_BYTES } B</p>
<h2>外部画像や動画への依存</h2><p>ローカルへ取り込めていない資産: 外部画像や動画</p>
<h2>データ保護上の制約</h2>
<p>公開抑止、除票、非公開情報、認証情報、監査専用情報を ZIP に含めない。</p>
<p>今回は現在状態のみの対応</p>
HTML
end
end
+7
ファイルの表示
@@ -0,0 +1,7 @@
:root { color-scheme: light dark; }
body { max-width: 65rem; margin: auto; padding: 1rem; font: 1rem/1.6 sans-serif; }
header { border-bottom: 1px solid; padding-bottom: 1rem; }
nav { display: flex; flex-wrap: wrap; gap: 1rem; }
a, p, li { overflow-wrap: anywhere; }
li { margin-block: .4rem; }
input, button { font: inherit; }
+61
ファイルの表示
@@ -0,0 +1,61 @@
(() => {
const root = new URL ('../', document.currentScript.src)
const origin = window.archiveConfig?.origin
if (typeof origin === 'string')
{
try
{
const url = new URL (origin)
if (['http:', 'https:'].includes (url.protocol) && !url.username && !url.password)
{
url.search = ''
url.hash = ''
document.querySelectorAll ('[data-original]').forEach (link => {
link.href = url.href.replace (/\/+$/, '') + link.dataset.original
})
}
}
catch
{
// Each HTML retains its original link when configuration is absent or invalid.
}
}
const form = document.getElementById ('archive-search')
const results = document.getElementById ('search-results')
if (!form || !results) return
form.addEventListener ('submit', async event => {
event.preventDefault ()
results.replaceChildren ()
const query = (new FormData (form).get ('q') ?? '').toString ().toLocaleLowerCase ()
if (!query.trim ()) return
try
{
const response = await fetch (new URL ('search-index.json', root))
if (!response.ok) throw new Error ('Search index unavailable')
const entries = await response.json ()
for (const entry of entries)
{
const text = [entry.title, ...(entry.names ?? [])].join (' ').toLocaleLowerCase ()
if (!text.includes (query)) continue
const url = new URL (entry.path, root)
if (url.origin !== root.origin || !url.pathname.startsWith (root.pathname)) continue
const item = document.createElement ('li')
const link = document.createElement ('a')
link.setAttribute ('href', entry.path)
link.textContent = entry.title
item.append (link)
results.append (item)
}
}
catch
{
// Lists remain available if the index cannot be loaded.
for (const link of document.querySelectorAll ('nav a:not([data-original])'))
{
const item = document.createElement ('li')
item.append (link.cloneNode (true))
results.append (item)
}
}
})
})()
+28
ファイルの表示
@@ -0,0 +1,28 @@
<!doctype html>
<html lang="ja">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="robots" content="noindex, nofollow">
<meta name="referrer" content="no-referrer">
<meta http-equiv="Content-Security-Policy"
content="default-src 'none'; script-src 'self'; style-src 'self'; connect-src 'self'; form-action 'none'; base-uri 'none'">
<title><%= h(@title) %></title>
<link rel="stylesheet" href="<%= h(relative('assets/archive.css')) %>">
<script defer src="<%= h(relative('archive-config.js')) %>"></script>
<script defer src="<%= h(relative('assets/archive.js')) %>"></script>
</head>
<body>
<header>
<p>静的保存版 — データ基準時点: <time><%= h(data_at) %></time></p>
<nav>
<a href="<%= h(relative('index.html')) %>">Static Mirror 生成機能</a>
<a href="<%= h(relative("#{ @locale.code }/posts/index.html")) %>">Post</a>
<a href="<%= h(relative("#{ @locale.code }/tags/index.html")) %>">Tag</a>
<a href="<%= h(@origin + @original_path) %>" data-original="<%= h(@original_path) %>"
target="_blank" rel="noopener noreferrer">本家へのリンク</a>
</nav>
</header>
<main><h1><%= h(@title) %></h1><%= linked_content %></main>
</body>
</html>
+5
ファイルの表示
@@ -1,4 +1,9 @@
Rails.application.routes.draw do Rails.application.routes.draw do
get 'static_mirror', to: 'static_mirrors#show'
post 'static_mirror/jobs', to: 'static_mirrors#create'
get 'static_mirror/jobs/:id', to: 'static_mirrors#status'
get 'static_mirror/files/:id', to: 'static_mirrors#download'
get 'counts/definitions/:resource', to: 'counts_tables#definition' get 'counts/definitions/:resource', to: 'counts_tables#definition'
get 'counts/definitions/:resource/candidates', to: 'counts_tables#candidates' get 'counts/definitions/:resource/candidates', to: 'counts_tables#candidates'
get 'counts/query', to: 'counts_tables#index' get 'counts/query', to: 'counts_tables#index'
+5
ファイルの表示
@@ -0,0 +1,5 @@
class AddLinkedTagIdsToNicoTagVersions < ActiveRecord::Migration[8.0]
def change
add_column :nico_tag_versions, :linked_tag_ids, :text
end
end
+42
ファイルの表示
@@ -0,0 +1,42 @@
class MigrateLinkedTagsInNicoTagVersions < ActiveRecord::Migration[8.0]
class MigrationTagVersion < ActiveRecord::Base
self.table_name = 'tag_versions'
end
class MigrationNicoTagVersion < ActiveRecord::Base
self.table_name = 'nico_tag_versions'
end
def up
# 除票外部タグの恢復はないので除票履歴があれば全消しでよいはず.
execute <<~SQL
DELETE
t1
FROM
nico_tag_versions t1
INNER JOIN
nico_tag_versions t2
ON
t1.tag_id = t2.tag_id
AND t2.event_type = 'discard'
SQL
MigrationNicoTagVersion.find_each do |ntv|
linked_tag_ids = ntv.linked_tags.split.map { |name|
# 厳密には一意ぢゃないけどめんだぅだからこれでいいや.
MigrationTagVersion
.order(created_at: :desc, id: :desc)
.find_by("names ->> '$.ja.name' = ?", name)
&.tag_id
}.compact.uniq.sort.join(' ')
ntv.update_columns(linked_tag_ids:)
end
change_column_null :nico_tag_versions, :linked_tag_ids, false
end
def down
raise ActiveRecord::IrreversibleMigration, '戻せません.'
end
end
+6
ファイルの表示
@@ -0,0 +1,6 @@
class RemoveLinkedTagsFromNicoTagVersions < ActiveRecord::Migration[8.0]
def change
remove_column :nico_tag_versions, :linked_tags
remove_column :nico_tag_versions, :name
end
end
生成ファイル
+2 -3
ファイルの表示
@@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "name", null: false t.string "name", null: false
t.string "record_type", null: false t.string "record_type", null: false
@@ -301,10 +301,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
t.bigint "tag_id", null: false t.bigint "tag_id", null: false
t.integer "version_no", null: false t.integer "version_no", null: false
t.string "event_type", null: false t.string "event_type", null: false
t.string "name", null: false
t.text "linked_tags", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.text "linked_tag_ids", null: false
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at" t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc } t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc } t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
+15 -2
ファイルの表示
@@ -9,8 +9,21 @@
# end # end
ApplicationRecord.transaction do ApplicationRecord.transaction do
Language.find_or_create_by!(code: 'ain') { _1.name = 'ain' } Language.find_or_create_by!(code: 'ja') { _1.name = '日本語' }
Script.find_or_create_by!(code: 'Kana') { _1.name = 'Kana' } Script.find_or_create_by!(code: 'Jpan') { _1.name = '漢字、仮名文字およびラテン文字' }
Region.find_or_create_by!(code: 392) do
_1.alpha_code = 'JP'
_1.name = '日本国'
end
Locale.find_or_create_by!(code: 'ja') do
_1.language_code = 'ja'
_1.script_code = 'Jpan'
_1.region_code = 392
_1.name = '日本語'
end
Language.find_or_create_by!(code: 'ain') { _1.name = 'ヤウンモシルン アイヌ イタㇰ' }
Script.find_or_create_by!(code: 'Kana') { _1.name = 'カナモジ オヨビ ラテンモジ' }
end end
post_url_sanitisation_rules = [ post_url_sanitisation_rules = [
+43 -8
ファイルの表示
@@ -11,28 +11,63 @@ RSpec.describe ExternalTag, type: :model do
expect(external.reload.name).to eq('raw tag[]') expect(external.reload.name).to eq('raw tag[]')
end end
it 'deletes post associations without deleting posts or version history' do it 'does not allow a persisted external tag to change its platform or name' do
external = create(:external_tag, name: 'immutable')
expect { external.update!(name: 'renamed') }
.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:name]).to include('は変更できません.')
external.reload
external.platform = nil
expect { external.save! }.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:platform]).to include('は変更できません.')
expect(external.reload).to have_attributes(platform: 'nico', name: 'immutable')
end
it 'rejects delete, which bypasses destroy callbacks' do
external = create(:external_tag)
expect { external.delete }.to raise_error(ActiveRecord::ReadOnlyRecord)
expect(external.reload).to be_persisted
end
it 'increments the counter through post associations without changing identity' do
external = create(:external_tag, name: 'counter')
post = create(:post)
expect {
PostExternalTag.create!(post:, external_tag: external)
}.to change { external.reload.post_count }.by(1)
expect(external.reload).to have_attributes(platform: 'nico', name: 'counter')
end
it 'does not destroy external tags or their post associations and history' do
external = create(:external_tag) external = create(:external_tag)
post = create(:post) post = create(:post)
PostExternalTag.create!(post:, external_tag: external) PostExternalTag.create!(post:, external_tag: external)
version = NicoTagVersionRecorder.record!( version = NicoTagVersionRecorder.record!(
external_tag: external, event_type: :create, created_by_user: nil) external_tag: external, event_type: :create, created_by_user: nil)
external.destroy! expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
expect(PostExternalTag.where(external_tag_id: external.id)).to be_empty expect(external.reload).to be_persisted
expect(post.reload.external_tags).to be_empty expect(PostExternalTag.exists?(post:, external_tag: external)).to be(true)
expect(post.reload.external_tags).to contain_exactly(external)
expect(version.reload.tag_id).to eq(external.id) expect(version.reload.tag_id).to eq(external.id)
end end
it 'deletes external links without deleting linked internal tags' do it 'does not destroy an external tag or its links to internal tags' do
external = create(:external_tag) external = create(:external_tag)
tag = create(:tag) tag = create(:tag)
NicoTagRelation.create!(nico_tag: external, tag:) relation = NicoTagRelation.create!(nico_tag: external, tag:)
external.destroy! expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
expect(NicoTagRelation.where(nico_tag_id: external.id)).to be_empty expect(external.reload).to be_persisted
expect(relation.reload).to be_persisted
expect(Tag.exists?(tag.id)).to be(true) expect(Tag.exists?(tag.id)).to be(true)
end end
end end
+3 -3
ファイルの表示
@@ -76,7 +76,7 @@ RSpec.describe 'Counts artifact policy and external references' do
end end
end end
it 'does not expose a private linked tag name through an external history snapshot' do it 'does not expose a private linked tag ID through an external history snapshot' do
tag = create(:tag, primary_name: 'private-linked-name') tag = create(:tag, primary_name: 'private-linked-name')
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name', TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024), category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
@@ -84,7 +84,7 @@ RSpec.describe 'Counts artifact policy and external references' do
auto_generated: false, aliases: [] } }) auto_generated: false, aliases: [] } })
external = create(:external_tag, name: 'public-external') external = create(:external_tag, name: 'public-external')
row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create', row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
name: 'nico:public-external', linked_tags: 'private-linked-name', linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024)) created_at: Time.utc(2024))
post = create(:post) post = create(:post)
snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create', snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
@@ -99,7 +99,7 @@ RSpec.describe 'Counts artifact policy and external references' do
expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist
end end
public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update', public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update',
name: 'nico:public-external', linked_tags: 'private-linked-name-extra', linked_tag_ids: '',
created_at: Time.utc(2024, 7)) created_at: Time.utc(2024, 7))
HistoryAccess.set(user: nil) do HistoryAccess.set(user: nil) do
expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist
+3 -4
ファイルの表示
@@ -10,23 +10,22 @@ RSpec.describe 'Shared Tag and ExternalTag IDs', type: :model do
expect(next_tag.id).to be > external.id expect(next_tag.id).to be > external.id
end end
it 'does not reuse physically deleted IDs in either table' do it 'does not reuse IDs after internal deletion while external tags remain' do
tag = create(:tag) tag = create(:tag)
external = create(:external_tag) external = create(:external_tag)
TagName.where(tag_id: tag.id).delete_all TagName.where(tag_id: tag.id).delete_all
tag.destroy! tag.destroy!
external.destroy! expect(ExternalTag.exists?(external.id)).to be(true)
expect(create(:tag).id).to be > external.id expect(create(:tag).id).to be > external.id
expect(create(:external_tag).id).to be > external.id expect(create(:external_tag).id).to be > external.id
end end
it 'retains existing overlapping IDs without renumbering on update or insert' do it 'retains overlapping IDs after a tag update and a new allocation' do
tag = create(:tag) tag = create(:tag)
external = create(:external_tag) external = create(:external_tag)
external.update_columns(id: tag.id) external.update_columns(id: tag.id)
tag.update!(category: :meta) tag.update!(category: :meta)
external.update!(name: 'updated_external')
before_tag = tag.reload.attributes before_tag = tag.reload.attributes
before_external = external.reload.attributes before_external = external.reload.attributes
+15 -5
ファイルの表示
@@ -47,24 +47,34 @@ RSpec.describe VersionRecord, type: :model do
external_tag: nico_tag, external_tag: nico_tag,
version_no: 1, version_no: 1,
event_type: 'create', event_type: 'create',
name: "nico:#{ nico_tag.name }", linked_tag_ids: '',
linked_tags: '',
created_at: Time.current, created_at: Time.current,
created_by_user: nil created_by_user: nil
) )
expect { expect {
version.update!(name: 'nico:changed') version.update!(linked_tag_ids: '123')
}.to raise_error(ActiveRecord::ReadOnlyRecord) }.to raise_error(ActiveRecord::ReadOnlyRecord)
end end
it 'rejects discard and restore versions for external tags' do
[:discard, :restore].each do |event_type|
version = NicoTagVersion.new(
external_tag: nico_tag, version_no: 1, event_type:,
linked_tag_ids: '', created_at: Time.current)
expect(version).not_to be_valid
expect(version.errors[:event_type]).not_to be_empty
end
end
it 'prevents NicoTagVersion destroy' do it 'prevents NicoTagVersion destroy' do
version = NicoTagVersion.create!( version = NicoTagVersion.create!(
external_tag: nico_tag, external_tag: nico_tag,
version_no: 1, version_no: 1,
event_type: 'create', event_type: 'create',
name: "nico:#{ nico_tag.name }", linked_tag_ids: '',
linked_tags: '',
created_at: Time.current, created_at: Time.current,
created_by_user: nil created_by_user: nil
) )
+196
ファイルの表示
@@ -0,0 +1,196 @@
require 'rails_helper'
RSpec.describe 'Counts masked search', type: :request do
let!(:tag) { create(:tag, primary_name: '秘密のタグ') }
let(:actor) { create(:user, :member) }
let(:admin) { create(:user, :admin) }
let(:base) do
{ 'resource' => 'tags', 'definition' => 'history', 'mode' => 'summary',
'locale' => 'ja', 'execution_at' => '2025-01-01T00:00:00Z',
'timezone' => 'UTC', 'rows' => '', 'cols' => '', 'sort' => '' }
end
before do
[1, 2].each do |number|
TagVersion.create!(tag:, version_no: number,
event_type: number == 1 ? 'create' : 'discard', name: '秘密のタグ',
category: 'general', aliases: '秘密の別名', parent_tag_ids: '',
names: { ja: { name: '秘密のタグ', script_code: 'Jpan', auto_generated: false,
aliases: [{ name: '秘密の別名', script_code: 'Jpan' }] } },
created_by_user: actor, created_at: Time.utc(2023, number))
end
end
def query(extra = {})
get '/counts/query', params: base.merge(extra)
expect(response).to have_http_status(:ok), extra.inspect
response.parsed_body
end
def predicate(field, operator, value, index = 0)
prefix = "conditions.#{ index }"
result = { 'conditions' => '', "#{ prefix }.field" => field,
"#{ prefix }.operator" => operator }
if ['in', 'any', 'all', 'none', 'not_in'].include?(operator)
result.merge!("#{ prefix }.values" => '1', 'condition_values' => '',
"condition_values.#{ index }.condition" => index.to_s,
"condition_values.#{ index }.value_type" => 'string',
"condition_values.#{ index }.value" => value)
else
result["#{ prefix }.value"] = value
end
result
end
it 'rejects every name and alias predicate on private history' do
['name', 'name_ja', 'names.name', 'aliases.name', 'names.aliases.name'].each do |field|
secret = field.include?('aliases') ? '秘密の別名' : '秘密のタグ'
multiple = !['name', 'name_ja'].include?(field)
operators = multiple ? ['any', 'all', 'none'] : ['in', 'not_in']
['eq', 'ne', 'like', *operators].each do |operator|
[secret, '********', '%', ''].each do |value|
expected = (value == '' && ['eq', 'ne', 'like'].include?(operator)) ? 2 : 0
expect(query(predicate(field, operator, value))['count']).to eq(expected)
end
end
blank = predicate(field, 'eq', '').merge('conditions.0.blank' => '1')
expect(query(blank)['count']).to eq(0)
end
end
it 'ignores missing and empty scalar values unless blank is checked' do
['name', 'name_ja', 'names.name', 'aliases.name'].each do |field|
['eq', 'ne', 'like'].each do |operator|
condition = predicate(field, operator, '')
[condition, condition.except('conditions.0.value')].each do |empty|
expect(query(empty)['count']).to eq(2)
expect(query(empty.merge('conditions.0.blank' => '0'))['count']).to eq(2)
expect(query(empty.merge('conditions.0.blank' => '1'))['count']).to eq(0)
end
end
end
end
it 'keeps details totals unchanged for inactive private predicates' do
settings = predicate('name', 'ne', '').merge('mode' => 'details')
result = query(settings)
expect(result['count']).to eq(0)
expect(result['versions']).to be_empty
expect(result['output_count']).to eq(2)
active = query(settings.merge('conditions.0.blank' => '1'))
expect(active['output_count']).to eq(0)
end
it 'ignores missing sets but preserves explicit empty set semantics' do
{ 'name' => ['in', 'not_in'], 'aliases.name' => ['any', 'all', 'none'] }.each do
|field, operators|
operators.each do |operator|
condition = { 'conditions' => '', 'conditions.0.field' => field,
'conditions.0.operator' => operator }
expect(query(condition)['count']).to eq(2)
empty = condition.merge('conditions.0.values' => '1', 'condition_values' => '')
expected = ['in', 'any'].include?(operator) ? 0 : 2
expect(query(empty)['count']).to eq(expected)
expect(query(condition.merge('conditions.0.blank' => '1'))['count']).to eq(0)
# An explicit empty string element is a real value, not an unspecified set.
expect(query(predicate(field, operator, ''))['count']).to eq(0)
end
end
end
it 'ignores empty private predicates regardless of their position' do
first = predicate('name', 'ne', '')
.merge(predicate('resource_id', 'eq', tag.id.to_s, 1))
last = predicate('resource_id', 'eq', tag.id.to_s)
.merge(predicate('aliases.name', 'like', '', 1))
expect(query(first)['count']).to eq(2)
expect(query(last)['count']).to eq(2)
active = predicate('name', 'ne', 'unrelated')
.merge(predicate('aliases.name', 'like', '', 1))
expect(query(active)['count']).to eq(0)
end
it 'searches public literal markers and treats axis predicates as explicit' do
public_tag = create(:tag, primary_name: '********')
TagVersion.create!(tag: public_tag, version_no: 1, event_type: 'create',
name: '********', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: '********', script_code: 'Jpan', auto_generated: false,
aliases: [] } }, created_at: Time.utc(2023))
expect(query['count']).to eq(3)
['eq', 'ne', 'like', 'in', 'not_in'].each do |operator|
expected = ['ne', 'not_in'].include?(operator) ? 0 : 1
expect(query(predicate('name', operator, '********'))['count']).to eq(expected)
end
blank = predicate('aliases.name', 'eq', '').merge('conditions.0.blank' => '1')
expect(query(blank)['count']).to eq(1)
['********', '', nil].each do |value|
condition = { 'conditions' => '', 'conditions.0.field' => 'name',
'conditions.0.operator' => 'axis_eq',
'conditions.0.value_type' => value.nil? ? 'null' : 'string' }
condition['conditions.0.value'] = value unless value.nil?
expected = value == '********' ? 1 : 0
expect(query(condition)['count']).to eq(expected)
drill = { 'drill' => '', 'drill.0.field' => 'name',
'drill.0.value_type' => value.nil? ? 'null' : 'string' }
drill['drill.0.value'] = value unless value.nil?
expect(query(drill)['count']).to eq(expected)
end
end
it 'keeps public identity and timeline predicates searchable' do
expect(query['count']).to eq(2)
values = { 'resource_id' => tag.id.to_s, 'version_no' => '2',
'event_type' => 'discard', 'user' => actor.id.to_s,
'created_at' => '2023-02-01T00:00:00Z' }
values.each do |field, value|
expected = ['resource_id', 'user'].include?(field) ? 2 : 1
expect(query(predicate(field, 'eq', value))['count']).to eq(expected)
end
condition = predicate('name', 'ne', '秘密のタグ')
.merge(predicate('event_type', 'eq', 'discard', 1))
expect(query(condition)['count']).to eq(0)
expect(query(predicate('category', 'eq', '********'))['count']).to eq(0)
expect(query(predicate('category', 'eq', 'general'))['count']).to eq(0)
end
it 'keeps public predicates available after combining multiple conditions' do
condition = predicate('resource_id', 'eq', tag.id.to_s)
.merge(predicate('event_type', 'eq', 'discard', 1))
expect(query(condition)['count']).to eq(1)
condition.merge!(predicate('name', 'ne', 'unrelated', 2))
expect(query(condition)['count']).to eq(0)
end
it 'keeps real name searches for administrators and excludes private details' do
condition = predicate('name', 'eq', '秘密のタグ')
details = query(condition.merge('mode' => 'details'))
expect(details['versions']).to be_empty
expect(details['output_count']).to eq(0)
masked = query(predicate('name', 'eq', '********').merge('mode' => 'details'))
expect(masked['versions']).to be_empty
expect(masked['output_count']).to eq(0)
sign_in_as(admin)
expect(query(condition)['count']).to eq(2)
expect(query(condition.merge('mode' => 'details'))['versions'].length).to eq(2)
end
it 'rejects private names reached through a post tag snapshot' do
post = create(:post)
PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'post',
url: post.url, tags: '', parent_post_ids: '',
tags_json: [{ tag_id: tag.id, version_no: 1, name: '秘密のタグ',
category: 'general', sections: [] }],
created_at: Time.utc(2024))
['tags.name', 'tags.names.name', 'tags.name_ja'].each do |field|
['eq', 'ne', 'like', 'any', 'all', 'none'].each do |operator|
['秘密のタグ', '********', '%'].each do |value|
settings = predicate(field, operator, value).merge('resource' => 'posts')
expect(query(settings)['count']).to eq(0)
end
end
blank = predicate(field, 'eq', '').merge('resource' => 'posts',
'conditions.0.blank' => '1')
expect(query(blank)['count']).to eq(0)
end
end
end
+129 -11
ファイルの表示
@@ -19,7 +19,7 @@ RSpec.describe 'Counts table API', type: :request do
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023)) created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 1, NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', name: 'beta', linked_tags: '', created_at: Time.utc(2023)) event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
snapshots = [ snapshots = [
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] }, { tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
{ external_tag_id: external.id }] { external_tag_id: external.id }]
@@ -50,6 +50,115 @@ RSpec.describe 'Counts table API', type: :request do
def versions(result) = result.fetch('versions').map { _1.fetch('version_no') } def versions(result) = result.fetch('versions').map { _1.fetch('version_no') }
context 'nico link ID snapshots through the V1 field name' do
let(:base) do
super().merge(resource: 'nico_tags')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024, 1, 1))
NicoTagVersion.create!(external_tag: external, version_no: 3,
event_type: 'update', linked_tag_ids: '',
created_at: Time.utc(2024, 2, 1))
end
it 'returns ID values under linked_tags without exposing the physical column key' do
result = query
expect(versions(result)).to eq([1, 2, 3])
expect(result['versions'].map { _1.fetch('linked_tags') }).to eq(['', tag.id.to_s, ''])
result['versions'].each do |row|
expect(row).not_to have_key('linked_tag_ids')
expect(row.fetch('name')).to eq('nico:beta')
end
end
it 'preloads external names separately for aliased link-change details' do
statements = []
listener = lambda do |_name, _start, _finish, _id, payload|
statements << payload[:sql]
end
ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do
result = query(axis('changed_field', 'linked_tags'))
expect(versions(result)).to eq([2, 3])
expect(result.fetch('versions').map { _1.fetch('name') })
.to eq(['nico:beta', 'nico:beta'])
end
details = statements.find { _1.include?('AS counts_latest') }
expect(details).not_to be_nil
expect(details).not_to include('JOIN `external_tags`')
names = statements.select { _1.match?(/SELECT .* FROM `external_tags`/) }
expect(names.length).to eq(1)
end
it 'advertises the legacy field, label and default columns only' do
get '/counts/definitions/nico_tags', params: { locale: 'ja' }
expect(response).to have_http_status(:ok)
body = response.parsed_body
['fields', 'filter_fields', 'output_fields'].each do |collection|
keys = body.fetch(collection).map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
field = body.fetch('output_fields').find { _1['key'] == 'linked_tags' }
expect(field.fetch('label')).to eq('counts:attributes.linked_tags')
body.fetch('axes').each_value do |keys|
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
body.fetch('defaults').select { _1['mode'] == 'details' }.each do |entry|
settings = entry.fetch('params').to_h { [_1.fetch('key'), _1.fetch('value')] }
expect(settings.fetch('columns').split).to include('name', 'linked_tags')
expect(settings.fetch('columns').split).not_to include('linked_tag_ids')
end
end
it 'filters IDs and legacy drills and compares link changes through linked_tags' do
predicate = { conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(axis('linked_tags', tag.id.to_s, root: 'drill')))).to eq([2])
expect(versions(query(axis('changed_field', 'linked_tags')))).to eq([2, 3])
expect(versions(query(predicate.merge('conditions.0.value' => 'alpha')))).to be_empty
end
it 'sorts ID snapshots through the public field in both directions' do
expect(versions(query(sort: 'linked_tags:asc version_no:asc'))).to eq([1, 3, 2])
expect(versions(query(sort: 'linked_tags:desc version_no:asc'))).to eq([2, 1, 3])
end
it 'restores historical link IDs before applying a latest snapshot filter' do
predicate = { definition: 'latest', at: '2024-01-15T00:00:00Z',
conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(predicate.except(:at)))).to be_empty
end
it 'groups by linked_tags ID values and accepts the resulting drill condition' do
sign_in_as(create(:user, :admin))
result = query(mode: 'summary', rows: 'linked_tags', cols: '', sort: '')
expect(result.fetch('cells')).to match_array([
{ 'values' => [''], 'count' => 2 },
{ 'values' => [tag.id.to_s], 'count' => 1 }])
expect(versions(query(axis('linked_tags', tag.id.to_s)))).to eq([2])
end
it 'rejects the physical column as a public filter, axis, sort or change field' do
sign_in_as(create(:user, :admin))
[
axis('linked_tag_ids', tag.id.to_s),
axis('changed_field', 'linked_tag_ids'),
{ mode: 'summary', rows: 'linked_tag_ids', cols: '', sort: '' },
{ sort: 'linked_tag_ids:asc' }].each do |invalid|
get '/counts/query', params: base.merge(invalid)
expect(response).to have_http_status(:bad_request), invalid.inspect
end
end
end
it 'identifies a totals timeout without exposing SQL in the error response' do it 'identifies a totals timeout without exposing SQL in the error response' do
allow_any_instance_of(CountsPivotTotals).to receive(:call) allow_any_instance_of(CountsPivotTotals).to receive(:call)
.and_raise(CountsPivotTotals::TimedOut, 'private SQL') .and_raise(CountsPivotTotals::TimedOut, 'private SQL')
@@ -223,11 +332,10 @@ RSpec.describe 'Counts table API', type: :request do
expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4]) expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4])
end end
it 'resolves external names from current registrations too' do it 'resolves immutable external names across historical snapshots' do
external.update!(name: 'renamed-beta') expect(versions(query(tags: 'nico:beta'))).to eq([1])
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([1]) expect(versions(query(tags: 'nico:renamed-beta'))).to eq([])
expect(versions(query(tags: 'nico:beta'))).to eq([]) expect(versions(query(tags: 'not:nico:beta'))).to eq([2, 3, 4])
expect(versions(query(tags: 'not:nico:renamed-beta'))).to eq([2, 3, 4])
end end
end end
@@ -354,15 +462,25 @@ RSpec.describe 'Counts table API', type: :request do
expect(result['cells'].sum { _1['count'] }).to eq(4) expect(result['cells'].sum { _1['count'] }).to eq(4)
expect(response.body).not_to include('hidden title') expect(response.body).not_to include('hidden title')
masked = query(mode: 'summary', rows: 'resource_id', cols: '') masked = query(mode: 'summary', rows: 'resource_id', cols: '')
expect(masked['cells'].map { _1['values'] }).to eq([[CountsAxes::MASKED_VALUE]]) expect(masked['cells'].map { _1['values'] }).to eq([[record.id]])
expect(masked['cells'].first['count']).to eq(4) expect(masked['cells'].first['count']).to eq(4)
expect(query['versions']).to be_empty expect(query['versions']).to be_empty
end end
it 'rejects private summary predicates instead of exposing a count oracle' do it 'allows public identity predicates without exposing private snapshot fields' do
get '/counts/query', params: base.merge(mode: 'summary', resource_id: record.id.to_s) PostVersion.create!(post: record, version_no: 4, event_type: 'discard',
expect(response).to have_http_status(:forbidden) url: record.url, title: 'hidden title', tags: '', tags_json: [],
expect(json).to eq('error' => 'private_condition') parent_post_ids: '', created_at: Time.utc(2024, 3))
get '/counts/query', params: base.merge(mode: 'summary',
resource_id: record.id.to_s, rows: 'resource_id', cols: 'title')
expect(response).to have_http_status(:ok)
expect(json['count']).to eq(4)
expect(json['cells'].sum { _1['count'] }).to eq(4)
expect(json['cells'].map { _1['values'].last })
.to include(CountsAxes::MASKED_VALUE)
expect(response.body).not_to include('hidden title')
end end
it 'reports the combined axis limit without replacing it with a generic 400' do it 'reports the combined axis limit without replacing it with a generic 400' do
+8 -14
ファイルの表示
@@ -38,12 +38,9 @@ RSpec.describe 'NicoTags', type: :request do
end end
it 'filters by nico tag name, linked tag name, and link status' do it 'filters by nico tag name, linked tag name, and link status' do
linked = create(:external_tag) linked = create(:external_tag, name: 'search_linked')
linked.update!(name: 'search_linked') unlinked = create(:external_tag, name: 'search_unlinked')
unlinked = create(:external_tag) other = create(:external_tag, name: 'other')
unlinked.update!(name: 'search_unlinked')
other = create(:external_tag)
other.update!(name: 'other')
destination = create(:tag, category: :general) destination = create(:tag, category: :general)
primary_tag_name_for(destination, 'ja').update!(name: 'destination_search') primary_tag_name_for(destination, 'ja').update!(name: 'destination_search')
NicoTagRelation.create!(nico_tag: linked, tag: destination) NicoTagRelation.create!(nico_tag: linked, tag: destination)
@@ -80,11 +77,9 @@ RSpec.describe 'NicoTags', type: :request do
end end
it 'sorts by name and timestamps' do it 'sorts by name and timestamps' do
older = create(:external_tag) older = create(:external_tag, name: 'ordered_a')
older.update!(name: 'ordered_a')
older.update_columns(created_at: 2.days.ago) older.update_columns(created_at: 2.days.ago)
newer = create(:external_tag) newer = create(:external_tag, name: 'ordered_b')
newer.update!(name: 'ordered_b')
newer.update_columns(created_at: 1.day.ago) newer.update_columns(created_at: 1.day.ago)
older_post_tag = older_post_tag =
PostExternalTag.create!(post: create(:post), external_tag: older) PostExternalTag.create!(post: create(:post), external_tag: older)
@@ -189,9 +184,8 @@ RSpec.describe 'NicoTags', type: :request do
versions = nico_tag.reload.nico_tag_versions.order(:version_no) versions = nico_tag.reload.nico_tag_versions.order(:version_no)
expect(versions.map(&:event_type)).to eq(['create', 'update']) expect(versions.map(&:event_type)).to eq(['create', 'update'])
expect(versions.last.linked_tags.split).to match_array([ expect(versions.last.linked_tag_ids.split.map(&:to_i))
'nico_linked_a', .to match_array([linked_a.id, linked_b.id])
'nico_linked_b'])
expect(versions.last.created_by_user_id).to eq(admin.id) expect(versions.last.created_by_user_id).to eq(admin.id)
end end
@@ -210,7 +204,7 @@ RSpec.describe 'NicoTags', type: :request do
expect(json).to eq([]) expect(json).to eq([])
expect(nico_tag.reload.linked_tags).to be_empty expect(nico_tag.reload.linked_tags).to be_empty
expect(nico_tag.nico_tag_versions.order(:version_no).last) expect(nico_tag.nico_tag_versions.order(:version_no).last)
.to have_attributes(linked_tags: '', created_by_user: member) .to have_attributes(linked_tag_ids: '', created_by_user: member)
end end
it 'returns the tags field error when a nico tag is specified directly' do it 'returns the tags field error when a nico tag is specified directly' do
+1 -1
ファイルの表示
@@ -20,7 +20,7 @@ RSpec.describe 'Post history privacy', type: :request do
created_at: origin + index.hours) created_at: origin + index.hours)
end end
NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create', NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
name: 'nico:external-history-tag', linked_tags: 'private-history-tag', linked_tag_ids: tag.id.to_s,
created_at: origin) created_at: origin)
['create', 'discard', 'restore', 'update'].each_with_index do |event, index| ['create', 'discard', 'restore', 'update'].each_with_index do |event, index|
snapshots = snapshots =
+169
ファイルの表示
@@ -0,0 +1,169 @@
require 'rails_helper'
require 'tmpdir'
RSpec.describe 'Static Mirror API', type: :request do
include ActiveSupport::Testing::TimeHelpers
around do |example|
Dir.mktmpdir('static-mirror-spec') do |path|
allow(StaticMirrorJob).to receive(:directory).and_return(Pathname.new(path))
example.run
end
end
before do
allow(Rails.env).to receive(:development?).and_return(true)
allow(StaticMirrorJob).to receive(:perform_later)
end
def create_job
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:accepted)
json.fetch('job')
end
it 'accepts anonymous jobs asynchronously and serves the completed ZIP' do
record = create(:post, title: 'mirror-public-api-title')
PostVersion.create!(post: record, version_no: 1, event_type: 'create',
title: record.title, url: record.url, tags: '', tags_json: [], parent_post_ids: '',
created_at: Time.current)
get '/static_mirror'
expect(json).to include('resource_limit' => 100, 'concurrency' => 1)
id = create_job
expect(StaticMirrorJob).to have_received(:perform_later).with(id)
expect(StaticMirrorJob.directory.join('archive.zip')).not_to exist
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'queued', 'data_at' => nil)
StaticMirrorJob.perform_now(id)
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'ready', 'processed' => 1, 'total' => 1)
expect(json.fetch('data_at')).to be_present
expect(json.keys).not_to include('owner', 'origin', 'actor_id', 'policy_revision')
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:ok)
expect(response.media_type).to eq('application/zip')
expect(response.body.byteslice(0, 4)).to eq("PK\x03\x04".b)
expect(response.body).to include(record.title)
expect(response.headers['Cache-Control']).to include('no-store')
end
it 'rejects historical and unknown input instead of pretending to restore it' do
['at', 'data_at', 'admin', 'limit'].each do |key|
post '/static_mirror/jobs', params: { locale: 'ja', key => '2020-01-01' }, as: :json
expect(response).to have_http_status(:bad_request)
end
expect(StaticMirrorJob).not_to have_received(:perform_later)
end
it 'limits requests globally even across fresh anonymous sessions' do
create_job
other = ActionDispatch::Integration::Session.new(Rails.application)
other.post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(other.response).to have_http_status(:too_many_requests)
expect(other.response.headers['Retry-After']).to eq('60')
expect(StaticMirrorJob).to have_received(:perform_later).once
end
it 'binds job status and downloads to the creating session' do
id = create_job
StaticMirrorJob.perform_now(id)
other = ActionDispatch::Integration::Session.new(Rails.application)
["/static_mirror/jobs/#{ id }", "/static_mirror/files/#{ id }"].each do |path|
other.get path
expect(other.response).to have_http_status(:not_found)
end
end
it 'refuses ready artifacts after a new discard even for admins' do
id = create_job
StaticMirrorJob.perform_now(id)
record = create(:post)
PostVersion.create!(post: record, version_no: 1, event_type: 'discard',
url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.current)
sign_in_as(create(:user, :admin))
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
get "/static_mirror/jobs/#{ id }"
expect(response).to have_http_status(:not_found)
end
it 'fails lost jobs and rejects expired downloads' do
id = create_job
travel 80.seconds do
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'failed', 'error' => 'worker_stopped')
end
travel 11.minutes do
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
end
end
it 'rejects a previously ready ZIP after its expiry' do
id = create_job
StaticMirrorJob.perform_now(id)
travel 11.minutes do
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
get "/static_mirror/jobs/#{ id }"
expect(response).to have_http_status(:not_found)
end
end
it 'keeps simultaneous generation bounded after the cooldown' do
create_job
lock = File.open(StaticMirrorJob.directory.join('.generation.lock'), File::RDWR)
lock.flock(File::LOCK_EX)
travel 61.seconds do
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:too_many_requests)
end
ensure
lock&.close
end
it 'reports bounded-generation failures without returning internal exception messages' do
id = create_job
allow(StaticMirror).to receive(:new).and_raise(StaticMirror::TooLarge, 'private details')
StaticMirrorJob.perform_now(id)
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'failed', 'error' => 'too_large')
expect(response.body).not_to include('private details')
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
end
it 'is unavailable outside development' do
allow(Rails.env).to receive(:development?).and_return(false)
get '/static_mirror'
expect(response).to have_http_status(:not_found)
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:not_found)
get '/static_mirror/jobs/unknown'
expect(response).to have_http_status(:not_found)
get '/static_mirror/files/unknown'
expect(response).to have_http_status(:not_found)
end
it 'preserves user and IP BAN checks' do
user = create(:user, banned_at: Time.current)
sign_in_as(user)
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:forbidden)
sign_out
IpAddress.create!(ip_address: IPAddr.new('127.0.0.1').hton, banned_at: Time.current)
get '/static_mirror', headers: { 'REMOTE_ADDR' => '127.0.0.1' }
expect(response).to have_http_status(:forbidden)
expect(StaticMirrorJob).not_to have_received(:perform_later)
end
it 'requires the normal CSRF token for anonymous generation', csrf: true do
get '/users/csrf'
token = json.fetch('token')
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:forbidden)
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json,
headers: { 'X-CSRF-Token' => token }
expect(response).to have_http_status(:accepted)
end
end
+49
ファイルの表示
@@ -22,6 +22,55 @@ RSpec.describe 'Counts export contracts' do
.and_return(@counts_export_dir) .and_return(@counts_export_dir)
end end
context 'nico link IDs with the V1 export field name' do
let(:tag) { create(:tag, primary_name: 'linked export tag') }
let(:external) { create(:external_tag, name: 'external export tag') }
let(:payload) do
super().merge('resource' => 'nico_tags', 'columns' => 'linked_tags',
'headers' => '["linked_tags"]')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s, created_at: Time.utc(2024))
end
it 'exports recorded IDs with the legacy JSON key and metadata' do
result = JSON.parse(CountsTableExport.new(payload).body.to_a.join)
expect(result.fetch('data')).to eq([
{ 'linked_tags' => '' }, { 'linked_tags' => tag.id.to_s }])
expect(result.fetch('metadata').fetch('columns')).to eq(['linked_tags'])
keys = result.fetch('metadata').fetch('fields').map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
it 'exports the selected legacy CSV header and ID values' do
body = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join
expect(CSV.parse(body.delete_prefix("\uFEFF")))
.to eq([['linked_tags'], [''], [tag.id.to_s]])
end
it 'keeps the legacy link column in default JSON exports' do
options = payload.except('columns', 'headers')
result = JSON.parse(CountsTableExport.new(options).body.to_a.join)
expect(result.fetch('metadata').fetch('columns')).to include('linked_tags')
result.fetch('data').each do |row|
expect(row).to have_key('linked_tags')
expect(row).not_to have_key('linked_tag_ids')
end
end
it 'rejects the physical column as a selected CSV or JSON field' do
['csv', 'json'].each do |format|
options = payload.merge('format' => format, 'columns' => 'linked_tag_ids')
expect { CountsTableExport.new(options) }.to raise_error(ArgumentError)
end
end
end
context 'serialization after the authorised query' do context 'serialization after the authorised query' do
let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] } let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] }
let(:page) do let(:page) do
+193 -23
ファイルの表示
@@ -69,27 +69,29 @@ RSpec.describe 'Counts masked pivot contracts' do
end end
end end
it 'preserves five tag occurrences after merging private tags and across pages' do it 'counts one opaque collection per private version across pages' do
[nil, guest, member, admin].each do |user| [nil, guest, member, admin].each do |user|
page = result(user) page = result(user)
expect(grand(page)).to eq(5) expected = user == admin ? 5 : 6
expect(page[:cells].sum { _1[:count] }).to eq(5) expect(grand(page)).to eq(expected)
expect(page[:cells].sum { _1[:count] }).to eq(expected)
expect(page).not_to have_key(:excluded_count) expect(page).not_to have_key(:excluded_count)
paged = result(user, 'limit' => '1') paged = result(user, 'limit' => '1')
expect(grand(paged)).to eq(5) expect(grand(paged)).to eq(expected)
expect(result(user, 'limit' => '1', 'page' => '2')[:group_count]) expect(result(user, 'limit' => '1', 'page' => '2')[:group_count])
.to eq(page[:group_count]) .to eq(page[:group_count])
end end
public_page = result(nil) public_page = result(nil)
hidden = public_page[:cells].select { _1[:values].first == CountsAxes::MASKED_VALUE } hidden = public_page[:cells].select { _1[:values].first == CountsAxes::MASKED_VALUE }
expect(hidden.sum { _1[:count] }).to eq(3) expect(hidden.sum { _1[:count] }).to eq(4)
expect(public_page[:axis_labels]['a0']).not_to have_key("internal:#{ tags.first.id }") expect(public_page[:axis_labels]['a0']).not_to have_key("internal:#{ tags.first.id }")
expect(public_page.to_json).not_to include('hidden-title', 'private-discard') expect(public_page.to_json).not_to include('hidden-title', 'private-discard')
end end
it 'retains distinct membership when tags are not a row axis' do it 'retains distinct membership when tags are not a row axis' do
[nil, admin].each do |user| [nil, admin].each do |user|
expect(grand(result(user, 'rows' => 'event_type', 'cols' => 'tags'))).to eq(3) expect(grand(result(user, 'rows' => 'event_type', 'cols' => 'tags')))
.to eq(user == admin ? 3 : 5)
expect(result(user, 'rows' => '', 'cols' => '')[:cells].sole[:count]).to eq(5) expect(result(user, 'rows' => '', 'cols' => '')[:cells].sole[:count]).to eq(5)
details = result(user, 'mode' => 'details', 'rows' => '', 'cols' => '') details = result(user, 'mode' => 'details', 'rows' => '', 'cols' => '')
expect(details[:count]).to eq(user == admin ? 5 : 1) expect(details[:count]).to eq(user == admin ? 5 : 1)
@@ -121,14 +123,13 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'counts distinct changed records when tags are not additive row tuples' do it 'counts distinct changed records when tags are not additive row tuples' do
[nil, admin].each do |user| [nil, admin].each do |user|
page = result(user, 'rows' => 'changed_field', 'cols' => 'event_type') page = result(user, 'rows' => 'changed_field', 'cols' => 'event_type')
expect(grand(page)).to eq(2) expect(grand(page)).to eq(user == admin ? 2 : 4)
if user.nil? if user.nil?
expect(page[:cells].map { _1[:values].first }.uniq).to eq([CountsAxes::MASKED_VALUE]) expect(page[:cells].map { _1[:values].first }.uniq).to eq([CountsAxes::MASKED_VALUE])
end end
# Changed discard snapshots have no tags: no full cell contributes here. # Private empty collections contribute the same opaque tuple as populated ones.
empty = result(user, 'rows' => 'changed_field', 'cols' => 'tags') combined = result(user, 'rows' => 'changed_field', 'cols' => 'tags')
expect(empty[:cells]).to be_empty expect(grand(combined)).to eq(user == admin ? 0 : 4)
expect(grand(empty)).to eq(0)
end end
end end
@@ -142,7 +143,7 @@ RSpec.describe 'Counts masked pivot contracts' do
expect(page[:row_headers]).to include(hash_including(values: [nil], kind: 'data')) expect(page[:row_headers]).to include(hash_including(values: [nil], kind: 'data'))
end end
it 'sorts public numeric values numerically alongside a masked group' do it 'sorts public version numbers numerically including formerly hidden records' do
post = PostVersion.order(:id).last.post post = PostVersion.order(:id).last.post
[2, 10].each do |number| [2, 10].each do |number|
PostVersion.create!(post:, version_no: number, event_type: 'update', PostVersion.create!(post:, version_no: number, event_type: 'update',
@@ -151,27 +152,196 @@ RSpec.describe 'Counts masked pivot contracts' do
end end
page = result(nil, 'rows' => 'version_no', 'cols' => '') page = result(nil, 'rows' => 'version_no', 'cols' => '')
values = page[:row_headers].select { _1[:kind] == 'data' }.map { _1[:values].first } values = page[:row_headers].select { _1[:kind] == 'data' }.map { _1[:values].first }
expect(values.reject { _1 == CountsAxes::MASKED_VALUE }.map(&:to_i)).to eq([1, 2, 10]) expect(values.map(&:to_i)).to eq([1, 2, 10])
expect(values.last).to eq(CountsAxes::MASKED_VALUE)
end end
it 'rejects private predicates and supplied measure coordinates before SQL labels escape' do it 'keeps public identity predicates and excludes private attributes' do
probes = [{ 'resource_id' => PostVersion.first.post_id.to_s }, hidden_id = PostVersion.first.post_id.to_s
{ 'tags' => 'A' }, base = { 'rows' => '', 'cols' => '' }
{ 'conditions' => '', 'conditions.0.field' => 'title', 'conditions.0.operator' => 'eq', condition = lambda do |field, operator, value|
'conditions.0.value' => 'hidden-title-0' }, { 'conditions' => '', 'conditions.0.field' => field,
{ 'drill' => '', 'drill.0.field' => 'tags', 'drill.0.value_type' => 'string', 'conditions.0.operator' => operator, 'conditions.0.value' => value }
'drill.0.value' => "internal:#{ tags.first.id }" }, end
expect(result(nil, base.merge('resource_id' => hidden_id))[:cells].sole[:count]).to eq(2)
expect(result(nil, base.merge(condition.call('version_no', 'eq', '2')))[:cells]
.sole[:count]).to eq(2)
expect(result(nil, base.merge(condition.call('user', 'eq', member.id.to_s)))[:cells]
.sole[:count]).to eq(5)
expect(result(nil, base.merge(condition.call('title', 'eq', 'hidden-title-0')))[:cells]
.sole[:count]).to eq(0)
expect(result(nil, base.merge(condition.call('title', 'ne', 'hidden-title-0')))[:cells]
.sole[:count]).to eq(1)
expect(result(nil, base.merge(condition.call('title', 'eq', '********')))[:cells]
.sole[:count]).to eq(0)
expect(result(nil, base.merge(condition.call('video_ms', 'eq', '********')))[:cells]
.sole[:count]).to eq(0)
expect(result(nil, base.merge(condition.call('title', 'like', '%title%')))[:cells]
.sole[:count]).to eq(1)
expect(result(nil, base.merge(condition.call('title', 'like', '%')))[:cells]
.sole[:count]).to eq(1)
expect(result(nil, base.merge('tags' => 'C'))[:cells].sole[:count]).to eq(1)
expect(result(nil, base.merge('tags' => 'not:C'))[:cells].sole[:count]).to eq(0)
end
it 'retains public OR branches while rejecting private predicates on hidden rows' do
HistoryAccess.set(user: nil) do
population = CountsPopulation.new(params.merge('rows' => '', 'cols' => ''),
authorisation_flg: false)
condition = CountsCondition.new(population)
public_scope = condition.apply(population.scope,
{ 'field' => 'event_type', 'operator' => 'eq', 'value' => 'discard' })
private_scope = condition.apply(population.scope,
{ 'field' => 'title', 'operator' => 'ne', 'value' => 'unrelated' })
masked_scope = condition.apply(population.scope,
{ 'field' => 'title', 'operator' => 'eq', 'value' => '********' })
expect(public_scope.except(:select).count).to eq(2)
expect(public_scope.or(private_scope).except(:select).count).to eq(3)
expect(private_scope.or(public_scope).except(:select).count).to eq(3)
expect(public_scope.or(masked_scope).except(:select).count).to eq(2)
expect(public_scope.merge(private_scope).except(:select).count).to eq(0)
end
end
it 'excludes private collections from positive, negative, AND and OR tag searches' do
settings = { 'rows' => '', 'cols' => '' }
{ 'C' => 1, 'not:C' => 0, 'not:unknown' => 1, '********' => 0,
'not:********' => 1, 'not:C C' => 0, 'not:C type:or C' => 1 }.each do |value, count|
expect(result(nil, settings.merge('tags' => value))[:cells].sole[:count]).to eq(count)
end
end
it 'ignores empty numeric and interval bounds without restricting private history' do
settings = { 'rows' => '', 'cols' => '', 'conditions' => '' }
{ 'video_ms' => ['eq', 'ne', 'gt', 'ge', 'lt', 'le', 'range'],
'tags.sections' => ['range'] }.each do |field, operators|
operators.each do |operator|
condition = settings.merge('conditions.0.field' => field,
'conditions.0.operator' => operator)
empty = condition.merge('conditions.0.value' => '')
expect(result(nil, condition)[:cells].sole[:count]).to eq(5)
expect(result(nil, empty)[:cells].sole[:count]).to eq(5)
expect(result(nil, empty.merge('conditions.0.blank' => '0'))[:cells]
.sole[:count]).to eq(5)
if operator == 'range'
empty['conditions.0.end'] = ''
expect(result(nil, empty)[:cells].sole[:count]).to eq(5)
['conditions.0.value', 'conditions.0.end'].each do |key|
active = empty.merge(key => '100')
expect(result(nil, active)[:cells].sole[:count]).to eq(0)
end
end
end
end
end
it 'keeps typed marker sets active after incompatible marker values are removed' do
settings = { 'rows' => '', 'cols' => '', 'conditions' => '',
'conditions.0.field' => 'video_ms', 'conditions.0.values' => '1',
'condition_values' => '', 'condition_values.0.condition' => '0',
'condition_values.0.value_type' => 'string',
'condition_values.0.value' => '********' }
['in', 'not_in'].each do |operator|
expected = operator == 'in' ? 0 : 1
condition = settings.merge('conditions.0.operator' => operator)
expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
end
end
it 'restricts active numeric comparisons and preserves empty selection semantics' do
settings = { 'rows' => '', 'cols' => '', 'conditions' => '',
'conditions.0.field' => 'video_ms' }
['eq', 'ne', 'gt', 'ge', 'lt', 'le', 'range'].each do |operator|
condition = settings.merge('conditions.0.operator' => operator,
'conditions.0.value' => '0')
condition['conditions.0.end'] = '100' if operator == 'range'
# The one public row is NULL; private NULLs and real values never match.
expected = operator == 'ne' ? 1 : 0
expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
end
['in', 'not_in'].each do |operator|
condition = settings.merge('conditions.0.operator' => operator,
'conditions.0.values' => '1', 'condition_values' => '')
expected = operator == 'not_in' ? 5 : 0
expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
end
blank = settings.merge('conditions.0.operator' => 'eq', 'conditions.0.blank' => '1')
expect(result(nil, blank)[:cells].sole[:count]).to eq(1)
end
it 'preserves empty tag sets and restricts active blank collection predicates' do
settings = { 'rows' => '', 'cols' => '', 'conditions' => '',
'conditions.0.field' => 'tags' }
['any', 'all', 'none'].each do |operator|
condition = settings.merge('conditions.0.operator' => operator,
'conditions.0.values' => '1', 'condition_values' => '')
expected = operator == 'any' ? 0 : 5
expect(result(nil, condition)[:cells].sole[:count]).to eq(expected)
end
blank = settings.merge('conditions.0.operator' => 'eq', 'conditions.0.blank' => '1')
expect(result(nil, blank)[:cells].sole[:count]).to eq(0)
end
it 'rejects server-only coordinates in column order' do
probes = [
{ 'cols' => 'tags', 'column_order' => '', 'column_order.0.value_type' => 'string', { 'cols' => 'tags', 'column_order' => '', 'column_order.0.value_type' => 'string',
'column_order.0.value' => CountsAxes::MASKED_VALUE }] 'column_order.0.value' => CountsAxes::MASKED_VALUE }]
HistoryAccess.set(user: nil) do HistoryAccess.set(user: nil) do
probes.each do |probe| probes.each do |probe|
expect { CountsTableQuery.new(params.merge(probe)) } expect { CountsTableQuery.new(params.merge(probe)).call }
.to raise_error(CountsAxes::PrivateCondition) .to raise_error(CountsAxes::PrivateCondition)
end end
end end
end end
it 'keeps private collection and change counts independent of stored elements' do
settings = [
{ 'rows' => 'tags', 'cols' => 'changed_field' },
{ 'rows' => 'changed_field tags', 'cols' => '' }]
original = settings.map { result(nil, _1) }
snapshot = tags.map do |tag|
{ tag_id: tag.id, version_no: 1, sections: [] }
end
hidden_posts = PostVersion.where(event_type: 'discard').pluck(:post_id)
PostVersion.where(post_id: hidden_posts).update_all(
title: 'same hidden value', tags_json: snapshot)
expect(settings.map { result(nil, _1) }).to eq(original)
end
it 'excludes private tag and change coordinates from drill conditions' do
['tags', 'changed_field'].each do |field|
settings = { 'rows' => field, 'cols' => '' }
page = result(nil, settings)
cell = page[:cells].find { _1[:values] == [CountsAxes::MASKED_VALUE] }
expect(cell[:count]).to eq(4)
[CountsAxes::MASKED_VALUE, CountsAxes::MASKED_TEXT].each do |value|
drill = { 'drill' => '', 'drill.0.field' => field,
'drill.0.value_type' => 'string', 'drill.0.value' => value }
expect(result(nil, settings.merge(drill))[:cells]).to be_empty
details = result(nil, settings.merge(drill).merge('mode' => 'details'))
expect(details[:versions]).to be_empty
condition = { 'conditions' => '', 'conditions.0.field' => field,
'conditions.0.operator' => 'axis_eq',
'conditions.0.value_type' => 'string', 'conditions.0.value' => value }
expect(result(nil, settings.merge(condition))[:cells]).to be_empty
end
end
end
it 'rejects real private tag and change coordinates for non-admin users' do
[nil, guest, member].each do |user|
{ 'tags' => "internal:#{ tags.first.id }", 'changed_field' => 'title' }.each do
|field, value|
settings = { 'rows' => '', 'cols' => '', 'drill' => '',
'drill.0.field' => field, 'drill.0.value_type' => 'string',
'drill.0.value' => value }
expect(result(user, settings)[:cells].sole[:count]).to eq(0)
expect(result(admin, settings)[:cells].sole[:count]).to be > 0
end
end
end
it 'keeps public column sorting usable while guessed private coordinates match nothing' do it 'keeps public column sorting usable while guessed private coordinates match nothing' do
first = result(nil, 'rows' => 'event_type', 'cols' => 'tags') first = result(nil, 'rows' => 'event_type', 'cols' => 'tags')
probe = result(nil, 'rows' => 'event_type', 'cols' => 'tags', probe = result(nil, 'rows' => 'event_type', 'cols' => 'tags',
@@ -187,7 +357,7 @@ RSpec.describe 'Counts masked pivot contracts' do
HistoryAccess.set(user: nil) do HistoryAccess.set(user: nil) do
payload = params.merge('format' => 'json') payload = params.merge('format' => 'json')
json = JSON.parse(CountsTableExport.new(payload).body.to_a.join) json = JSON.parse(CountsTableExport.new(payload).body.to_a.join)
expect(json['data'].sum { _1['kind'] == 'data' ? _1['count'] : 0 }).to eq(5) expect(json['data'].sum { _1['kind'] == 'data' ? _1['count'] : 0 }).to eq(6)
expect(json.to_json).not_to include('hidden-title', 'private-discard') expect(json.to_json).not_to include('hidden-title', 'private-discard')
csv = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join csv = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join
expect(csv).to include('********') expect(csv).to include('********')
+18 -8
ファイルの表示
@@ -8,21 +8,23 @@ RSpec.describe NicoTagVersionRecorder do
described_class.record!(external_tag:, event_type:, created_by_user: member) described_class.record!(external_tag:, event_type:, created_by_user: member)
end end
it 'records the external association and platform-qualified name' do it 'records the external association and derives the platform-qualified name' do
version = record(:create) version = record(:create)
expect(version).to have_attributes( expect(version).to have_attributes(
external_tag:, version_no: 1, event_type: 'create', external_tag:, version_no: 1, event_type: 'create',
name: 'nico:raw tag[]', linked_tags: '', created_by_user: member) name: 'nico:raw tag[]', linked_tag_ids: '', created_by_user: member)
expect(external_tag.reload.nico_tag_versions).to contain_exactly(version) expect(external_tag.reload.nico_tag_versions).to contain_exactly(version)
end end
it 'uses the latest history number when the record has no version_no column' do it 'uses the latest history number when the record has no version_no column' do
first = record(:create) first = record(:create)
external_tag.update!(name: 'changed') tag = create(:tag)
NicoTagRelation.create!(nico_tag: external_tag, tag:)
second = record(:update) second = record(:update)
expect(second).to have_attributes(version_no: 2, name: 'nico:changed') expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]',
linked_tag_ids: tag.id.to_s)
expect(first.reload.name).to eq('nico:raw tag[]') expect(first.reload.name).to eq('nico:raw tag[]')
expect(external_tag.reload.has_attribute?(:version_no)).to be(false) expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
end end
@@ -40,7 +42,7 @@ RSpec.describe NicoTagVersionRecorder do
expect(version).to have_attributes( expect(version).to have_attributes(
external_tag: external, name: 'registered_external:foo', version_no: 1, external_tag: external, name: 'registered_external:foo', version_no: 1,
event_type: 'create', linked_tags: '', created_by_user: member) event_type: 'create', linked_tag_ids: '', created_by_user: member)
end end
it 'returns the latest version without appending an unchanged snapshot' do it 'returns the latest version without appending an unchanged snapshot' do
@@ -64,13 +66,21 @@ RSpec.describe NicoTagVersionRecorder do
expect(external_tag.nico_tag_versions).to contain_exactly(first) expect(external_tag.nico_tag_versions).to contain_exactly(first)
end end
it 'records sorted linked internal names and later link removal' do
it 'rejects discard and restore events for external tags' do
[:discard, :restore].each do |event_type|
expect { record(event_type) }
.to raise_error(ArgumentError, "Invalid event_type: #{ event_type }")
end
end
it 'records sorted linked internal IDs and later link removal' do
tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) } tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) }
tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) } tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) }
expect(record(:create).linked_tags).to eq('a_link z_link') expect(record(:create).linked_tag_ids).to eq(tags.map(&:id).sort.join(' '))
external_tag.linked_tags = [tags.first] external_tag.linked_tags = [tags.first]
expect(record(:update)).to have_attributes(version_no: 2, linked_tags: 'z_link') expect(record(:update)).to have_attributes(version_no: 2, linked_tag_ids: tags.first.id.to_s)
end end
end end
+158
ファイルの表示
@@ -0,0 +1,158 @@
require 'rails_helper'
RSpec.describe StaticMirror do
include_context 'Ainu locale'
let(:tag) { create(:tag, primary_name: 'mirror-public-tag') }
let(:post) { create(:post, title: '<img src=x onerror=alert(1)>') }
let(:mirror) { described_class.new(locale: Locale.nipponese, origin: 'https://source.test') }
def snapshot_tag(record, event: 'create', number: 1)
TagVersion.create!(tag: record, version_no: number, event_type: event,
name: record.name('ja'), category: record.category, aliases: '', parent_tag_ids: '',
names: { ja: { name: record.name('ja'), script_code: 'Jpan',
auto_generated: false, aliases: [] } }, created_at: Time.current)
end
def snapshot_post(record, tags: [])
PostVersion.create!(post: record, version_no: 1, event_type: 'create',
title: record.title, url: record.url, tags: '', tags_json: tags,
parent_post_ids: '', created_at: Time.current)
end
# Read STORE entries independently of the production writer and verify CRCs.
def archive_files(bytes)
offset = 0
files = { }
while bytes.byteslice(offset, 4).unpack1('V') == 0x04034b50
header = bytes.byteslice(offset, 30).unpack('VvvvvvVVVvv')
size, name_size, extra_size = header[7], header[9], header[10]
path = bytes.byteslice(offset + 30, name_size).force_encoding('UTF-8')
data = bytes.byteslice(offset + 30 + name_size + extra_size, size)
expect(Zlib.crc32(data)).to eq(header[6])
files[path.delete_prefix('archive/')] = data.force_encoding('UTF-8')
offset += 30 + name_size + extra_size + size
end
expect(bytes.byteslice(-22, 4).unpack1('V')).to eq(0x06054b50)
files
end
before do
snapshot_tag(tag)
PostTag.create!(post:, tag:)
snapshot_post(post, tags: [{ tag_id: tag.id, version_no: 1, sections: [] }])
end
it 'generates a navigable ZIP, escaped HTML, search data and verified hashes' do
progress = []
files = archive_files(mirror.export { |done, total| progress << [done, total] })
expect(progress.last).to eq([2, 2])
expect(files.keys).to include('index.html', 'robots.txt', 'assets/archive.css',
'assets/archive.js', 'archive-config.js', 'search-index.json', 'manifest.json',
'ja/posts/index.html', "ja/posts/#{ post.id }/index.html",
'ja/tags/index.html', "ja/tags/#{ tag.id }/index.html")
files.select { |path, _| path.end_with?('.html') }.each do |path, html|
document = Nokogiri::HTML(html)
expect(document.at_css('meta[name="robots"]')['content']).to include('noindex')
expect(document.text).to include('静的保存版', mirror.data_at)
expect(document.css('img')).to be_empty
expect(document.at_css('[data-original]')['href']).to start_with('https://source.test/ja')
document.css('a[href], link[href], script[src]').each do |node|
target = node['href'] || node['src']
next if target.start_with?('https://')
expect(target).not_to start_with('/')
resolved = Pathname.new(path).dirname.join(target).cleanpath.to_s
expect(files).to have_key(resolved)
end
end
detail = Nokogiri::HTML(files.fetch("ja/posts/#{ post.id }/index.html"))
expect(detail.at_css('h1').text).to eq(post.title)
expect(detail.css('main a').map { _1['href'] })
.to include("../../tags/#{ tag.id }/index.html")
manifest = JSON.parse(files.fetch('manifest.json'))
expect(manifest).to include('format_version' => 1, 'locale' => 'ja',
'data_at' => mirror.data_at, 'resources' => { 'posts' => 1, 'tags' => 1 })
expect(Time.iso8601(manifest.fetch('generated_at'))).to be >= Time.iso8601(mirror.data_at)
expect(manifest.fetch('files').map { _1.fetch('path') })
.to match_array(files.keys - ['manifest.json'])
manifest.fetch('files').each do |entry|
digest = Digest::SHA256.hexdigest(files.fetch(entry.fetch('path')))
expect(entry.fetch('sha256')).to eq(digest)
end
expect(JSON.parse(files.fetch('search-index.json')).map { _1.fetch('path') })
.to include("ja/posts/#{ post.id }/index.html", "ja/tags/#{ tag.id }/index.html")
end
it 'keeps private and unversioned records out even for an admin caller' do
private_tag = create(:tag, primary_name: 'mirror-secret-tag')
snapshot_tag(private_tag)
snapshot_tag(private_tag, event: 'discard', number: 2)
private_post = create(:post, title: 'mirror-secret-post')
snapshot_post(private_post)
PostVersion.create!(post: private_post, version_no: 2, event_type: 'discard',
url: private_post.url, tags: '', tags_json: [], parent_post_ids: '',
created_at: Time.current)
legacy = create(:post, title: 'mirror-unversioned-secret')
referencing = create(:post, title: 'mirror-secret-reference')
snapshot_post(referencing,
tags: [{ tag_id: private_tag.id, version_no: 1, sections: [] }])
files = HistoryAccess.set(user: create(:user, :admin)) { archive_files(mirror.export) }
expect(files.values.join).not_to include('mirror-secret', legacy.title, private_post.url)
expect(files.keys).not_to include("ja/tags/#{ private_tag.id }/index.html",
"ja/posts/#{ private_post.id }/index.html", "ja/posts/#{ referencing.id }/index.html")
expect(mirror.authority.fetch('admin')).to be(false)
end
it 'applies later discard boundaries after a restoration' do
snapshot_tag(tag, event: 'discard', number: 2)
snapshot_tag(tag, event: 'restore', number: 3)
tag.update_columns(version_no: 3)
expect(archive_files(mirror.export)).to have_key("ja/tags/#{ tag.id }/index.html")
snapshot_tag(tag, event: 'discard', number: 4)
second = described_class.new(locale: Locale.nipponese, origin: 'https://source.test')
files = archive_files(second.export)
expect(files.keys).not_to include("ja/tags/#{ tag.id }/index.html")
expect(files.values.join).not_to include('mirror-public-tag')
end
it 'does not include credentials or executable URL schemes' do
post.update_columns(url: 'https://secret-user:secret-password@source.test/path')
content = archive_files(mirror.export).values.join
expect(content).not_to include('secret-password', 'secret-user')
post.update_columns(url: 'javascript:alert(1)')
expect(archive_files(mirror.export).values.join).not_to include('javascript:')
end
it 'fails if publication changes during generation' do
expect do
mirror.export do |done, _|
snapshot_tag(tag, event: 'discard', number: 2) if done.zero?
end
end.to raise_error(HistoryAccess::Forbidden)
end
it 'bounds output and never reports hidden population counts' do
stub_const('StaticMirror::RESOURCE_LIMIT', 1)
second = create(:post, title: 'mirror-beyond-limit')
snapshot_post(second)
files = archive_files(mirror.export)
expect(files.values.join).not_to include(second.title, 'population_count', 'excluded_count')
stub_const('StaticMirror::MAX_BYTES', 16)
expect { mirror.export }.to raise_error(StaticMirror::TooLarge)
end
it 'keeps all registered language names and aliases without locale filtering' do
locale
create(:tag_name, :alias, tag:, name: 'mirror-alias', language_code: 'ja', script_code: 'Jpan')
files = archive_files(described_class.new(locale:, origin: 'https://source.test').export)
detail = files.fetch("ain-Kana/tags/#{ tag.id }/index.html")
expect(detail).to include('mirror-public-tag', 'mirror-alias', 'lang="ain"', 'lang="ja"')
end
it 'fails rather than truncating registered aliases at the name limit' do
create(:tag_name, :alias, tag:, name: 'mirror-extra-alias')
stub_const('StaticMirror::NAME_LIMIT', 1)
expect { mirror.export }.to raise_error(StaticMirror::TooLarge)
end
end
+3366
ファイルの表示
ファイル差分が大きすぎるため省略します 差分を読み込み
+12 -4
ファイルの表示
@@ -158,7 +158,15 @@ private ID の正誤に応じて許可可否を変えないため、条件の一
非公開列を含む列順変更は API の column_values_editable でも不可と通知する。 非公開列を含む列順変更は API の column_values_editable でも不可と通知する。
公開列の値を使うソートは引き続き利用できる。 公開列の値を使うソートは引き続き利用できる。
明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。 明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。
外部タグ履歴の linked_tags は名前しか記録していないため、非公開タグの記録名を含む 外部タグ履歴の linked_tag_ids は、連携する内部タグの ID を半角スペース区切りで
スナップショットを保守的に非公開とする。名前全体を空白区切りの境界で照合する。 記録する。除票履歴のある内部タグの ID を含むスナップショットを非管理者へ公開しない。
区切りが曖昧な旧データでは過剰な秘匿の可能性はあるが、参照 ID がない旧形式から 名前や UI ロカールを参照 ID の判定に使わない。
名前の公開可否を楽観的に推定しない。 外部タグ名は履歴に保存せず、external_tags の platform と name を参照する。
V1 Counts の公開フィールド名は linked_tags を維持し、DB の linked_tag_ids へ対応付ける。
明細・フィルタ・集計軸・変更項目・ソート・CSV / JSON 出力で同じ対応付けを使う。
既定列と既存の表示ラベルも linked_tags のままとし、値は ID のスペース区切りとする。
linked_tag_ids は物理カラム名であり、Counts の公開フィールドとしては受け付けない。
旧 URL や保存済み設定のフィールド指定は維持できるが、値にタグ名を指定した検索条件や
ドリル条件は ID 値への見直しが必要となる。旧履歴の名称は移行後の ID 列から復元できず、
現在の名称からの推定変換も行わない。
+169
ファイルの表示
@@ -0,0 +1,169 @@
# Static Mirror PoC (#483)
現在の公開状態の一部を、Rails で HTML にして ZIP 出力する開発環境専用の PoC。
Post は ID・タイトル・URL・出力済み Tag との関連、Tag は ID・カテゴリ・全言語の
名前と別名・出力済み Post との関連を出力する。それ以外の Post / Tag 属性は対象外。
DB backup / restore とは別機能で、日時指定の復元機能はない。
本番環境では全 API が 404 になる。依存パッケージ・DB schema の変更はない。
## 操作
既存のローカル開発用 MySQL 設定と locale 登録を用意した環境で、
`backend/` の `bin/rails server -p 3002` と、`frontend/` の `npm run dev` を使う。
Vite の既存 `/api` proxy は3002番ポートを参照する。これらの起動コマンドは
今回実行していない。DB の準備・migration・依存導入も実行していない。
1. `http://localhost:5173/ja/static-mirror` を開く。開発時の「その他」にもリンクがある。
有効な locale では `/:locale/static-mirror` から利用できる。
2. 「スナップショット生成」を押す。ログインは不要。通常の CSRF、IP BAN、user BAN
の境界を通り、セッションに紐づくジョブを登録する。
3. 状態・処理件数・データ基準時点を確認し、完了後「ZIP ダウンロード」を押す。
4. ZIP を展開し、`archive/` を通常の静的 HTTP サーバーへ配置する。
`/保存版/archive/index.html` のようなサブディレクトリ配置に対応する。
DB、Node.js、原サーバー、外部 API は閲覧先では不要。
一覧・詳細・相互リンクは JavaScript 無効でも利用できる。検索は HTTP 配信した
`search-index.json` を JavaScript が読む。`file://` からの検索は保証しない。
外部動画・画像・サムネール・素材ファイルは取得も同梱もしない。Post の外部 URL は
通常のリンクとして残すため、そのリンク先の閲覧は外部サイトの存続に依存する。
各 HTML に静的保存版の表示、UTC のデータ基準時点、`noindex, nofollow`、
本家への絶対リンクを焼き込む。内部リンク・CSS・JS は相対参照。
`archive-config.js` の `window.archiveConfig.origin` を HTTP(S) の本家基点 URL
(例: `https://example.org`)に変更すれば本家リンクをまとめて変更できる。
設定 JS が削除・欠落・不正な場合や JS 無効時にも HTML の初期リンクが残る。
設定は配置先ミラーの URL ではなく、本家の基点を指す。
## API と処理上限
| API | 役割 |
| --- | --- |
| `GET /static_mirror` | 件数・容量・実行制限と対象外機能 |
| `POST /static_mirror/jobs` | 現在状態のジョブ登録。入力は `locale` のみ |
| `GET /static_mirror/jobs/:id` | 所有セッションの状態・処理進捗・基準時点・失敗コード |
| `GET /static_mirror/files/:id` | 所有セッションの完成 ZIP を再認可して取得 |
通常どおりフロントエンドの API transport と Query key を使用する。
URL に JSON を格納しない。`at` 等の任意時点入力・未知の生成オプションは400で拒否する。
- Post / Tag は各100件。公開認可後に ID 昇順で選ぶ。非公開件数や全母集団件数は返さない。
- 対象 Tag の全言語名・別名は最大2,000行。超過時は失敗させ、黙って切り捨てない。
言語・文字体系は保持し、表示対象言語に登録がない場合は ID を使う。
- Post と Tag の関連は両者が出力集合にあるものだけ。出力外への内部リンクは生成しない。
- 展開後のファイル合計及び ZIP は各8 MiB 以下。超過時は配布しない。
- 同時実行1件、全セッションを通じて新規登録は60秒に1件、登録から処理期限60秒。
競合・受付制限は429と `Retry-After`。状態取得・取得時の短いロック競合は503。
- ZIP とジョブの認可期限は10分。次のジョブ登録で前の ZIP / ジョブは置き換える。
期限後も最後のファイルがディスクに残り得るが、API では取得できない。
容量は単一 ZIP と作業ファイルに限定され、無制限に蓄積しない。
Rails の既存 Active Job と `:async` adapter を使い、生成は HTTP request の外で行う。
既存 `CountsExportJobs` は Counts の入力・投影・配信確認に結合しているため変更せず、
本機能の状態・単一成果物の管理だけを feature 固有の Job に置く。
受付・状態・ZIP は `backend/tmp/static_mirror/` の単一 spool を使う。
プロセス間の filesystem lock で実行枠と更新を制御する。各ファイルは0600、directory は
0700で作成する。Web プロセス再起動で非永続キューが失われる点が PoC の限界。
進まない queued / running は75秒後の状態取得で failed になる。再開や再実行はしない。
失敗コードは `too_large`、`generation_timeout`、`publication_changed`、
`generation_failed`、`worker_stopped`。内部の例外本文・パス・資源属性は応答に含めない。
画面では失敗コード又は既存の通信・認可エラー文言を表示する。
## 公開制御と整合性
生成者の role によらず `HistoryAccess.set(user: nil)` の公開権限を使う。
既存の `HistoryAccess.current` と確定済みの同一 `version_no` の存在確認を組み合わせる。
独自の role 判定や簡易な除票判定は作らない。対応する immutable revision がない
legacy record は安全側で対象外とする。公開不可の参照を含む確定版も既存認可で除外する。
廃止 Tag は対象外。HTML / 検索 JSON / manifest の件数には認可済みの出力集合だけが入る。
user、actor、履歴版番号、監査、認証、blob 情報は投影しない。
`CountsExporter.with_read_snapshot` の既存 repeatable-read 境界を再利用し、Post、Tag、
全言語 TagName、PostTag、publication revision を同じ読み取り view から取得する。
これには既存 HistoryAccess の SQL が動作する MySQL 環境が必要。未対応の adapter や
未整備の DB では生成失敗とし、認可を迂回した出力へフォールバックしない。
`data_at` はこの現在状態読み取りの開始時刻であり、履歴の指定日時復元を表さない。
`generated_at` はファイル生成後の別の時刻。
生成の最後と状態・ZIP 取得時に既存 artifact policy / discard revision を再検証する。
生成中の除票は失敗にし、生成後の除票では古い ZIP の再取得を404にする。
ZIP は再認可後のバイト列として返し、遅延 sendfile に古いパスを渡さない。
HTTP 応答は既存境界の `private, no-store`。ダウンロード済み ZIP の回収や、
最終認可と送出の間に発生する公開制御変更の完全な排他は保証できない。
新しい公開制御を導入する場合は共通 policy と artifact revision の連動が必要。
本文・名前・URL は escape する。外部リンクは HTTP(S)・host・userinfo 不在を検証し、
不正な URL はリンクとして出さない。外部 URL の取得は行わないため SSRF 用 DNS 検査を
流用しない。HTML の CSP は外部スクリプト・画像・通信を許可しない。
`manifest.json` に形式版、生成日時、基準時点、locale、出力件数、対象外項目、上限、
各ファイルの相対パスと SHA-256 を記録する。自己ハッシュは成立しないため manifest
自身だけは一覧の対象外とし、`checksum_scope` にその範囲を記録する。
## 過去時点復元の調査
- `post_versions` / `tag_versions` は親 ID と正の `version_no` に一意制約があり、
readonly の `VersionRecord` を使う。`created_at <= 時点` の中で最大の確定版を
選ぶことは可能。同一時刻の順序は時刻だけで決めず版番号を併用する必要がある。
- Tag は `names` に言語別の名前・script・別名を保存する。古い行の移行では
日本語として backfill し、旧 aliases 文字列を分割している。失われた区切りや
当時未記録の他言語名を現在の TagName で補完して正確と称することはできない。
- Post は `tags_json`、区間、Tag 版参照、`parent_post_ids` を、Tag は
`parent_tag_ids` を記録する。ただし legacy `tags_json` は名前・時刻からの補完を
含む。全時代・全書き込み経路の関係変更の完全性を検証する必要がある。
外部 Tag 名の現行参照など、immutable history だけでは揃わない値もある。
- Tag Description は `(tag_id, language_code, version_no)` の版に本文と翻訳元を記録する。
Material にはファイル情報等の版があるが、blob 本体の永久保存や除票・公開抑止との
整合は別途必要。Help はフロントエンドの文書配信に依存し、DB の任意時点だけでは
当時の公開版を復元できない。
- 当時の publication policy そのものや将来追加される公開抑止の完全な履歴は、
これらの内容版だけでは保証できない。指定時点の再現と現在の公開許可を別々に評価し、
現在の全後続除票境界を版番号と複合キーで適用する必要がある。恢復しても過去の
秘匿履歴を再公開しない。Counts の件数例外はこの機能へ拡張しない。
- 正確な時点復元には、全 resource の履歴の起点・欠落・backfill の識別、関係・名前・
policy・locale・asset の時点整合性、immutable な Help の版、削除済み asset の保存方針、
一つの DB read view と現在の認可の再検証、同時刻更新の順序・境界の設計が必要。
このため日時入力は実装していない。履歴評価はソース調査であり、実 DB の網羅監査ではない。
## 検証と残課題
追加した回帰テスト:
- `backend/spec/services/static_mirror_spec.rb`: ZIP の CRC / 構造、全ファイルの hash、
内部参照、escape、基準時点、公開権限、後続除票、言語名・別名、容量・件数上限。
- `backend/spec/requests/static_mirrors_spec.rb`: 一般受付、非同期境界、所有権、
公開制御変更、失敗・期限・競合・全体 rate limit、開発環境制限、CSRF と BAN。
- `frontend/src/pages/StaticMirrorPage.test.tsx`: 開始、進捗、取得、失敗、
受付エラー、認可喪失、日本語 fallback の言語属性。
- `frontend/src/lib/staticMirrorAssets.test.ts`: 静的検索の相対参照・escape と
サブディレクトリ配備、本家設定の欠落・不正・変更。
実施したのは既存コードの調査と差分の目視確認のみ。テスト、lint、build、型検査、
migration、実ブラウザーでの表示、ZIP 展開・HTTP 配置は実行していない。
管理者指定の suite による結果確認と、サブディレクトリ配置・JS 無効・原サーバー停止・
設定 JS 欠落・静的検索の実画面確認が残る。
本番公開には durable な worker / queue、復旧・取消・削除と運用監視、適切な利用者別
rate limit、容量・時間・負荷の実測、公開制御の監査と変更検知、長時間配信の再認可方針、
asset の権利・保管方針、追加 resource の安全な投影、UI 文言・翻訳の確定が必要。
本 PoC の開発環境制限を単に外して公開することは想定しない。
## 変更ファイルの責務
| ファイル | 責務 |
| --- | --- |
| `backend/config/routes.rb` | metadata・job・ZIP の4経路 |
| `backend/app/controllers/static_mirrors_controller.rb` | 通常認証境界、開発制限、入力・HTTP 応答 |
| `backend/app/jobs/static_mirror_job.rb` | 単一生成枠、受付制限、状態・成果物・期限・取得認可 |
| `backend/app/services/static_mirror.rb` | 公開データの一貫した投影、ページ・検索・manifest・ZIP |
| `backend/app/views/static_mirror/page.html.erb` | escape 済み HTML、ナビ、基準時点・本家リンク・CSP |
| `backend/app/views/static_mirror/archive.css` | 静的サイトの読み取り表示 |
| `backend/app/views/static_mirror/archive.js` | ローカル検索と本家リンクの設定変更 |
| `frontend/src/App.tsx` | locale 付き操作画面経路 |
| `frontend/src/lib/queryKeys.ts` | 既存 Query key entrypoint への追加 |
| `frontend/src/pages/StaticMirrorPage.tsx` | 開始・制限・進捗・失敗・ZIP 操作 |
| `frontend/src/pages/MorePage.tsx` | 開発時の画面への導線 |
| `frontend/src/locales/{ja,ain-Kana}/archive.json` | Issue 指定の文言と未翻訳 fallback |
| 上記4テストファイル | 回帰テスト |
| `docs/static-mirror.md` | 手順・制約・調査・未検証事項 |
+3
ファイルの表示
@@ -83,6 +83,7 @@ const MaterialSyncSuppressionsPage = lazyPage (
() => import ('@/pages/materials/MaterialSyncSuppressionsPage')) () => import ('@/pages/materials/MaterialSyncSuppressionsPage'))
const CountsResourcePage = lazyPage (() => import ('@/pages/counts/CountsResourcePage')) const CountsResourcePage = lazyPage (() => import ('@/pages/counts/CountsResourcePage'))
const MorePage = lazyPage (() => import ('@/pages/MorePage')) const MorePage = lazyPage (() => import ('@/pages/MorePage'))
const StaticMirrorPage = lazyPage (() => import ('@/pages/StaticMirrorPage'))
const GekanatorUnavailablePage = lazyPage (() => import ('@/pages/GekanatorUnavailablePage')) const GekanatorUnavailablePage = lazyPage (() => import ('@/pages/GekanatorUnavailablePage'))
const NicoTagListPage = lazyPage (() => import ('@/pages/tags/NicoTagListPage')) const NicoTagListPage = lazyPage (() => import ('@/pages/tags/NicoTagListPage'))
const TOSPage = lazyPage (() => import ('@/pages/TOSPage')) const TOSPage = lazyPage (() => import ('@/pages/TOSPage'))
@@ -126,6 +127,8 @@ export const pageRoutes = (
user: User | null, user: User | null,
setUser: Dispatch<SetStateAction<User | null>>, setUser: Dispatch<SetStateAction<User | null>>,
): PageRoute[] => [ ): PageRoute[] => [
{ path: 'static-mirror', element: <StaticMirrorPage/>,
handle: { preload: StaticMirrorPage.preload, robots: 'noindex' } },
{ path: '', element: <LocaleRedirect to="/posts"/>, { path: '', element: <LocaleRedirect to="/posts"/>,
handle: { redirectTo: '/posts' } }, handle: { redirectTo: '/posts' } },
{ path: 'posts', element: <PostListPage/>, { path: 'posts', element: <PostListPage/>,
+10
ファイルの表示
@@ -70,6 +70,16 @@ describe ('SidebarComponent', () => {
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true) vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
}) })
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
renderSidebar ()
// jsdom has no layout; guard the responsive classes responsible for clipping.
const sidebar = screen.getByText ('Sidebar body')
expect (sidebar).not.toHaveClass ('overflow-y-auto')
expect (sidebar).toHaveClass ('md:overflow-y-auto')
})
it ('uses maxWidth without applying the container main-width reserve twice', async () => { it ('uses maxWidth without applying the container main-width reserve twice', async () => {
localStorage.setItem ('sidebar:test-sidebar:left:width', '700') localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
const onWidthChange = vi.fn () const onWidthChange = vi.fn ()
+1 -1
ファイルの表示
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
</style> </style>
</Helmet> </Helmet>
<div className="h-full overflow-y-auto p-4 sidebar"> <div className="h-full md:overflow-y-auto p-4 sidebar">
{children} {children}
</div> </div>
+4
ファイルの表示
@@ -7,6 +7,10 @@ import type {
MaterialFilter, MaterialFilter,
WikiTagReference } from '@/types' WikiTagReference } from '@/types'
export const staticMirrorKeys = {
definition: ['static_mirror', 'definition'] as const,
job: (id: string | null) => ['static_mirror', 'jobs', id] as const }
export const localesKeys = { export const localesKeys = {
root: ['locales'] as const, root: ['locales'] as const,
index: ['locales', 'index'] as const } index: ['locales', 'index'] as const }
+59
ファイルの表示
@@ -0,0 +1,59 @@
import { readFileSync } from 'node:fs'
import { URL as NodeURL } from 'node:url'
import { fireEvent, waitFor } from '@testing-library/react'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
const script = readFileSync (new NodeURL (
'../../../backend/app/views/static_mirror/archive.js', import.meta.url), 'utf8')
const archiveWindow = window as typeof window & { archiveConfig?: { origin: string | null } }
beforeEach (() => {
const element = document.createElement ('script')
element.src = 'https://mirror.test/subdirectory/archive/assets/archive.js'
vi.spyOn (document, 'currentScript', 'get').mockReturnValue (element)
delete archiveWindow.archiveConfig
document.body.innerHTML = `
<nav><a href="ja/posts/index.html">Post</a>
<a data-original="/ja/posts/1" href="https://source.test/ja/posts/1">Source</a></nav>
<form id="archive-search"><input name="q" value="alias"></form>
<ul id="search-results"></ul>`
})
afterEach (() => {
delete archiveWindow.archiveConfig
document.body.replaceChildren ()
vi.unstubAllGlobals ()
})
describe ('Portable static mirror assets', () => {
it ('searches local JSON by aliases using safe text and relative links', async () => {
const fetcher = vi.fn ().mockResolvedValue ({ ok: true, json: async () => [
{ path: 'ja/tags/1/index.html', title: '<img src=x onerror=alert(1)>', names: ['alias'] },
{ path: 'https://outside.test/', title: 'alias' },
{ path: '../outside.html', title: 'alias' }] })
vi.stubGlobal ('fetch', fetcher)
new Function (script) ()
fireEvent.submit (document.querySelector ('form')!)
await waitFor (() => expect (document.querySelectorAll ('#search-results a')).toHaveLength (1))
const link = document.querySelector ('#search-results a')!
expect (link).toHaveAttribute ('href', 'ja/tags/1/index.html')
expect (link.textContent).toBe ('<img src=x onerror=alert(1)>')
expect (document.querySelector ('img')).toBeNull ()
expect (fetcher).toHaveBeenCalledTimes (1)
expect (fetcher.mock.calls[0][0].href)
.toBe ('https://mirror.test/subdirectory/archive/search-index.json')
})
it ('retains baked links without config and changes only source links with valid config', () => {
new Function (script) ()
const source = document.querySelector ('[data-original]')!
expect (source).toHaveAttribute ('href', 'https://source.test/ja/posts/1')
archiveWindow.archiveConfig = { origin: 'javascript:alert(1)' }
new Function (script) ()
expect (source).toHaveAttribute ('href', 'https://source.test/ja/posts/1')
archiveWindow.archiveConfig = { origin: 'https://replacement.test/base/' }
new Function (script) ()
expect (source).toHaveAttribute ('href', 'https://replacement.test/base/ja/posts/1')
expect (document.querySelector ('a:not([data-original])'))
.toHaveAttribute ('href', 'ja/posts/index.html')
})
})
+19
ファイルの表示
@@ -0,0 +1,19 @@
{
"_untranslated": ["*"],
"title": "Static Mirror 生成機能",
"generation": "スナップショット生成",
"dataAt": "データ基準時点",
"currentOnly": "今回は現在状態のみの対応",
"developmentOnly": "開発環境限定",
"limits": "出力件数の制限",
"concurrency": "同時実行数",
"exclusions": "未対応機能",
"protection": "データ保護上の制約",
"protectionDetails": "公開抑止、除票、非公開情報、認証情報、監査専用情報を ZIP に含めない。",
"externalAssets": "外部画像や動画への依存",
"externalMedia": "外部画像や動画",
"externalOmissions": "ローカルへ取り込めていない資産",
"download": "ZIP ダウンロード",
"zip": "ZIP",
"failure": "失敗時の理由"
}
+18
ファイルの表示
@@ -0,0 +1,18 @@
{
"title": "Static Mirror 生成機能",
"generation": "スナップショット生成",
"dataAt": "データ基準時点",
"currentOnly": "今回は現在状態のみの対応",
"developmentOnly": "開発環境限定",
"limits": "出力件数の制限",
"concurrency": "同時実行数",
"exclusions": "未対応機能",
"protection": "データ保護上の制約",
"protectionDetails": "公開抑止、除票、非公開情報、認証情報、監査専用情報を ZIP に含めない。",
"externalAssets": "外部画像や動画への依存",
"externalMedia": "外部画像や動画",
"externalOmissions": "ローカルへ取り込めていない資産",
"download": "ZIP ダウンロード",
"zip": "ZIP",
"failure": "失敗時の理由"
}
+5
ファイルの表示
@@ -16,12 +16,17 @@ import type { User } from '@/types'
const MorePage: FC = () => { const MorePage: FC = () => {
const location = useLocation () const location = useLocation ()
const { message } = useUITranslation ('shared') const { message } = useUITranslation ('shared')
const { label: archiveLabel } = useUITranslation ('archive')
const menu = menuOutline ( const menu = menuOutline (
{ tag: null, wikiId: null, user: { } as User, pathName: location.pathname }) { tag: null, wikiId: null, user: { } as User, pathName: location.pathname })
return ( return (
<MainArea className="md:flex"> <MainArea className="md:flex">
<PageHead title={message ('labels.menu')}/> <PageHead title={message ('labels.menu')}/>
{import.meta.env.DEV && (
<PrefetchLink to="/static-mirror">
{archiveLabel ('title')}
</PrefetchLink>)}
{[...Array (Math.ceil (menu.length / 4)).keys ()].map (i => ( {[...Array (Math.ceil (menu.length / 4)).keys ()].map (i => (
<div key={i} className="flex-1 mx-16"> <div key={i} className="flex-1 mx-16">
+96
ファイルの表示
@@ -0,0 +1,96 @@
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import StaticMirrorPage from '@/pages/StaticMirrorPage'
import { staticMirrorKeys } from '@/lib/queryKeys'
import { renderWithProviders } from '@/test/render'
const api = vi.hoisted (() => ({
apiGet: vi.fn (), apiPost: vi.fn (), startAPIDownload: vi.fn () }))
vi.mock ('@/lib/api', async original => ({
...await original<typeof import ('@/lib/api')> (), ...api }))
const definition = {
resourceLimit: 100, nameLimit: 2000, maxBytes: 8388608, maxSeconds: 60,
concurrency: 1, cooldownSeconds: 60, expirySeconds: 600,
exclusions: ['historical_state', 'unversioned_resources', 'images', 'videos'] }
const ready = {
status: 'ready', dataAt: '2026-11-16T00:00:00.000000Z', processed: 2, total: 2 }
beforeEach (() => {
vi.clearAllMocks ()
api.apiGet.mockImplementation (async (path: string) =>
path === '/static_mirror' ? definition : ready)
api.apiPost.mockResolvedValue ({ job: 'opaque-job' })
api.startAPIDownload.mockReturnValue (vi.fn ())
})
const startGeneration = async () => {
const button = screen.getByRole ('button', { name: 'スナップショット生成' })
await waitFor (() => expect (button).toBeEnabled ())
fireEvent.click (button)
}
describe ('Static Mirror generation', () => {
it ('starts a current snapshot and downloads through the common API', async () => {
const view = renderWithProviders (<StaticMirrorPage/>, { route: '/ja/static-mirror' })
await startGeneration ()
expect (api.apiPost).toHaveBeenCalledWith ('/static_mirror/jobs', { }, { locale: 'ja' })
fireEvent.click (await screen.findByRole ('button', { name: 'ZIP ダウンロード' }))
expect (screen.getByText (ready.dataAt)).toBeInTheDocument ()
expect (screen.getByText ('言語別名称').parentElement).toHaveTextContent ('2000')
expect (api.startAPIDownload).toHaveBeenCalledWith (
'/static_mirror', 'opaque-job', expect.any (Function))
const release = api.startAPIDownload.mock.results[0].value
view.unmount ()
expect (release).toHaveBeenCalled ()
})
it ('shows generation progress and offers the ZIP only after readiness', async () => {
let state = { ...ready, status: 'running', processed: 1 }
api.apiGet.mockImplementation (async (path: string) =>
path === '/static_mirror' ? definition : state)
const view = renderWithProviders (<StaticMirrorPage/>)
await startGeneration ()
expect (await screen.findByText ('生成中')).toBeInTheDocument ()
expect (screen.queryByRole ('button', { name: 'ZIP ダウンロード' })).toBeNull ()
expect (screen.getByRole ('button', { name: 'スナップショット生成' })).toBeDisabled ()
state = ready
await act (async () => {
await view.queryClient.invalidateQueries ({ queryKey: staticMirrorKeys.job ('opaque-job') })
})
expect (await screen.findByRole ('button', { name: 'ZIP ダウンロード' })).toBeEnabled ()
})
it ('keeps failure reasons visible without offering a ZIP', async () => {
api.apiGet.mockImplementation (async (path: string) =>
path === '/static_mirror' ? definition : { ...ready, status: 'failed', error: 'too_large' })
renderWithProviders (<StaticMirrorPage/>)
await startGeneration ()
expect (await screen.findByRole ('alert')).toHaveTextContent ('too_large')
expect (screen.queryByRole ('button', { name: 'ZIP ダウンロード' })).toBeNull ()
})
it ('shows intake limits and revoked downloads using existing error copy', async () => {
api.apiPost.mockRejectedValueOnce ({ isAxiosError: true, response: { status: 429 } })
renderWithProviders (<StaticMirrorPage/>)
await startGeneration ()
expect (await screen.findByRole ('alert')).toHaveTextContent ('HTTP 429')
api.apiGet.mockImplementation (async (path: string) => {
if (path === '/static_mirror') return definition
throw { isAxiosError: true, response: { status: 404 } }
})
await startGeneration ()
await waitFor (() => expect (screen.getByRole ('alert')).toHaveTextContent ('有効期限'))
expect (screen.getByRole ('button', { name: 'スナップショット生成' })).toBeEnabled ()
})
it ('preserves Japanese fallback language metadata for untranslated UI', async () => {
renderWithProviders (<StaticMirrorPage/>, { route: '/ain-Kana/static-mirror' })
await startGeneration ()
expect (api.apiPost).toHaveBeenCalledWith (
'/static_mirror/jobs', { }, { locale: 'ain-Kana' })
expect (screen.getByRole ('heading', { name: 'Static Mirror 生成機能' })
.querySelector ('[lang="ja"]')).toBeInTheDocument ()
})
})
+140
ファイルの表示
@@ -0,0 +1,140 @@
import { useMutation, useQuery } from '@tanstack/react-query'
import { useEffect, useRef, useState } from 'react'
import PageHead from '@/components/common/PageHead'
import PageTitle from '@/components/common/PageTitle'
import MainArea from '@/components/layout/MainArea'
import { Button } from '@/components/ui/button'
import { apiGet, apiPost, isApiError, startAPIDownload } from '@/lib/api'
import { staticMirrorKeys } from '@/lib/queryKeys'
import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
type Definition = {
resourceLimit: number
nameLimit: number
maxBytes: number
maxSeconds: number
concurrency: number
cooldownSeconds: number
expirySeconds: number
exclusions: string[] }
type Job = {
status: 'queued' | 'running' | 'ready' | 'failed'
dataAt: string | null
processed: number
total: number | null
error?: string }
const StaticMirrorPage = () => {
const locale = useLocale ()
const { label, message } = useUITranslation ('archive')
const [job, setJob] = useState<string | null> (null)
const [downloadFailed, setDownloadFailed] = useState (false)
const downloadRef = useRef<(() => void) | null> (null)
useEffect (() => () => downloadRef.current?.(), [])
const definition = useQuery ({
queryKey: staticMirrorKeys.definition,
queryFn: () => apiGet<Definition> ('/static_mirror'), retry: false })
const { mutate: start, isPending: pending, error: creationError } = useMutation ({
mutationFn: () => apiPost<{ job: string }> ('/static_mirror/jobs', { }, { locale }),
onSuccess: result => {
downloadRef.current?.()
setDownloadFailed (false)
setJob (result.job)
} })
const status = useQuery ({
queryKey: staticMirrorKeys.job (job),
queryFn: () => apiGet<Job> (`/static_mirror/jobs/${encodeURIComponent (job!)}`),
enabled: job != null,
retry: false,
refetchInterval: query =>
(query.state.error != null
|| ['ready', 'failed'].includes (query.state.data?.status ?? ''))
? false : 1000 })
const unavailable = isApiError (status.error) && status.error.response?.status === 404
const active = job != null && !unavailable
&& !['ready', 'failed'].includes (status.data?.status ?? '')
const error = creationError ?? status.error ?? definition.error
const errorStatus = isApiError (error) ? error.response?.status : null
const metadata = definition.data
const percentage =
(status.data?.total == null || status.data.total === 0)
? 100
: Math.round (100 * status.data.processed / status.data.total)
const download = () => {
if (job == null) return
downloadRef.current?.()
setDownloadFailed (false)
downloadRef.current = startAPIDownload (
'/static_mirror', job, () => setDownloadFailed (true))
}
return (
<MainArea className="space-y-4">
<PageHead title={message ('title')}/>
<PageTitle>{label ('title')}</PageTitle>
<p>{label ('developmentOnly')} / {label ('currentOnly')}</p>
{metadata != null && (
<dl>
<dt>{label ('limits')}</dt>
<dd>
{label ('counts:resources.posts')} / {label ('counts:resources.tags')}:
{' '}{metadata.resourceLimit}
</dd>
<dd>{label ('counts:columns.names')}: {metadata.nameLimit}</dd>
<dd>{metadata.maxBytes} B / {metadata.maxSeconds} s</dd>
<dt>{label ('concurrency')}</dt>
<dd>{metadata.concurrency} / {metadata.cooldownSeconds} s</dd>
<dd>{label ('zip')}: {metadata.expirySeconds} s</dd>
<dt>{label ('exclusions')}</dt>
<dd>
{['counts:resources.tag_descriptions', 'navigation:help',
'counts:resources.materials', 'counts:resources.nico_tags',
'counts:attributes.parent_post_ids', 'counts:attributes.parent_tag_ids',
'counts:columns.sections', 'navigation:history', 'navigation:edit']
.map (key => <span key={key}>{label (key)}{' / '}</span>)}
</dd>
<dt>{label ('externalAssets')}</dt>
<dd>{label ('externalOmissions')}: {label ('externalMedia')}</dd>
<dt>{label ('protection')}</dt>
<dd>{label ('protectionDetails')}</dd>
</dl>)}
<Button onClick={() => start ()}
disabled={metadata == null || pending || active}>
{label ('generation')}
</Button>
{status.data != null && (
<div role="status">
<p>{label ('dataAt')}: <time>{status.data.dataAt ?? '—'}</time></p>
<p>
{status.data.status === 'ready'
? label ('download')
: label (`counts:exportProgress.${status.data.status}`)}
</p>
{status.data.total != null && (
<p>{label ('counts:exportProgress.measured', {
processed: status.data.processed, total: status.data.total,
percent: percentage })}</p>)}
{status.data.status === 'ready' && (
<Button onClick={download}>{label ('download')}</Button>)}
{status.data.error != null && (
<p role="alert">{label ('failure')}: <code>{status.data.error}</code></p>)}
</div>)}
{error != null && (
<p role="alert">
{errorStatus === 404
? label ('counts:downloadErrors.unavailable')
: (errorStatus != null
? label ('counts:errors.http', { status: errorStatus })
: label ('counts:errors.network'))}
</p>)}
{status.error != null && (
<Button onClick={() => status.refetch ()}>{label ('shared:actions.retry')}</Button>)}
{downloadFailed && <p role="alert">{label ('counts:downloadErrors.failed')}</p>}
</MainArea>)
}
export default StaticMirrorPage
+9 -2
ファイルの表示
@@ -35,6 +35,10 @@ const renderPage = () =>
describe ('TagDetailPage', () => { describe ('TagDetailPage', () => {
beforeEach (() => { beforeEach (() => {
vi.clearAllMocks () vi.clearAllMocks ()
tagsApi.fetchTag.mockReset ()
api.apiPut.mockReset ()
api.isApiError.mockReset ()
toastApi.toast.mockReset ()
api.isApiError.mockReturnValue (false) api.isApiError.mockReturnValue (false)
}) })
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
}) })
it ('submits edited tag fields', async () => { it ('submits edited tag fields', async () => {
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' })) const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] })) tagsApi.fetchTag
.mockResolvedValue (updatedTag)
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
api.apiPut.mockResolvedValueOnce (updatedTag)
renderPage () renderPage ()