Fix authenticated writes behind fnOS gateway and record completed backup
这个提交包含在:
1 父节点
12df14ebf0
当前提交
1827628a93
8 个文件已更改
+80
-11
没有与搜索条件相匹配的文件
+28
-2
@@ -3,6 +3,7 @@ import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import socket
|
||||
import socketserver
|
||||
import tempfile
|
||||
import threading
|
||||
import unittest
|
||||
@@ -91,11 +92,36 @@ class GatewayTests(unittest.TestCase):
|
||||
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)
|
||||
self.assertNotIn(b'__DAYU_CSRF__', data)
|
||||
self.assertIn(self.front.CSRF_TOKEN.encode(), data)
|
||||
|
||||
def test_writes_require_request_marker_and_same_origin(self):
|
||||
def test_writes_require_private_page_nonce_and_no_cross_site_context(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)
|
||||
self.assertEqual(self.request('POST', '/app/dayu-diskcopy/api/start', headers + 'X-Dayu-Request: 1\r\n')[0], 403)
|
||||
token = 'X-Dayu-Token: ' + self.front.CSRF_TOKEN + '\r\n'
|
||||
self.assertEqual(self.request('POST', '/app/dayu-diskcopy/api/start', headers + 'X-Dayu-Request: 1\r\n' + token + 'Sec-Fetch-Site: cross-site\r\n')[0], 403)
|
||||
|
||||
def test_valid_nonce_supports_gateway_rewritten_host(self):
|
||||
class Reply(socketserver.StreamRequestHandler):
|
||||
def handle(self):
|
||||
self.rfile.readline()
|
||||
self.wfile.write(b'{"ok":true,"data":{"accepted":true}}\n')
|
||||
broker_path = str(Path(self.temp.name) / 'broker.sock')
|
||||
server = socketserver.UnixStreamServer(broker_path, Reply)
|
||||
thread = threading.Thread(target=server.handle_request, daemon=True)
|
||||
thread.start()
|
||||
headers = ('X-Trim-Userid: 1000\r\nX-Trim-Isadmin: true\r\nContent-Length: 0\r\n'
|
||||
'X-Dayu-Request: 1\r\nSec-Fetch-Site: same-origin\r\n'
|
||||
'Origin: https://nas.local:5668\r\nX-Dayu-Token: ' + self.front.CSRF_TOKEN + '\r\n')
|
||||
try:
|
||||
with patch.object(self.front, 'VAR', Path(self.temp.name)):
|
||||
code, data = self.request('POST', '/app/dayu-diskcopy/api/mkdir', headers)
|
||||
self.assertEqual(code, 200)
|
||||
self.assertIn(b'accepted', data)
|
||||
finally:
|
||||
thread.join(timeout=2)
|
||||
server.server_close()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
在新工单中引用
屏蔽一个用户