Build native fnOS disk-copy application with APFS and NTFS support
这个提交包含在:
1 父节点
1f598007d1
当前提交
58769c431f
21 个文件已更改
+734
-8
没有与搜索条件相匹配的文件
+7
-1
@@ -4,7 +4,13 @@
|
||||
|
||||
## 当前目标
|
||||
|
||||
基础 APFS 只读挂载已验证。当前用户要求把 4 TB APFS USB 盘的“火影秋决”和“LCQ”比赛目录复制到 NAS `/vol5/1000/剪辑盘备份`,正在 NAS 本机执行复制。
|
||||
当前并行目标:完成已授权的两目录 NAS 本机复制;开发可安装的飞牛桌面应用“大鱼硬盘拷贝”,支持 APFS 与 NTFS 的识别、选目录和后台复制。
|
||||
|
||||
- 用户已要求停止逐条报告拷贝速度,保留内部监控,仅在完成或异常时告知。
|
||||
- 新应用沿用当前仓库与驱动,固定 appname 为 `dayu-diskcopy`、唯一安装入口 `/var/apps/dayu-diskcopy`。使用飞牛登录态网关,普通 Web 进程降权运行,设备操作由本机受限服务执行。
|
||||
- NAS 已核实为 fnOS `1.2.0701`,有 ntfs-3g、mkntfs、ntfscp。NTFS 已有系统挂载时优先复用,应用只读取源文件;不强行卸载或修改系统在用盘。未挂载的新盘使用只读挂载。
|
||||
- 应用第一版代码位于 `application/`,FPK 定义在 `packaging/fpk/`,构建入口 `scripts/build-fpk.py`。当前版本 0.1.0;使用官方网关 Unix Socket,不开放新的网络端口。Web 进程启动后降为专用包用户,原始设备操作由本机 Socket 服务处理并核验调用 UID。
|
||||
- 已通过五项边界测试:匿名及非管理员拒绝、管理员页面可读、写请求来源校验、路径穿越和符号链接越界拒绝、系统身份拒绝;Python/生命周期脚本语法通过。FPK 构建和实机界面/NTFS 镜像验证正在进行,尚未宣称正式交付。
|
||||
|
||||
## 当前复制任务(2026-11-11 22:36 启动)
|
||||
|
||||
|
||||
@@ -0,0 +1,313 @@
|
||||
"""Privileged local-only disk operations; no TCP listener and no shell execution."""
|
||||
import fcntl
|
||||
import grp
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import pwd
|
||||
import re
|
||||
import signal
|
||||
import socket
|
||||
import socketserver
|
||||
import stat
|
||||
import struct
|
||||
import subprocess
|
||||
import time
|
||||
import uuid
|
||||
|
||||
ROOT = Path(__file__).resolve().parent
|
||||
VAR = Path(os.environ['TRIM_PKGVAR'])
|
||||
APP_UID = int(os.environ['TRIM_UID'])
|
||||
APP_GID = int(os.environ['TRIM_GID'])
|
||||
LEGACY = Path('/var/tmp/dayu-apfs-validation')
|
||||
TERMINAL = {'complete', 'failed', 'needs_attention', 'cleanup_failed', 'cancelled'}
|
||||
|
||||
|
||||
def command(args, timeout=30):
|
||||
result = subprocess.run(args, capture_output=True, text=True, timeout=timeout, env={**os.environ, 'LC_ALL': 'C'})
|
||||
if result.returncode:
|
||||
raise ValueError((result.stderr or result.stdout).strip()[-600:] or '操作失败')
|
||||
return result.stdout.strip()
|
||||
|
||||
|
||||
def beneath(path, root, must_exist=True):
|
||||
path = Path(path).resolve(strict=must_exist)
|
||||
root = Path(root).resolve(strict=True)
|
||||
if not path.is_relative_to(root):
|
||||
raise ValueError('所选路径超出可访问目录')
|
||||
return path
|
||||
|
||||
|
||||
def atomic(path, data):
|
||||
temporary = path.with_suffix('.tmp')
|
||||
temporary.write_text(json.dumps(data, ensure_ascii=False, indent=2))
|
||||
temporary.replace(path)
|
||||
|
||||
|
||||
def disks():
|
||||
tree = json.loads(command(['lsblk', '-J', '-b', '-o',
|
||||
'NAME,PATH,TYPE,SIZE,FSTYPE,UUID,PARTUUID,TRAN,MODEL,SERIAL,MOUNTPOINTS']))
|
||||
result = []
|
||||
for disk in tree['blockdevices']:
|
||||
if disk.get('tran') != 'usb' or not disk.get('size'):
|
||||
continue
|
||||
for part in [disk, *disk.get('children', [])]:
|
||||
filesystem = (part.get('fstype') or '').lower()
|
||||
if filesystem not in ('apfs', 'ntfs', 'ntfs3'):
|
||||
continue
|
||||
identity = part.get('partuuid') or part.get('uuid')
|
||||
if not identity or not disk.get('serial'):
|
||||
continue
|
||||
result.append({'id': identity, 'partuuid': part.get('partuuid'),
|
||||
'uuid': part.get('uuid'), 'device': part['path'], 'filesystem': filesystem,
|
||||
'serial': disk['serial'], 'model': (disk.get('model') or 'USB 硬盘').strip(),
|
||||
'size': part['size'], 'mountpoints': [x for x in part.get('mountpoints', []) if x]})
|
||||
return result
|
||||
|
||||
|
||||
def mounts():
|
||||
path = VAR / 'mounts.json'
|
||||
return json.loads(path.read_text()) if path.exists() else {}
|
||||
|
||||
|
||||
def jobs(uid=None):
|
||||
result = []
|
||||
for parent, legacy in ((VAR / 'jobs', False), (LEGACY / 'jobs', True)):
|
||||
if not parent.exists():
|
||||
continue
|
||||
for folder in sorted(parent.iterdir(), reverse=True):
|
||||
try:
|
||||
config = json.loads((folder / 'config.json').read_text())
|
||||
state = json.loads((folder / 'status.json').read_text())
|
||||
owner = config.get('uid', 1000)
|
||||
if uid is not None and uid != owner:
|
||||
continue
|
||||
data = (folder / 'copy.log').read_bytes()[-16000:].decode(errors='replace')
|
||||
progress = list(re.finditer(r'([\d,]+)\s+(\d+)%\s+([\d.]+)([kMGT]?)B/s\s+', data))
|
||||
copied = int(progress[-1][1].replace(',', '')) if progress else 0
|
||||
phase = state['phase']
|
||||
paused = (folder / 'paused').exists()
|
||||
if paused:
|
||||
phase = 'paused'
|
||||
alive = Path('/proc/' + str(state.get('pid', -1))).exists()
|
||||
if not alive and phase not in TERMINAL and time.time() - state.get('started', 0) > 10:
|
||||
phase = 'interrupted'
|
||||
if phase == 'complete' and 'source_write_counters_after' not in state:
|
||||
phase = 'finalizing'
|
||||
speed = 0
|
||||
if progress and phase == 'copying':
|
||||
multiplier = 1024 ** ('kMGT'.find(progress[-1][4]) + 1) if progress[-1][4] else 1
|
||||
speed = float(progress[-1][3]) * multiplier
|
||||
total = config.get('planned_copy_bytes', 0)
|
||||
if phase == 'complete':
|
||||
copied = total
|
||||
result.append({'id': ('legacy:' if legacy else '') + folder.name,
|
||||
'directories': config['directories'], 'destination': config['destination'],
|
||||
'phase': phase, 'bytes': copied, 'total': total, 'speed': speed,
|
||||
'eta': max(0, total - copied) / speed if speed else None,
|
||||
'started': state.get('started'), 'finished': state.get('finished'),
|
||||
'error': state.get('error') or state.get('reason') or state.get('cleanup_error'),
|
||||
'device_id': config.get('partuuid') or config.get('fs_uuid'),
|
||||
'legacy': legacy, 'uid': owner, '_folder': str(folder), '_config': config,
|
||||
'source_writes_unchanged': state.get('source_writes_unchanged')})
|
||||
except (OSError, ValueError, KeyError):
|
||||
continue
|
||||
return sorted(result, key=lambda item: item.get('started') or 0, reverse=True)
|
||||
|
||||
|
||||
def active():
|
||||
return [job for job in jobs() if job['phase'] not in TERMINAL and job['phase'] != 'interrupted']
|
||||
|
||||
|
||||
def mount_disk(identity):
|
||||
choices = [item for item in disks() if item['id'] == identity]
|
||||
if len(choices) != 1:
|
||||
raise ValueError('硬盘已移除或身份发生变化,请刷新')
|
||||
disk = choices[0]
|
||||
# Adopt the current authorized copy without remounting or moving its data.
|
||||
for job in active():
|
||||
config = job['_config']
|
||||
if job['device_id'] == identity and os.path.ismount(config['mount']):
|
||||
return {**disk, 'mount': config['mount'], 'base': str(Path(config['mount']) / config['source_root']),
|
||||
'managed': False, 'busy': True}
|
||||
known = mounts()
|
||||
if identity in known and os.path.ismount(known[identity]['mount']):
|
||||
return {**disk, **known[identity]}
|
||||
if disk['filesystem'].startswith('ntfs') and disk['mountpoints']:
|
||||
mount = Path(disk['mountpoints'][0])
|
||||
return {**disk, 'mount': str(mount), 'base': str(mount), 'managed': False, 'busy': False}
|
||||
if disk['mountpoints']:
|
||||
raise ValueError('该硬盘已被其他程序挂载,请先停止使用')
|
||||
device = Path(disk['device'])
|
||||
target = VAR / 'mounts' / re.sub(r'[^a-zA-Z0-9_-]', '_', identity)
|
||||
target.mkdir(parents=True, exist_ok=True)
|
||||
if any(target.iterdir()):
|
||||
raise ValueError('挂载目录不为空,已停止以保护数据')
|
||||
original = command(['blockdev', '--getro', str(device)])
|
||||
command(['blockdev', '--setro', str(device)])
|
||||
try:
|
||||
if disk['filesystem'] == 'apfs':
|
||||
command([str(ROOT / 'bin/apfs-fuse'), '-o', 'ro,nodev,nosuid,noexec', str(device), str(target)])
|
||||
else:
|
||||
command(['ntfs-3g', '-o', 'ro,nodev,nosuid,noexec', str(device), str(target)])
|
||||
if not os.path.ismount(target):
|
||||
raise ValueError('无法只读挂载;加密卷或此文件系统特性可能暂不支持')
|
||||
except BaseException:
|
||||
if os.path.ismount(target):
|
||||
command(['umount', str(target)])
|
||||
if original == '0':
|
||||
command(['blockdev', '--setrw', str(device)])
|
||||
raise
|
||||
base = target / 'root' if (target / 'root').is_dir() and (target / 'private-dir').is_dir() else target
|
||||
known[identity] = {'mount': str(target), 'base': str(base), 'managed': True,
|
||||
'device': str(device), 'original_ro': original, 'serial': disk['serial']}
|
||||
atomic(VAR / 'mounts.json', known)
|
||||
return {**disk, **known[identity]}
|
||||
|
||||
|
||||
def destination_roots(uid):
|
||||
return [path for path in Path('/').glob('vol[0-9]*')
|
||||
if (path / str(uid)).is_dir() and os.path.ismount(path)]
|
||||
|
||||
|
||||
def target_path(path, uid, must_exist=True):
|
||||
resolved = Path(path).resolve(strict=must_exist)
|
||||
if not any(resolved.is_relative_to(root / str(uid)) for root in destination_roots(uid)):
|
||||
raise ValueError('请选择当前用户存储空间中的目标目录')
|
||||
return resolved
|
||||
|
||||
|
||||
def listing(root, relative=''):
|
||||
path = beneath(root / relative, root)
|
||||
entries = []
|
||||
for entry in path.iterdir():
|
||||
if entry.name.startswith('.') or entry.is_symlink() or not entry.is_dir():
|
||||
continue
|
||||
entries.append({'name': entry.name, 'path': str(entry.relative_to(root))})
|
||||
return {'path': str(path.relative_to(root)), 'entries': sorted(entries, key=lambda item: item['name'].casefold())}
|
||||
|
||||
|
||||
def dispatch(request):
|
||||
uid = int(request['uid'])
|
||||
if uid < 1000:
|
||||
raise ValueError('请使用飞牛管理员账号')
|
||||
action = request['action']
|
||||
args = request.get('args', {})
|
||||
if action == 'status':
|
||||
return {'disks': disks(), 'jobs': [{k: v for k, v in job.items() if not k.startswith('_')}
|
||||
for job in jobs(uid)], 'version': os.environ.get('TRIM_APPVER', '0.1.0')}
|
||||
if action == 'source':
|
||||
disk = mount_disk(args['device'])
|
||||
return {**listing(Path(disk['base']), args.get('path', '')), 'device': disk['id']}
|
||||
if action == 'destinations':
|
||||
if not args.get('path'):
|
||||
return {'path': '', 'entries': [{'name': root.name + ' · 我的文件', 'path': str(root / str(uid))}
|
||||
for root in destination_roots(uid)]}
|
||||
path = target_path(args['path'], uid)
|
||||
return {'path': str(path), 'entries': [{'name': item.name, 'path': str(item)}
|
||||
for item in sorted(path.iterdir()) if item.is_dir() and not item.is_symlink() and not item.name.startswith('.')]}
|
||||
if action == 'mkdir':
|
||||
parent = target_path(args['path'], uid)
|
||||
name = args['name'].strip()
|
||||
if not name or name in ('.', '..') or '/' in name or '\0' in name or name.startswith('.'):
|
||||
raise ValueError('文件夹名称无效')
|
||||
new = parent / name
|
||||
new.mkdir()
|
||||
os.chown(new, uid, pwd.getpwuid(uid).pw_gid)
|
||||
return {'path': str(new)}
|
||||
if action == 'start':
|
||||
if active():
|
||||
raise ValueError('已有拷贝任务运行中,请等待完成')
|
||||
disk = mount_disk(args['device'])
|
||||
base = Path(disk['base'])
|
||||
paths = args.get('paths', [])
|
||||
if not paths or len(paths) > 100:
|
||||
raise ValueError('请选择 1–100 个目录')
|
||||
folders = [beneath(base / name, base) for name in paths]
|
||||
if any(not folder.is_dir() or folder == base for folder in folders):
|
||||
raise ValueError('请选择硬盘中的具体目录')
|
||||
if len({folder.name for folder in folders}) != len(folders):
|
||||
raise ValueError('所选目录存在同名项,请分开拷贝')
|
||||
parents = {folder.parent for folder in folders}
|
||||
if len(parents) != 1:
|
||||
raise ValueError('请选择同一层级下的目录')
|
||||
destination = target_path(args['destination'], uid)
|
||||
command(['runuser', '-u', pwd.getpwuid(uid).pw_name, '--', 'test', '-w', str(destination)])
|
||||
preview = command(['rsync', '-rltHn', '--ignore-existing', '--stats', '--protect-args',
|
||||
*map(str, folders), str(destination) + '/'], timeout=120)
|
||||
match = re.search(r'Total transferred file size: ([\d,]+)', preview)
|
||||
if not match:
|
||||
raise ValueError('无法计算拷贝大小,请稍后重试')
|
||||
total = int(match[1].replace(',', ''))
|
||||
available = os.statvfs(destination)
|
||||
if total + 1024**3 > available.f_bavail * available.f_frsize:
|
||||
raise ValueError('目标空间不足')
|
||||
job = VAR / 'jobs' / (time.strftime('%Y%m%d-%H%M%S') + '-' + uuid.uuid4().hex[:6])
|
||||
job.mkdir(parents=True)
|
||||
config = {'mount': disk['mount'], 'source_root': str(next(iter(parents)).relative_to(disk['mount'])),
|
||||
'destination': str(destination), 'partuuid': disk.get('partuuid'), 'fs_uuid': disk.get('uuid'),
|
||||
'device_path': disk['device'], 'serial': disk['serial'], 'uid': uid, 'gid': pwd.getpwuid(uid).pw_gid,
|
||||
'directories': [folder.name for folder in folders], 'planned_copy_bytes': total,
|
||||
'original_ro': disk.get('original_ro', '0'), 'managed_mount': disk['managed'],
|
||||
'filesystem': disk['filesystem'], 'selection_paths': paths}
|
||||
atomic(job / 'config.json', config)
|
||||
atomic(job / 'status.json', {'phase': 'preflight', 'started': time.time()})
|
||||
with (job / 'worker.log').open('ab') as log:
|
||||
subprocess.Popen(['/usr/bin/python3', str(ROOT / 'copy_worker.py'), str(job / 'config.json')],
|
||||
stdin=subprocess.DEVNULL, stdout=log, stderr=subprocess.STDOUT, start_new_session=True)
|
||||
return {'job': job.name}
|
||||
if action == 'resume':
|
||||
selected = next((item for item in jobs(uid) if item['id'] == args['job']), None)
|
||||
if not selected or selected['legacy'] or selected['phase'] not in ('failed', 'interrupted'):
|
||||
raise ValueError('此任务当前不能重试')
|
||||
config = selected['_config']
|
||||
return dispatch({'uid': uid, 'action': 'start', 'args': {
|
||||
'device': selected['device_id'], 'paths': config['selection_paths'], 'destination': config['destination']}})
|
||||
if action == 'eject':
|
||||
if any(job['device_id'] == args['device'] for job in active()):
|
||||
raise ValueError('硬盘仍有拷贝任务,完成后才能释放')
|
||||
known = mounts()
|
||||
item = known.get(args['device'])
|
||||
if not item or not item['managed']:
|
||||
raise ValueError('此盘由飞牛系统挂载,请在系统“外接存储”中推出')
|
||||
if os.path.ismount(item['mount']):
|
||||
command(['umount', item['mount']])
|
||||
if item['original_ro'] == '0':
|
||||
command(['blockdev', '--setrw', item['device']])
|
||||
del known[args['device']]
|
||||
atomic(VAR / 'mounts.json', known)
|
||||
return {'released': True}
|
||||
raise ValueError('未知操作')
|
||||
|
||||
|
||||
class Handler(socketserver.StreamRequestHandler):
|
||||
def handle(self):
|
||||
try:
|
||||
_, uid, _ = struct.unpack('3i', self.request.getsockopt(socket.SOL_SOCKET, socket.SO_PEERCRED, 12))
|
||||
if uid not in (0, APP_UID):
|
||||
raise ValueError('拒绝未授权本机客户端')
|
||||
raw = self.rfile.readline(262145)
|
||||
if len(raw) > 262144:
|
||||
raise ValueError('请求过大')
|
||||
request = json.loads(raw)
|
||||
result = {'ok': True, 'data': dispatch(request)}
|
||||
except Exception as error:
|
||||
result = {'ok': False, 'error': str(error)}
|
||||
self.wfile.write((json.dumps(result, ensure_ascii=False) + '\n').encode())
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
VAR.mkdir(exist_ok=True)
|
||||
path = VAR / 'broker.sock'
|
||||
path.unlink(missing_ok=True)
|
||||
server = socketserver.UnixStreamServer(str(path), Handler)
|
||||
os.chown(path, 0, APP_GID)
|
||||
path.chmod(0o660)
|
||||
signal.signal(signal.SIGTERM, lambda *_: (_ for _ in ()).throw(KeyboardInterrupt()))
|
||||
try:
|
||||
server.serve_forever()
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
finally:
|
||||
server.server_close()
|
||||
path.unlink(missing_ok=True)
|
||||
@@ -0,0 +1,86 @@
|
||||
"""Unprivileged HTTP UI, reachable only through the authenticated fnOS gateway."""
|
||||
import http.server
|
||||
import grp
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import socket
|
||||
import socketserver
|
||||
import urllib.parse
|
||||
|
||||
ROOT = Path(__file__).resolve().parent
|
||||
PREFIX = '/app/dayu-diskcopy'
|
||||
VAR = Path(os.environ['TRIM_PKGVAR'])
|
||||
|
||||
|
||||
class Handler(http.server.BaseHTTPRequestHandler):
|
||||
def log_message(self, *args):
|
||||
pass
|
||||
|
||||
def reply(self, status, data, mime='application/json; charset=utf-8'):
|
||||
payload = data if isinstance(data, bytes) else json.dumps(data, ensure_ascii=False).encode()
|
||||
self.send_response(status)
|
||||
self.send_header('Content-Type', mime)
|
||||
self.send_header('Content-Length', str(len(payload)))
|
||||
self.send_header('Cache-Control', 'no-store')
|
||||
self.send_header('X-Content-Type-Options', 'nosniff')
|
||||
self.end_headers()
|
||||
self.wfile.write(payload)
|
||||
|
||||
def handle_request(self, post=False):
|
||||
try:
|
||||
uid = self.headers.get('X-Trim-Userid', '')
|
||||
if self.headers.get('X-Trim-Isadmin', '').lower() != 'true' or not uid.isdigit() or int(uid) < 1000:
|
||||
return self.reply(403, {'error': '请从飞牛桌面使用管理员账号打开此应用'})
|
||||
path = urllib.parse.urlsplit(self.path).path
|
||||
if path in (PREFIX, PREFIX + '/') and not post:
|
||||
return self.reply(200, (ROOT / 'index.html').read_bytes(), 'text/html; charset=utf-8')
|
||||
if not path.startswith(PREFIX + '/api/'):
|
||||
return self.reply(404, {'error': '页面不存在'})
|
||||
action = path.removeprefix(PREFIX + '/api/')
|
||||
writes = {'start', 'mkdir', 'eject', 'resume'}
|
||||
if post != (action in writes):
|
||||
return self.reply(405, {'error': '请求方法无效'})
|
||||
if post:
|
||||
if self.headers.get('X-Dayu-Request') != '1':
|
||||
return self.reply(403, {'error': '无效请求来源'})
|
||||
origin = self.headers.get('Origin')
|
||||
if origin and urllib.parse.urlsplit(origin).netloc != self.headers.get('Host'):
|
||||
return self.reply(403, {'error': '请求来源不匹配'})
|
||||
length = int(self.headers.get('Content-Length', '0'))
|
||||
if length > 262144:
|
||||
return self.reply(413, {'error': '请求过大'})
|
||||
args = json.loads(self.rfile.read(length) or '{}')
|
||||
else:
|
||||
args = {key: value[0] for key, value in urllib.parse.parse_qs(urllib.parse.urlsplit(self.path).query).items()}
|
||||
with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as client:
|
||||
client.settimeout(180)
|
||||
client.connect(str(VAR / 'broker.sock'))
|
||||
client.sendall((json.dumps({'uid': int(uid), 'action': action, 'args': args}) + '\n').encode())
|
||||
with client.makefile('rb') as response:
|
||||
data = json.loads(response.readline(4 * 1024 * 1024))
|
||||
self.reply(200 if data['ok'] else 400, data.get('data') if data['ok'] else {'error': data['error']})
|
||||
except Exception:
|
||||
self.reply(500, {'error': '服务暂时不可用,请稍后刷新或在应用中心重启应用'})
|
||||
|
||||
def do_GET(self):
|
||||
self.handle_request()
|
||||
|
||||
def do_POST(self):
|
||||
self.handle_request(True)
|
||||
|
||||
|
||||
class Server(socketserver.ThreadingMixIn, socketserver.UnixStreamServer):
|
||||
daemon_threads = True
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
path = ROOT / 'app.sock'
|
||||
path.unlink(missing_ok=True)
|
||||
server = Server(str(path), Handler)
|
||||
os.chown(path, int(os.environ['TRIM_UID']), grp.getgrnam('Administrators').gr_gid)
|
||||
path.chmod(0o660)
|
||||
os.setgroups([])
|
||||
os.setgid(int(os.environ['TRIM_GID']))
|
||||
os.setuid(int(os.environ['TRIM_UID']))
|
||||
server.serve_forever()
|
||||
@@ -0,0 +1,33 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<title>大鱼硬盘拷贝</title>
|
||||
<style>
|
||||
:root{font:14px -apple-system,BlinkMacSystemFont,"PingFang SC",sans-serif;color:#172c39;background:#f2f5f6;--accent:#167666;--line:#e0e7e8}*{box-sizing:border-box}body{margin:0}button,select,input{font:inherit}button{cursor:pointer;border:1px solid var(--line);border-radius:9px;padding:9px 15px;background:white;color:inherit}button:hover{background:#edf5f2;border-color:#bad4ce}button:disabled{opacity:.45;cursor:default}button.primary{background:var(--accent);color:white;border-color:var(--accent);font-weight:600}button:focus-visible,input:focus-visible,select:focus-visible{outline:3px solid #4eaea1;outline-offset:2px}header{padding:29px 34px 22px;display:flex;align-items:center;gap:14px}header svg{width:44px;height:44px;flex:none}h1{font-size:22px;margin:0 0 5px;letter-spacing:.5px}header p{margin:0;color:#6c7d85;font-size:13px}.badge{margin-left:auto;font-size:12px;padding:7px 11px;border-radius:20px;background:#e3efeb;color:var(--accent);white-space:nowrap}main{max-width:1180px;margin:auto;padding:0 30px 35px}.steps{display:flex;gap:20px;margin-bottom:18px;color:#7b8a91;font-size:12px}.steps span{display:flex;align-items:center;gap:7px}.steps b{display:inline-grid;place-items:center;width:21px;height:21px;border:1px solid #c8d5d6;border-radius:50%;font-weight:500}.steps span:first-child{color:var(--accent)}.columns{display:grid;grid-template-columns:1fr 1fr;gap:18px}.card{background:#fff;border:1px solid var(--line);border-radius:14px;overflow:hidden}.cardhead{padding:20px 21px 15px;border-bottom:1px solid #edf0f1}.cardhead h2{font-size:15px;margin:0 0 6px}.muted{color:#7c8b92;font-size:12px}.cardbody{padding:16px 20px}.disk{display:flex;gap:10px;align-items:center;padding:12px;border:1px solid var(--line);border-radius:10px;margin-bottom:14px}.disk select{width:100%;border:0;background:transparent;color:#213e4b;padding:4px 0;outline:none}.disk .fs{font-size:11px;background:#edf4f2;color:var(--accent);padding:5px 7px;border-radius:5px;min-width:43px;text-align:center}.tools{display:flex;align-items:center;gap:7px;margin-bottom:10px}.tools button{font-size:12px;padding:6px 10px}.path{font-size:12px;color:#6a8088;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex:1;direction:rtl;text-align:left}.folders{height:280px;overflow:auto;border:1px solid #e9eeee;border-radius:9px}.row{display:flex;align-items:center;gap:8px;padding:10px 12px;border-bottom:1px solid #f0f3f3;min-height:43px}.row:last-child{border:0}.row:hover{background:#f5f9f8}.row input{accent-color:var(--accent);width:16px;height:16px}.foldericon{width:20px;color:#9cbaaf;flex:none}.row button{border:0;padding:0;background:none;text-align:left;flex:1;overflow-wrap:anywhere;line-height:1.5}.row .arrow{color:#9cabb0}.empty{padding:45px 16px;text-align:center;color:#8a999e;font-size:13px;line-height:1.8}.destination{padding:12px;margin-top:12px;background:#f3f7f6;border-radius:8px;font-size:12px;line-height:1.7;overflow-wrap:anywhere}.actions{display:flex;align-items:center;gap:12px;padding:18px 0 22px}.actions .note{font-size:12px;color:#7c8d93;flex:1}.actions button.primary{padding:11px 24px}.tasks h2{font-size:15px;margin:0}.taskhead{padding:18px 21px;display:flex;justify-content:space-between;align-items:center}.task{padding:0 21px 20px}.task+.task{border-top:1px solid var(--line);padding-top:18px}.tasktitle{display:flex;align-items:center;gap:10px;justify-content:space-between;margin-bottom:8px;font-weight:600}.state{font-size:12px;font-weight:400;color:var(--accent);white-space:nowrap}.track{height:7px;border-radius:6px;background:#eef2f2;margin:13px 0 10px;overflow:hidden}.bar{height:100%;border-radius:6px;background:#258c77;transition:width .5s}.metrics{display:flex;gap:22px;font-size:12px;color:#657f89}.taskpath{font-size:12px;color:#94a1a5;overflow-wrap:anywhere;margin-top:10px}.err{background:#fff0eb;color:#a74c30;padding:12px 15px;border-radius:9px;line-height:1.6;margin-bottom:15px;display:none}footer{color:#89999f;font-size:12px;padding-top:18px;display:flex;justify-content:space-between;gap:10px}dialog{border:0;border-radius:14px;padding:25px;box-shadow:0 20px 70px #172c3930;max-width:460px;width:90%}dialog::backdrop{background:#172c3950}dialog input{width:100%;padding:12px;border:1px solid var(--line);border-radius:8px;margin:8px 0 20px}.dialogbuttons{display:flex;justify-content:flex-end;gap:10px}@media(max-width:720px){header{padding:20px}main{padding:0 16px 25px}.columns{grid-template-columns:1fr}.badge{display:none}.folders{height:200px}.steps{gap:10px;font-size:11px}.actions{flex-wrap:wrap}.actions .note{flex-basis:100%}.metrics{gap:12px;flex-wrap:wrap}footer{display:block;line-height:1.8}}
|
||||
</style>
|
||||
<header><svg viewBox="0 0 48 48" aria-hidden="true"><rect width="48" height="48" rx="13" fill="#167666"/><rect x="10" y="11" width="28" height="25" rx="5" fill="none" stroke="white" stroke-width="2"/><path d="M10 27h28M16 31h2" stroke="white" stroke-width="2"/><path d="m21 18 4 4 7-7" fill="none" stroke="#9ee5c7" stroke-width="2.5"/></svg><div><h1>大鱼硬盘拷贝</h1><p>外接硬盘直连导入,拷贝在 NAS 本机完成</p></div><span class="badge">APFS · NTFS · 只读访问源盘</span></header>
|
||||
<main><div class="steps"><span><b>1</b>选择源目录</span><span><b>2</b>选择存储位置</span><span><b>3</b>后台拷贝与校验</span></div><div id="error" class="err" role="alert"></div>
|
||||
<div class="columns"><section class="card"><div class="cardhead"><h2>从外接硬盘拷贝</h2><div class="muted">勾选同一层级中要拷贝的目录</div></div><div class="cardbody"><div class="disk"><span id="fs" class="fs">USB</span><select id="disk" aria-label="选择外接硬盘"></select><button id="refresh" title="刷新硬盘">刷新</button></div><div class="tools"><button id="sourceUp">上一级</button><span id="sourcePath" class="path">/</span><button id="release">释放挂载</button></div><div id="sources" class="folders"><div class="empty">请选择 APFS 或 NTFS 硬盘</div></div></div></section>
|
||||
<section class="card"><div class="cardhead"><h2>拷贝到 NAS</h2><div class="muted">选择你的存储空间和目标目录</div></div><div class="cardbody"><div class="disk"><span class="fs">NAS</span><div style="flex:1">我的存储空间<div class="muted" style="margin-top:4px">文件直接写入此处</div></div><button id="newFolder">新建文件夹</button></div><div class="tools"><button id="destUp">上一级</button><span id="destPath" class="path">存储空间</span></div><div id="destinations" class="folders"></div><div class="destination">当前目标:<span id="chosenDest">请选择一个目录</span></div></div></section></div>
|
||||
<div class="actions"><span id="selection" class="note">尚未选择源目录。同名文件会先保留,并在复制后校验。</span><button id="start" class="primary" disabled>开始拷贝</button></div>
|
||||
<section class="card tasks"><div class="taskhead"><h2>拷贝任务</h2><span class="muted">关闭窗口后仍继续运行</span></div><div id="tasks"><div class="empty">暂无拷贝任务</div></div></section>
|
||||
<footer><span>不格式化、不修复源盘;保留目录、文件名和链接。</span><span id="version">大鱼硬盘拷贝</span></footer></main>
|
||||
<dialog id="newDialog"><h3>新建目标文件夹</h3><form method="dialog" id="newForm"><input id="folderName" placeholder="文件夹名称" aria-label="新文件夹名称" required><div class="dialogbuttons"><button value="cancel" formnovalidate>取消</button><button class="primary" value="create">创建</button></div></form></dialog>
|
||||
<script>
|
||||
const API='/app/dayu-diskcopy/api/',$=id=>document.getElementById(id);
|
||||
let device='',sourcePath='',destPath='',selected=new Set(),lastDisks='',busy=false,loading=false;
|
||||
const states={preflight:'准备中',copying:'正在拷贝',verifying_existing:'校验已有文件',verifying_tree:'核对目录',saving_metadata:'保存扩展属性',finalizing:'正在完成',complete:'已完成',failed:'拷贝失败',needs_attention:'发现不同版本,请保留核对',cleanup_failed:'需要检查挂载状态',interrupted:'任务已中断'};
|
||||
function bytes(n){if(!n)return'0 B';const u=['B','KB','MB','GB','TB'],i=Math.min(4,Math.floor(Math.log(n)/Math.log(1000)));return(n/1000**i).toFixed(i>1?1:0)+' '+u[i]}
|
||||
function duration(s){if(s==null)return'估算中';if(s<60)return'不足 1 分钟';if(s<3600)return Math.ceil(s/60)+' 分钟';return Math.floor(s/3600)+' 小时 '+Math.ceil(s%3600/60)+' 分钟'}
|
||||
function error(message){$('error').textContent=message||'';$('error').style.display=message?'block':'none'}
|
||||
async function api(action,args={},post=false){const url=API+action+(post?'':'?'+new URLSearchParams(args));const r=await fetch(url,{method:post?'POST':'GET',headers:post?{'Content-Type':'application/json','X-Dayu-Request':'1'}:{},body:post?JSON.stringify(args):undefined});const d=await r.json();if(!r.ok)throw Error(d.error||'操作失败');return d}
|
||||
function button(name,fn){const b=document.createElement('button');b.textContent=name;b.onclick=fn;return b}
|
||||
function folderRows(container,entries,source){container.replaceChildren();if(!entries.length){const e=document.createElement('div');e.className='empty';e.textContent=source?'当前目录下没有可选择的文件夹':'当前目录下没有子文件夹,可以直接选作目标';container.append(e);return}for(const entry of entries){const row=document.createElement('div');row.className='row';if(source){const check=document.createElement('input');check.type='checkbox';check.setAttribute('aria-label','选择 '+entry.name);check.checked=selected.has(entry.path);check.onchange=()=>{check.checked?selected.add(entry.path):selected.delete(entry.path);updateSelection()};row.append(check)}const icon=document.createElement('span');icon.className='foldericon';icon.textContent='▰';row.append(icon,button(entry.name,()=>source?browseSource(entry.path):browseDest(entry.path)));const arrow=document.createElement('span');arrow.className='arrow';arrow.textContent='›';row.append(arrow);container.append(row)}}
|
||||
function updateSelection(){$('selection').textContent=selected.size?'已选 '+selected.size+' 个目录。同名文件会先保留,并在复制后校验。':'尚未选择源目录。同名文件会先保留,并在复制后校验。';$('start').disabled=!selected.size||!destPath||busy||loading}
|
||||
async function browseSource(path=''){if(!device)return;try{loading=true;updateSelection();const d=await api('source',{device,path});sourcePath=d.path;selected.clear();$('sourcePath').textContent='/'+sourcePath;$('sourceUp').disabled=!sourcePath;folderRows($('sources'),d.entries,true);error()}catch(e){error(e.message)}finally{loading=false;updateSelection()}}
|
||||
async function browseDest(path=''){try{const d=await api('destinations',{path});destPath=d.path;$('destPath').textContent=destPath||'存储空间';$('chosenDest').textContent=destPath||'请选择一个目录';folderRows($('destinations'),d.entries,false);updateSelection();error()}catch(e){error(e.message)}}
|
||||
function renderJobs(jobs){busy=jobs.some(j=>!['complete','failed','needs_attention','cleanup_failed','interrupted','cancelled'].includes(j.phase));$('tasks').replaceChildren();if(!jobs.length){const e=document.createElement('div');e.className='empty';e.textContent='暂无拷贝任务';$('tasks').append(e)}for(const job of jobs.slice(0,10)){const box=document.createElement('div');box.className='task';const title=document.createElement('div');title.className='tasktitle';const name=document.createElement('span');name.textContent=job.directories.join('、');const state=document.createElement('span');state.className='state';state.textContent=states[job.phase]||job.phase;title.append(name,state);const track=document.createElement('div');track.className='track';const bar=document.createElement('div');bar.className='bar';bar.style.width=(job.phase==='complete'?100:Math.min(100,job.total?job.bytes/job.total*100:0))+'%';track.append(bar);const metrics=document.createElement('div');metrics.className='metrics';for(const value of [bytes(job.bytes)+' / '+bytes(job.total),job.phase==='copying'?bytes(job.speed)+'/s':'',job.phase==='copying'?'预计剩余 '+duration(job.eta):job.phase==='complete'?'文件与目录核验通过':'']){if(value){const e=document.createElement('span');e.textContent=value;metrics.append(e)}}const path=document.createElement('div');path.className='taskpath';path.textContent=job.destination;box.append(title,track,metrics,path);if(job.error){const e=document.createElement('div');e.className='taskpath';e.style.color='#a74c30';e.textContent=job.error;box.append(e)}if(!job.legacy&&['failed','interrupted'].includes(job.phase))box.append(button('继续此任务',async()=>{try{await api('resume',{job:job.id},true);await refresh()}catch(e){error(e.message)}}));$('tasks').append(box)}updateSelection()}
|
||||
async function refresh(){try{const d=await api('status');$('version').textContent='大鱼硬盘拷贝 '+d.version;const signature=JSON.stringify(d.disks.map(x=>[x.id,x.filesystem]));if(signature!==lastDisks){lastDisks=signature;$('disk').replaceChildren();for(const disk of d.disks){const option=document.createElement('option');option.value=disk.id;option.textContent=disk.model+' · '+bytes(disk.size)+' · '+disk.filesystem.toUpperCase();$('disk').append(option)}if(!d.disks.length){const o=document.createElement('option');o.textContent='未发现 APFS 或 NTFS 外接硬盘';$('disk').append(o);device=''}else if(!d.disks.some(x=>x.id===device)){device=d.disks[0].id;$('disk').value=device;await browseSource()}$('fs').textContent=(d.disks.find(x=>x.id===device)?.filesystem||'USB').toUpperCase()}renderJobs(d.jobs)}catch(e){error(e.message)}}
|
||||
$('disk').onchange=()=>{device=$('disk').value;$('fs').textContent=$('disk').selectedOptions[0]?.textContent.split(' · ').at(-1)||'USB';browseSource()};$('refresh').onclick=refresh;$('sourceUp').onclick=()=>browseSource(sourcePath.split('/').slice(0,-1).join('/'));$('destUp').onclick=()=>{const up=destPath.split('/').slice(0,-1).join('/');browseDest(/^\/vol\d+\/\d+/.test(up)?up:'')};$('start').onclick=async()=>{try{loading=true;updateSelection();await api('start',{device,paths:[...selected],destination:destPath},true);selected.clear();error();await refresh()}catch(e){error(e.message)}finally{loading=false;updateSelection()}};$('release').onclick=async()=>{try{await api('eject',{device},true);error('已释放应用挂载;拔盘前仍请在飞牛系统中推出整块硬盘');await refresh()}catch(e){error(e.message)}};$('newFolder').onclick=()=>{if(!destPath)return error('请先选择一个存储空间或目录');$('folderName').value='';$('newDialog').showModal()};$('newForm').onsubmit=async e=>{if(e.submitter?.value!=='create')return;e.preventDefault();try{const d=await api('mkdir',{path:destPath,name:$('folderName').value},true);$('newDialog').close();await browseDest(d.path)}catch(err){error(err.message)}};
|
||||
browseDest();refresh();setInterval(refresh,2500);
|
||||
</script></html>
|
||||
@@ -0,0 +1,58 @@
|
||||
"""fnOS lifecycle controller. Stops only the two service processes, not copy jobs."""
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import signal
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
ROOT = Path(__file__).resolve().parent
|
||||
VAR = Path(os.environ['TRIM_PKGVAR'])
|
||||
STATE = VAR / 'services.json'
|
||||
|
||||
|
||||
def alive(pid, script):
|
||||
try:
|
||||
return str(ROOT / script).encode() in (Path('/proc') / str(pid) / 'cmdline').read_bytes()
|
||||
except OSError:
|
||||
return False
|
||||
|
||||
|
||||
def main():
|
||||
action = sys.argv[1]
|
||||
VAR.mkdir(parents=True, exist_ok=True)
|
||||
os.chown(VAR, 0, int(os.environ['TRIM_GID']))
|
||||
VAR.chmod(0o750)
|
||||
records = json.loads(STATE.read_text()) if STATE.exists() else {}
|
||||
if action == 'status':
|
||||
raise SystemExit(0 if all(alive(records.get(name, -1), name) for name in ('broker.py', 'front.py')) else 3)
|
||||
if action == 'stop':
|
||||
for script, pid in records.items():
|
||||
if alive(pid, script):
|
||||
os.kill(pid, signal.SIGTERM)
|
||||
for _ in range(30):
|
||||
if not any(alive(pid, script) for script, pid in records.items()):
|
||||
break
|
||||
time.sleep(.1)
|
||||
STATE.unlink(missing_ok=True)
|
||||
return
|
||||
if action != 'start':
|
||||
raise SystemExit(1)
|
||||
for script in ('broker.py', 'front.py'):
|
||||
if alive(records.get(script, -1), script):
|
||||
continue
|
||||
with (VAR / 'service.log').open('ab') as log:
|
||||
process = subprocess.Popen(['/usr/bin/python3', str(ROOT / script)],
|
||||
stdin=subprocess.DEVNULL, stdout=log, stderr=subprocess.STDOUT, start_new_session=True)
|
||||
records[script] = process.pid
|
||||
STATE.write_text(json.dumps(records))
|
||||
for _ in range(50):
|
||||
if (ROOT / 'app.sock').exists() and (VAR / 'broker.sock').exists():
|
||||
return
|
||||
time.sleep(.1)
|
||||
raise SystemExit('服务启动失败,请查看应用日志')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1 @@
|
||||
{".url":{"dayu-diskcopy.main":{"title":"大鱼硬盘拷贝","icon":"images/icon_{0}.png","type":"iframe","protocol":"","gatewayPrefix":"/app/dayu-diskcopy","gatewaySocket":"app.sock","url":"/app/dayu-diskcopy","allUsers":false,"control":{"accessPerm":"readonly"}}}}
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
exit 0
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
exit 0
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
exit 0
|
||||
@@ -0,0 +1,9 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
for program in python3 rsync ntfs-3g; do
|
||||
if ! command -v "$program" >/dev/null; then
|
||||
printf '系统缺少运行组件:%s\n' "$program" > "$TRIM_TEMP_LOGFILE"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
exit 0
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
exec /usr/bin/python3 "$TRIM_APPDEST/service.py" "$1"
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
exit 0
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
if test -f "$TRIM_APPDEST/service.py"; then
|
||||
/usr/bin/python3 "$TRIM_APPDEST/service.py" stop
|
||||
fi
|
||||
exit 0
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
exit 0
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
exit 0
|
||||
@@ -0,0 +1 @@
|
||||
{"defaults":{"run-as":"root"},"username":"dayu_diskcopy","groupname":"dayu_diskcopy"}
|
||||
@@ -0,0 +1 @@
|
||||
{}
|
||||
@@ -0,0 +1,16 @@
|
||||
appname=dayu-diskcopy
|
||||
version=0.1.0
|
||||
display_name=大鱼硬盘拷贝
|
||||
desc=直接读取 APFS、NTFS 外接硬盘,在飞牛 NAS 本机后台拷贝目录、查看进度和校验结果。
|
||||
source=thirdparty
|
||||
platform=x86
|
||||
maintainer=大鱼
|
||||
maintainer_url=https://dayu.media
|
||||
distributor=大鱼
|
||||
os_min_version=1.2.0701
|
||||
desktop_uidir=ui
|
||||
desktop_applaunchname=dayu-diskcopy.main
|
||||
ctl_stop=true
|
||||
checkport=false
|
||||
disable_authorization_path=false
|
||||
changelog=首版:APFS 与 NTFS 只读访问、目录选择、后台复制、进度与校验。
|
||||
@@ -0,0 +1,80 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Build a self-contained native fnOS FPK with the validated Linux driver."""
|
||||
from pathlib import Path
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import shutil
|
||||
import struct
|
||||
import subprocess
|
||||
import sys
|
||||
import zlib
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
stage = ROOT / 'build/fpk'
|
||||
if stage.exists():
|
||||
shutil.rmtree(stage)
|
||||
shutil.copytree(ROOT / 'packaging/fpk', stage)
|
||||
(stage / 'wizard').mkdir(exist_ok=True)
|
||||
(stage / 'wizard/.gitkeep').touch()
|
||||
app = stage / 'app'
|
||||
for path in (ROOT / 'application').iterdir():
|
||||
if path.is_file():
|
||||
shutil.copy2(path, app / path.name)
|
||||
shutil.copy2(ROOT / 'scripts/copy-directories.py', app / 'copy_worker.py')
|
||||
shutil.copy2(ROOT / 'scripts/save-xattrs.py', app / 'save_xattrs.py')
|
||||
(app / 'bin').mkdir()
|
||||
for name, expected in [('apfs-fuse','89a7083c42fb498b021d9f7fabbc5b754eaae503649500e4926965fdcfbcb11e'),
|
||||
('apfsutil','692bbd961678c5db1a48e00cb2bc96c50e82dd77e39d87cfe11087608b4658ae')]:
|
||||
binary = ROOT / 'build/linux-bin' / name
|
||||
if hashlib.sha256(binary.read_bytes()).hexdigest() != expected:
|
||||
raise SystemExit('Driver hash mismatch: ' + name)
|
||||
shutil.copy2(binary, app / 'bin' / name)
|
||||
(app / 'bin' / name).chmod(0o755)
|
||||
shutil.copytree(ROOT / 'vendor/apfs-fuse', app / 'source/apfs-fuse')
|
||||
shutil.copy2(ROOT / 'UPSTREAM.json', app / 'source/UPSTREAM.json')
|
||||
shutil.copy2(ROOT / 'packaging/Dockerfile', app / 'source/Dockerfile')
|
||||
for path in (stage / 'cmd').iterdir():
|
||||
path.chmod(0o755)
|
||||
|
||||
|
||||
def icon(size):
|
||||
def chunk(kind, payload):
|
||||
return struct.pack('>I', len(payload)) + kind + payload + struct.pack('>I', zlib.crc32(kind + payload) & 0xffffffff)
|
||||
rows = []
|
||||
for y in range(size):
|
||||
row = bytearray()
|
||||
for x in range(size):
|
||||
px, py = x * 256 / size, y * 256 / size
|
||||
radius = 50
|
||||
dx, dy = max(abs(px - 128) - 78, 0), max(abs(py - 128) - 78, 0)
|
||||
inside = dx * dx + dy * dy <= radius * radius
|
||||
color = (22, 118, 102, 255) if inside else (0, 0, 0, 0)
|
||||
if 53 <= px <= 203 and 62 <= py <= 192 and (px < 63 or px > 193 or py < 72 or py > 182 or 144 < py < 153):
|
||||
color = (255, 255, 255, 255)
|
||||
if 78 <= px <= 90 and 164 <= py <= 172:
|
||||
color = (255, 255, 255, 255)
|
||||
if 100 <= px <= 126 and abs(py - (px - 3)) < 5 or 122 <= px <= 165 and abs(py - (249 - px)) < 5:
|
||||
color = (158, 229, 199, 255)
|
||||
row.extend(color)
|
||||
rows.append(b'\0' + row)
|
||||
return b'\x89PNG\r\n\x1a\n' + chunk(b'IHDR', struct.pack('>IIBBBBB', size, size, 8, 6, 0, 0, 0)) + chunk(b'IDAT', zlib.compress(b''.join(rows))) + chunk(b'IEND', b'')
|
||||
|
||||
|
||||
images = app / 'ui/images'
|
||||
images.mkdir(exist_ok=True)
|
||||
for size in (64, 256):
|
||||
payload = icon(size)
|
||||
(images / ('icon_' + str(size) + '.png')).write_bytes(payload)
|
||||
(stage / ('ICON.PNG' if size == 64 else 'ICON_256.PNG')).write_bytes(payload)
|
||||
subprocess.run([sys.argv[1], 'build', '--directory', str(stage)], cwd=stage, check=True)
|
||||
output = ROOT / 'dist'
|
||||
output.mkdir(exist_ok=True)
|
||||
packages = list(stage.glob('*.fpk'))
|
||||
if len(packages) != 1:
|
||||
raise SystemExit('Expected one FPK package')
|
||||
version = next(line.split('=',1)[1].strip() for line in (stage / 'manifest').read_text().splitlines() if line.startswith('version='))
|
||||
destination = output / ('dayu-diskcopy-' + version + '-x86.fpk')
|
||||
shutil.copy2(packages[0], destination)
|
||||
print(destination)
|
||||
print('sha256:', hashlib.sha256(destination.read_bytes()).hexdigest())
|
||||
+17
-7
@@ -22,7 +22,9 @@ def main():
|
||||
mount = Path(config['mount'])
|
||||
source = mount / config['source_root']
|
||||
destination = Path(config['destination']).resolve(strict=True)
|
||||
device = (Path('/dev/disk/by-partuuid') / config['partuuid']).resolve(strict=True)
|
||||
device = Path(config['device_path']).resolve(strict=True) if config.get('device_path') else (Path('/dev/disk/by-partuuid') / config['partuuid']).resolve(strict=True)
|
||||
managed = config.get('managed_mount', True)
|
||||
os.environ['LC_ALL'] = 'C'
|
||||
lock = (job.parent.parent / 'transfer.lock').open('a')
|
||||
fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
state = {'pid': os.getpid(), 'started': time.time(), 'phase': 'preflight',
|
||||
@@ -48,9 +50,9 @@ def main():
|
||||
raise RuntimeError('Source is not mounted.')
|
||||
mounted = json.loads(subprocess.check_output(
|
||||
['findmnt', '-J', '-M', str(mount), '-o', 'SOURCE,OPTIONS'], text=True))['filesystems'][0]
|
||||
if Path(mounted['source']).resolve() != device or 'ro' not in mounted['options'].split(','):
|
||||
if Path(mounted['source']).resolve() != device or (managed and 'ro' not in mounted['options'].split(',')):
|
||||
raise RuntimeError('Unexpected source mount or source is not read-only.')
|
||||
if subprocess.check_output(['blockdev', '--getro', str(device)], text=True).strip() != '1':
|
||||
if managed and subprocess.check_output(['blockdev', '--getro', str(device)], text=True).strip() != '1':
|
||||
raise RuntimeError('Block device is not read-only.')
|
||||
writes_before = (Path('/sys/class/block') / device.name / 'stat').read_text().split()[4:8:2]
|
||||
state['source_write_counters_before'] = writes_before
|
||||
@@ -72,7 +74,7 @@ def main():
|
||||
(job / 'existing-files.list').write_bytes(b'\0'.join(existing) + (b'\0' if existing else b''))
|
||||
save('copying', existing_files_to_verify=len(existing), copy_started=time.time())
|
||||
source_args = [str(source / name) for name in config['directories']]
|
||||
command = ['rsync', '-rltH', '--chown=1000:1001', '--ignore-existing', '--partial',
|
||||
command = ['rsync', '-rltH', '--chown=' + str(config.get('uid', 1000)) + ':' + str(config.get('gid', 1001)), '--ignore-existing', '--partial', '--no-whole-file',
|
||||
'--partial-dir=.dayu-apfs-partial', '--info=progress2,stats2', '--outbuf=L',
|
||||
'--stats', '--no-inc-recursive', '--protect-args', *source_args, str(destination) + '/']
|
||||
result = run_to_log(command, 'copy.log')
|
||||
@@ -96,6 +98,14 @@ def main():
|
||||
*source_args, str(destination) + '/'], 'tree-check.log')
|
||||
if result or (job / 'tree-check.log').read_text().strip():
|
||||
raise RuntimeError('Final directory comparison found differences; see tree-check.log.')
|
||||
subprocess.run(['sync', '-f', str(destination)], check=True)
|
||||
metadata_helper = Path(__file__).with_name('save_xattrs.py')
|
||||
if config.get('filesystem') == 'apfs' and metadata_helper.exists():
|
||||
save('saving_metadata')
|
||||
metadata_target = destination / ('.dayu-diskcopy-metadata-' + job.name)
|
||||
result = run_to_log(['/usr/bin/python3', str(metadata_helper), str(config_path), str(metadata_target)], 'metadata-summary.json')
|
||||
if result:
|
||||
raise RuntimeError('File copy passed but extended attribute archive failed.')
|
||||
save('complete', finished=time.time(), existing_files_checksum_match=True,
|
||||
new_files_verified_by_rsync_transfer_checksums=True)
|
||||
except BaseException as error:
|
||||
@@ -103,12 +113,12 @@ def main():
|
||||
traceback.print_exc()
|
||||
finally:
|
||||
try:
|
||||
if os.path.ismount(mount):
|
||||
if managed and os.path.ismount(mount):
|
||||
subprocess.run(['umount', str(mount)], check=True, timeout=60)
|
||||
if config['original_ro'] == '0':
|
||||
if managed and config['original_ro'] == '0':
|
||||
subprocess.run(['blockdev', '--setrw', str(device)], check=True)
|
||||
writes_after = (Path('/sys/class/block') / device.name / 'stat').read_text().split()[4:8:2]
|
||||
save(state['phase'], unmounted=True, source_write_counters_after=writes_after,
|
||||
save(state['phase'], unmounted=managed and not os.path.ismount(mount), source_write_counters_after=writes_after,
|
||||
source_writes_unchanged=writes_after == state.get('source_write_counters_before'))
|
||||
except BaseException as error:
|
||||
save('cleanup_failed', prior_phase=state['phase'], cleanup_error=str(error))
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
import importlib.util
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import socket
|
||||
import tempfile
|
||||
import threading
|
||||
import unittest
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def module(name):
|
||||
os.environ.setdefault('TRIM_PKGVAR', '/tmp/dayu-diskcopy-test')
|
||||
os.environ.setdefault('TRIM_UID', '99999')
|
||||
os.environ.setdefault('TRIM_GID', '99999')
|
||||
spec = importlib.util.spec_from_file_location(name, ROOT / 'application' / (name + '.py'))
|
||||
result = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(result)
|
||||
return result
|
||||
|
||||
|
||||
class PathBoundaryTests(unittest.TestCase):
|
||||
def test_path_traversal_and_symlink_escape_are_rejected(self):
|
||||
broker = module('broker')
|
||||
with tempfile.TemporaryDirectory() as folder:
|
||||
root = Path(folder) / 'root'
|
||||
root.mkdir()
|
||||
outside = Path(folder) / 'outside'
|
||||
outside.mkdir()
|
||||
(root / 'shortcut').symlink_to(outside)
|
||||
self.assertEqual(broker.beneath(root, root), root.resolve())
|
||||
for path in (root / '../outside', root / 'shortcut'):
|
||||
with self.assertRaises(ValueError):
|
||||
broker.beneath(path, root)
|
||||
|
||||
def test_system_identity_rejected_before_any_disk_operation(self):
|
||||
broker = module('broker')
|
||||
with self.assertRaises(ValueError):
|
||||
broker.dispatch({'uid': 0, 'action': 'start', 'args': {}})
|
||||
|
||||
|
||||
class GatewayTests(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.front = module('front')
|
||||
cls.temp = tempfile.TemporaryDirectory(dir='/tmp', prefix='dayu-ui-')
|
||||
cls.path = str(Path(cls.temp.name) / 'web.sock')
|
||||
cls.server = cls.front.Server(cls.path, cls.front.Handler)
|
||||
cls.thread = threading.Thread(target=cls.server.serve_forever, daemon=True)
|
||||
cls.thread.start()
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
cls.server.shutdown()
|
||||
cls.server.server_close()
|
||||
cls.thread.join()
|
||||
cls.temp.cleanup()
|
||||
|
||||
def request(self, method, path, headers=''):
|
||||
with socket.socket(socket.AF_UNIX) as client:
|
||||
client.connect(self.path)
|
||||
client.sendall((method + ' ' + path + ' HTTP/1.0\r\nHost: nas.local\r\n' + headers + '\r\n').encode())
|
||||
response = b''
|
||||
while data := client.recv(65536):
|
||||
response += data
|
||||
return int(response.split(b' ')[1]), response
|
||||
|
||||
def test_anonymous_and_non_admin_are_rejected(self):
|
||||
self.assertEqual(self.request('GET', '/app/dayu-diskcopy')[0], 403)
|
||||
self.assertEqual(self.request('GET', '/app/dayu-diskcopy', 'X-Trim-Userid: 1000\r\nX-Trim-Isadmin: false\r\n')[0], 403)
|
||||
|
||||
def test_admin_can_load_interface(self):
|
||||
code, data = self.request('GET', '/app/dayu-diskcopy', 'X-Trim-Userid: 1000\r\nX-Trim-Isadmin: true\r\n')
|
||||
self.assertEqual(code, 200)
|
||||
self.assertIn('大鱼硬盘拷贝'.encode(), data)
|
||||
|
||||
def test_writes_require_request_marker_and_same_origin(self):
|
||||
headers = 'X-Trim-Userid: 1000\r\nX-Trim-Isadmin: true\r\nContent-Length: 0\r\n'
|
||||
self.assertEqual(self.request('POST', '/app/dayu-diskcopy/api/start', headers)[0], 403)
|
||||
self.assertEqual(self.request('POST', '/app/dayu-diskcopy/api/start', headers + 'X-Dayu-Request: 1\r\nOrigin: https://other.local\r\n')[0], 403)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
在新工单中引用
屏蔽一个用户