{ // 获取包含Hugging Face文本的span元素 const spans = link.querySelectorAll('span.whitespace-nowrap, span.hidden.whitespace-nowrap'); spans.forEach(span => { if (span.textContent && span.textContent.trim().match(/Hugging\s*Face/i)) { span.textContent = 'AI快站'; } }); }); // 替换logo图片的alt属性 document.querySelectorAll('img[alt*="Hugging"], img[alt*="Face"]').forEach(img => { if (img.alt.match(/Hugging\s*Face/i)) { img.alt = 'AI快站 logo'; } }); } // 替换导航栏中的链接 function replaceNavigationLinks() { // 已替换标记,防止重复运行 if (window._navLinksReplaced) { return; } // 已经替换过的链接集合,防止重复替换 const replacedLinks = new Set(); // 只在导航栏区域查找和替换链接 const headerArea = document.querySelector('header') || document.querySelector('nav'); if (!headerArea) { return; } // 在导航区域内查找链接 const navLinks = headerArea.querySelectorAll('a'); navLinks.forEach(link => { // 如果已经替换过,跳过 if (replacedLinks.has(link)) return; const linkText = link.textContent.trim(); const linkHref = link.getAttribute('href') || ''; // 替换Spaces链接 - 仅替换一次 if ( (linkHref.includes('/spaces') || linkHref === '/spaces' || linkText === 'Spaces' || linkText.match(/^s*Spacess*$/i)) && linkText !== 'PDF TO Markdown' && linkText !== 'PDF TO Markdown' ) { link.textContent = 'PDF TO Markdown'; link.href = 'https://fast360.xyz'; link.setAttribute('target', '_blank'); link.setAttribute('rel', 'noopener noreferrer'); replacedLinks.add(link); } // 删除Posts链接 else if ( (linkHref.includes('/posts') || linkHref === '/posts' || linkText === 'Posts' || linkText.match(/^s*Postss*$/i)) ) { if (link.parentNode) { link.parentNode.removeChild(link); } replacedLinks.add(link); } // 替换Docs链接 - 仅替换一次 else if ( (linkHref.includes('/docs') || linkHref === '/docs' || linkText === 'Docs' || linkText.match(/^s*Docss*$/i)) && linkText !== 'Voice Cloning' ) { link.textContent = 'Voice Cloning'; link.href = 'https://vibevoice.info/'; replacedLinks.add(link); } // 删除Enterprise链接 else if ( (linkHref.includes('/enterprise') || linkHref === '/enterprise' || linkText === 'Enterprise' || linkText.match(/^s*Enterprises*$/i)) ) { if (link.parentNode) { link.parentNode.removeChild(link); } replacedLinks.add(link); } }); // 查找可能嵌套的Spaces和Posts文本 const textNodes = []; function findTextNodes(element) { if (element.nodeType === Node.TEXT_NODE) { const text = element.textContent.trim(); if (text === 'Spaces' || text === 'Posts' || text === 'Enterprise') { textNodes.push(element); } } else { for (const child of element.childNodes) { findTextNodes(child); } } } // 只在导航区域内查找文本节点 findTextNodes(headerArea); // 替换找到的文本节点 textNodes.forEach(node => { const text = node.textContent.trim(); if (text === 'Spaces') { node.textContent = node.textContent.replace(/Spaces/g, 'PDF TO Markdown'); } else if (text === 'Posts') { // 删除Posts文本节点 if (node.parentNode) { node.parentNode.removeChild(node); } } else if (text === 'Enterprise') { // 删除Enterprise文本节点 if (node.parentNode) { node.parentNode.removeChild(node); } } }); // 标记已替换完成 window._navLinksReplaced = true; } // 替换代码区域中的域名 function replaceCodeDomains() { // 特别处理span.hljs-string和span.njs-string元素 document.querySelectorAll('span.hljs-string, span.njs-string, span[class*="hljs-string"], span[class*="njs-string"]').forEach(span => { if (span.textContent && span.textContent.includes('huggingface.co')) { span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } }); // 替换hljs-string类的span中的域名(移除多余的转义符号) document.querySelectorAll('span.hljs-string, span[class*="hljs-string"]').forEach(span => { if (span.textContent && span.textContent.includes('huggingface.co')) { span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } }); // 替换pre和code标签中包含git clone命令的域名 document.querySelectorAll('pre, code').forEach(element => { if (element.textContent && element.textContent.includes('git clone')) { const text = element.innerHTML; if (text.includes('huggingface.co')) { element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com'); } } }); // 处理特定的命令行示例 document.querySelectorAll('pre, code').forEach(element => { const text = element.innerHTML; if (text.includes('huggingface.co')) { // 针对git clone命令的专门处理 if (text.includes('git clone') || text.includes('GIT_LFS_SKIP_SMUDGE=1')) { element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com'); } } }); // 特别处理模型下载页面上的代码片段 document.querySelectorAll('.flex.border-t, .svelte_hydrator, .inline-block').forEach(container => { const content = container.innerHTML; if (content && content.includes('huggingface.co')) { container.innerHTML = content.replace(/huggingface.co/g, 'aifasthub.com'); } }); // 特别处理模型仓库克隆对话框中的代码片段 try { // 查找包含"Clone this model repository"标题的对话框 const cloneDialog = document.querySelector('.svelte_hydration_boundary, [data-target="MainHeader"]'); if (cloneDialog) { // 查找对话框中所有的代码片段和命令示例 const codeElements = cloneDialog.querySelectorAll('pre, code, span'); codeElements.forEach(element => { if (element.textContent && element.textContent.includes('huggingface.co')) { if (element.innerHTML.includes('huggingface.co')) { element.innerHTML = element.innerHTML.replace(/huggingface.co/g, 'aifasthub.com'); } else { element.textContent = element.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } } }); } // 更精确地定位克隆命令中的域名 document.querySelectorAll('[data-target]').forEach(container => { const codeBlocks = container.querySelectorAll('pre, code, span.hljs-string'); codeBlocks.forEach(block => { if (block.textContent && block.textContent.includes('huggingface.co')) { if (block.innerHTML.includes('huggingface.co')) { block.innerHTML = block.innerHTML.replace(/huggingface.co/g, 'aifasthub.com'); } else { block.textContent = block.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } } }); }); } catch (e) { // 错误处理但不打印日志 } } // 当DOM加载完成后执行替换 if (document.readyState === 'loading') { document.addEventListener('DOMContentLoaded', () => { replaceHeaderBranding(); replaceNavigationLinks(); replaceCodeDomains(); // 只在必要时执行替换 - 3秒后再次检查 setTimeout(() => { if (!window._navLinksReplaced) { console.log('[Client] 3秒后重新检查导航链接'); replaceNavigationLinks(); } }, 3000); }); } else { replaceHeaderBranding(); replaceNavigationLinks(); replaceCodeDomains(); // 只在必要时执行替换 - 3秒后再次检查 setTimeout(() => { if (!window._navLinksReplaced) { console.log('[Client] 3秒后重新检查导航链接'); replaceNavigationLinks(); } }, 3000); } // 增加一个MutationObserver来处理可能的动态元素加载 const observer = new MutationObserver(mutations => { // 检查是否导航区域有变化 const hasNavChanges = mutations.some(mutation => { // 检查是否存在header或nav元素变化 return Array.from(mutation.addedNodes).some(node => { if (node.nodeType === Node.ELEMENT_NODE) { // 检查是否是导航元素或其子元素 if (node.tagName === 'HEADER' || node.tagName === 'NAV' || node.querySelector('header, nav')) { return true; } // 检查是否在导航元素内部 let parent = node.parentElement; while (parent) { if (parent.tagName === 'HEADER' || parent.tagName === 'NAV') { return true; } parent = parent.parentElement; } } return false; }); }); // 只在导航区域有变化时执行替换 if (hasNavChanges) { // 重置替换状态,允许再次替换 window._navLinksReplaced = false; replaceHeaderBranding(); replaceNavigationLinks(); } }); // 开始观察document.body的变化,包括子节点 if (document.body) { observer.observe(document.body, { childList: true, subtree: true }); } else { document.addEventListener('DOMContentLoaded', () => { observer.observe(document.body, { childList: true, subtree: true }); }); } })(); \",\n end_stream=True,\n )\n \n # receive response\n events = h0_transfer(quic_server, h0_client)\n self.assertEqual(len(events), 2)\n \n self.assertTrue(isinstance(events[0], HeadersReceived))\n self.assertEqual(events[0].headers, [])\n self.assertEqual(events[0].stream_id, stream_id)\n self.assertEqual(events[0].stream_ended, False)\n \n self.assertTrue(isinstance(events[1], DataReceived))\n self.assertEqual(events[1].data, b\"hello\")\n self.assertEqual(events[1].stream_id, stream_id)\n self.assertEqual(events[1].stream_ended, True)\n \n \n===========unchanged ref 0===========\n at: aioquic.h0.connection\n H0Connection(quic: QuicConnection)\n \n at: aioquic.h0.connection.H0Connection\n send_data(stream_id: int, data: bytes, end_stream: bool) -> None\n \n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: aioquic.h3.events\n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h0\n h0_transfer(quic_sender, h0_receiver)\n \n at: unittest.case.TestCase\n failureException: Type[BaseException]\n \n longMessage: bool\n \n maxDiff: Optional[int]\n \n _testMethodName: str\n \n _testMethodDoc: str\n \n assertEqual(first: Any, second: Any, msg: Any=...) -> None\n \n assertTrue(expr: Any, msg: Any=...) -> None\n \n \n===========changed ref 0===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.\n===========changed ref 1===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n # offset: 1\n .assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.next_event())\n "}}},{"rowIdx":3574,"cells":{"path":{"kind":"string","value":"tests.test_h0/H0ConnectionTest.test_headers_only"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: client_options={\"alpn_protocols\": [\"hq-23\"]},\n client_options={\"alpn_protocols\": [\"hq-22\"]},\n <2>: server_options={\"alpn_protocols\": [\"hq-23\"]},\n server_options={\"alpn_protocols\": [\"hq-22\"]},\n"},"main_code":{"kind":"string","value":" # module: tests.test_h0\n class H0ConnectionTest(TestCase):\n def test_headers_only(self):\n <0> with client_and_server(\n <1> client_options={\"alpn_protocols\": [\"hq-22\"]},\n <2> server_options={\"alpn_protocols\": [\"hq-22\"]},\n <3> ) as (quic_client, quic_server):\n <4> h0_client = H0Connection(quic_client)\n <5> h0_server = H0Connection(quic_server)\n <6> \n <7> # send request\n <8> stream_id = quic_client.get_next_available_stream_id()\n <9> h0_client.send_headers(\n<10> stream_id=stream_id,\n<11> headers=[\n<12> (b\":method\", b\"HEAD\"),\n<13> (b\":scheme\", b\"https\"),\n<14> (b\":authority\", b\"localhost\"),\n<15> (b\":path\", b\"/\"),\n<16> ],\n<17> end_stream=True,\n<18> )\n<19> \n<20> # receive request\n<21> events = h0_transfer(quic_client, h0_server)\n<22> self.assertEqual(len(events), 2)\n<23> \n<24> self.assertTrue(isinstance(events[0], HeadersReceived))\n<25> self.assertEqual(\n<26> events[0].headers, [(b\":method\", b\"HEAD\"), (b\":path\", b\"/\")]\n<27> )\n<28> self.assertEqual(events[0].stream_id, stream_id)\n<29> self.assertEqual(events[0].stream_ended, False)\n<30> \n<31> self.assertTrue(isinstance(events[1], DataReceived))\n<32> self.assertEqual(events[1].data, b\"\")\n<33> self.assertEqual(events[1].stream_id, stream_id)\n<34> self.assertEqual(events[1].stream_ended, True)\n<35> \n<36> # send response\n<37> h0_server.send_headers(\n<38> stream_id=stream_id,\n<39> headers=[\n<40> "},"context":{"kind":"string","value":"===========below chunk 0===========\n # module: tests.test_h0\n class H0ConnectionTest(TestCase):\n def test_headers_only(self):\n # offset: 1\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n ],\n end_stream=True,\n )\n \n # receive response\n events = h0_transfer(quic_server, h0_client)\n self.assertEqual(len(events), 2)\n \n self.assertTrue(isinstance(events[0], HeadersReceived))\n self.assertEqual(events[0].headers, [])\n self.assertEqual(events[0].stream_id, stream_id)\n self.assertEqual(events[0].stream_ended, False)\n \n self.assertTrue(isinstance(events[1], DataReceived))\n self.assertEqual(events[1].data, b\"\")\n self.assertEqual(events[1].stream_id, stream_id)\n self.assertEqual(events[1].stream_ended, True)\n \n \n===========unchanged ref 0===========\n at: aioquic.h0.connection\n H0Connection(quic: QuicConnection)\n \n at: aioquic.h0.connection.H0Connection\n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: aioquic.h3.events\n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h0\n h0_transfer(quic_sender, h0_receiver)\n \n at: unittest.case.TestCase\n assertEqual(first: Any, second: Any, msg: Any=...) -> None\n \n assertTrue(expr: Any, msg: Any=...) -> None\n \n \n===========changed ref 0===========\n # module: tests.test_h0\n class H0ConnectionTest(TestCase):\n def test_connect(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (quic_client, quic_server):\n h0_client = H0Connection(quic_client)\n h0_server = H0Connection(quic_server)\n \n # send request\n stream_id = quic_client.get_next_available_stream_id()\n h0_client.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n )\n h0_client.send_data(stream_id=stream_id, data=b\"\", end_stream=True)\n \n # receive request\n events = h0_transfer(quic_client, h0_server)\n self.assertEqual(len(events), 2)\n \n self.assertTrue(isinstance(events[0], HeadersReceived))\n self.assertEqual(\n events[0].headers, [(b\":method\", b\"GET\"), (b\":path\", b\"/\")]\n )\n self.assertEqual(events[0].stream_id, stream_id)\n self.assertEqual(events[0].stream_ended, False)\n \n self.assertTrue(isinstance(events[1], DataReceived))\n self.assertEqual(events[1].data, b\"\")\n self.assertEqual(events[1].stream_id, stream_id)\n self.assertEqual(events[1].stream_ended, True)\n \n # send response\n h0_\n===========changed ref 1===========\n # module: tests.test_h0\n class H0ConnectionTest(TestCase):\n def test_connect(self):\n # offset: 1\n id)\n self.assertEqual(events[1].stream_ended, True)\n \n # send response\n h0_server.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n ],\n )\n h0_server.send_data(\n stream_id=stream_id,\n data=b\"hello\",\n end_stream=True,\n )\n \n # receive response\n events = h0_transfer(quic_server, h0_client)\n self.assertEqual(len(events), 2)\n \n self.assertTrue(isinstance(events[0], HeadersReceived))\n self.assertEqual(events[0].headers, [])\n self.assertEqual(events[0].stream_id, stream_id)\n self.assertEqual(events[0].stream_ended, False)\n \n self.assertTrue(isinstance(events[1], DataReceived))\n self.assertEqual(events[1].data, b\"hello\")\n self.assertEqual(events[1].stream_id, stream_id)\n self.assertEqual(events[1].stream_ended, True)\n \n===========changed ref 2===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.\n===========changed ref 3===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n # offset: 1\n .assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.next_event())\n "}}},{"rowIdx":3575,"cells":{"path":{"kind":"string","value":"docs.http_client/http_client"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <0>: configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n"},"main_code":{"kind":"string","value":" # module: docs.http_client\n def http_client(host, port):\n <0> configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n <1> \n <2> async with connect(host, port, configuration=configuration) as connection:\n <3> reader, writer = await connection.create_stream()\n <4> writer.write(b\"GET /\\r\\n\")\n <5> writer.write_eof()\n <6> \n <7> response = await reader.read()\n <8> sys.stdout.buffer.write(response)\n <9> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.asyncio.protocol.QuicConnectionProtocol\n create_stream(is_unidirectional: bool=False) -> Tuple[asyncio.StreamReader, asyncio.StreamWriter]\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n certificate: Any = None\n \n connection_id_length: int = 8\n \n idle_timeout: float = 60.0\n \n is_client: bool = True\n \n private_key: Any = None\n \n quic_logger: Optional[QuicLogger] = None\n \n secrets_log_file: TextIO = None\n \n server_name: Optional[str] = None\n \n session_ticket: Optional[SessionTicket] = None\n \n supported_versions: List[int] = field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n )\n \n \n===========unchanged ref 1===========\n at: asyncio.streams.StreamReader\n _source_traceback = None\n \n read(n: int=...) -> bytes\n \n at: asyncio.streams.StreamWriter\n write(data: bytes) -> None\n \n write_eof() -> None\n \n at: sys\n stdout: TextIO\n \n at: typing.BinaryIO\n __slots__ = ()\n \n write(s: AnyStr) -> int\n \n at: typing.TextIO\n __slots__ = ()\n \n \n===========changed ref 0===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.\n===========changed ref 1===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n # offset: 1\n .assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.next_event())\n \n===========changed ref 2===========\n # module: tests.test_h0\n class H0ConnectionTest(TestCase):\n def test_headers_only(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (quic_client, quic_server):\n h0_client = H0Connection(quic_client)\n h0_server = H0Connection(quic_server)\n \n # send request\n stream_id = quic_client.get_next_available_stream_id()\n h0_client.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"HEAD\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n end_stream=True,\n )\n \n # receive request\n events = h0_transfer(quic_client, h0_server)\n self.assertEqual(len(events), 2)\n \n self.assertTrue(isinstance(events[0], HeadersReceived))\n self.assertEqual(\n events[0].headers, [(b\":method\", b\"HEAD\"), (b\":path\", b\"/\")]\n )\n self.assertEqual(events[0].stream_id, stream_id)\n self.assertEqual(events[0].stream_ended, False)\n \n self.assertTrue(isinstance(events[1], DataReceived))\n self.assertEqual(events[1].data, b\"\")\n self.assertEqual(events[1].stream_id, stream_id)\n self.assertEqual(events[1].stream_ended, True)\n \n # send response\n h0_server.send_headers(\n stream_id=stream_id,\n headers=["}}},{"rowIdx":3576,"cells":{"path":{"kind":"string","value":"examples.interop/test_http_0"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <3>: configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n configuration.alpn_protocols = [\"hq-22\"]\n"},"main_code":{"kind":"string","value":" # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n <0> if server.path is None:\n <1> return\n <2> \n <3> configuration.alpn_protocols = [\"hq-22\"]\n <4> async with connect(\n <5> server.host,\n <6> server.port,\n <7> configuration=configuration,\n <8> create_protocol=HttpClient,\n <9> ) as protocol:\n<10> protocol = cast(HttpClient, protocol)\n<11> \n<12> # perform HTTP request\n<13> events = await protocol.get(server.host, server.path)\n<14> if events and isinstance(events[0], HeadersReceived):\n<15> server.result |= Result.D\n<16> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.h3.events\n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n certificate: Any = None\n \n connection_id_length: int = 8\n \n idle_timeout: float = 60.0\n \n is_client: bool = True\n \n private_key: Any = None\n \n quic_logger: Optional[QuicLogger] = None\n \n secrets_log_file: TextIO = None\n \n server_name: Optional[str] = None\n \n session_ticket: Optional[SessionTicket] = None\n \n supported_versions: List[int] = field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n )\n \n \n===========unchanged ref 1===========\n at: examples.interop\n Result()\n \n Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str=\"/\", result: Result=field(default_factory=lambda: Result(0)))\n \n at: examples.interop.Server\n name: str\n \n host: str\n \n port: int = 4433\n \n http3: bool = True\n \n retry_port: Optional[int] = 4434\n \n path: str = \"/\"\n \n result: Result = field(default_factory=lambda: Result(0))\n \n at: http3_client\n HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: http3_client.HttpClient\n get(authority: str, path: str) -> Deque[H3Event]\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n \n===========changed ref 0===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 1===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.\n===========changed ref 2===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n # offset: 1\n .assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.next_event())\n "}}},{"rowIdx":3577,"cells":{"path":{"kind":"string","value":"examples.interop/test_http_3"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <3>: configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n configuration.alpn_protocols = [\"h3-22\"]\n"},"main_code":{"kind":"string","value":" # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n <0> if server.path is None:\n <1> return\n <2> \n <3> configuration.alpn_protocols = [\"h3-22\"]\n <4> async with connect(\n <5> server.host,\n <6> server.port,\n <7> configuration=configuration,\n <8> create_protocol=HttpClient,\n <9> ) as protocol:\n<10> protocol = cast(HttpClient, protocol)\n<11> \n<12> # perform HTTP request\n<13> events = await protocol.get(server.host, server.path)\n<14> if events and isinstance(events[0], HeadersReceived):\n<15> server.result |= Result.D\n<16> server.result |= Result.three\n<17> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.h3.events\n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n at: examples.interop\n Result()\n \n Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str=\"/\", result: Result=field(default_factory=lambda: Result(0)))\n \n at: examples.interop.Server\n host: str\n \n port: int = 4433\n \n path: str = \"/\"\n \n result: Result = field(default_factory=lambda: Result(0))\n \n \n===========unchanged ref 1===========\n at: http3_client\n HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: http3_client.HttpClient\n get(authority: str, path: str) -> Deque[H3Event]\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n \n===========changed ref 0===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 1===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 2===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.\n===========changed ref 3===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n # offset: 1\n .assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.next_event())\n "}}},{"rowIdx":3578,"cells":{"path":{"kind":"string","value":"examples.interop/test_throughput"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":"<15>: configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n configuration.alpn_protocols = [\"h3-22\"]\n<17>: configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n configuration.alpn_protocols = [\"hq-22\"]\n"},"main_code":{"kind":"string","value":" # module: examples.interop\n def test_throughput(server: Server, configuration: QuicConfiguration):\n <0> failures = 0\n <1> \n <2> for size in [5000000, 10000000]:\n <3> print(\"Testing %d bytes download\" % size)\n <4> path = \"/%d\" % size\n <5> \n <6> # perform HTTP request over TCP\n <7> start = time.time()\n <8> response = requests.get(\"https://\" + server.host + path, verify=False)\n <9> tcp_octets = len(response.content)\n<10> tcp_elapsed = time.time() - start\n<11> assert tcp_octets == size, \"HTTP/TCP response size mismatch\"\n<12> \n<13> # perform HTTP request over QUIC\n<14> if server.http3:\n<15> configuration.alpn_protocols = [\"h3-22\"]\n<16> else:\n<17> configuration.alpn_protocols = [\"hq-22\"]\n<18> start = time.time()\n<19> async with connect(\n<20> server.host,\n<21> server.port,\n<22> configuration=configuration,\n<23> create_protocol=HttpClient,\n<24> ) as protocol:\n<25> protocol = cast(HttpClient, protocol)\n<26> \n<27> http_events = await protocol.get(server.host, path)\n<28> quic_elapsed = time.time() - start\n<29> quic_octets = 0\n<30> for http_event in http_events:\n<31> if isinstance(http_event, DataReceived):\n<32> quic_octets += len(http_event.data)\n<33> assert quic_octets == size, \"HTTP/QUIC response size mismatch\"\n<34> \n<35> print(\" - HTTP/TCP completed in %.3f s\" % tcp_elapsed)\n<36> print(\" - HTTP/QUIC completed in %.3f s\" % quic_elapsed)\n<37> \n<38> if quic_elapsed > 1.1 * tcp_elapsed:\n<39> failures += 1\n<40> print(\" => FAIL\")\n<41> else:\n<42> print(\" => PASS\")\n<43> \n<44> if failures == 0:\n<45> server.result |= Result.T\n<46> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.h3.events\n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n at: examples.interop\n Result()\n \n Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str=\"/\", result: Result=field(default_factory=lambda: Result(0)))\n \n at: examples.interop.Server\n host: str\n \n port: int = 4433\n \n http3: bool = True\n \n result: Result = field(default_factory=lambda: Result(0))\n \n \n===========unchanged ref 1===========\n at: http3_client\n HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: http3_client.HttpClient\n get(authority: str, path: str) -> Deque[H3Event]\n \n at: requests.api\n get(url: Union[Text, bytes], params: Optional[\n Union[\n SupportsItems[_ParamsMappingKeyType, _ParamsMappingValueType],\n Tuple[_ParamsMappingKeyType, _ParamsMappingValueType],\n Iterable[Tuple[_ParamsMappingKeyType, _ParamsMappingValueType]],\n Union[Text, bytes],\n ]\n ]=..., **kwargs) -> Response\n \n at: requests.models.Response\n __attrs__ = [\n \"_content\",\n \"status_code\",\n \"headers\",\n \"url\",\n \"history\",\n \"encoding\",\n \"reason\",\n \"cookies\",\n \"elapsed\",\n \"request\",\n ]\n \n at: time\n time() -> float\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n \n===========changed ref 0===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n \n===========changed ref 1===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 2===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 3===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.\n===========changed ref 4===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n # offset: 1\n .assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server.next_event())\n "}}},{"rowIdx":3579,"cells":{"path":{"kind":"string","value":"examples.interop/run"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <4>: alpn_protocols=[\"h3-23\", \"h3-22\", \"hq-23\", \"hq-22\"],\n alpn_protocols=[\"hq-22\", \"h3-22\"],\n"},"main_code":{"kind":"string","value":" # module: examples.interop\n def run(servers, tests, quic_log=False, secrets_log_file=None) -> None:\n <0> for server in servers:\n <1> for test_name, test_func in tests:\n <2> print(\"\\n=== %s %s ===\\n\" % (server.name, test_name))\n <3> configuration = QuicConfiguration(\n <4> alpn_protocols=[\"hq-22\", \"h3-22\"],\n <5> is_client=True,\n <6> quic_logger=QuicLogger(),\n <7> secrets_log_file=secrets_log_file,\n <8> )\n <9> if test_name == \"test_throughput\":\n<10> timeout = 60\n<11> else:\n<12> timeout = 5\n<13> try:\n<14> await asyncio.wait_for(\n<15> test_func(server, configuration), timeout=timeout\n<16> )\n<17> except Exception as exc:\n<18> print(exc)\n<19> \n<20> if quic_log:\n<21> with open(\"%s-%s.qlog\" % (server.name, test_name), \"w\") as logger_fp:\n<22> json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4)\n<23> \n<24> print(\"\")\n<25> print_result(server)\n<26> \n<27> # print summary\n<28> if len(servers) > 1:\n<29> print(\"SUMMARY\")\n<30> for server in servers:\n<31> print_result(server)\n<32> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n quic_logger: Optional[QuicLogger] = None\n \n at: aioquic.quic.logger\n QuicLogger()\n \n at: aioquic.quic.logger.QuicLogger\n to_dict() -> Dict[str, Any]\n \n at: asyncio.tasks\n wait_for(fut: _FutureT[_T], timeout: Optional[float], *, loop: Optional[AbstractEventLoop]=...) -> Future[_T]\n \n at: examples.interop\n print_result(server: Server) -> None\n \n at: examples.interop.Server\n name: str\n \n at: json\n dump(obj: Any, fp: IO[str], *, skipkeys: bool=..., ensure_ascii: bool=..., check_circular: bool=..., allow_nan: bool=..., cls: Optional[Type[JSONEncoder]]=..., indent: Union[None, int, str]=..., separators: Optional[Tuple[str, str]]=..., default: Optional[Callable[[Any], Any]]=..., sort_keys: bool=..., **kwds: Any) -> None\n \n \n===========changed ref 0===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n \n===========changed ref 1===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 2===========\n # module: examples.interop\n def test_throughput(server: Server, configuration: QuicConfiguration):\n failures = 0\n \n for size in [5000000, 10000000]:\n print(\"Testing %d bytes download\" % size)\n path = \"/%d\" % size\n \n # perform HTTP request over TCP\n start = time.time()\n response = requests.get(\"https://\" + server.host + path, verify=False)\n tcp_octets = len(response.content)\n tcp_elapsed = time.time() - start\n assert tcp_octets == size, \"HTTP/TCP response size mismatch\"\n \n # perform HTTP request over QUIC\n if server.http3:\n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n else:\n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n start = time.time()\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n http_events = await protocol.get(server.host, path)\n quic_elapsed = time.time() - start\n quic_octets = 0\n for http_event in http_events:\n if isinstance(http_event, DataReceived):\n quic_octets += len(http_event.data)\n assert quic_octets == size, \"HTTP/QUIC response size mismatch\"\n \n print(\" - HTTP/TCP completed in %.3f s\" % tcp_elapsed)\n print(\" - HTTP/QUIC completed in %.3f s\" % quic_elapsed)\n \n if quic_elapsed > 1.1 * tcp_elapsed:\n failures += 1\n print(\" => FAIL\")\n else:\n print(\" => PASS\")\n \n if failures == 0:\n server.result |= Result.T\n \n===========changed ref 3===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 4===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server."}}},{"rowIdx":3580,"cells":{"path":{"kind":"string","value":"tests.test_h3/H3ConnectionTest.test_request"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: client_options={\"alpn_protocols\": [\"h3-23\"]},\n client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2>: server_options={\"alpn_protocols\": [\"h3-23\"]},\n server_options={\"alpn_protocols\": [\"h3-22\"]},\n"},"main_code":{"kind":"string","value":" # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request(self):\n <0> with client_and_server(\n <1> client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2> server_options={\"alpn_protocols\": [\"h3-22\"]},\n <3> ) as (quic_client, quic_server):\n <4> h3_client = H3Connection(quic_client)\n <5> h3_server = H3Connection(quic_server)\n <6> \n <7> # make first request\n <8> self._make_request(h3_client, h3_server)\n <9> \n<10> # make second request\n<11> self._make_request(h3_client, h3_server)\n<12> \n<13> # make third request -> dynamic table\n<14> self._make_request(h3_client, h3_server)\n<15> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h3.H3ConnectionTest\n maxDiff = None\n \n _make_request(h3_client, h3_server)\n \n \n===========changed ref 0===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 1===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 2===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n \n===========changed ref 3===========\n # module: examples.interop\n def run(servers, tests, quic_log=False, secrets_log_file=None) -> None:\n for server in servers:\n for test_name, test_func in tests:\n print(\"\\n=== %s %s ===\\n\" % (server.name, test_name))\n configuration = QuicConfiguration(\n + alpn_protocols=[\"h3-23\", \"h3-22\", \"hq-23\", \"hq-22\"],\n - alpn_protocols=[\"hq-22\", \"h3-22\"],\n is_client=True,\n quic_logger=QuicLogger(),\n secrets_log_file=secrets_log_file,\n )\n if test_name == \"test_throughput\":\n timeout = 60\n else:\n timeout = 5\n try:\n await asyncio.wait_for(\n test_func(server, configuration), timeout=timeout\n )\n except Exception as exc:\n print(exc)\n \n if quic_log:\n with open(\"%s-%s.qlog\" % (server.name, test_name), \"w\") as logger_fp:\n json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4)\n \n print(\"\")\n print_result(server)\n \n # print summary\n if len(servers) > 1:\n print(\"SUMMARY\")\n for server in servers:\n print_result(server)\n \n===========changed ref 4===========\n # module: examples.interop\n def test_throughput(server: Server, configuration: QuicConfiguration):\n failures = 0\n \n for size in [5000000, 10000000]:\n print(\"Testing %d bytes download\" % size)\n path = \"/%d\" % size\n \n # perform HTTP request over TCP\n start = time.time()\n response = requests.get(\"https://\" + server.host + path, verify=False)\n tcp_octets = len(response.content)\n tcp_elapsed = time.time() - start\n assert tcp_octets == size, \"HTTP/TCP response size mismatch\"\n \n # perform HTTP request over QUIC\n if server.http3:\n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n else:\n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n start = time.time()\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n http_events = await protocol.get(server.host, path)\n quic_elapsed = time.time() - start\n quic_octets = 0\n for http_event in http_events:\n if isinstance(http_event, DataReceived):\n quic_octets += len(http_event.data)\n assert quic_octets == size, \"HTTP/QUIC response size mismatch\"\n \n print(\" - HTTP/TCP completed in %.3f s\" % tcp_elapsed)\n print(\" - HTTP/QUIC completed in %.3f s\" % quic_elapsed)\n \n if quic_elapsed > 1.1 * tcp_elapsed:\n failures += 1\n print(\" => FAIL\")\n else:\n print(\" => PASS\")\n \n if failures == 0:\n server.result |= Result.T\n \n===========changed ref 5===========\n # module: tests.test_connection\n class QuicConnectionTest(TestCase):\n def test_connect_with_alpn(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\", \"hq-23\"]},\n - client_options={\"alpn_protocols\": [\"hq-22\", \"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"hq-23\"]},\n - server_options={\"alpn_protocols\": [\"hq-22\"]},\n ) as (client, server):\n # check handshake completed\n event = client.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = client.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(client.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(client.next_event())\n \n event = server.next_event()\n self.assertEqual(type(event), events.ProtocolNegotiated)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n event = server.next_event()\n self.assertEqual(type(event), events.HandshakeCompleted)\n + self.assertEqual(event.alpn_protocol, \"hq-23\")\n - self.assertEqual(event.alpn_protocol, \"hq-22\")\n for i in range(7):\n self.assertEqual(type(server.next_event()), events.ConnectionIdIssued)\n self.assertIsNone(server."}}},{"rowIdx":3581,"cells":{"path":{"kind":"string","value":"tests.test_h3/H3ConnectionTest.test_request_headers_only"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: client_options={\"alpn_protocols\": [\"h3-23\"]},\n client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2>: server_options={\"alpn_protocols\": [\"h3-23\"]},\n server_options={\"alpn_protocols\": [\"h3-22\"]},\n"},"main_code":{"kind":"string","value":" # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_headers_only(self):\n <0> with client_and_server(\n <1> client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2> server_options={\"alpn_protocols\": [\"h3-22\"]},\n <3> ) as (quic_client, quic_server):\n <4> h3_client = H3Connection(quic_client)\n <5> h3_server = H3Connection(quic_server)\n <6> \n <7> # send request\n <8> stream_id = quic_client.get_next_available_stream_id()\n <9> h3_client.send_headers(\n<10> stream_id=stream_id,\n<11> headers=[\n<12> (b\":method\", b\"HEAD\"),\n<13> (b\":scheme\", b\"https\"),\n<14> (b\":authority\", b\"localhost\"),\n<15> (b\":path\", b\"/\"),\n<16> (b\"x-foo\", b\"client\"),\n<17> ],\n<18> end_stream=True,\n<19> )\n<20> \n<21> # receive request\n<22> events = h3_transfer(quic_client, h3_server)\n<23> self.assertEqual(\n<24> events,\n<25> [\n<26> HeadersReceived(\n<27> headers=[\n<28> (b\":method\", b\"HEAD\"),\n<29> (b\":scheme\", b\"https\"),\n<30> (b\":authority\", b\"localhost\"),\n<31> (b\":path\", b\"/\"),\n<32> (b\"x-foo\", b\"client\"),\n<33> ],\n<34> stream_id=stream_id,\n<35> stream_ended=True,\n<36> )\n<37> ],\n<38> )\n<39> \n<40> # send response\n<41> h3_server.send_headers(\n<42> stream_id=stream_id,\n<43> headers=[\n<44> (b\":status\", b\"200\"),\n<45> (b\"content-type\", b\"text/html; charset=utf-8\"),\n<46> (b"},"context":{"kind":"string","value":"===========below chunk 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_headers_only(self):\n # offset: 1\n ],\n end_stream=True,\n )\n \n # receive response\n events = h3_transfer(quic_server, h3_client)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n (b\"x-foo\", b\"server\"),\n ],\n stream_id=stream_id,\n stream_ended=True,\n )\n ],\n )\n \n \n===========unchanged ref 0===========\n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: aioquic.h3.connection.H3Connection\n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: aioquic.h3.events\n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.h3.events.HeadersReceived\n headers: Headers\n \n stream_id: int\n \n stream_ended: bool\n \n push_id: Optional[int] = None\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h3\n h3_transfer(quic_sender, h3_receiver)\n \n at: unittest.case.TestCase\n failureException: Type[BaseException]\n \n longMessage: bool\n \n maxDiff: Optional[int]\n \n _testMethodName: str\n \n _testMethodDoc: str\n \n assertEqual(first: Any, second: Any, msg: Any=...) -> None\n \n \n===========changed ref 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # make first request\n self._make_request(h3_client, h3_server)\n \n # make second request\n self._make_request(h3_client, h3_server)\n \n # make third request -> dynamic table\n self._make_request(h3_client, h3_server)\n \n===========changed ref 1===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 2===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 3===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n \n===========changed ref 4===========\n # module: examples.interop\n def run(servers, tests, quic_log=False, secrets_log_file=None) -> None:\n for server in servers:\n for test_name, test_func in tests:\n print(\"\\n=== %s %s ===\\n\" % (server.name, test_name))\n configuration = QuicConfiguration(\n + alpn_protocols=[\"h3-23\", \"h3-22\", \"hq-23\", \"hq-22\"],\n - alpn_protocols=[\"hq-22\", \"h3-22\"],\n is_client=True,\n quic_logger=QuicLogger(),\n secrets_log_file=secrets_log_file,\n )\n if test_name == \"test_throughput\":\n timeout = 60\n else:\n timeout = 5\n try:\n await asyncio.wait_for(\n test_func(server, configuration), timeout=timeout\n )\n except Exception as exc:\n print(exc)\n \n if quic_log:\n with open(\"%s-%s.qlog\" % (server.name, test_name), \"w\") as logger_fp:\n json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4)\n \n print(\"\")\n print_result(server)\n \n # print summary\n if len(servers) > 1:\n print(\"SUMMARY\")\n for server in servers:\n print_result(server)\n "}}},{"rowIdx":3582,"cells":{"path":{"kind":"string","value":"tests.test_h3/H3ConnectionTest.test_request_with_server_push_max_push_id"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: client_options={\"alpn_protocols\": [\"h3-23\"]},\n client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2>: server_options={\"alpn_protocols\": [\"h3-23\"]},\n server_options={\"alpn_protocols\": [\"h3-22\"]},\n"},"main_code":{"kind":"string","value":" # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_server_push_max_push_id(self):\n <0> with client_and_server(\n <1> client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2> server_options={\"alpn_protocols\": [\"h3-22\"]},\n <3> ) as (quic_client, quic_server):\n <4> h3_client = H3Connection(quic_client)\n <5> h3_server = H3Connection(quic_server)\n <6> \n <7> # send request\n <8> stream_id = quic_client.get_next_available_stream_id()\n <9> h3_client.send_headers(\n<10> stream_id=stream_id,\n<11> headers=[\n<12> (b\":method\", b\"GET\"),\n<13> (b\":scheme\", b\"https\"),\n<14> (b\":authority\", b\"localhost\"),\n<15> (b\":path\", b\"/\"),\n<16> ],\n<17> end_stream=True,\n<18> )\n<19> \n<20> # receive request\n<21> events = h3_transfer(quic_client, h3_server)\n<22> self.assertEqual(\n<23> events,\n<24> [\n<25> HeadersReceived(\n<26> headers=[\n<27> (b\":method\", b\"GET\"),\n<28> (b\":scheme\", b\"https\"),\n<29> (b\":authority\", b\"localhost\"),\n<30> (b\":path\", b\"/\"),\n<31> ],\n<32> stream_id=stream_id,\n<33> stream_ended=True,\n<34> )\n<35> ],\n<36> )\n<37> \n<38> # send push promises\n<39> for i in range(0, 8):\n<40> h3_server.send_push_promise(\n<41> stream_id=stream_id,\n<42> headers=[\n<43> (b\":method\", b\"GET\"),\n<44> (b\":scheme\", b\"https\"),\n<45> (b\":authority\", b\"localhost\"),\n<46> (b\":path\", \"/"},"context":{"kind":"string","value":"===========below chunk 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_server_push_max_push_id(self):\n # offset: 1\n ],\n )\n \n # send one too many\n with self.assertRaises(NoAvailablePushIDError):\n h3_server.send_push_promise(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/8.css\"),\n ],\n )\n \n \n===========unchanged ref 0===========\n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: aioquic.h3.connection.H3Connection\n send_push_promise(stream_id: int, headers: Headers) -> int\n \n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: aioquic.h3.events\n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.h3.exceptions\n NoAvailablePushIDError(*args: object)\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h3\n h3_transfer(quic_sender, h3_receiver)\n \n at: unittest.case.TestCase\n assertEqual(first: Any, second: Any, msg: Any=...) -> None\n \n assertRaises(expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any=...) -> _AssertRaisesContext[_E]\n assertRaises(expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None\n \n \n===========changed ref 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # make first request\n self._make_request(h3_client, h3_server)\n \n # make second request\n self._make_request(h3_client, h3_server)\n \n # make third request -> dynamic table\n self._make_request(h3_client, h3_server)\n \n===========changed ref 1===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_headers_only(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # send request\n stream_id = quic_client.get_next_available_stream_id()\n h3_client.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"HEAD\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n (b\"x-foo\", b\"client\"),\n ],\n end_stream=True,\n )\n \n # receive request\n events = h3_transfer(quic_client, h3_server)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":method\", b\"HEAD\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n (b\"x-foo\", b\"client\"),\n ],\n stream_id=stream_id,\n stream_ended=True,\n )\n ],\n )\n \n # send response\n h3_server.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n (b\"x-foo\",\n===========changed ref 2===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_headers_only(self):\n # offset: 1\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n (b\"x-foo\", b\"server\"),\n ],\n end_stream=True,\n )\n \n # receive response\n events = h3_transfer(quic_server, h3_client)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n (b\"x-foo\", b\"server\"),\n ],\n stream_id=stream_id,\n stream_ended=True,\n )\n ],\n )\n \n===========changed ref 3===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 4===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 5===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n "}}},{"rowIdx":3583,"cells":{"path":{"kind":"string","value":"tests.test_h3/H3ConnectionTest.test_uni_stream_grease"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: client_options={\"alpn_protocols\": [\"h3-23\"]},\n client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2>: server_options={\"alpn_protocols\": [\"h3-23\"]},\n server_options={\"alpn_protocols\": [\"h3-22\"]},\n"},"main_code":{"kind":"string","value":" # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_uni_stream_grease(self):\n <0> with client_and_server(\n <1> client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2> server_options={\"alpn_protocols\": [\"h3-22\"]},\n <3> ) as (quic_client, quic_server):\n <4> h3_server = H3Connection(quic_server)\n <5> \n <6> quic_client.send_stream_data(\n <7> 14, b\"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfeGREASE is the word\"\n <8> )\n <9> self.assertEqual(h3_transfer(quic_client, h3_server), [])\n<10> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h3\n h3_transfer(quic_sender, h3_receiver)\n \n at: unittest.case.TestCase\n assertEqual(first: Any, second: Any, msg: Any=...) -> None\n \n \n===========changed ref 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_server_push_max_push_id(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # send request\n stream_id = quic_client.get_next_available_stream_id()\n h3_client.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n end_stream=True,\n )\n \n # receive request\n events = h3_transfer(quic_client, h3_server)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n stream_id=stream_id,\n stream_ended=True,\n )\n ],\n )\n \n # send push promises\n for i in range(0, 8):\n h3_server.send_push_promise(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", \"/{}.css\".format(\n===========changed ref 1===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_server_push_max_push_id(self):\n # offset: 1\n b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", \"/{}.css\".format(i).encode(\"ascii\")),\n ],\n )\n \n # send one too many\n with self.assertRaises(NoAvailablePushIDError):\n h3_server.send_push_promise(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/8.css\"),\n ],\n )\n \n===========changed ref 2===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # make first request\n self._make_request(h3_client, h3_server)\n \n # make second request\n self._make_request(h3_client, h3_server)\n \n # make third request -> dynamic table\n self._make_request(h3_client, h3_server)\n \n===========changed ref 3===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 4===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 5===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n "}}},{"rowIdx":3584,"cells":{"path":{"kind":"string","value":"tests.test_h3/H3ConnectionTest.test_request_with_trailers"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: client_options={\"alpn_protocols\": [\"h3-23\"]},\n client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2>: server_options={\"alpn_protocols\": [\"h3-23\"]},\n server_options={\"alpn_protocols\": [\"h3-22\"]},\n"},"main_code":{"kind":"string","value":" # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_trailers(self):\n <0> with client_and_server(\n <1> client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2> server_options={\"alpn_protocols\": [\"h3-22\"]},\n <3> ) as (quic_client, quic_server):\n <4> h3_client = H3Connection(quic_client)\n <5> h3_server = H3Connection(quic_server)\n <6> \n <7> # send request with trailers\n <8> stream_id = quic_client.get_next_available_stream_id()\n <9> h3_client.send_headers(\n<10> stream_id=stream_id,\n<11> headers=[\n<12> (b\":method\", b\"GET\"),\n<13> (b\":scheme\", b\"https\"),\n<14> (b\":authority\", b\"localhost\"),\n<15> (b\":path\", b\"/\"),\n<16> ],\n<17> end_stream=False,\n<18> )\n<19> h3_client.send_headers(\n<20> stream_id=stream_id,\n<21> headers=[(b\"x-some-trailer\", b\"foo\")],\n<22> end_stream=True,\n<23> )\n<24> \n<25> # receive request\n<26> events = h3_transfer(quic_client, h3_server)\n<27> self.assertEqual(\n<28> events,\n<29> [\n<30> HeadersReceived(\n<31> headers=[\n<32> (b\":method\", b\"GET\"),\n<33> (b\":scheme\", b\"https\"),\n<34> (b\":authority\", b\"localhost\"),\n<35> (b\":path\", b\"/\"),\n<36> ],\n<37> stream_id=stream_id,\n<38> stream_ended=False,\n<39> ),\n<40> HeadersReceived(\n<41> headers=[(b\"x-some-trailer\", b\"foo\")],\n<42> stream_id=stream_id,\n<43> stream_ended=True,\n<44> ),\n<45> ]"},"context":{"kind":"string","value":"===========below chunk 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_trailers(self):\n # offset: 1\n )\n \n # send response\n h3_server.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n ],\n end_stream=False,\n )\n h3_server.send_data(\n stream_id=stream_id,\n data=b\"hello\",\n end_stream=False,\n )\n h3_server.send_headers(\n stream_id=stream_id,\n headers=[(b\"x-some-trailer\", b\"bar\")],\n end_stream=True,\n )\n \n # receive response\n events = h3_transfer(quic_server, h3_client)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n ],\n stream_id=stream_id,\n stream_ended=False,\n ),\n DataReceived(\n data=b\"hello\",\n stream_id=stream_id,\n stream_ended=False,\n ),\n HeadersReceived(\n headers=[(b\"x-some-trailer\", b\"bar\")],\n stream_id=stream_id,\n stream_ended=True,\n ),\n ],\n )\n \n \n===========unchanged ref 0===========\n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: aioquic.h3.connection.H3Connection\n send_data(stream_id: int, data: bytes, end_stream: bool) -> None\n \n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: aioquic.h3.events\n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.h3.events.DataReceived\n data: bytes\n \n stream_id: int\n \n stream_ended: bool\n \n push_id: Optional[int] = None\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h3\n h3_transfer(quic_sender, h3_receiver)\n \n at: unittest.case.TestCase\n assertEqual(first: Any, second: Any, msg: Any=...) -> None\n \n \n===========changed ref 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_uni_stream_grease(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_server = H3Connection(quic_server)\n \n quic_client.send_stream_data(\n 14, b\"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfeGREASE is the word\"\n )\n self.assertEqual(h3_transfer(quic_client, h3_server), [])\n \n===========changed ref 1===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_server_push_max_push_id(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # send request\n stream_id = quic_client.get_next_available_stream_id()\n h3_client.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n end_stream=True,\n )\n \n # receive request\n events = h3_transfer(quic_client, h3_server)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n stream_id=stream_id,\n stream_ended=True,\n )\n ],\n )\n \n # send push promises\n for i in range(0, 8):\n h3_server.send_push_promise(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", \"/{}.css\".format(\n===========changed ref 2===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_server_push_max_push_id(self):\n # offset: 1\n b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", \"/{}.css\".format(i).encode(\"ascii\")),\n ],\n )\n \n # send one too many\n with self.assertRaises(NoAvailablePushIDError):\n h3_server.send_push_promise(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/8.css\"),\n ],\n )\n \n===========changed ref 3===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # make first request\n self._make_request(h3_client, h3_server)\n \n # make second request\n self._make_request(h3_client, h3_server)\n \n # make third request -> dynamic table\n self._make_request(h3_client, h3_server)\n "}}},{"rowIdx":3585,"cells":{"path":{"kind":"string","value":"tests.test_h3/H3ConnectionTest.test_uni_stream_type"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: client_options={\"alpn_protocols\": [\"h3-23\"]},\n client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2>: server_options={\"alpn_protocols\": [\"h3-23\"]},\n server_options={\"alpn_protocols\": [\"h3-22\"]},\n"},"main_code":{"kind":"string","value":" # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_uni_stream_type(self):\n <0> with client_and_server(\n <1> client_options={\"alpn_protocols\": [\"h3-22\"]},\n <2> server_options={\"alpn_protocols\": [\"h3-22\"]},\n <3> ) as (quic_client, quic_server):\n <4> h3_server = H3Connection(quic_server)\n <5> \n <6> # unknown stream type 9\n <7> stream_id = quic_client.get_next_available_stream_id(is_unidirectional=True)\n <8> self.assertEqual(stream_id, 2)\n <9> quic_client.send_stream_data(stream_id, b\"\\x09\")\n<10> self.assertEqual(h3_transfer(quic_client, h3_server), [])\n<11> self.assertEqual(list(h3_server._stream.keys()), [2])\n<12> self.assertEqual(h3_server._stream[2].buffer, b\"\")\n<13> self.assertEqual(h3_server._stream[2].stream_type, 9)\n<14> \n<15> # unknown stream type 64, one byte at a time\n<16> stream_id = quic_client.get_next_available_stream_id(is_unidirectional=True)\n<17> self.assertEqual(stream_id, 6)\n<18> \n<19> quic_client.send_stream_data(stream_id, b\"\\x40\")\n<20> self.assertEqual(h3_transfer(quic_client, h3_server), [])\n<21> self.assertEqual(list(h3_server._stream.keys()), [2, 6])\n<22> self.assertEqual(h3_server._stream[2].buffer, b\"\")\n<23> self.assertEqual(h3_server._stream[2].stream_type, 9)\n<24> self.assertEqual(h3_server._stream[6].buffer, b\"\\x40\")\n<25> self.assertEqual(h3_server._stream[6].stream_type,"},"context":{"kind":"string","value":"===========below chunk 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_uni_stream_type(self):\n # offset: 1\n \n quic_client.send_stream_data(stream_id, b\"\\x40\")\n self.assertEqual(h3_transfer(quic_client, h3_server), [])\n self.assertEqual(list(h3_server._stream.keys()), [2, 6])\n self.assertEqual(h3_server._stream[2].buffer, b\"\")\n self.assertEqual(h3_server._stream[2].stream_type, 9)\n self.assertEqual(h3_server._stream[6].buffer, b\"\")\n self.assertEqual(h3_server._stream[6].stream_type, 64)\n \n \n===========unchanged ref 0===========\n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: aioquic.h3.connection.H3Connection.__init__\n self._stream: Dict[int, H3Stream] = {}\n \n at: aioquic.h3.connection.H3Stream.__init__\n self.buffer = b\"\"\n \n self.stream_type: Optional[int] = None\n \n at: tests.test_connection\n client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={})\n \n at: tests.test_h3\n h3_transfer(quic_sender, h3_receiver)\n \n at: unittest.case.TestCase\n assertEqual(first: Any, second: Any, msg: Any=...) -> None\n \n \n===========changed ref 0===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_uni_stream_grease(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_server = H3Connection(quic_server)\n \n quic_client.send_stream_data(\n 14, b\"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfeGREASE is the word\"\n )\n self.assertEqual(h3_transfer(quic_client, h3_server), [])\n \n===========changed ref 1===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_trailers(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # send request with trailers\n stream_id = quic_client.get_next_available_stream_id()\n h3_client.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n end_stream=False,\n )\n h3_client.send_headers(\n stream_id=stream_id,\n headers=[(b\"x-some-trailer\", b\"foo\")],\n end_stream=True,\n )\n \n # receive request\n events = h3_transfer(quic_client, h3_server)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":method\", b\"GET\"),\n (b\":scheme\", b\"https\"),\n (b\":authority\", b\"localhost\"),\n (b\":path\", b\"/\"),\n ],\n stream_id=stream_id,\n stream_ended=False,\n ),\n HeadersReceived(\n headers=[(b\"x-some-trailer\", b\"foo\")],\n stream_id=stream_id,\n stream_ended=True,\n ),\n ],\n )\n===========changed ref 2===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request_with_trailers(self):\n # offset: 1\n ],\n stream_id=stream_id,\n stream_ended=True,\n ),\n ],\n )\n \n # send response\n h3_server.send_headers(\n stream_id=stream_id,\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n ],\n end_stream=False,\n )\n h3_server.send_data(\n stream_id=stream_id,\n data=b\"hello\",\n end_stream=False,\n )\n h3_server.send_headers(\n stream_id=stream_id,\n headers=[(b\"x-some-trailer\", b\"bar\")],\n end_stream=True,\n )\n \n # receive response\n events = h3_transfer(quic_server, h3_client)\n self.assertEqual(\n events,\n [\n HeadersReceived(\n headers=[\n (b\":status\", b\"200\"),\n (b\"content-type\", b\"text/html; charset=utf-8\"),\n ],\n stream_id=stream_id,\n stream_ended=False,\n ),\n DataReceived(\n data=b\"hello\",\n stream_id=stream_id,\n stream_ended=False,\n ),\n HeadersReceived(\n headers=[(b\"x-some-trailer\", b\"bar\")],\n stream_id=stream_id,\n stream_ended=True,\n ),\n ],\n )\n "}}},{"rowIdx":3586,"cells":{"path":{"kind":"string","value":"examples.http3_server/HttpServerProtocol.quic_event_received"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b8c652bb6051522bbf495ad9ea72e25a1cbd273d"},"commit_message":{"kind":"string","value":"[http] announce support for h3-23 and hq-23"},"ground_truth":{"kind":"string","value":" <1>: if event.alpn_protocol.startswith(\"h3-\"):\n if event.alpn_protocol == \"h3-22\":\n <3>: elif event.alpn_protocol.startswith(\"hq-\"):\n elif event.alpn_protocol == \"hq-22\":\n"},"main_code":{"kind":"string","value":" # module: examples.http3_server\n class HttpServerProtocol(QuicConnectionProtocol):\n def quic_event_received(self, event: QuicEvent):\n <0> if isinstance(event, ProtocolNegotiated):\n <1> if event.alpn_protocol == \"h3-22\":\n <2> self._http = H3Connection(self._quic)\n <3> elif event.alpn_protocol == \"hq-22\":\n <4> self._http = H0Connection(self._quic)\n <5> \n <6> #  pass event to the HTTP layer\n <7> if self._http is not None:\n <8> for http_event in self._http.handle_event(event):\n <9> self.http_event_received(http_event)\n<10> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.protocol.QuicConnectionProtocol\n quic_event_received(self, event: events.QuicEvent) -> None\n \n at: aioquic.asyncio.protocol.QuicConnectionProtocol.__init__\n self._quic = quic\n \n at: aioquic.h0.connection\n H0Connection(quic: QuicConnection)\n \n at: aioquic.h0.connection.H0Connection\n handle_event(event: QuicEvent) -> List[H3Event]\n \n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: aioquic.h3.connection.H3Connection\n handle_event(event: QuicEvent) -> List[H3Event]\n \n at: aioquic.quic.events\n QuicEvent()\n \n ProtocolNegotiated(alpn_protocol: Optional[str])\n \n at: examples.http3_server.HttpServerProtocol\n http_event_received(event: H3Event) -> None\n \n at: examples.http3_server.HttpServerProtocol.__init__\n self._http: Optional[HttpConnection] = None\n \n \n===========changed ref 0===========\n # module: docs.http_client\n def http_client(host, port):\n + configuration = QuicConfiguration(alpn_protocols=[\"hq-23\"])\n - configuration = QuicConfiguration(alpn_protocols=[\"hq-22\"])\n \n async with connect(host, port, configuration=configuration) as connection:\n reader, writer = await connection.create_stream()\n writer.write(b\"GET /\\r\\n\")\n writer.write_eof()\n \n response = await reader.read()\n sys.stdout.buffer.write(response)\n \n===========changed ref 1===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n - configuration.alpn_protocols = [\"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 2===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n + configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n - configuration.alpn_protocols = [\"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n \n===========changed ref 3===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_uni_stream_grease(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_server = H3Connection(quic_server)\n \n quic_client.send_stream_data(\n 14, b\"\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfeGREASE is the word\"\n )\n self.assertEqual(h3_transfer(quic_client, h3_server), [])\n \n===========changed ref 4===========\n # module: tests.test_h3\n class H3ConnectionTest(TestCase):\n def test_request(self):\n with client_and_server(\n + client_options={\"alpn_protocols\": [\"h3-23\"]},\n - client_options={\"alpn_protocols\": [\"h3-22\"]},\n + server_options={\"alpn_protocols\": [\"h3-23\"]},\n - server_options={\"alpn_protocols\": [\"h3-22\"]},\n ) as (quic_client, quic_server):\n h3_client = H3Connection(quic_client)\n h3_server = H3Connection(quic_server)\n \n # make first request\n self._make_request(h3_client, h3_server)\n \n # make second request\n self._make_request(h3_client, h3_server)\n \n # make third request -> dynamic table\n self._make_request(h3_client, h3_server)\n \n===========changed ref 5===========\n # module: examples.interop\n def run(servers, tests, quic_log=False, secrets_log_file=None) -> None:\n for server in servers:\n for test_name, test_func in tests:\n print(\"\\n=== %s %s ===\\n\" % (server.name, test_name))\n configuration = QuicConfiguration(\n + alpn_protocols=[\"h3-23\", \"h3-22\", \"hq-23\", \"hq-22\"],\n - alpn_protocols=[\"hq-22\", \"h3-22\"],\n is_client=True,\n quic_logger=QuicLogger(),\n secrets_log_file=secrets_log_file,\n )\n if test_name == \"test_throughput\":\n timeout = 60\n else:\n timeout = 5\n try:\n await asyncio.wait_for(\n test_func(server, configuration), timeout=timeout\n )\n except Exception as exc:\n print(exc)\n \n if quic_log:\n with open(\"%s-%s.qlog\" % (server.name, test_name), \"w\") as logger_fp:\n json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4)\n \n print(\"\")\n print_result(server)\n \n # print summary\n if len(servers) > 1:\n print(\"SUMMARY\")\n for server in servers:\n print_result(server)\n "}}},{"rowIdx":3587,"cells":{"path":{"kind":"string","value":"examples.http3_client/HttpClient.get"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"1fe0bc1229a3ea120ba1da369ae51690b59b71c1"},"commit_message":{"kind":"string","value":"[examples] make it possible to perform POST request"},"ground_truth":{"kind":"string","value":" <3>: stream_id = self._quic.get_next_available_stream_id()\n <4>: self._http.send_headers(\n <5>: stream_id=stream_id,\n <6>: headers=[\n <7>: (b\":method\", b\"GET\"),\n <8>: (b\":scheme\", b\"https\"),\n <9>: (b\":authority\", authority.encode(\"utf8\")),\n<10>: (b\":path\", path.encode(\"utf8\")),\n<11>: (b\"user-agent\", b\"aioquic\"),\n<12>: ],\n<13>: return await self._request(\n HttpRequest(method=\"GET\", url=URL(url), headers=headers)\n<14>: self._http.send_data(stream_id=stream_id, data=b\"\", end_stream=True)\n<16>: waiter = self._loop.create_future()\n<17>: self._request_events[stream_id] = deque()\n<18>: self._request_waiter[stream_id] = waiter\n<19>: self.transmit()\n<20>: \n<21>: return await asyncio.shield(waiter)\n<22>: \n"},"main_code":{"kind":"string","value":" # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]:\n - def get(self, authority: str, path: str) -> Deque[H3Event]:\n <0> \"\"\"\n <1> Perform a GET request.\n <2> \"\"\"\n <3> stream_id = self._quic.get_next_available_stream_id()\n <4> self._http.send_headers(\n <5> stream_id=stream_id,\n <6> headers=[\n <7> (b\":method\", b\"GET\"),\n <8> (b\":scheme\", b\"https\"),\n <9> (b\":authority\", authority.encode(\"utf8\")),\n<10> (b\":path\", path.encode(\"utf8\")),\n<11> (b\"user-agent\", b\"aioquic\"),\n<12> ],\n<13> )\n<14> self._http.send_data(stream_id=stream_id, data=b\"\", end_stream=True)\n<15> \n<16> waiter = self._loop.create_future()\n<17> self._request_events[stream_id] = deque()\n<18> self._request_waiter[stream_id] = waiter\n<19> self.transmit()\n<20> \n<21> return await asyncio.shield(waiter)\n<22> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.protocol\n QuicConnectionProtocol(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: aioquic.asyncio.protocol.QuicConnectionProtocol\n __init__(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n __init__(self, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: aioquic.asyncio.protocol.QuicConnectionProtocol.__init__\n self._quic = quic\n \n at: aioquic.h0.connection\n H0Connection(quic: QuicConnection)\n \n at: aioquic.h3.connection\n H3Connection(quic: QuicConnection)\n \n at: aioquic.h3.events\n H3Event()\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n certificate: Any = None\n \n connection_id_length: int = 8\n \n idle_timeout: float = 60.0\n \n is_client: bool = True\n \n private_key: Any = None\n \n quic_logger: Optional[QuicLogger] = None\n \n secrets_log_file: TextIO = None\n \n server_name: Optional[str] = None\n \n session_ticket: Optional[SessionTicket] = None\n \n supported_versions: List[int] = field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n )\n \n at: asyncio.futures\n Future(*, loop: Optional[AbstractEventLoop]=...)\n Future = _CFuture = _asyncio.Future\n \n at: asyncio.queues.Queue\n __class_getitem__ = classmethod(GenericAlias)\n \n put_nowait(item: _T) -> None\n \n at: examples.http3_client\n HttpConnection = Union[H0Connection, H3Connection]\n \n \n===========unchanged ref 1===========\n WebSocket(http: HttpConnection, stream_id: int, transmit: Callable[[], None])\n \n at: examples.http3_client.WebSocket.__init__\n self.queue: asyncio.Queue[str] = asyncio.Queue()\n \n at: typing\n Deque = _alias(collections.deque, 1, name='Deque')\n \n Dict = _alias(dict, 2, inst=False, name='Dict')\n \n \n===========changed ref 0===========\n # module: examples.http3_client\n + class HttpRequest:\n + def __init__(\n + self, method: str, url: URL, content: bytes = b\"\", headers: Dict = {}\n + ) -> None:\n + self.content = content\n + self.headers = headers\n + self.method = method\n + self.url = url\n + \n===========changed ref 1===========\n # module: examples.http3_client\n + class URL:\n + def __init__(self, url: str):\n + parsed = urlparse(url)\n + \n + self.authority = parsed.netloc\n + self.full_path = parsed.path\n + if parsed.query:\n + self.full_path += \"?\" + parsed.query\n + self.scheme = parsed.scheme\n + "}}},{"rowIdx":3588,"cells":{"path":{"kind":"string","value":"examples.http3_client/run"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"1fe0bc1229a3ea120ba1da369ae51690b59b71c1"},"commit_message":{"kind":"string","value":"[examples] make it possible to perform POST request"},"ground_truth":{"kind":"string","value":"<44>: if data is not None:\n http_events = await client.post(\n url,\n data=data.encode(\"utf8\"),\n headers={\"content-type\": \"application/x-www-form-urlencoded\"},\n )\n else:\n http_events = await client.get(url)\n http_events = await client.get(parsed.netloc, path)\n"},"main_code":{"kind":"string","value":" # module: examples.http3_client\n + def run(configuration: QuicConfiguration, url: str, data: str) -> None:\n - def run(configuration: QuicConfiguration, url: str) -> None:\n <0> # parse URL\n <1> parsed = urlparse(url)\n <2> assert parsed.scheme in (\n <3> \"https\",\n <4> \"wss\",\n <5> ), \"Only https:// or wss:// URLs are supported.\"\n <6> if \":\" in parsed.netloc:\n <7> host, port_str = parsed.netloc.split(\":\")\n <8> port = int(port_str)\n <9> else:\n<10> host = parsed.netloc\n<11> port = 443\n<12> \n<13> path = parsed.path\n<14> if parsed.query:\n<15> path += \"?\" + parsed.query\n<16> \n<17> async with connect(\n<18> host,\n<19> port,\n<20> configuration=configuration,\n<21> create_protocol=HttpClient,\n<22> session_ticket_handler=save_session_ticket,\n<23> ) as client:\n<24> client = cast(HttpClient, client)\n<25> \n<26> if parsed.scheme == \"wss\":\n<27> ws = await client.websocket(\n<28> parsed.netloc, path, subprotocols=[\"chat\", \"superchat\"]\n<29> )\n<30> \n<31> # send some messages and receive reply\n<32> for i in range(2):\n<33> message = \"Hello {}, WebSocket!\".format(i)\n<34> print(\"> \" + message)\n<35> await ws.send(message)\n<36> \n<37> message = await ws.recv()\n<38> print(\"< \" + message)\n<39> \n<40> await ws.close()\n<41> else:\n<42> # perform request\n<43> start = time.time()\n<44> http_events = await client.get(parsed.netloc, path)\n<45> elapsed = time.time() - start\n<46> \n<47> # print speed\n<48> octets = 0\n<49> for http_event in http_events:\n<50> if isinstance(http_event, DataReceived):\n<51> octets += len(http_event.data)\n<52> logger.info(\n<53> \"Received %"},"context":{"kind":"string","value":"===========below chunk 0===========\n # module: examples.http3_client\n + def run(configuration: QuicConfiguration, url: str, data: str) -> None:\n - def run(configuration: QuicConfiguration, url: str) -> None:\n # offset: 1\n % (octets, elapsed, octets * 8 / elapsed / 1000000)\n )\n \n # print response\n for http_event in http_events:\n if isinstance(http_event, HeadersReceived):\n headers = b\"\"\n for k, v in http_event.headers:\n headers += k + b\": \" + v + b\"\\r\\n\"\n if headers:\n sys.stderr.buffer.write(headers + b\"\\r\\n\")\n sys.stderr.buffer.flush()\n elif isinstance(http_event, DataReceived):\n sys.stdout.buffer.write(http_event.data)\n sys.stdout.buffer.flush()\n \n \n===========unchanged ref 0===========\n at: _asyncio.Future\n set_result(result, /)\n \n at: _pickle\n dump(obj, file, protocol=None, *, fix_imports=True, buffer_callback=None)\n \n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.asyncio.protocol.QuicConnectionProtocol\n quic_event_received(self, event: events.QuicEvent) -> None\n \n at: aioquic.h0.connection.H0Connection\n handle_event(event: QuicEvent) -> List[H3Event]\n \n at: aioquic.h3.connection.H3Connection\n handle_event(event: QuicEvent) -> List[H3Event]\n \n at: aioquic.h3.events\n H3Event()\n \n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n \n===========unchanged ref 1===========\n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.events\n QuicEvent()\n \n at: asyncio.futures.Future\n _state = _PENDING\n \n _result = None\n \n _exception = None\n \n _loop = None\n \n _source_traceback = None\n \n _cancel_message = None\n \n _cancelled_exc = None\n \n _asyncio_future_blocking = False\n \n __log_traceback = False\n \n __class_getitem__ = classmethod(GenericAlias)\n \n set_result(result: _T, /) -> None\n \n __iter__ = __await__ # make compatible with 'yield from'.\n \n at: collections.deque\n append(x: _T) -> None\n \n at: examples.http3_client\n logger = logging.getLogger(\"client\")\n \n HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n args = parser.parse_args()\n \n at: examples.http3_client.HttpClient\n websocket(authority: str, path: str, subprotocols: List[str]=[]) -> WebSocket\n \n \n===========unchanged ref 2===========\n at: examples.http3_client.HttpClient.__init__\n self._http = H3Connection(self._quic)\n self._http: Optional[HttpConnection] = None\n self._http = H0Connection(self._quic)\n \n self._request_events: Dict[int, Deque[H3Event]] = {}\n \n self._request_waiter: Dict[int, asyncio.Future[Deque[H3Event]]] = {}\n \n self._websockets: Dict[int, WebSocket] = {}\n \n at: examples.http3_client.WebSocket\n http_event_received(event: H3Event)\n \n at: logging.Logger\n info(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None\n \n at: pickle\n dump, dumps, load, loads = _dump, _dumps, _load, _loads\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n at: typing.MutableMapping\n pop(key: _KT) -> _VT\n pop(key: _KT, default: Union[_VT, _T]=...) -> Union[_VT, _T]\n \n at: urllib.parse\n urlparse(url: str, scheme: Optional[str]=..., allow_fragments: bool=...) -> ParseResult\n urlparse(url: Optional[bytes], scheme: Optional[bytes]=..., allow_fragments: bool=...) -> ParseResultBytes\n \n \n===========changed ref 0===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]:\n + \"\"\"\n + Perform a POST request.\n + \"\"\"\n + return await self._request(\n + HttpRequest(method=\"POST\", url=URL(url), content=data, headers=headers)\n + )\n + \n===========changed ref 1===========\n # module: examples.http3_client\n + class HttpRequest:\n + def __init__(\n + self, method: str, url: URL, content: bytes = b\"\", headers: Dict = {}\n + ) -> None:\n + self.content = content\n + self.headers = headers\n + self.method = method\n + self.url = url\n + \n===========changed ref 2===========\n # module: examples.http3_client\n + class URL:\n + def __init__(self, url: str):\n + parsed = urlparse(url)\n + \n + self.authority = parsed.netloc\n + self.full_path = parsed.path\n + if parsed.query:\n + self.full_path += \"?\" + parsed.query\n + self.scheme = parsed.scheme\n + "}}},{"rowIdx":3589,"cells":{"path":{"kind":"string","value":"examples.httpx_client/run"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"1fe0bc1229a3ea120ba1da369ae51690b59b71c1"},"commit_message":{"kind":"string","value":"[examples] make it possible to perform POST request"},"ground_truth":{"kind":"string","value":"<17>: client = AsyncClient(dispatch=cast(AsyncDispatcher, dispatch))\n client = AsyncClient(dispatch=dispatch)\n<21>: if data is not None:\n response = await client.post(\n url,\n data=data.encode(\"utf8\"),\n headers={\"content-type\": \"application/x-www-form-urlencoded\"},\n )\n else:\n response = await client.get(url)\n response = await client.get(url)\n<22>: \n"},"main_code":{"kind":"string","value":" # module: examples.httpx_client\n + def run(configuration: QuicConfiguration, url: str, data: str) -> None:\n - def run(configuration: QuicConfiguration, url: str) -> None:\n <0> # parse URL\n <1> parsed = urlparse(url)\n <2> assert parsed.scheme == \"https\", \"Only https:// URLs are supported.\"\n <3> if \":\" in parsed.netloc:\n <4> host, port_str = parsed.netloc.split(\":\")\n <5> port = int(port_str)\n <6> else:\n <7> host = parsed.netloc\n <8> port = 443\n <9> \n<10> async with connect(\n<11> host,\n<12> port,\n<13> configuration=configuration,\n<14> create_protocol=H3Dispatcher,\n<15> session_ticket_handler=save_session_ticket,\n<16> ) as dispatch:\n<17> client = AsyncClient(dispatch=dispatch)\n<18> \n<19> # perform request\n<20> start = time.time()\n<21> response = await client.get(url)\n<22> elapsed = time.time() - start\n<23> \n<24> # print speed\n<25> octets = len(response.content)\n<26> logger.info(\n<27> \"Received %d bytes in %.1f s (%.3f Mbps)\"\n<28> % (octets, elapsed, octets * 8 / elapsed / 1000000)\n<29> )\n<30> \n<31> # print response\n<32> for header, value in response.headers.items():\n<33> sys.stderr.write(header + \": \" + value + \"\\r\\n\")\n<34> sys.stdout.buffer.write(response.content)\n<35> sys.stdout.buffer.flush()\n<36> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: examples.httpx_client\n logger = logging.getLogger(\"client\")\n \n H3Dispatcher(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n save_session_ticket(ticket)\n \n \n===========unchanged ref 1===========\n at: httpx._client\n AsyncClient(*, auth: AuthTypes | None=None, params: QueryParamTypes | None=None, headers: HeaderTypes | None=None, cookies: CookieTypes | None=None, verify: VerifyTypes=True, cert: CertTypes | None=None, http1: bool=True, http2: bool=False, proxy: ProxyTypes | None=None, proxies: ProxiesTypes | None=None, mounts: None | (typing.Mapping[str, AsyncBaseTransport | None])=None, timeout: TimeoutTypes=DEFAULT_TIMEOUT_CONFIG, follow_redirects: bool=False, limits: Limits=DEFAULT_LIMITS, max_redirects: int=DEFAULT_MAX_REDIRECTS, event_hooks: None | (typing.Mapping[str, list[EventHook]])=None, base_url: URL | str=\"\", transport: AsyncBaseTransport | None=None, app: typing.Callable[..., typing.Any] | None=None, trust_env: bool=True, default_encoding: str | typing.Callable[[bytes], str]=\"utf-8\")\n \n at: httpx._client.AsyncClient\n get(url: URL | str, *, params: QueryParamTypes | None=None, headers: HeaderTypes | None=None, cookies: CookieTypes | None=None, auth: AuthTypes | UseClientDefault | None=USE_CLIENT_DEFAULT, follow_redirects: bool | UseClientDefault=USE_CLIENT_DEFAULT, timeout: TimeoutTypes | UseClientDefault=USE_CLIENT_DEFAULT, extensions: RequestExtensions | None=None) -> Response\n \n post(url: URL | str, *, content: RequestContent | None=None, data: RequestData | None=None, files: RequestFiles | None=None, json: typing.Any | None=None, params: QueryParamTypes | None=None, headers: HeaderTypes | None=None, cookies: CookieTypes | None=None, auth: AuthTypes | UseClientDefault=USE_CLIENT_DEFAULT, follow_redirects: bool | UseClientDefault=USE_CLIENT_DEFAULT, timeout: TimeoutTypes | UseClientDefault=USE_CLIENT_DEFAULT, extensions: RequestExtensions | None=None) -> Response\n \n \n===========unchanged ref 2===========\n at: logging.Logger\n info(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None\n \n at: time\n time() -> float\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n at: urllib.parse\n urlparse(url: str, scheme: Optional[str]=..., allow_fragments: bool=...) -> ParseResult\n urlparse(url: Optional[bytes], scheme: Optional[bytes]=..., allow_fragments: bool=...) -> ParseResultBytes\n \n \n===========changed ref 0===========\n # module: examples.http3_client\n + class HttpRequest:\n + def __init__(\n + self, method: str, url: URL, content: bytes = b\"\", headers: Dict = {}\n + ) -> None:\n + self.content = content\n + self.headers = headers\n + self.method = method\n + self.url = url\n + \n===========changed ref 1===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]:\n + \"\"\"\n + Perform a POST request.\n + \"\"\"\n + return await self._request(\n + HttpRequest(method=\"POST\", url=URL(url), content=data, headers=headers)\n + )\n + \n===========changed ref 2===========\n # module: examples.http3_client\n + class URL:\n + def __init__(self, url: str):\n + parsed = urlparse(url)\n + \n + self.authority = parsed.netloc\n + self.full_path = parsed.path\n + if parsed.query:\n + self.full_path += \"?\" + parsed.query\n + self.scheme = parsed.scheme\n + \n===========changed ref 3===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]:\n - def get(self, authority: str, path: str) -> Deque[H3Event]:\n \"\"\"\n Perform a GET request.\n \"\"\"\n - stream_id = self._quic.get_next_available_stream_id()\n - self._http.send_headers(\n - stream_id=stream_id,\n - headers=[\n - (b\":method\", b\"GET\"),\n - (b\":scheme\", b\"https\"),\n - (b\":authority\", authority.encode(\"utf8\")),\n - (b\":path\", path.encode(\"utf8\")),\n - (b\"user-agent\", b\"aioquic\"),\n - ],\n + return await self._request(\n + HttpRequest(method=\"GET\", url=URL(url), headers=headers)\n )\n - self._http.send_data(stream_id=stream_id, data=b\"\", end_stream=True)\n \n - waiter = self._loop.create_future()\n - self._request_events[stream_id] = deque()\n - self._request_waiter[stream_id] = waiter\n - self.transmit()\n - \n - return await asyncio.shield(waiter)\n - \n===========changed ref 4===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def _request(self, request: HttpRequest):\n + stream_id = self._quic.get_next_available_stream_id()\n + self._http.send_headers(\n + stream_id=stream_id,\n + headers=[\n + (b\":method\", request.method.encode(\"utf8\")),\n + (b\":scheme\", request.url.scheme.encode(\"utf8\")),\n + (b\":authority\", str(request.url.authority).encode(\"utf8\")),\n + (b\":path\", request.url.full_path.encode(\"utf8\")),\n + (b\"user-agent\", b\"aioquic\"),\n + ]\n + + [\n + (k.encode(\"utf8\"), v.encode(\"utf8\"))\n + for (k, v) in request.headers.items()\n + ],\n + )\n + self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True)\n + \n + waiter = self._loop.create_future()\n + self._request_events[stream_id] = deque()\n + self._request_waiter[stream_id] = waiter\n + self.transmit()\n + \n + return await asyncio.shield(waiter)\n + "}}},{"rowIdx":3590,"cells":{"path":{"kind":"string","value":"examples.interop/test_http_0"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"1fe0bc1229a3ea120ba1da369ae51690b59b71c1"},"commit_message":{"kind":"string","value":"[examples] make it possible to perform POST request"},"ground_truth":{"kind":"string","value":"<13>: events = await protocol.get(\n \"https://{}:{}{}\".format(server.host, server.port, server.path)\n )\n events = await protocol.get(server.host, server.path)\n"},"main_code":{"kind":"string","value":" # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n <0> if server.path is None:\n <1> return\n <2> \n <3> configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n <4> async with connect(\n <5> server.host,\n <6> server.port,\n <7> configuration=configuration,\n <8> create_protocol=HttpClient,\n <9> ) as protocol:\n<10> protocol = cast(HttpClient, protocol)\n<11> \n<12> # perform HTTP request\n<13> events = await protocol.get(server.host, server.path)\n<14> if events and isinstance(events[0], HeadersReceived):\n<15> server.result |= Result.D\n<16> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.h3.events\n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n certificate: Any = None\n \n connection_id_length: int = 8\n \n idle_timeout: float = 60.0\n \n is_client: bool = True\n \n private_key: Any = None\n \n quic_logger: Optional[QuicLogger] = None\n \n secrets_log_file: TextIO = None\n \n server_name: Optional[str] = None\n \n session_ticket: Optional[SessionTicket] = None\n \n supported_versions: List[int] = field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n )\n \n \n===========unchanged ref 1===========\n at: examples.interop\n Result()\n \n Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str=\"/\", result: Result=field(default_factory=lambda: Result(0)))\n \n at: examples.interop.Server\n name: str\n \n host: str\n \n port: int = 4433\n \n http3: bool = True\n \n retry_port: Optional[int] = 4434\n \n path: str = \"/\"\n \n result: Result = field(default_factory=lambda: Result(0))\n \n at: http3_client\n HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: http3_client.HttpClient\n get(url: str, headers: Dict={}) -> Deque[H3Event]\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n \n===========changed ref 0===========\n # module: examples.http3_client\n + class HttpRequest:\n + def __init__(\n + self, method: str, url: URL, content: bytes = b\"\", headers: Dict = {}\n + ) -> None:\n + self.content = content\n + self.headers = headers\n + self.method = method\n + self.url = url\n + \n===========changed ref 1===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]:\n + \"\"\"\n + Perform a POST request.\n + \"\"\"\n + return await self._request(\n + HttpRequest(method=\"POST\", url=URL(url), content=data, headers=headers)\n + )\n + \n===========changed ref 2===========\n # module: examples.http3_client\n + class URL:\n + def __init__(self, url: str):\n + parsed = urlparse(url)\n + \n + self.authority = parsed.netloc\n + self.full_path = parsed.path\n + if parsed.query:\n + self.full_path += \"?\" + parsed.query\n + self.scheme = parsed.scheme\n + \n===========changed ref 3===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]:\n - def get(self, authority: str, path: str) -> Deque[H3Event]:\n \"\"\"\n Perform a GET request.\n \"\"\"\n - stream_id = self._quic.get_next_available_stream_id()\n - self._http.send_headers(\n - stream_id=stream_id,\n - headers=[\n - (b\":method\", b\"GET\"),\n - (b\":scheme\", b\"https\"),\n - (b\":authority\", authority.encode(\"utf8\")),\n - (b\":path\", path.encode(\"utf8\")),\n - (b\"user-agent\", b\"aioquic\"),\n - ],\n + return await self._request(\n + HttpRequest(method=\"GET\", url=URL(url), headers=headers)\n )\n - self._http.send_data(stream_id=stream_id, data=b\"\", end_stream=True)\n \n - waiter = self._loop.create_future()\n - self._request_events[stream_id] = deque()\n - self._request_waiter[stream_id] = waiter\n - self.transmit()\n - \n - return await asyncio.shield(waiter)\n - \n===========changed ref 4===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def _request(self, request: HttpRequest):\n + stream_id = self._quic.get_next_available_stream_id()\n + self._http.send_headers(\n + stream_id=stream_id,\n + headers=[\n + (b\":method\", request.method.encode(\"utf8\")),\n + (b\":scheme\", request.url.scheme.encode(\"utf8\")),\n + (b\":authority\", str(request.url.authority).encode(\"utf8\")),\n + (b\":path\", request.url.full_path.encode(\"utf8\")),\n + (b\"user-agent\", b\"aioquic\"),\n + ]\n + + [\n + (k.encode(\"utf8\"), v.encode(\"utf8\"))\n + for (k, v) in request.headers.items()\n + ],\n + )\n + self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True)\n + \n + waiter = self._loop.create_future()\n + self._request_events[stream_id] = deque()\n + self._request_waiter[stream_id] = waiter\n + self.transmit()\n + \n + return await asyncio.shield(waiter)\n + "}}},{"rowIdx":3591,"cells":{"path":{"kind":"string","value":"examples.interop/test_http_3"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"1fe0bc1229a3ea120ba1da369ae51690b59b71c1"},"commit_message":{"kind":"string","value":"[examples] make it possible to perform POST request"},"ground_truth":{"kind":"string","value":"<13>: events = await protocol.get(\n \"https://{}:{}{}\".format(server.host, server.port, server.path)\n )\n events = await protocol.get(server.host, server.path)\n"},"main_code":{"kind":"string","value":" # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n <0> if server.path is None:\n <1> return\n <2> \n <3> configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n <4> async with connect(\n <5> server.host,\n <6> server.port,\n <7> configuration=configuration,\n <8> create_protocol=HttpClient,\n <9> ) as protocol:\n<10> protocol = cast(HttpClient, protocol)\n<11> \n<12> # perform HTTP request\n<13> events = await protocol.get(server.host, server.path)\n<14> if events and isinstance(events[0], HeadersReceived):\n<15> server.result |= Result.D\n<16> server.result |= Result.three\n<17> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.h3.events\n HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n at: examples.interop\n Result()\n \n Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str=\"/\", result: Result=field(default_factory=lambda: Result(0)))\n \n at: examples.interop.Server\n host: str\n \n port: int = 4433\n \n path: str = \"/\"\n \n result: Result = field(default_factory=lambda: Result(0))\n \n \n===========unchanged ref 1===========\n at: http3_client\n HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: http3_client.HttpClient\n get(url: str, headers: Dict={}) -> Deque[H3Event]\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n \n===========changed ref 0===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n + events = await protocol.get(\n + \"https://{}:{}{}\".format(server.host, server.port, server.path)\n + )\n - events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 1===========\n # module: examples.http3_client\n + class HttpRequest:\n + def __init__(\n + self, method: str, url: URL, content: bytes = b\"\", headers: Dict = {}\n + ) -> None:\n + self.content = content\n + self.headers = headers\n + self.method = method\n + self.url = url\n + \n===========changed ref 2===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]:\n + \"\"\"\n + Perform a POST request.\n + \"\"\"\n + return await self._request(\n + HttpRequest(method=\"POST\", url=URL(url), content=data, headers=headers)\n + )\n + \n===========changed ref 3===========\n # module: examples.http3_client\n + class URL:\n + def __init__(self, url: str):\n + parsed = urlparse(url)\n + \n + self.authority = parsed.netloc\n + self.full_path = parsed.path\n + if parsed.query:\n + self.full_path += \"?\" + parsed.query\n + self.scheme = parsed.scheme\n + \n===========changed ref 4===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]:\n - def get(self, authority: str, path: str) -> Deque[H3Event]:\n \"\"\"\n Perform a GET request.\n \"\"\"\n - stream_id = self._quic.get_next_available_stream_id()\n - self._http.send_headers(\n - stream_id=stream_id,\n - headers=[\n - (b\":method\", b\"GET\"),\n - (b\":scheme\", b\"https\"),\n - (b\":authority\", authority.encode(\"utf8\")),\n - (b\":path\", path.encode(\"utf8\")),\n - (b\"user-agent\", b\"aioquic\"),\n - ],\n + return await self._request(\n + HttpRequest(method=\"GET\", url=URL(url), headers=headers)\n )\n - self._http.send_data(stream_id=stream_id, data=b\"\", end_stream=True)\n \n - waiter = self._loop.create_future()\n - self._request_events[stream_id] = deque()\n - self._request_waiter[stream_id] = waiter\n - self.transmit()\n - \n - return await asyncio.shield(waiter)\n - \n===========changed ref 5===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def _request(self, request: HttpRequest):\n + stream_id = self._quic.get_next_available_stream_id()\n + self._http.send_headers(\n + stream_id=stream_id,\n + headers=[\n + (b\":method\", request.method.encode(\"utf8\")),\n + (b\":scheme\", request.url.scheme.encode(\"utf8\")),\n + (b\":authority\", str(request.url.authority).encode(\"utf8\")),\n + (b\":path\", request.url.full_path.encode(\"utf8\")),\n + (b\"user-agent\", b\"aioquic\"),\n + ]\n + + [\n + (k.encode(\"utf8\"), v.encode(\"utf8\"))\n + for (k, v) in request.headers.items()\n + ],\n + )\n + self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True)\n + \n + waiter = self._loop.create_future()\n + self._request_events[stream_id] = deque()\n + self._request_waiter[stream_id] = waiter\n + self.transmit()\n + \n + return await asyncio.shield(waiter)\n + "}}},{"rowIdx":3592,"cells":{"path":{"kind":"string","value":"examples.interop/test_throughput"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"1fe0bc1229a3ea120ba1da369ae51690b59b71c1"},"commit_message":{"kind":"string","value":"[examples] make it possible to perform POST request"},"ground_truth":{"kind":"string","value":"<27>: http_events = await protocol.get(\n http_events = await protocol.get(server.host, path)\n<28>: \"https://{}:{}{}\".format(server.host, server.port, path)\n )\n"},"main_code":{"kind":"string","value":" # module: examples.interop\n def test_throughput(server: Server, configuration: QuicConfiguration):\n <0> failures = 0\n <1> \n <2> for size in [5000000, 10000000]:\n <3> print(\"Testing %d bytes download\" % size)\n <4> path = \"/%d\" % size\n <5> \n <6> # perform HTTP request over TCP\n <7> start = time.time()\n <8> response = requests.get(\"https://\" + server.host + path, verify=False)\n <9> tcp_octets = len(response.content)\n<10> tcp_elapsed = time.time() - start\n<11> assert tcp_octets == size, \"HTTP/TCP response size mismatch\"\n<12> \n<13> # perform HTTP request over QUIC\n<14> if server.http3:\n<15> configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n<16> else:\n<17> configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n<18> start = time.time()\n<19> async with connect(\n<20> server.host,\n<21> server.port,\n<22> configuration=configuration,\n<23> create_protocol=HttpClient,\n<24> ) as protocol:\n<25> protocol = cast(HttpClient, protocol)\n<26> \n<27> http_events = await protocol.get(server.host, path)\n<28> quic_elapsed = time.time() - start\n<29> quic_octets = 0\n<30> for http_event in http_events:\n<31> if isinstance(http_event, DataReceived):\n<32> quic_octets += len(http_event.data)\n<33> assert quic_octets == size, \"HTTP/QUIC response size mismatch\"\n<34> \n<35> print(\" - HTTP/TCP completed in %.3f s\" % tcp_elapsed)\n<36> print(\" - HTTP/QUIC completed in %.3f s\" % quic_elapsed)\n<37> \n<38> if quic_elapsed > 1.1 * tcp_elapsed:\n<39> failures += 1\n<40> print(\" => FAIL\")\n<41> else:\n<42> print(\" => PASS\")\n<43> \n<44> if failures == 0:\n<45> server.result |= Result.T"},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.client\n connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None]\n connect(*args, **kwds)\n \n at: aioquic.h3.events\n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: aioquic.quic.configuration\n QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field(\n default_factory=lambda: [\n QuicProtocolVersion.DRAFT_23,\n QuicProtocolVersion.DRAFT_22,\n ]\n ))\n \n at: aioquic.quic.configuration.QuicConfiguration\n alpn_protocols: Optional[List[str]] = None\n \n at: examples.interop\n Result()\n \n Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str=\"/\", result: Result=field(default_factory=lambda: Result(0)))\n \n at: examples.interop.Server\n host: str\n \n port: int = 4433\n \n http3: bool = True\n \n result: Result = field(default_factory=lambda: Result(0))\n \n \n===========unchanged ref 1===========\n at: http3_client\n HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None)\n \n at: http3_client.HttpClient\n get(url: str, headers: Dict={}) -> Deque[H3Event]\n \n at: requests.api\n get(url: Union[Text, bytes], params: Optional[\n Union[\n SupportsItems[_ParamsMappingKeyType, _ParamsMappingValueType],\n Tuple[_ParamsMappingKeyType, _ParamsMappingValueType],\n Iterable[Tuple[_ParamsMappingKeyType, _ParamsMappingValueType]],\n Union[Text, bytes],\n ]\n ]=..., **kwargs) -> Response\n \n at: requests.models.Response\n __attrs__ = [\n \"_content\",\n \"status_code\",\n \"headers\",\n \"url\",\n \"history\",\n \"encoding\",\n \"reason\",\n \"cookies\",\n \"elapsed\",\n \"request\",\n ]\n \n at: time\n time() -> float\n \n at: typing\n cast(typ: Type[_T], val: Any) -> _T\n cast(typ: str, val: Any) -> Any\n cast(typ: object, val: Any) -> Any\n \n \n===========changed ref 0===========\n # module: examples.interop\n def test_http_3(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n configuration.alpn_protocols = [\"h3-23\", \"h3-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n + events = await protocol.get(\n + \"https://{}:{}{}\".format(server.host, server.port, server.path)\n + )\n - events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n server.result |= Result.three\n \n===========changed ref 1===========\n # module: examples.interop\n def test_http_0(server: Server, configuration: QuicConfiguration):\n if server.path is None:\n return\n \n configuration.alpn_protocols = [\"hq-23\", \"hq-22\"]\n async with connect(\n server.host,\n server.port,\n configuration=configuration,\n create_protocol=HttpClient,\n ) as protocol:\n protocol = cast(HttpClient, protocol)\n \n # perform HTTP request\n + events = await protocol.get(\n + \"https://{}:{}{}\".format(server.host, server.port, server.path)\n + )\n - events = await protocol.get(server.host, server.path)\n if events and isinstance(events[0], HeadersReceived):\n server.result |= Result.D\n \n===========changed ref 2===========\n # module: examples.http3_client\n + class HttpRequest:\n + def __init__(\n + self, method: str, url: URL, content: bytes = b\"\", headers: Dict = {}\n + ) -> None:\n + self.content = content\n + self.headers = headers\n + self.method = method\n + self.url = url\n + \n===========changed ref 3===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]:\n + \"\"\"\n + Perform a POST request.\n + \"\"\"\n + return await self._request(\n + HttpRequest(method=\"POST\", url=URL(url), content=data, headers=headers)\n + )\n + \n===========changed ref 4===========\n # module: examples.http3_client\n + class URL:\n + def __init__(self, url: str):\n + parsed = urlparse(url)\n + \n + self.authority = parsed.netloc\n + self.full_path = parsed.path\n + if parsed.query:\n + self.full_path += \"?\" + parsed.query\n + self.scheme = parsed.scheme\n + \n===========changed ref 5===========\n # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]:\n - def get(self, authority: str, path: str) -> Deque[H3Event]:\n \"\"\"\n Perform a GET request.\n \"\"\"\n - stream_id = self._quic.get_next_available_stream_id()\n - self._http.send_headers(\n - stream_id=stream_id,\n - headers=[\n - (b\":method\", b\"GET\"),\n - (b\":scheme\", b\"https\"),\n - (b\":authority\", authority.encode(\"utf8\")),\n - (b\":path\", path.encode(\"utf8\")),\n - (b\"user-agent\", b\"aioquic\"),\n - ],\n + return await self._request(\n + HttpRequest(method=\"GET\", url=URL(url), headers=headers)\n )\n - self._http.send_data(stream_id=stream_id, data=b\"\", end_stream=True)\n \n - waiter = self._loop.create_future()\n - self._request_events[stream_id] = deque()\n - self._request_waiter[stream_id] = waiter\n - self.transmit()\n - \n - return await asyncio.shield(waiter)\n - "}}},{"rowIdx":3593,"cells":{"path":{"kind":"string","value":"aioquic.quic.connection/QuicConnection.change_connection_id"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"c6c677c662efbc68f02d89fc28e6030d58004ad1"},"commit_message":{"kind":"string","value":"[connection] clarify connection ID change log messages"},"ground_truth":{"kind":"string","value":" <3>: \n After calling this method call :meth:`datagrams_to_send` to retrieve data\n which needs to be sent.\n <7>: \"Retiring CID %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n \"Retiring %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n<16>: \"Switching to CID %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n \"Migrating to %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n"},"main_code":{"kind":"string","value":" # module: aioquic.quic.connection\n class QuicConnection:\n def change_connection_id(self) -> None:\n <0> \"\"\"\n <1> Switch to the next available connection ID and retire\n <2> the previous one.\n <3> \"\"\"\n <4> if self._peer_cid_available:\n <5> # retire previous CID\n <6> self._logger.debug(\n <7> \"Retiring %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n <8> )\n <9> self._retire_connection_ids.append(self._peer_cid_seq)\n<10> \n<11> # assign new CID\n<12> connection_id = self._peer_cid_available.pop(0)\n<13> self._peer_cid_seq = connection_id.sequence_number\n<14> self._peer_cid = connection_id.cid\n<15> self._logger.debug(\n<16> \"Migrating to %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n<17> )\n<18> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.quic.connection\n dump_cid(cid: bytes) -> str\n \n at: aioquic.quic.connection.QuicConnection.__init__\n self._peer_cid = os.urandom(configuration.connection_id_length)\n \n self._peer_cid_seq: Optional[int] = None\n \n self._peer_cid_available: List[QuicConnectionId] = []\n \n self._logger = QuicConnectionAdapter(\n logger, {\"id\": dump_cid(logger_connection_id)}\n )\n \n self._retire_connection_ids: List[int] = []\n \n at: aioquic.quic.connection.QuicConnection.receive_datagram\n self._peer_cid = header.source_cid\n \n self._peer_cid_seq = 0\n \n at: aioquic.quic.connection.QuicConnectionId\n cid: bytes\n \n sequence_number: int\n \n stateless_reset_token: bytes = b\"\"\n \n was_sent: bool = False\n \n at: logging.LoggerAdapter\n logger: Logger\n \n extra: Mapping[str, Any]\n \n debug(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None\n \n "}}},{"rowIdx":3594,"cells":{"path":{"kind":"string","value":"aioquic.quic.connection/QuicConnection._handle_retire_connection_id_frame"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"c6c677c662efbc68f02d89fc28e6030d58004ad1"},"commit_message":{"kind":"string","value":"[connection] clarify connection ID change log messages"},"ground_truth":{"kind":"string","value":"<21>: \"Peer retiring CID %s (%d)\",\n \"Peer retiring %s (%d)\",\n"},"main_code":{"kind":"string","value":" # module: aioquic.quic.connection\n class QuicConnection:\n def _handle_retire_connection_id_frame(\n self, context: QuicReceiveContext, frame_type: int, buf: Buffer\n ) -> None:\n <0> \"\"\"\n <1> Handle a RETIRE_CONNECTION_ID frame.\n <2> \"\"\"\n <3> sequence_number = buf.pull_uint_var()\n <4> \n <5> # log frame\n <6> if self._quic_logger is not None:\n <7> context.quic_logger_frames.append(\n <8> self._quic_logger.encode_retire_connection_id_frame(sequence_number)\n <9> )\n<10> \n<11> # find the connection ID by sequence number\n<12> for index, connection_id in enumerate(self._host_cids):\n<13> if connection_id.sequence_number == sequence_number:\n<14> if connection_id.cid == context.host_cid:\n<15> raise QuicConnectionError(\n<16> error_code=QuicErrorCode.PROTOCOL_VIOLATION,\n<17> frame_type=frame_type,\n<18> reason_phrase=\"Cannot retire current connection ID\",\n<19> )\n<20> self._logger.debug(\n<21> \"Peer retiring %s (%d)\",\n<22> dump_cid(connection_id.cid),\n<23> connection_id.sequence_number,\n<24> )\n<25> del self._host_cids[index]\n<26> self._events.append(\n<27> events.ConnectionIdRetired(connection_id=connection_id.cid)\n<28> )\n<29> break\n<30> \n<31> # issue a new connection ID\n<32> self._replenish_connection_ids()\n<33> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic._buffer\n Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None)\n \n at: aioquic._buffer.Buffer\n pull_uint_var() -> int\n \n at: aioquic.quic.connection\n dump_cid(cid: bytes) -> str\n \n QuicConnectionError(error_code: int, frame_type: int, reason_phrase: str)\n \n QuicReceiveContext(epoch: tls.Epoch, host_cid: bytes, network_path: QuicNetworkPath, quic_logger_frames: Optional[List[Any]], time: float)\n \n at: aioquic.quic.connection.QuicConnection.__init__\n self._events: Deque[events.QuicEvent] = deque()\n \n self._host_cids = [\n QuicConnectionId(\n cid=os.urandom(configuration.connection_id_length),\n sequence_number=0,\n stateless_reset_token=os.urandom(16),\n was_sent=True,\n )\n ]\n \n self._quic_logger: Optional[QuicLoggerTrace] = None\n self._quic_logger = configuration.quic_logger.start_trace(\n is_client=configuration.is_client, odcid=logger_connection_id\n )\n \n self._logger = QuicConnectionAdapter(\n logger, {\"id\": dump_cid(logger_connection_id)}\n )\n \n at: aioquic.quic.connection.QuicConnection._close_end\n self._quic_logger = None\n \n at: aioquic.quic.connection.QuicConnection._handle_reset_stream_frame\n stream_id = buf.pull_uint_var()\n \n error_code = buf.pull_uint_var()\n \n at: aioquic.quic.connection.QuicConnectionId\n cid: bytes\n \n sequence_number: int\n \n at: aioquic.quic.connection.QuicReceiveContext\n epoch: tls.Epoch\n \n host_cid: bytes\n \n network_path: QuicNetworkPath\n \n \n===========unchanged ref 1===========\n quic_logger_frames: Optional[List[Any]]\n \n time: float\n \n at: aioquic.quic.events\n ConnectionIdRetired(connection_id: bytes)\n \n StreamReset(error_code: int, stream_id: int)\n \n at: aioquic.quic.events.ConnectionIdRetired\n connection_id: bytes\n \n at: aioquic.quic.events.StreamReset\n error_code: int\n \n stream_id: int\n \n at: aioquic.quic.logger.QuicLoggerTrace\n encode_retire_connection_id_frame(sequence_number: int) -> Dict\n \n at: aioquic.quic.packet\n QuicErrorCode(x: Union[str, bytes, bytearray], base: int)\n QuicErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...)\n \n at: collections.deque\n append(x: _T) -> None\n \n at: logging.LoggerAdapter\n debug(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None\n \n \n===========changed ref 0===========\n # module: aioquic.quic.connection\n class QuicConnection:\n def change_connection_id(self) -> None:\n \"\"\"\n Switch to the next available connection ID and retire\n the previous one.\n + \n + After calling this method call :meth:`datagrams_to_send` to retrieve data\n + which needs to be sent.\n \"\"\"\n if self._peer_cid_available:\n # retire previous CID\n self._logger.debug(\n + \"Retiring CID %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n - \"Retiring %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n )\n self._retire_connection_ids.append(self._peer_cid_seq)\n \n # assign new CID\n connection_id = self._peer_cid_available.pop(0)\n self._peer_cid_seq = connection_id.sequence_number\n self._peer_cid = connection_id.cid\n self._logger.debug(\n + \"Switching to CID %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n - \"Migrating to %s (%d)\", dump_cid(self._peer_cid), self._peer_cid_seq\n )\n \n===========changed ref 1===========\n # module: aioquic.quic.connection\n class QuicConnection:\n def receive_datagram(self, data: bytes, addr: NetworkAddress, now: float) -> None:\n \"\"\"\n Handle an incoming datagram.\n \n :param data: The datagram which was received.\n :param addr: The network address from which the datagram was received.\n :param now: The current time.\n \"\"\"\n # stop handling packets when closing\n if self._state in END_STATES:\n return\n \n data = cast(bytes, data)\n if self._quic_logger is not None:\n self._quic_logger.log_event(\n category=\"transport\",\n event=\"datagram_received\",\n data={\"byte_length\": len(data), \"count\": 1},\n )\n \n buf = Buffer(data=data)\n while not buf.eof():\n start_off = buf.tell()\n try:\n header = pull_quic_header(\n buf, host_cid_length=self._configuration.connection_id_length\n )\n except ValueError:\n return\n \n # check destination CID matches\n destination_cid_seq: Optional[int] = None\n for connection_id in self._host_cids:\n if header.destination_cid == connection_id.cid:\n destination_cid_seq = connection_id.sequence_number\n break\n if self._is_client and destination_cid_seq is None:\n return\n \n # check protocol version\n if self._is_client and header.version == QuicProtocolVersion.NEGOTIATION:\n # version negotiation\n versions = []\n while not buf.eof():\n versions.append(buf.pull_uint32())\n if self._quic_logger is not None:\n self._quic_logger.log_event(\n category=\"transport\",\n event=\"packet_received\",\n data={\n \"packet_type\": \"version_negotiation\",\n \"header\": {\n \"scid\": dump_cid(header.source_cid),\n \"dcid\": dump_cid("}}},{"rowIdx":3595,"cells":{"path":{"kind":"string","value":"examples.http3_server/WebSocketHandler.send"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"46675a17e147823012cd5618070013e4974bdeef"},"commit_message":{"kind":"string","value":"[http3 server] handle `websocket.close` used to reject websocket"},"ground_truth":{"kind":"string","value":"<16>: if self.websocket is not None:\n data = self.websocket.send(\n data = self.websocket.send(\n<17>: wsproto.events.CloseConnection(code=message[\"code\"])\n wsproto.events.CloseConnection(code=message[\"code\"])\n<18>: )\n )\n<19>: else:\n self.connection.send_headers(\n stream_id=self.stream_id, headers=[(b\":status\", b\"403\")]\n )\n"},"main_code":{"kind":"string","value":" # module: examples.http3_server\n class WebSocketHandler:\n def send(self, message: Dict):\n <0> data = b\"\"\n <1> end_stream = False\n <2> if message[\"type\"] == \"websocket.accept\":\n <3> subprotocol = message.get(\"subprotocol\")\n <4> \n <5> self.websocket = wsproto.Connection(wsproto.ConnectionType.SERVER)\n <6> \n <7> headers = [\n <8> (b\":status\", b\"200\"),\n <9> (b\"server\", b\"aioquic\"),\n<10> (b\"date\", formatdate(time.time(), usegmt=True).encode()),\n<11> ]\n<12> if subprotocol is not None:\n<13> headers.append((b\"sec-websocket-protocol\", subprotocol.encode(\"utf8\")))\n<14> self.connection.send_headers(stream_id=self.stream_id, headers=headers)\n<15> elif message[\"type\"] == \"websocket.close\":\n<16> data = self.websocket.send(\n<17> wsproto.events.CloseConnection(code=message[\"code\"])\n<18> )\n<19> end_stream = True\n<20> elif message[\"type\"] == \"websocket.send\":\n<21> if message.get(\"text\") is not None:\n<22> data = self.websocket.send(\n<23> wsproto.events.TextMessage(data=message[\"text\"])\n<24> )\n<25> elif message.get(\"bytes\") is not None:\n<26> data = self.websocket.send(\n<27> wsproto.events.Message(data=message[\"bytes\"])\n<28> )\n<29> \n<30> if data:\n<31> self.connection.send_data(\n<32> stream_id=self.stream_id, data=data, end_stream=end_stream\n<33> )\n<34> if end_stream:\n<35> self.closed = True\n<36> self.transmit()\n<37> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.h0.connection.H0Connection\n send_data(stream_id: int, data: bytes, end_stream: bool) -> None\n \n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: aioquic.h3.connection.H3Connection\n send_data(stream_id: int, data: bytes, end_stream: bool) -> None\n \n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: email.utils\n formatdate(timeval: Optional[float]=..., localtime: bool=..., usegmt: bool=...) -> str\n \n at: examples.http3_server.WebSocketHandler.__init__\n self.connection = connection\n \n self.stream_id = stream_id\n \n self.websocket: Optional[wsproto.Connection] = None\n \n at: time\n time() -> float\n \n at: typing\n Dict = _alias(dict, 2, inst=False, name='Dict')\n \n at: typing.Mapping\n get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T]\n get(key: _KT) -> Optional[_VT_co]\n \n "}}},{"rowIdx":3596,"cells":{"path":{"kind":"string","value":"examples.http3_server/WebSocketHandler.__init__"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b9f4211643567cfb603d73483e11afd2b4f57239"},"commit_message":{"kind":"string","value":"[http3 server] delay websocket event handling until it is accepted"},"ground_truth":{"kind":"string","value":" <2>: self.http_event_queue: Deque[DataReceived] = deque()\n"},"main_code":{"kind":"string","value":" # module: examples.http3_server\n class WebSocketHandler:\n def __init__(\n self,\n *,\n connection: HttpConnection,\n scope: Dict,\n stream_id: int,\n transmit: Callable[[], None],\n ):\n <0> self.closed = False\n <1> self.connection = connection\n <2> self.queue: asyncio.Queue[Dict] = asyncio.Queue()\n <3> self.scope = scope\n <4> self.stream_id = stream_id\n <5> self.transmit = transmit\n <6> self.websocket: Optional[wsproto.Connection] = None\n <7> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.h3.events\n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: asyncio.queues\n Queue(maxsize: int=..., *, loop: Optional[AbstractEventLoop]=...)\n \n at: collections\n deque(iterable: Iterable[_T]=..., maxlen: Optional[int]=...)\n \n at: examples.http3_server\n HttpConnection = Union[H0Connection, H3Connection]\n \n at: examples.http3_server.WebSocketHandler.send\n self.closed = True\n \n at: typing\n Callable = _CallableType(collections.abc.Callable, 2)\n \n Deque = _alias(collections.deque, 1, name='Deque')\n \n Dict = _alias(dict, 2, inst=False, name='Dict')\n \n "}}},{"rowIdx":3597,"cells":{"path":{"kind":"string","value":"examples.http3_server/WebSocketHandler.http_event_received"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b9f4211643567cfb603d73483e11afd2b4f57239"},"commit_message":{"kind":"string","value":"[http3 server] delay websocket event handling until it is accepted"},"ground_truth":{"kind":"string","value":" <0>: if isinstance(event, DataReceived) and not self.closed:\n if isinstance(event, DataReceived):\n <1>: if self.websocket is not None:\n self.websocket.receive_data(event.data)\n self.websocket.receive_data(event.data)\n <3>: for ws_event in self.websocket.events():\n for ws_event in self.websocket.events():\n <4>: self.websocket_event_received(ws_event)\n self.websocket_event_received(ws_event)\n <5>: else:\n # delay event processing until we get `websocket.accept`\n # from the ASGI application\n self.http_event_queue.append(event)\n"},"main_code":{"kind":"string","value":" # module: examples.http3_server\n class WebSocketHandler:\n def http_event_received(self, event: H3Event) -> None:\n <0> if isinstance(event, DataReceived):\n <1> self.websocket.receive_data(event.data)\n <2> \n <3> for ws_event in self.websocket.events():\n <4> self.websocket_event_received(ws_event)\n <5> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.h3.events\n H3Event()\n \n DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None)\n \n at: examples.http3_server.WebSocketHandler.__init__\n self.closed = False\n \n at: examples.http3_server.WebSocketHandler.send\n self.websocket = wsproto.Connection(wsproto.ConnectionType.SERVER)\n \n self.closed = True\n \n \n===========changed ref 0===========\n # module: examples.http3_server\n class WebSocketHandler:\n def __init__(\n self,\n *,\n connection: HttpConnection,\n scope: Dict,\n stream_id: int,\n transmit: Callable[[], None],\n ):\n self.closed = False\n self.connection = connection\n + self.http_event_queue: Deque[DataReceived] = deque()\n self.queue: asyncio.Queue[Dict] = asyncio.Queue()\n self.scope = scope\n self.stream_id = stream_id\n self.transmit = transmit\n self.websocket: Optional[wsproto.Connection] = None\n "}}},{"rowIdx":3598,"cells":{"path":{"kind":"string","value":"examples.http3_server/WebSocketHandler.send"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"b9f4211643567cfb603d73483e11afd2b4f57239"},"commit_message":{"kind":"string","value":"[http3 server] delay websocket event handling until it is accepted"},"ground_truth":{"kind":"string","value":"<15>: \n # consume backlog\n while self.http_event_queue:\n self.http_event_received(self.http_event_queue.popleft())\n \n"},"main_code":{"kind":"string","value":" # module: examples.http3_server\n class WebSocketHandler:\n def send(self, message: Dict):\n <0> data = b\"\"\n <1> end_stream = False\n <2> if message[\"type\"] == \"websocket.accept\":\n <3> subprotocol = message.get(\"subprotocol\")\n <4> \n <5> self.websocket = wsproto.Connection(wsproto.ConnectionType.SERVER)\n <6> \n <7> headers = [\n <8> (b\":status\", b\"200\"),\n <9> (b\"server\", b\"aioquic\"),\n<10> (b\"date\", formatdate(time.time(), usegmt=True).encode()),\n<11> ]\n<12> if subprotocol is not None:\n<13> headers.append((b\"sec-websocket-protocol\", subprotocol.encode(\"utf8\")))\n<14> self.connection.send_headers(stream_id=self.stream_id, headers=headers)\n<15> elif message[\"type\"] == \"websocket.close\":\n<16> if self.websocket is not None:\n<17> data = self.websocket.send(\n<18> wsproto.events.CloseConnection(code=message[\"code\"])\n<19> )\n<20> else:\n<21> self.connection.send_headers(\n<22> stream_id=self.stream_id, headers=[(b\":status\", b\"403\")]\n<23> )\n<24> end_stream = True\n<25> elif message[\"type\"] == \"websocket.send\":\n<26> if message.get(\"text\") is not None:\n<27> data = self.websocket.send(\n<28> wsproto.events.TextMessage(data=message[\"text\"])\n<29> )\n<30> elif message.get(\"bytes\") is not None:\n<31> data = self.websocket.send(\n<32> wsproto.events.Message(data=message[\"bytes\"])\n<33> )\n<34> \n<35> if data:\n<36> self.connection.send_data(\n<37> stream_id=self.stream_id, data=data, end_stream=end_stream\n<38> )\n<39> if end_stream:\n<40> self.closed = True\n<41> self.transmit()\n<42> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.h0.connection.H0Connection\n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: aioquic.h3.connection.H3Connection\n send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None\n \n at: asyncio.queues.Queue\n __class_getitem__ = classmethod(GenericAlias)\n \n get() -> _T\n \n at: collections.deque\n popleft() -> _T\n \n at: email.utils\n formatdate(timeval: Optional[float]=..., localtime: bool=..., usegmt: bool=...) -> str\n \n at: examples.http3_server.WebSocketHandler\n http_event_received(event: H3Event) -> None\n http_event_received(self, event: H3Event) -> None\n \n at: examples.http3_server.WebSocketHandler.__init__\n self.closed = False\n \n self.connection = connection\n \n self.http_event_queue: Deque[DataReceived] = deque()\n \n self.queue: asyncio.Queue[Dict] = asyncio.Queue()\n \n self.stream_id = stream_id\n \n self.websocket: Optional[wsproto.Connection] = None\n \n at: examples.http3_server.WebSocketHandler.send\n self.closed = True\n \n at: time\n time() -> float\n \n at: typing\n Dict = _alias(dict, 2, inst=False, name='Dict')\n \n at: typing.Mapping\n get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T]\n get(key: _KT) -> Optional[_VT_co]\n \n \n===========changed ref 0===========\n # module: examples.http3_server\n class WebSocketHandler:\n def http_event_received(self, event: H3Event) -> None:\n + if isinstance(event, DataReceived) and not self.closed:\n - if isinstance(event, DataReceived):\n + if self.websocket is not None:\n + self.websocket.receive_data(event.data)\n - self.websocket.receive_data(event.data)\n \n + for ws_event in self.websocket.events():\n - for ws_event in self.websocket.events():\n + self.websocket_event_received(ws_event)\n - self.websocket_event_received(ws_event)\n + else:\n + # delay event processing until we get `websocket.accept`\n + # from the ASGI application\n + self.http_event_queue.append(event)\n \n===========changed ref 1===========\n # module: examples.http3_server\n class WebSocketHandler:\n def __init__(\n self,\n *,\n connection: HttpConnection,\n scope: Dict,\n stream_id: int,\n transmit: Callable[[], None],\n ):\n self.closed = False\n self.connection = connection\n + self.http_event_queue: Deque[DataReceived] = deque()\n self.queue: asyncio.Queue[Dict] = asyncio.Queue()\n self.scope = scope\n self.stream_id = stream_id\n self.transmit = transmit\n self.websocket: Optional[wsproto.Connection] = None\n "}}},{"rowIdx":3599,"cells":{"path":{"kind":"string","value":"examples.http3_client/HttpClient._request"},"type":{"kind":"string","value":"Modified"},"project":{"kind":"string","value":"aiortc~aioquic"},"commit_hash":{"kind":"string","value":"4a86e356f9392ad0eee7b798aac40556d7b61390"},"commit_message":{"kind":"string","value":"[http3 client] pass URL to websocket() method"},"ground_truth":{"kind":"string","value":" <6>: (b\":authority\", request.url.authority.encode(\"utf8\")),\n (b\":authority\", str(request.url.authority).encode(\"utf8\")),\n"},"main_code":{"kind":"string","value":" # module: examples.http3_client\n class HttpClient(QuicConnectionProtocol):\n def _request(self, request: HttpRequest):\n <0> stream_id = self._quic.get_next_available_stream_id()\n <1> self._http.send_headers(\n <2> stream_id=stream_id,\n <3> headers=[\n <4> (b\":method\", request.method.encode(\"utf8\")),\n <5> (b\":scheme\", request.url.scheme.encode(\"utf8\")),\n <6> (b\":authority\", str(request.url.authority).encode(\"utf8\")),\n <7> (b\":path\", request.url.full_path.encode(\"utf8\")),\n <8> (b\"user-agent\", b\"aioquic\"),\n <9> ]\n<10> + [\n<11> (k.encode(\"utf8\"), v.encode(\"utf8\"))\n<12> for (k, v) in request.headers.items()\n<13> ],\n<14> )\n<15> self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True)\n<16> \n<17> waiter = self._loop.create_future()\n<18> self._request_events[stream_id] = deque()\n<19> self._request_waiter[stream_id] = waiter\n<20> self.transmit()\n<21> \n<22> return await asyncio.shield(waiter)\n<23> \n "},"context":{"kind":"string","value":"===========unchanged ref 0===========\n at: aioquic.asyncio.protocol.QuicConnectionProtocol\n transmit() -> None\n \n at: aioquic.asyncio.protocol.QuicConnectionProtocol.__init__\n self._quic = quic\n \n at: aioquic.quic.connection.QuicConnection\n get_next_available_stream_id(is_unidirectional=False) -> int\n \n at: examples.http3_client\n URL(url: str)\n \n HttpRequest(method: str, url: URL, content: bytes=b\"\", headers: Dict={})\n \n WebSocket(http: HttpConnection, stream_id: int, transmit: Callable[[], None])\n \n at: examples.http3_client.HttpClient.__init__\n self._http = H3Connection(self._quic)\n self._http: Optional[HttpConnection] = None\n self._http = H0Connection(self._quic)\n \n self._websockets: Dict[int, WebSocket] = {}\n \n at: examples.http3_client.HttpRequest.__init__\n self.url = url\n \n at: examples.http3_client.URL.__init__\n self.authority = parsed.netloc\n \n self.full_path += \"?\" + parsed.query\n self.full_path = parsed.path\n \n at: typing\n List = _alias(list, 1, inst=False, name='List')\n \n "}}}],"truncated":false,"partial":false},"paginationData":{"pageIndex":35,"numItemsPerPage":100,"numTotalItems":7800,"offset":3500,"length":100}},"jwt":"eyJhbGciOiJFZERTQSJ9.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc1Nzk0MTg3MSwic3ViIjoiL2RhdGFzZXRzL2tyYWFsZmFyL0NvZWRpdG9yLXByb2Nlc3NlZC1kZW1vMiIsImV4cCI6MTc1Nzk0NTQ3MSwiaXNzIjoiaHR0cHM6Ly9odWdnaW5nZmFjZS5jbyJ9.Ye1cPUYdw11yfIC9AdX64_Ck9cR1uVa-xVAh39NrBGRl7A0VW0nGdbKRUe94Q0beLQt1byaqbXCUaxiNSdV4Cw","displayUrls":true},"discussionsStats":{"closed":0,"open":1,"total":1},"fullWidth":true,"hasGatedAccess":true,"hasFullAccess":true,"isEmbedded":false,"savedQueries":{"community":[],"user":[]}}">
path
stringlengths
9
117
type
stringclasses
2 values
project
stringclasses
10 values
commit_hash
stringlengths
40
40
commit_message
stringlengths
1
137
ground_truth
stringlengths
0
2.74k
main_code
stringlengths
102
3.37k
context
stringlengths
0
14.7k
aioquic.h3.connection/H3Connection.__init__
Modified
aiortc~aioquic
44c20c190cf84f2bacad0299e3848fd2cc2a11b7
[http3] add some initial QLOG support for HTTP/3 events
<6>:<add> self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger
# module: aioquic.h3.connection class H3Connection: def __init__(self, quic: QuicConnection): <0> self._max_table_capacity = 0x100 <1> self._blocked_streams = 0x10 <2> <3> self._is_client = quic.configuration.is_client <4> self._is_done = False <5> self._quic = quic <6> self._decoder = pylsqpack.Decoder( <7> self._max_table_capacity, self._blocked_streams <8> ) <9> self._encoder = pylsqpack.Encoder() <10> self._stream: Dict[int, H3Stream] = {} <11> <12> self._max_push_id: Optional[int] = 8 if self._is_client else None <13> self._next_push_id: int = 0 <14> <15> self._local_control_stream_id: Optional[int] = None <16> self._local_decoder_stream_id: Optional[int] = None <17> self._local_encoder_stream_id: Optional[int] = None <18> <19> self._peer_control_stream_id: Optional[int] = None <20> self._peer_decoder_stream_id: Optional[int] = None <21> self._peer_encoder_stream_id: Optional[int] = None <22> <23> self._init_connection() <24>
===========unchanged ref 0=========== at: aioquic.h3.connection qlog_encode_headers(headers: Headers) -> List[Dict] at: aioquic.h3.events Headers = List[Tuple[bytes, bytes]] at: typing Dict = _alias(dict, 2, inst=False, name='Dict') ===========changed ref 0=========== # module: aioquic.h3.connection + def qlog_encode_headers(headers: Headers) -> List[Dict]: + return [ + {"name": h[0].decode("utf8"), "value": h[1].decode("utf8")} for h in headers + ] + ===========changed ref 1=========== # module: aioquic.h3.connection + def qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "data"}, + "stream_id": str(stream_id), + } + ===========changed ref 2=========== # module: aioquic.h3.connection + def qlog_encode_headers_frame( + byte_length: int, headers: Headers, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "headers", "fields": qlog_encode_headers(headers)}, + "stream_id": str(stream_id), + } + ===========changed ref 3=========== # module: aioquic.h3.connection class H3Stream: def __init__(self) -> None: self.blocked = False + self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None self.stream_type: Optional[int] = None
aioquic.h3.connection/H3Connection.send_data
Modified
aiortc~aioquic
44c20c190cf84f2bacad0299e3848fd2cc2a11b7
[http3] add some initial QLOG support for HTTP/3 events
<11>:<add> # log frame <add> if self._quic_logger is not None: <add> self._quic_logger.log_event( <add> category="HTTP", <add> event="frame_created", <add> data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), <add> ) <add>
# module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: <0> """ <1> Send data on the given stream. <2> <3> To retrieve datagram which need to be sent over the network call the QUIC <4> connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` <5> method. <6> <7> :param stream_id: The stream ID on which to send the data. <8> :param data: The data to send. <9> :param end_stream: Whether to end the stream. <10> """ <11> self._quic.send_stream_data( <12> stream_id, encode_frame(FrameType.DATA, data), end_stream <13> ) <14>
===========unchanged ref 0=========== at: aioquic.h3.connection ProtocolError(reason_phrase: str="") at: aioquic.h3.connection.H3Connection _receive_stream_data_uni(self, stream_id: int, data: bytes, stream_ended: bool) -> List[H3Event] _receive_stream_data_uni(stream_id: int, data: bytes, stream_ended: bool) -> List[H3Event] at: aioquic.h3.connection.H3Connection.__init__ self._is_done = False self._quic = quic at: aioquic.h3.connection.H3Connection.handle_event stream_id = event.stream_id at: aioquic.h3.connection.ProtocolError error_code = ErrorCode.HTTP_GENERAL_PROTOCOL_ERROR at: aioquic.h3.connection.ProtocolError.__init__ self.reason_phrase = reason_phrase at: aioquic.h3.events Headers = List[Tuple[bytes, bytes]] at: aioquic.quic.connection stream_is_unidirectional(stream_id: int) -> bool at: aioquic.quic.connection.QuicConnection close(error_code: int=QuicErrorCode.NO_ERROR, frame_type: Optional[int]=None, reason_phrase: str="") -> None ===========changed ref 0=========== # module: aioquic.h3.connection + def qlog_encode_headers(headers: Headers) -> List[Dict]: + return [ + {"name": h[0].decode("utf8"), "value": h[1].decode("utf8")} for h in headers + ] + ===========changed ref 1=========== # module: aioquic.h3.connection + def qlog_encode_headers_frame( + byte_length: int, headers: Headers, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "headers", "fields": qlog_encode_headers(headers)}, + "stream_id": str(stream_id), + } + ===========changed ref 2=========== # module: aioquic.h3.connection + def qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "data"}, + "stream_id": str(stream_id), + } + ===========changed ref 3=========== # module: aioquic.h3.connection + def qlog_encode_push_promise_frame( + byte_length: int, headers: Headers, push_id: int, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": { + "frame_type": "push_promise", + "field": qlog_encode_headers(headers), + "id": str(push_id), + }, + "stream_id": str(stream_id), + } + ===========changed ref 4=========== # module: aioquic.h3.connection class H3Stream: def __init__(self) -> None: self.blocked = False + self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None self.stream_type: Optional[int] = None ===========changed ref 5=========== # module: aioquic.h3.connection class H3Connection: def __init__(self, quic: QuicConnection): self._max_table_capacity = 0x100 self._blocked_streams = 0x10 self._is_client = quic.configuration.is_client self._is_done = False self._quic = quic + self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._decoder = pylsqpack.Decoder( self._max_table_capacity, self._blocked_streams ) self._encoder = pylsqpack.Encoder() self._stream: Dict[int, H3Stream] = {} self._max_push_id: Optional[int] = 8 if self._is_client else None self._next_push_id: int = 0 self._local_control_stream_id: Optional[int] = None self._local_decoder_stream_id: Optional[int] = None self._local_encoder_stream_id: Optional[int] = None self._peer_control_stream_id: Optional[int] = None self._peer_decoder_stream_id: Optional[int] = None self._peer_encoder_stream_id: Optional[int] = None self._init_connection()
aioquic.h3.connection/H3Connection.send_headers
Modified
aiortc~aioquic
44c20c190cf84f2bacad0299e3848fd2cc2a11b7
[http3] add some initial QLOG support for HTTP/3 events
<12>:<add> <add> # log frame <add> if self._quic_logger is not None: <add> self._quic_logger.log_event( <add> category="HTTP", <add> event="frame_created", <add> data=qlog_encode_headers_frame( <add> byte_length=len(frame_data), headers=headers, stream_id=stream_id <add> ), <add> ) <add>
# module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: <0> """ <1> Send headers on the given stream. <2> <3> To retrieve datagram which need to be sent over the network call the QUIC <4> connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` <5> method. <6> <7> :param stream_id: The stream ID on which to send the headers. <8> :param headers: The HTTP headers to send. <9> :param end_stream: Whether to end the stream. <10> """ <11> frame_data = self._encode_headers(stream_id, headers) <12> self._quic.send_stream_data( <13> stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream <14> ) <15>
===========unchanged ref 0=========== at: aioquic.buffer encode_uint_var(value: int) -> bytes at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_frame(frame_type: int, frame_data: bytes) -> bytes at: aioquic.h3.connection.H3Connection _encode_headers(stream_id, headers: Headers) -> bytes _encode_headers(self, stream_id, headers: Headers) -> bytes at: aioquic.h3.connection.H3Connection.__init__ self._is_client = quic.configuration.is_client self._quic = quic self._max_push_id: Optional[int] = 8 if self._is_client else None self._next_push_id: int = 0 at: aioquic.h3.connection.H3Connection._handle_control_frame self._max_push_id = parse_max_push_id(frame_data) at: aioquic.h3.exceptions NoAvailablePushIDError(*args: object) at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None ===========changed ref 0=========== # module: aioquic.h3.connection + def qlog_encode_headers(headers: Headers) -> List[Dict]: + return [ + {"name": h[0].decode("utf8"), "value": h[1].decode("utf8")} for h in headers + ] + ===========changed ref 1=========== # module: aioquic.h3.connection + def qlog_encode_headers_frame( + byte_length: int, headers: Headers, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "headers", "fields": qlog_encode_headers(headers)}, + "stream_id": str(stream_id), + } + ===========changed ref 2=========== # module: aioquic.h3.connection + def qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "data"}, + "stream_id": str(stream_id), + } + ===========changed ref 3=========== # module: aioquic.h3.connection + def qlog_encode_push_promise_frame( + byte_length: int, headers: Headers, push_id: int, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": { + "frame_type": "push_promise", + "field": qlog_encode_headers(headers), + "id": str(push_id), + }, + "stream_id": str(stream_id), + } + ===========changed ref 4=========== # module: aioquic.h3.connection class H3Stream: def __init__(self) -> None: self.blocked = False + self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None self.stream_type: Optional[int] = None ===========changed ref 5=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ + # log frame + if self._quic_logger is not None: + self._quic_logger.log_event( + category="HTTP", + event="frame_created", + data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), + ) + self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream ) ===========changed ref 6=========== # module: aioquic.h3.connection class H3Connection: def __init__(self, quic: QuicConnection): self._max_table_capacity = 0x100 self._blocked_streams = 0x10 self._is_client = quic.configuration.is_client self._is_done = False self._quic = quic + self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._decoder = pylsqpack.Decoder( self._max_table_capacity, self._blocked_streams ) self._encoder = pylsqpack.Encoder() self._stream: Dict[int, H3Stream] = {} self._max_push_id: Optional[int] = 8 if self._is_client else None self._next_push_id: int = 0 self._local_control_stream_id: Optional[int] = None self._local_decoder_stream_id: Optional[int] = None self._local_encoder_stream_id: Optional[int] = None self._peer_control_stream_id: Optional[int] = None self._peer_decoder_stream_id: Optional[int] = None self._peer_encoder_stream_id: Optional[int] = None self._init_connection()
aioquic.h3.connection/H3Connection._handle_request_or_push_frame
Modified
aiortc~aioquic
44c20c190cf84f2bacad0299e3848fd2cc2a11b7
[http3] add some initial QLOG support for HTTP/3 events
<28>:<add> # log frame <add> if self._quic_logger is not None: <add> self._quic_logger.log_event( <add> category="HTTP", <add> event="frame_parsed", <add> data=qlog_encode_headers_frame( <add> byte_length=stream.blocked_frame_size <add> if frame_data is None <add> else len(frame_data), <add> headers=headers, <add> stream_id=stream_id, <add> ), <add> ) <add>
# module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], stream_id: int, stream_ended: bool, ) -> List[H3Event]: <0> """ <1> Handle a frame received on a request or push stream. <2> """ <3> http_events: List[H3Event] = [] <4> stream = self._stream[stream_id] <5> <6> if frame_type == FrameType.DATA: <7> # check DATA frame is allowed <8> if stream.headers_state != HeadersState.AFTER_HEADERS: <9> raise UnexpectedFrame("DATA frame is not allowed in this state") <10> <11> if stream_ended or frame_data: <12> http_events.append( <13> DataReceived( <14> data=frame_data, <15> push_id=stream.push_id, <16> stream_ended=stream_ended, <17> stream_id=stream_id, <18> ) <19> ) <20> elif frame_type == FrameType.HEADERS: <21> # check HEADERS frame is allowed <22> if stream.headers_state == HeadersState.AFTER_TRAILERS: <23> raise UnexpectedFrame("HEADERS frame is not allowed in this state") <24> <25> # try to decode HEADERS, may raise pylsqpack.StreamBlocked <26> headers = self._decode_headers(stream_id, frame_data) <27> <28> # update state and emit headers <29> if stream.headers_state == HeadersState.INITIAL: <30> stream.headers_state = HeadersState.AFTER_HEADERS <31> else: <32> stream.headers_state = HeadersState.AFTER_TRAILERS <33> http_events.append( <34> HeadersReceived( <35> headers=headers, <36> push_id=stream.push_id, <37> stream_id=stream_id, <38> stream_ended=stream_ended, <39> ) <40> ) <41> elif stream.frame_type == FrameType.PUSH_PROMISE</s>
===========below chunk 0=========== # module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], stream_id: int, stream_ended: bool, ) -> List[H3Event]: # offset: 1 if not self._is_client: raise UnexpectedFrame("Clients must not send PUSH_PROMISE") frame_buf = Buffer(data=frame_data) push_id = frame_buf.pull_uint_var() headers = self._decode_headers(stream_id, frame_data[frame_buf.tell() :]) http_events.append( PushPromiseReceived( headers=headers, push_id=push_id, stream_id=stream_id ) ) elif frame_type in ( FrameType.PRIORITY, FrameType.CANCEL_PUSH, FrameType.SETTINGS, FrameType.PUSH_PROMISE, FrameType.GOAWAY, FrameType.MAX_PUSH_ID, FrameType.DUPLICATE_PUSH, ): raise WrongStream( "Invalid frame type on request stream" if stream.push_id is None else "Invalid frame type on push stream" ) return http_events ===========unchanged ref 0=========== at: aioquic.buffer encode_uint_var(value: int) -> bytes at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) Setting(x: Union[str, bytes, bytearray], base: int) Setting(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QpackDecompressionFailed(reason_phrase: str="") UnexpectedFrame(reason_phrase: str="") WrongStream(reason_phrase: str="") encode_frame(frame_type: int, frame_data: bytes) -> bytes parse_max_push_id(data: bytes) -> int parse_settings(data: bytes) -> Dict[int, int] at: aioquic.h3.connection.H3Connection.__init__ self._is_client = quic.configuration.is_client self._quic = quic self._decoder = pylsqpack.Decoder( self._max_table_capacity, self._blocked_streams ) self._encoder = pylsqpack.Encoder() self._stream: Dict[int, H3Stream] = {} self._max_push_id: Optional[int] = 8 if self._is_client else None self._local_decoder_stream_id: Optional[int] = None self._local_encoder_stream_id: Optional[int] = None at: aioquic.h3.connection.H3Connection._init_connection self._local_encoder_stream_id = self._create_uni_stream( StreamType.QPACK_ENCODER ) self._local_decoder_stream_id = self._create_uni_stream( StreamType.QPACK_DECODER ) ===========unchanged ref 1=========== at: aioquic.h3.connection.H3Connection.send_headers frame_data = self._encode_headers(stream_id, headers) at: aioquic.h3.events Headers = List[Tuple[bytes, bytes]] H3Event() at: aioquic.quic.connection.QuicConnection get_next_available_stream_id(is_unidirectional=False) -> int send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None at: typing List = _alias(list, 1, inst=False, name='List') at: typing.Mapping get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T] get(key: _KT) -> Optional[_VT_co] ===========changed ref 0=========== # module: aioquic.h3.connection + def qlog_encode_headers(headers: Headers) -> List[Dict]: + return [ + {"name": h[0].decode("utf8"), "value": h[1].decode("utf8")} for h in headers + ] + ===========changed ref 1=========== # module: aioquic.h3.connection + def qlog_encode_headers_frame( + byte_length: int, headers: Headers, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "headers", "fields": qlog_encode_headers(headers)}, + "stream_id": str(stream_id), + } + ===========changed ref 2=========== # module: aioquic.h3.connection + def qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "data"}, + "stream_id": str(stream_id), + } + ===========changed ref 3=========== # module: aioquic.h3.connection + def qlog_encode_push_promise_frame( + byte_length: int, headers: Headers, push_id: int, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": { + "frame_type": "push_promise", + "field": qlog_encode_headers(headers), + "id": str(push_id), + }, + "stream_id": str(stream_id), + } + ===========changed ref 4=========== # module: aioquic.h3.connection class H3Stream: def __init__(self) -> None: self.blocked = False + self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None self.stream_type: Optional[int] = None ===========changed ref 5=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ + # log frame + if self._quic_logger is not None: + self._quic_logger.log_event( + category="HTTP", + event="frame_created", + data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), + ) + self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream )
aioquic.h3.connection/H3Connection._receive_request_or_push_data
Modified
aiortc~aioquic
44c20c190cf84f2bacad0299e3848fd2cc2a11b7
[http3] add some initial QLOG support for HTTP/3 events
# module: aioquic.h3.connection class H3Connection: def _receive_request_or_push_data( self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: <0> """ <1> Handle data received on a request or push stream. <2> """ <3> http_events: List[H3Event] = [] <4> <5> stream = self._stream[stream_id] <6> stream.buffer += data <7> if stream_ended: <8> stream.ended = True <9> if stream.blocked: <10> return http_events <11> <12> # shortcut for DATA frame fragments <13> if ( <14> stream.frame_type == FrameType.DATA <15> and stream.frame_size is not None <16> and len(stream.buffer) < stream.frame_size <17> ): <18> http_events.append( <19> DataReceived( <20> data=stream.buffer, <21> push_id=stream.push_id, <22> stream_id=stream_id, <23> stream_ended=False, <24> ) <25> ) <26> stream.frame_size -= len(stream.buffer) <27> stream.buffer = b"" <28> return http_events <29> <30> # handle lone FIN <31> if stream_ended and not stream.buffer: <32> http_events.append( <33> DataReceived( <34> data=b"", <35> push_id=stream.push_id, <36> stream_id=stream_id, <37> stream_ended=True, <38> ) <39> ) <40> return http_events <41> <42> buf = Buffer(data=stream.buffer) <43> consumed = 0 <44> <45> while not buf.eof(): <46> # fetch next frame header <47> if stream.frame_size is None: <48> try: <49> stream.frame_type = buf.pull_uint_var() <50> stream.frame_size = buf.pull_uint_var() <51> except BufferReadError: <52> break <53> consumed = buf</s>
===========below chunk 0=========== # module: aioquic.h3.connection class H3Connection: def _receive_request_or_push_data( self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: # offset: 1 # check how much data is available chunk_size = min(stream.frame_size, buf.capacity - consumed) if stream.frame_type != FrameType.DATA and chunk_size < stream.frame_size: break # read available data frame_data = buf.pull_bytes(chunk_size) consumed = buf.tell() # detect end of frame stream.frame_size -= chunk_size if not stream.frame_size: stream.frame_size = None try: http_events.extend( self._handle_request_or_push_frame( frame_type=stream.frame_type, frame_data=frame_data, stream_id=stream_id, stream_ended=stream.ended and buf.eof(), ) ) except pylsqpack.StreamBlocked: stream.blocked = True break # remove processed data from buffer stream.buffer = stream.buffer[consumed:] return http_events ===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer tell() -> int pull_uint_var() -> int at: aioquic.buffer encode_uint_var(value: int) -> bytes at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) HeadersState() Setting(x: Union[str, bytes, bytearray], base: int) Setting(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, bytearray], base: int) UnexpectedFrame(reason_phrase: str="") WrongStream(reason_phrase: str="") encode_frame(frame_type: int, frame_data: bytes) -> bytes encode_settings(settings: Dict[int, int]) -> bytes qlog_encode_push_promise_frame(byte_length: int, headers: Headers, push_id: int, stream_id: int) -> Dict at: aioquic.h3.connection.H3Connection _create_uni_stream(stream_type: int) -> int _create_uni_stream(self, stream_type: int) -> int _decode_headers(stream_id: int, frame_data: Optional[bytes]) -> Headers _decode_headers(self, stream_id: int, frame_data: Optional[bytes]) -> Headers at: aioquic.h3.connection.H3Connection.__init__ self._max_table_capacity = 0x100 self._blocked_streams = 0x10 self._is_client = quic.configuration.is_client self._quic = quic ===========unchanged ref 1=========== self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._max_push_id: Optional[int] = 8 if self._is_client else None self._local_control_stream_id: Optional[int] = None self._local_decoder_stream_id: Optional[int] = None self._local_encoder_stream_id: Optional[int] = None at: aioquic.h3.connection.H3Connection._handle_control_frame self._max_push_id = parse_max_push_id(frame_data) at: aioquic.h3.connection.H3Connection._handle_request_or_push_frame http_events: List[H3Event] = [] stream = self._stream[stream_id] at: aioquic.h3.connection.H3Stream.__init__ self.frame_type: Optional[int] = None self.headers_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None at: aioquic.h3.events HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) PushPromiseReceived(headers: Headers, push_id: int, stream_id: int) at: aioquic.h3.events.HeadersReceived headers: Headers stream_id: int stream_ended: bool push_id: Optional[int] = None at: aioquic.h3.events.PushPromiseReceived headers: Headers push_id: int stream_id: int at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None ===========changed ref 0=========== # module: aioquic.h3.connection + def qlog_encode_push_promise_frame( + byte_length: int, headers: Headers, push_id: int, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": { + "frame_type": "push_promise", + "field": qlog_encode_headers(headers), + "id": str(push_id), + }, + "stream_id": str(stream_id), + } + ===========changed ref 1=========== # module: aioquic.h3.connection + def qlog_encode_headers(headers: Headers) -> List[Dict]: + return [ + {"name": h[0].decode("utf8"), "value": h[1].decode("utf8")} for h in headers + ] + ===========changed ref 2=========== # module: aioquic.h3.connection + def qlog_encode_headers_frame( + byte_length: int, headers: Headers, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "headers", "fields": qlog_encode_headers(headers)}, + "stream_id": str(stream_id), + } + ===========changed ref 3=========== # module: aioquic.h3.connection + def qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "data"}, + "stream_id": str(stream_id), + } + ===========changed ref 4=========== # module: aioquic.h3.connection class H3Stream: def __init__(self) -> None: self.blocked = False + self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None self.stream_type: Optional[int] = None
aioquic.h3.connection/H3Connection._receive_stream_data_uni
Modified
aiortc~aioquic
44c20c190cf84f2bacad0299e3848fd2cc2a11b7
[http3] add some initial QLOG support for HTTP/3 events
# module: aioquic.h3.connection class H3Connection: def _receive_stream_data_uni( self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: <0> http_events: List[H3Event] = [] <1> <2> stream = self._stream[stream_id] <3> stream.buffer += data <4> if stream_ended: <5> stream.ended = True <6> <7> buf = Buffer(data=stream.buffer) <8> consumed = 0 <9> unblocked_streams: Set[int] = set() <10> <11> while stream.stream_type == StreamType.PUSH or not buf.eof(): <12> # fetch stream type for unidirectional streams <13> if stream.stream_type is None: <14> try: <15> stream.stream_type = buf.pull_uint_var() <16> except BufferReadError: <17> break <18> consumed = buf.tell() <19> <20> # check unicity <21> if stream.stream_type == StreamType.CONTROL: <22> if self._peer_control_stream_id is not None: <23> raise StreamCreationError("Only one control stream is allowed") <24> self._peer_control_stream_id = stream_id <25> elif stream.stream_type == StreamType.QPACK_DECODER: <26> if self._peer_decoder_stream_id is not None: <27> raise StreamCreationError( <28> "Only one QPACK decoder stream is allowed" <29> ) <30> self._peer_decoder_stream_id = stream_id <31> elif stream.stream_type == StreamType.QPACK_ENCODER: <32> if self._peer_encoder_stream_id is not None: <33> raise StreamCreationError( <34> "Only one QPACK encoder stream is allowed" <35> ) <36> self._peer_encoder_stream_id = stream_id <37> <38> if stream.stream_type == StreamType.CONTROL: <39> # fetch next frame <40> try: <41> frame_type = buf.pull_uint_var</s>
===========below chunk 0=========== # module: aioquic.h3.connection class H3Connection: def _receive_stream_data_uni( self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: # offset: 1 frame_length = buf.pull_uint_var() frame_data = buf.pull_bytes(frame_length) except BufferReadError: break consumed = buf.tell() self._handle_control_frame(frame_type, frame_data) elif stream.stream_type == StreamType.PUSH: # fetch push id if stream.push_id is None: try: stream.push_id = buf.pull_uint_var() except BufferReadError: break consumed = buf.tell() # remove processed data from buffer stream.buffer = stream.buffer[consumed:] return self._receive_request_or_push_data(stream_id, b"", stream_ended) elif stream.stream_type == StreamType.QPACK_DECODER: # feed unframed data to decoder data = buf.pull_bytes(buf.capacity - buf.tell()) consumed = buf.tell() try: self._encoder.feed_decoder(data) except pylsqpack.DecoderStreamError as exc: raise QpackDecoderStreamError() from exc elif stream.stream_type == StreamType.QPACK_ENCODER: # feed unframed data to encoder data = buf.pull_bytes(buf.capacity - buf.tell()) consumed = buf.tell() try: unblocked_streams.update(self._decoder.feed_encoder(data)) except pylsqpack.EncoderStreamError as exc: raise QpackEncoderStreamError() from exc else: # unknown stream type, discard data buf.seek(buf.capacity) consumed = buf.tell() # remove processed data from buffer stream.buffer = stream.buffer[consumed:] </s> ===========below chunk 1=========== # module: aioquic.h3.connection class H3Connection: def _receive_stream_data_uni( self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: # offset: 2 <s> = buf.tell() # remove processed data from buffer stream.buffer = stream.buffer[consumed:] # process unblocked streams for stream_id in unblocked_streams: stream = self._stream[stream_id] # resume headers http_events.extend( self._handle_request_or_push_frame( frame_type=FrameType.HEADERS, frame_data=None, stream_id=stream_id, stream_ended=stream.ended and not stream.buffer, ) ) stream.blocked = False # resume processing if stream.buffer: http_events.extend( self._receive_request_or_push_data(stream_id, b"", stream.ended) ) return http_events ===========unchanged ref 0=========== at: aioquic._buffer BufferReadError(*args: object) Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer eof() -> bool tell() -> int pull_bytes(length: int) -> bytes pull_uint_var() -> int at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict at: aioquic.h3.connection.H3Connection _handle_request_or_push_frame(self, frame_type: int, frame_data: Optional[bytes], stream_id: int, stream_ended: bool) -> List[H3Event] _handle_request_or_push_frame(frame_type: int, frame_data: Optional[bytes], stream_id: int, stream_ended: bool) -> List[H3Event] at: aioquic.h3.connection.H3Connection.__init__ self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._stream: Dict[int, H3Stream] = {} at: aioquic.h3.connection.H3Stream.__init__ self.blocked = False self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.push_id: Optional[int] = None at: aioquic.h3.events H3Event() DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.h3.events.DataReceived data: bytes stream_id: int ===========unchanged ref 1=========== stream_ended: bool push_id: Optional[int] = None at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None at: typing List = _alias(list, 1, inst=False, name='List') ===========changed ref 0=========== # module: aioquic.h3.connection + def qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "data"}, + "stream_id": str(stream_id), + } + ===========changed ref 1=========== # module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], stream_id: int, stream_ended: bool, ) -> List[H3Event]: """ Handle a frame received on a request or push stream. """ http_events: List[H3Event] = [] stream = self._stream[stream_id] if frame_type == FrameType.DATA: # check DATA frame is allowed if stream.headers_state != HeadersState.AFTER_HEADERS: raise UnexpectedFrame("DATA frame is not allowed in this state") if stream_ended or frame_data: http_events.append( DataReceived( data=frame_data, push_id=stream.push_id, stream_ended=stream_ended, stream_id=stream_id, ) ) elif frame_type == FrameType.HEADERS: # check HEADERS frame is allowed if stream.headers_state == HeadersState.AFTER_TRAILERS: raise UnexpectedFrame("HEADERS frame is not allowed in this state") # try to decode HEADERS, may raise pylsqpack.StreamBlocked headers = self._decode_headers(stream_id, frame_data) + # log frame + if self._quic_logger is not None: + self._quic_logger.log_event( + category="HTTP", + event="frame_parsed", + data=qlog_encode_headers_frame( + byte_length=stream.blocked_frame_size + if frame_data is None + else len(frame_data), + headers=headers, + stream_id=stream_id, + ), + ) + # update state and emit headers if stream.headers_state == HeadersState.INITIAL: stream.headers_state = HeadersState.AFTER_HEADERS else: stream.headers_</s>
tests.test_h3/FakeQuicConnection.__init__
Modified
aiortc~aioquic
44c20c190cf84f2bacad0299e3848fd2cc2a11b7
[http3] add some initial QLOG support for HTTP/3 events
<6>:<add> self._quic_logger = QuicLogger().start_trace( <add> is_client=configuration.is_client, odcid=b"" <add> )
# module: tests.test_h3 class FakeQuicConnection: def __init__(self, configuration): <0> self.closed = None <1> self.configuration = configuration <2> self.stream_queue = [] <3> self._events = [] <4> self._next_stream_bidi = 0 if configuration.is_client else 1 <5> self._next_stream_uni = 2 if configuration.is_client else 3 <6>
===========unchanged ref 0=========== at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [QuicProtocolVersion.DRAFT_22] ) at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: tests.test_h3.FakeQuicConnection.get_next_available_stream_id self._next_stream_bidi += 4 ===========changed ref 0=========== # module: aioquic.h3.connection + def qlog_encode_headers(headers: Headers) -> List[Dict]: + return [ + {"name": h[0].decode("utf8"), "value": h[1].decode("utf8")} for h in headers + ] + ===========changed ref 1=========== # module: aioquic.h3.connection + def qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "data"}, + "stream_id": str(stream_id), + } + ===========changed ref 2=========== # module: aioquic.h3.connection + def qlog_encode_headers_frame( + byte_length: int, headers: Headers, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": {"frame_type": "headers", "fields": qlog_encode_headers(headers)}, + "stream_id": str(stream_id), + } + ===========changed ref 3=========== # module: aioquic.h3.connection + def qlog_encode_push_promise_frame( + byte_length: int, headers: Headers, push_id: int, stream_id: int + ) -> Dict: + return { + "byte_length": str(byte_length), + "frame": { + "frame_type": "push_promise", + "field": qlog_encode_headers(headers), + "id": str(push_id), + }, + "stream_id": str(stream_id), + } + ===========changed ref 4=========== # module: aioquic.h3.connection class H3Stream: def __init__(self) -> None: self.blocked = False + self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None self.stream_type: Optional[int] = None ===========changed ref 5=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ + # log frame + if self._quic_logger is not None: + self._quic_logger.log_event( + category="HTTP", + event="frame_created", + data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), + ) + self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream ) ===========changed ref 6=========== # module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: """ Send headers on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the headers. :param headers: The HTTP headers to send. :param end_stream: Whether to end the stream. """ frame_data = self._encode_headers(stream_id, headers) + + # log frame + if self._quic_logger is not None: + self._quic_logger.log_event( + category="HTTP", + event="frame_created", + data=qlog_encode_headers_frame( + byte_length=len(frame_data), headers=headers, stream_id=stream_id + ), + ) + self._quic.send_stream_data( stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream ) ===========changed ref 7=========== # module: aioquic.h3.connection class H3Connection: def __init__(self, quic: QuicConnection): self._max_table_capacity = 0x100 self._blocked_streams = 0x10 self._is_client = quic.configuration.is_client self._is_done = False self._quic = quic + self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._decoder = pylsqpack.Decoder( self._max_table_capacity, self._blocked_streams ) self._encoder = pylsqpack.Encoder() self._stream: Dict[int, H3Stream] = {} self._max_push_id: Optional[int] = 8 if self._is_client else None self._next_push_id: int = 0 self._local_control_stream_id: Optional[int] = None self._local_decoder_stream_id: Optional[int] = None self._local_encoder_stream_id: Optional[int] = None self._peer_control_stream_id: Optional[int] = None self._peer_decoder_stream_id: Optional[int] = None self._peer_encoder_stream_id: Optional[int] = None self._init_connection()
aioquic.quic.connection/QuicConnection._handle_new_token_frame
Modified
aiortc~aioquic
e2e648f10d5ecf19c48af53098efbd2ed0d610a6
[quic] ensure servers do not receive NEW_TOKEN frames
<4>:<add> <add> if not self._is_client: <add> raise QuicConnectionError( <add> error_code=QuicErrorCode.PROTOCOL_VIOLATION, <add> frame_type=frame_type, <add> reason_phrase="Clients must not send NEW_TOKEN frames", <add> )
# module: aioquic.quic.connection class QuicConnection: def _handle_new_token_frame( self, context: QuicReceiveContext, frame_type: int, buf: Buffer ) -> None: <0> """ <1> Handle a NEW_TOKEN frame. <2> """ <3> token = pull_new_token_frame(buf) <4> <5> # log frame <6> if self._quic_logger is not None: <7> context.quic_logger_frames.append( <8> self._quic_logger.encode_new_token_frame(token=token) <9> ) <10>
===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic.quic.connection QuicConnectionError(error_code: int, frame_type: int, reason_phrase: str) QuicReceiveContext(epoch: tls.Epoch, host_cid: bytes, network_path: QuicNetworkPath, quic_logger_frames: Optional[List[Any]], time: float) at: aioquic.quic.connection.QuicConnection.__init__ self._is_client = configuration.is_client at: aioquic.quic.packet QuicErrorCode(x: Union[str, bytes, bytearray], base: int) QuicErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) pull_new_token_frame(buf: Buffer) -> bytes
aioquic.quic.stream/QuicStream.__init__
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<0>:<del> self._connection = connection
# module: aioquic.quic.stream class QuicStream: def __init__( self, stream_id: Optional[int] = None, - connection: Optional[Any] = None, max_stream_data_local: int = 0, max_stream_data_remote: int = 0, ) -> None: <0> self._connection = connection <1> self.is_blocked = False <2> self.max_stream_data_local = max_stream_data_local <3> self.max_stream_data_local_sent = max_stream_data_local <4> self.max_stream_data_remote = max_stream_data_remote <5> self.send_buffer_is_empty = True <6> <7> self._recv_buffer = bytearray() <8> self._recv_buffer_fin: Optional[int] = None <9> self._recv_buffer_start = 0 # the offset for the start of the buffer <10> self._recv_highest = 0 # the highest offset ever seen <11> self._recv_ranges = RangeSet() <12> <13> self._send_acked = RangeSet() <14> self._send_buffer = bytearray() <15> self._send_buffer_fin: Optional[int] = None <16> self._send_buffer_start = 0 # the offset for the start of the buffer <17> self._send_buffer_stop = 0 # the offset for the stop of the buffer <18> self._send_highest = 0 <19> self._send_pending = RangeSet() <20> self._send_pending_eof = False <21> <22> self.__stream_id = stream_id <23>
===========unchanged ref 0=========== at: aioquic.quic.rangeset RangeSet(ranges: Iterable[range]=[]) at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop at: aioquic.quic.stream.QuicStream.add_frame self._recv_buffer_fin = frame_end self._recv_highest = frame_end self._recv_buffer_start += count self._recv_buffer += bytearray(gap) at: aioquic.quic.stream.QuicStream.get_frame self._send_pending_eof = False self.send_buffer_is_empty = True self._send_highest = stop at: aioquic.quic.stream.QuicStream.on_data_delivery self.send_buffer_is_empty = False self._send_buffer_start += size self._send_pending_eof = True at: aioquic.quic.stream.QuicStream.write self.send_buffer_is_empty = False self._send_buffer += data self._send_buffer_stop += size self._send_buffer_fin = self._send_buffer_stop self._send_pending_eof = True
aioquic.quic.stream/QuicStream.add_frame
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<10>:<del> <11>:<del> if pos + count > 0: <12>:<del> # frame has been partially consumed <13>:<del> if pos < 0: <14>:<del> count += pos <15>:<del> frame.data = frame.data[-pos:] <16>:<del> frame.offset -= pos <17>:<del> pos = 0 <18>:<del> <19>:<del> # marked received <20>:<del> if count: <21>:<del> self._recv_ranges.add(frame.offset, frame_end) <22>:<del> if frame_end > self._recv_highest: <23>:<del> self._recv_highest = frame_end <24>:<del> <25>:<del> # add data <26>:<del> gap = pos - len(self._recv_buffer) <27>:<del> if gap > 0: <28>:<del> self._recv_buffer += bytearray(gap) <29>:<del> self._recv_buffer[pos : pos + count] = frame.data <30>:<del> <33>:<add> if frame_end > self._recv_highest: <add> self._recv_highest = frame_end <34>:<add> # fast path: new in-order chunk <add> if pos == 0 and count and not self._recv_buffer: <add> self._recv_buffer_start += count <del> if self._connection: <35>:<del> data = self.pull_data() <36>:<del> self._connection._events.append( <37>:<add> return events.StreamDataReceived( <del> events.StreamDataReceived( <38>:<del> data=data, <39>:<del> end_stream=(self._recv_buffer_start == self._recv_buffer_fin), <40>:<del> stream_id=self.__stream_id, <41>:<del> ) <42>:<add> data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id
# module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: <0> """ <1> Add a frame of received data. <2> """ <3> pos = frame.offset - self._recv_buffer_start <4> count = len(frame.data) <5> frame_end = frame.offset + count <6> <7> # we should receive no more data beyond FIN! <8> if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: <9> raise Exception("Data received beyond FIN") <10> <11> if pos + count > 0: <12> # frame has been partially consumed <13> if pos < 0: <14> count += pos <15> frame.data = frame.data[-pos:] <16> frame.offset -= pos <17> pos = 0 <18> <19> # marked received <20> if count: <21> self._recv_ranges.add(frame.offset, frame_end) <22> if frame_end > self._recv_highest: <23> self._recv_highest = frame_end <24> <25> # add data <26> gap = pos - len(self._recv_buffer) <27> if gap > 0: <28> self._recv_buffer += bytearray(gap) <29> self._recv_buffer[pos : pos + count] = frame.data <30> <31> if frame.fin: <32> self._recv_buffer_fin = frame_end <33> <34> if self._connection: <35> data = self.pull_data() <36> self._connection._events.append( <37> events.StreamDataReceived( <38> data=data, <39> end_stream=(self._recv_buffer_start == self._recv_buffer_fin), <40> stream_id=self.__stream_id, <41> ) <42> ) <43>
===========unchanged ref 0=========== at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: aioquic.quic.events.StreamDataReceived data: bytes end_stream: bool stream_id: int at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.packet.QuicStreamFrame data: bytes = b"" fin: bool = False offset: int = 0 at: aioquic.quic.rangeset.RangeSet add(start: int, stop: Optional[int]=None) -> None at: aioquic.quic.stream.QuicStream _pull_data() -> bytes at: aioquic.quic.stream.QuicStream.__init__ self._recv_buffer = bytearray() self._recv_buffer_fin: Optional[int] = None self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_highest = 0 # the highest offset ever seen self._recv_ranges = RangeSet() self.__stream_id = stream_id at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: def __init__( self, stream_id: Optional[int] = None, - connection: Optional[Any] = None, max_stream_data_local: int = 0, max_stream_data_remote: int = 0, ) -> None: - self._connection = connection self.is_blocked = False self.max_stream_data_local = max_stream_data_local self.max_stream_data_local_sent = max_stream_data_local self.max_stream_data_remote = max_stream_data_remote self.send_buffer_is_empty = True self._recv_buffer = bytearray() self._recv_buffer_fin: Optional[int] = None self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_highest = 0 # the highest offset ever seen self._recv_ranges = RangeSet() self._send_acked = RangeSet() self._send_buffer = bytearray() self._send_buffer_fin: Optional[int] = None self._send_buffer_start = 0 # the offset for the start of the buffer self._send_buffer_stop = 0 # the offset for the stop of the buffer self._send_highest = 0 self._send_pending = RangeSet() self._send_pending_eof = False self.__stream_id = stream_id
aioquic.quic.connection/QuicConnection._create_stream
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<17>:<del> connection=self,
# module: aioquic.quic.connection class QuicConnection: def _create_stream(self, stream_id: int) -> QuicStream: <0> """ <1> Create a QUIC stream in order to send data to the peer. <2> """ <3> # determine limits <4> if stream_is_unidirectional(stream_id): <5> max_stream_data_local = 0 <6> max_stream_data_remote = self._remote_max_stream_data_uni <7> max_streams = self._remote_max_streams_uni <8> streams_blocked = self._streams_blocked_uni <9> else: <10> max_stream_data_local = self._local_max_stream_data_bidi_local <11> max_stream_data_remote = self._remote_max_stream_data_bidi_remote <12> max_streams = self._remote_max_streams_bidi <13> streams_blocked = self._streams_blocked_bidi <14> <15> # create stream <16> stream = self._streams[stream_id] = QuicStream( <17> connection=self, <18> stream_id=stream_id, <19> max_stream_data_local=max_stream_data_local, <20> max_stream_data_remote=max_stream_data_remote, <21> ) <22> <23> # mark stream as blocked if needed <24> if stream_id // 4 >= max_streams: <25> stream.is_blocked = True <26> streams_blocked.append(stream) <27> self._streams_blocked_pending = True <28> <29> return stream <30>
===========unchanged ref 0=========== at: aioquic.quic.connection stream_is_unidirectional(stream_id: int) -> bool at: aioquic.quic.connection.QuicConnection.__init__ self._local_max_stream_data_bidi_local = MAX_DATA_WINDOW self._remote_max_stream_data_bidi_remote = 0 self._remote_max_stream_data_uni = 0 self._remote_max_streams_bidi = 0 self._remote_max_streams_uni = 0 self._streams: Dict[int, QuicStream] = {} self._streams_blocked_bidi: List[QuicStream] = [] self._streams_blocked_uni: List[QuicStream] = [] self._streams_blocked_pending = False at: aioquic.quic.connection.QuicConnection._handle_max_streams_bidi_frame self._remote_max_streams_bidi = max_streams at: aioquic.quic.connection.QuicConnection._handle_max_streams_uni_frame self._remote_max_streams_uni = max_streams at: aioquic.quic.connection.QuicConnection._unblock_streams self._streams_blocked_pending = False at: aioquic.quic.connection.QuicConnection._write_application self._streams_blocked_pending = False at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream.__init__ self.is_blocked = False ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: + def _pull_data(self) -> bytes: + """ + Remove data from the front of the buffer. + """ + try: + has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start + except IndexError: + has_data_to_read = False + if not has_data_to_read: + return b"" + + r = self._recv_ranges.shift() + pos = r.stop - r.start + data = bytes(self._recv_buffer[:pos]) + del self._recv_buffer[:pos] + self._recv_buffer_start = r.stop + return data + ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: - def pull_data(self) -> bytes: - """ - Pull received data. - """ - try: - has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start - except IndexError: - has_data_to_read = False - if not has_data_to_read: - return b"" - - r = self._recv_ranges.shift() - pos = r.stop - r.start - data = bytes(self._recv_buffer[:pos]) - del self._recv_buffer[:pos] - self._recv_buffer_start = r.stop - return data - ===========changed ref 2=========== # module: aioquic.quic.stream class QuicStream: def __init__( self, stream_id: Optional[int] = None, - connection: Optional[Any] = None, max_stream_data_local: int = 0, max_stream_data_remote: int = 0, ) -> None: - self._connection = connection self.is_blocked = False self.max_stream_data_local = max_stream_data_local self.max_stream_data_local_sent = max_stream_data_local self.max_stream_data_remote = max_stream_data_remote self.send_buffer_is_empty = True self._recv_buffer = bytearray() self._recv_buffer_fin: Optional[int] = None self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_highest = 0 # the highest offset ever seen self._recv_ranges = RangeSet() self._send_acked = RangeSet() self._send_buffer = bytearray() self._send_buffer_fin: Optional[int] = None self._send_buffer_start = 0 # the offset for the start of the buffer self._send_buffer_stop = 0 # the offset for the stop of the buffer self._send_highest = 0 self._send_pending = RangeSet() self._send_pending_eof = False self.__stream_id = stream_id ===========changed ref 3=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 4=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id )
aioquic.quic.connection/QuicConnection._get_or_create_stream
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<34>:<del> connection=self,
# module: aioquic.quic.connection class QuicConnection: def _get_or_create_stream(self, frame_type: int, stream_id: int) -> QuicStream: <0> """ <1> Get or create a stream in response to a received frame. <2> """ <3> stream = self._streams.get(stream_id, None) <4> if stream is None: <5> # check initiator <6> if stream_is_client_initiated(stream_id) == self._is_client: <7> raise QuicConnectionError( <8> error_code=QuicErrorCode.STREAM_STATE_ERROR, <9> frame_type=frame_type, <10> reason_phrase="Wrong stream initiator", <11> ) <12> <13> # determine limits <14> if stream_is_unidirectional(stream_id): <15> max_stream_data_local = self._local_max_stream_data_uni <16> max_stream_data_remote = 0 <17> max_streams = self._local_max_streams_uni <18> else: <19> max_stream_data_local = self._local_max_stream_data_bidi_remote <20> max_stream_data_remote = self._remote_max_stream_data_bidi_local <21> max_streams = self._local_max_streams_bidi <22> <23> # check max streams <24> if stream_id // 4 >= max_streams: <25> raise QuicConnectionError( <26> error_code=QuicErrorCode.STREAM_LIMIT_ERROR, <27> frame_type=frame_type, <28> reason_phrase="Too many streams open", <29> ) <30> <31> # create stream <32> self._logger.info("Stream %d created by peer" % stream_id) <33> stream = self._streams[stream_id] = QuicStream( <34> connection=self, <35> stream_id=stream_id, <36> max_stream_data_local=max_stream_data_local, <37> max_stream_data_remote=max_stream_data_remote, <38> ) <39> return</s>
===========below chunk 0=========== # module: aioquic.quic.connection class QuicConnection: def _get_or_create_stream(self, frame_type: int, stream_id: int) -> QuicStream: # offset: 1 ===========unchanged ref 0=========== at: aioquic.quic.connection stream_is_client_initiated(stream_id: int) -> bool stream_is_unidirectional(stream_id: int) -> bool QuicConnectionError(error_code: int, frame_type: int, reason_phrase: str) at: aioquic.quic.connection.QuicConnection.__init__ self._is_client = configuration.is_client self._local_max_stream_data_bidi_remote = MAX_DATA_WINDOW self._local_max_stream_data_uni = MAX_DATA_WINDOW self._local_max_streams_bidi = 128 self._local_max_streams_uni = 128 self._remote_max_stream_data_bidi_local = 0 self._streams: Dict[int, QuicStream] = {} self._logger = QuicConnectionAdapter( logger, {"id": dump_cid(logger_connection_id)} ) at: aioquic.quic.packet QuicErrorCode(x: Union[str, bytes, bytearray], base: int) QuicErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: logging.LoggerAdapter logger: Logger extra: Mapping[str, Any] info(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None at: typing.Mapping get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T] get(key: _KT) -> Optional[_VT_co] ===========changed ref 0=========== # module: aioquic.quic.connection class QuicConnection: def _create_stream(self, stream_id: int) -> QuicStream: """ Create a QUIC stream in order to send data to the peer. """ # determine limits if stream_is_unidirectional(stream_id): max_stream_data_local = 0 max_stream_data_remote = self._remote_max_stream_data_uni max_streams = self._remote_max_streams_uni streams_blocked = self._streams_blocked_uni else: max_stream_data_local = self._local_max_stream_data_bidi_local max_stream_data_remote = self._remote_max_stream_data_bidi_remote max_streams = self._remote_max_streams_bidi streams_blocked = self._streams_blocked_bidi # create stream stream = self._streams[stream_id] = QuicStream( - connection=self, stream_id=stream_id, max_stream_data_local=max_stream_data_local, max_stream_data_remote=max_stream_data_remote, ) # mark stream as blocked if needed if stream_id // 4 >= max_streams: stream.is_blocked = True streams_blocked.append(stream) self._streams_blocked_pending = True return stream ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: + def _pull_data(self) -> bytes: + """ + Remove data from the front of the buffer. + """ + try: + has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start + except IndexError: + has_data_to_read = False + if not has_data_to_read: + return b"" + + r = self._recv_ranges.shift() + pos = r.stop - r.start + data = bytes(self._recv_buffer[:pos]) + del self._recv_buffer[:pos] + self._recv_buffer_start = r.stop + return data + ===========changed ref 2=========== # module: aioquic.quic.stream class QuicStream: - def pull_data(self) -> bytes: - """ - Pull received data. - """ - try: - has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start - except IndexError: - has_data_to_read = False - if not has_data_to_read: - return b"" - - r = self._recv_ranges.shift() - pos = r.stop - r.start - data = bytes(self._recv_buffer[:pos]) - del self._recv_buffer[:pos] - self._recv_buffer_start = r.stop - return data - ===========changed ref 3=========== # module: aioquic.quic.stream class QuicStream: def __init__( self, stream_id: Optional[int] = None, - connection: Optional[Any] = None, max_stream_data_local: int = 0, max_stream_data_remote: int = 0, ) -> None: - self._connection = connection self.is_blocked = False self.max_stream_data_local = max_stream_data_local self.max_stream_data_local_sent = max_stream_data_local self.max_stream_data_remote = max_stream_data_remote self.send_buffer_is_empty = True self._recv_buffer = bytearray() self._recv_buffer_fin: Optional[int] = None self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_highest = 0 # the highest offset ever seen self._recv_ranges = RangeSet() self._send_acked = RangeSet() self._send_buffer = bytearray() self._send_buffer_fin: Optional[int] = None self._send_buffer_start = 0 # the offset for the start of the buffer self._send_buffer_stop = 0 # the offset for the stop of the buffer self._send_highest = 0 self._send_pending = RangeSet() self._send_pending_eof = False self.__stream_id = stream_id
aioquic.quic.connection/QuicConnection._handle_crypto_frame
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<14>:<add> event = stream.add_frame(frame) <del> stream.add_frame(frame) <15>:<del> data = stream.pull_data() <16>:<del> if data: <17>:<add> if event is not None: <19>:<add> self.tls.handle_message(event.data, self._crypto_buffers) <del> self.tls.handle_message(data, self._crypto_buffers)
# module: aioquic.quic.connection class QuicConnection: def _handle_crypto_frame( self, context: QuicReceiveContext, frame_type: int, buf: Buffer ) -> None: <0> """ <1> Handle a CRYPTO frame. <2> """ <3> offset = buf.pull_uint_var() <4> length = buf.pull_uint_var() <5> frame = QuicStreamFrame(offset=offset, data=buf.pull_bytes(length)) <6> <7> # log frame <8> if self._quic_logger is not None: <9> context.quic_logger_frames.append( <10> self._quic_logger.encode_crypto_frame(frame) <11> ) <12> <13> stream = self._crypto_streams[context.epoch] <14> stream.add_frame(frame) <15> data = stream.pull_data() <16> if data: <17> # pass data to TLS layer <18> try: <19> self.tls.handle_message(data, self._crypto_buffers) <20> self._push_crypto_data() <21> except tls.Alert as exc: <22> raise QuicConnectionError( <23> error_code=QuicErrorCode.CRYPTO_ERROR + int(exc.description), <24> frame_type=QuicFrameType.CRYPTO, <25> reason_phrase=str(exc), <26> ) <27> <28> # parse transport parameters <29> if ( <30> not self._parameters_received <31> and self.tls.received_extensions is not None <32> ): <33> for ext_type, ext_data in self.tls.received_extensions: <34> if ext_type == tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS: <35> self._parse_transport_parameters(ext_data) <36> self._parameters_received = True <37> break <38> assert ( <39> self._parameters_received <40> ), "No QUIC transport parameters received" <41> <42> # update current epoch <43> if not self._handshake_complete and self.tls.state in [ <44> tls.State.CLIENT</s>
===========below chunk 0=========== # module: aioquic.quic.connection class QuicConnection: def _handle_crypto_frame( self, context: QuicReceiveContext, frame_type: int, buf: Buffer ) -> None: # offset: 1 tls.State.SERVER_POST_HANDSHAKE, ]: self._handshake_complete = True self._loss.is_client_without_1rtt = False self._replenish_connection_ids() self._events.append( events.HandshakeCompleted( alpn_protocol=self.tls.alpn_negotiated, early_data_accepted=self.tls.early_data_accepted, session_resumed=self.tls.session_resumed, ) ) self._unblock_streams(is_unidirectional=False) self._unblock_streams(is_unidirectional=True) self._logger.info( "ALPN negotiated protocol %s", self.tls.alpn_negotiated ) ===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer pull_bytes(length: int) -> bytes pull_uint_var() -> int at: aioquic.quic.connection QuicConnectionError(error_code: int, frame_type: int, reason_phrase: str) QuicReceiveContext(epoch: tls.Epoch, host_cid: bytes, network_path: QuicNetworkPath, quic_logger_frames: Optional[List[Any]], time: float) at: aioquic.quic.connection.QuicConnection _replenish_connection_ids() -> None _push_crypto_data() -> None _parse_transport_parameters(data: bytes, from_session_ticket: bool=False) -> None _unblock_streams(is_unidirectional: bool) -> None at: aioquic.quic.connection.QuicConnection.__init__ self._crypto_buffers: Dict[tls.Epoch, Buffer] = {} self._crypto_streams: Dict[tls.Epoch, QuicStream] = {} self._events: Deque[events.QuicEvent] = deque() self._handshake_complete = False self._parameters_received = False self._quic_logger: Optional[QuicLoggerTrace] = None self._quic_logger = configuration.quic_logger.start_trace( is_client=configuration.is_client, odcid=logger_connection_id ) self._logger = QuicConnectionAdapter( logger, {"id": dump_cid(logger_connection_id)} ) self._loss = QuicPacketRecovery( is_client_without_1rtt=self._is_client, quic_logger=self._quic_logger, send_probe=self._send_probe, ) ===========unchanged ref 1=========== at: aioquic.quic.connection.QuicConnection._close_end self._quic_logger = None at: aioquic.quic.connection.QuicConnection._initialize self.tls = tls.Context(is_client=self._is_client, logger=self._logger) self._crypto_buffers = { tls.Epoch.INITIAL: Buffer(capacity=4096), tls.Epoch.HANDSHAKE: Buffer(capacity=4096), tls.Epoch.ONE_RTT: Buffer(capacity=4096), } self._crypto_streams = { tls.Epoch.INITIAL: QuicStream(), tls.Epoch.HANDSHAKE: QuicStream(), tls.Epoch.ONE_RTT: QuicStream(), } at: aioquic.quic.connection.QuicReceiveContext epoch: tls.Epoch host_cid: bytes network_path: QuicNetworkPath quic_logger_frames: Optional[List[Any]] time: float at: aioquic.quic.events HandshakeCompleted(alpn_protocol: Optional[str], early_data_accepted: bool, session_resumed: bool) at: aioquic.quic.events.HandshakeCompleted alpn_protocol: Optional[str] early_data_accepted: bool session_resumed: bool at: aioquic.quic.events.StreamDataReceived data: bytes end_stream: bool stream_id: int at: aioquic.quic.logger.QuicLoggerTrace encode_crypto_frame(frame: QuicStreamFrame) -> Dict at: aioquic.quic.packet QuicErrorCode(x: Union[str, bytes, bytearray], base: int) QuicErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) ===========unchanged ref 2=========== QuicFrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QuicFrameType(x: Union[str, bytes, bytearray], base: int) QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.packet.QuicStreamFrame data: bytes = b"" fin: bool = False offset: int = 0 at: aioquic.quic.recovery.QuicPacketRecovery.__init__ self.is_client_without_1rtt = is_client_without_1rtt at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.tls Alert(*args: object) State() ExtensionType(x: Union[str, bytes, bytearray], base: int) ExtensionType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: aioquic.tls.Alert description: AlertDescription at: aioquic.tls.Context handle_message(input_data: bytes, output_buf: Dict[Epoch, Buffer]) -> None at: aioquic.tls.Context.__init__ self.alpn_negotiated: Optional[str] = None self.early_data_accepted = False self.received_extensions: Optional[List[Extension]] = None self.state = State.CLIENT_HANDSHAKE_START self.state = State.SERVER_EXPECT_CLIENT_HELLO at: aioquic.tls.Context._client_handle_encrypted_extensions self.alpn_negotiated = encrypted_extensions.alpn_protocol self.early_data_accepted = encrypted_extensions.early_data self.received_extensions = encrypted_extensions.other_extensions ===========unchanged ref 3=========== at: aioquic.tls.Context._server_handle_hello self.alpn_negotiated = negotiate( self.alpn_protocols, peer_hello.alpn_protocols, AlertHandshakeFailure("No common ALPN protocols"), ) self.received_extensions = peer_hello.other_extensions self.early_data_accepted = True at: aioquic.tls.Context._set_state self.state = state at: collections.deque append(x: _T) -> None at: logging.LoggerAdapter info(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None
aioquic.quic.connection/QuicConnection._handle_stream_frame
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<41>:<add> event = stream.add_frame(frame) <del> stream.add_frame
# module: aioquic.quic.connection class QuicConnection: def _handle_stream_frame( self, context: QuicReceiveContext, frame_type: int, buf: Buffer ) -> None: <0> """ <1> Handle a STREAM frame. <2> """ <3> stream_id = buf.pull_uint_var() <4> if frame_type & 4: <5> offset = buf.pull_uint_var() <6> else: <7> offset = 0 <8> if frame_type & 2: <9> length = buf.pull_uint_var() <10> else: <11> length = buf.capacity - buf.tell() <12> frame = QuicStreamFrame( <13> offset=offset, data=buf.pull_bytes(length), fin=bool(frame_type & 1) <14> ) <15> <16> # log frame <17> if self._quic_logger is not None: <18> context.quic_logger_frames.append( <19> self._quic_logger.encode_stream_frame(frame, stream_id=stream_id) <20> ) <21> <22> # check stream direction <23> self._assert_stream_can_receive(frame_type, stream_id) <24> <25> # check flow-control limits <26> stream = self._get_or_create_stream(frame_type, stream_id) <27> if offset + length > stream.max_stream_data_local: <28> raise QuicConnectionError( <29> error_code=QuicErrorCode.FLOW_CONTROL_ERROR, <30> frame_type=frame_type, <31> reason_phrase="Over stream data limit", <32> ) <33> newly_received = max(0, offset + length - stream._recv_highest) <34> if self._local_max_data_used + newly_received > self._local_max_data: <35> raise QuicConnectionError( <36> error_code=QuicErrorCode.FLOW_CONTROL_ERROR, <37> frame_type=frame_type, <38> reason_phrase="Over connection data limit", <39> ) <40> <41> stream.add_frame</s>
===========below chunk 0=========== # module: aioquic.quic.connection class QuicConnection: def _handle_stream_frame( self, context: QuicReceiveContext, frame_type: int, buf: Buffer ) -> None: # offset: 1 self._local_max_data_used += newly_received ===========unchanged ref 0=========== at: aioquic._buffer.Buffer tell() -> int pull_bytes(length: int) -> bytes pull_uint_var() -> int at: aioquic.quic.connection QuicConnectionError(error_code: int, frame_type: int, reason_phrase: str) at: aioquic.quic.connection.QuicConnection _assert_stream_can_receive(frame_type: int, stream_id: int) -> None _get_or_create_stream(frame_type: int, stream_id: int) -> QuicStream at: aioquic.quic.connection.QuicConnection.__init__ self._events: Deque[events.QuicEvent] = deque() self._local_max_data = MAX_DATA_WINDOW self._local_max_data_used = 0 self._quic_logger: Optional[QuicLoggerTrace] = None self._quic_logger = configuration.quic_logger.start_trace( is_client=configuration.is_client, odcid=logger_connection_id ) at: aioquic.quic.connection.QuicConnection._close_end self._quic_logger = None at: aioquic.quic.connection.QuicConnection._write_connection_limits self._local_max_data *= 2 at: aioquic.quic.connection.QuicReceiveContext quic_logger_frames: Optional[List[Any]] at: aioquic.quic.logger.QuicLoggerTrace encode_stream_frame(frame: QuicStreamFrame, stream_id: int) -> Dict at: aioquic.quic.packet QuicErrorCode(x: Union[str, bytes, bytearray], base: int) QuicErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) ===========unchanged ref 1=========== at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.quic.stream.QuicStream.__init__ self.max_stream_data_local = max_stream_data_local self._recv_highest = 0 # the highest offset ever seen at: aioquic.quic.stream.QuicStream.add_frame self._recv_highest = frame_end at: collections.deque append(x: _T) -> None ===========changed ref 0=========== # module: aioquic.quic.connection class QuicConnection: def _get_or_create_stream(self, frame_type: int, stream_id: int) -> QuicStream: """ Get or create a stream in response to a received frame. """ stream = self._streams.get(stream_id, None) if stream is None: # check initiator if stream_is_client_initiated(stream_id) == self._is_client: raise QuicConnectionError( error_code=QuicErrorCode.STREAM_STATE_ERROR, frame_type=frame_type, reason_phrase="Wrong stream initiator", ) # determine limits if stream_is_unidirectional(stream_id): max_stream_data_local = self._local_max_stream_data_uni max_stream_data_remote = 0 max_streams = self._local_max_streams_uni else: max_stream_data_local = self._local_max_stream_data_bidi_remote max_stream_data_remote = self._remote_max_stream_data_bidi_local max_streams = self._local_max_streams_bidi # check max streams if stream_id // 4 >= max_streams: raise QuicConnectionError( error_code=QuicErrorCode.STREAM_LIMIT_ERROR, frame_type=frame_type, reason_phrase="Too many streams open", ) # create stream self._logger.info("Stream %d created by peer" % stream_id) stream = self._streams[stream_id] = QuicStream( - connection=self, stream_id=stream_id, max_stream_data_local=max_stream_data_local, max_stream_data_remote=max_stream_data_remote, ) return stream ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 2=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id )
tests.test_stream/QuicStreamTest.test_recv_empty
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<0>:<add> stream = QuicStream(stream_id=0) <del> stream = QuicStream() <6>:<add> self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) <del> self.assertEqual(stream.pull_data(), b"")
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): <0> stream = QuicStream() <1> self.assertEqual(bytes(stream._recv_buffer), b"") <2> self.assertEqual(list(stream._recv_ranges), []) <3> self.assertEqual(stream._recv_buffer_start, 0) <4> <5> # empty <6> self.assertEqual(stream.pull_data(), b"") <7> self.assertEqual(bytes(stream._recv_buffer), b"") <8> self.assertEqual(list(stream._recv_ranges), []) <9> self.assertEqual(stream._recv_buffer_start, 0) <10>
===========unchanged ref 0=========== at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.packet.QuicStreamFrame data: bytes = b"" fin: bool = False offset: int = 0 at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.quic.stream.QuicStream.__init__ self._recv_buffer = bytearray() self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_ranges = RangeSet() at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop at: aioquic.quic.stream.QuicStream.add_frame self._recv_buffer_start += count self._recv_buffer += bytearray(gap) at: unittest.case TestCase(methodName: str=...) at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: aioquic.quic.stream class QuicStream: + def _pull_data(self) -> bytes: + """ + Remove data from the front of the buffer. + """ + try: + has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start + except IndexError: + has_data_to_read = False + if not has_data_to_read: + return b"" + + r = self._recv_ranges.shift() + pos = r.stop - r.start + data = bytes(self._recv_buffer[:pos]) + del self._recv_buffer[:pos] + self._recv_buffer_start = r.stop + return data + ===========changed ref 3=========== # module: aioquic.quic.stream class QuicStream: - def pull_data(self) -> bytes: - """ - Pull received data. - """ - try: - has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start - except IndexError: - has_data_to_read = False - if not has_data_to_read: - return b"" - - r = self._recv_ranges.shift() - pos = r.stop - r.start - data = bytes(self._recv_buffer[:pos]) - del self._recv_buffer[:pos] - self._recv_buffer_start = r.stop - return data - ===========changed ref 4=========== # module: aioquic.quic.stream class QuicStream: def __init__( self, stream_id: Optional[int] = None, - connection: Optional[Any] = None, max_stream_data_local: int = 0, max_stream_data_remote: int = 0, ) -> None: - self._connection = connection self.is_blocked = False self.max_stream_data_local = max_stream_data_local self.max_stream_data_local_sent = max_stream_data_local self.max_stream_data_remote = max_stream_data_remote self.send_buffer_is_empty = True self._recv_buffer = bytearray() self._recv_buffer_fin: Optional[int] = None self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_highest = 0 # the highest offset ever seen self._recv_ranges = RangeSet() self._send_acked = RangeSet() self._send_buffer = bytearray() self._send_buffer_fin: Optional[int] = None self._send_buffer_start = 0 # the offset for the start of the buffer self._send_buffer_stop = 0 # the offset for the stop of the buffer self._send_highest = 0 self._send_pending = RangeSet() self._send_pending_eof = False self.__stream_id = stream_id
tests.test_stream/QuicStreamTest.test_recv_ordered
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<0>:<add> stream = QuicStream(stream_id=0) <del> stream = QuicStream() <3>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <4>:<del> self.assertEqual(bytes(stream._recv_buffer), b"01234567") <5>:<del> self.assertEqual(list(stream._recv_ranges), [range(0, 8)]) <6>:<del> self.assertEqual(stream._recv_buffer_start, 0) <7>:<del> <8>:<del> # pull data <9>:<del> self.assertEqual(stream.pull_data(), b"01234567") <10>:<add> StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), <add> ) <15>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")), <del> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) <16>:<del> self.assertEqual(bytes(stream._recv_buffer), b"89012345") <17>:<del> self.assertEqual(list(stream._recv_ranges), [range(8, 16)]) <18>:<del> self.assertEqual(stream._recv_buffer_start, 8) <19>:<del> <20>:<del> # pull data <21>:<del> self.assertEqual(stream.pull_data(), b"89012345") <22>:<add> StreamDataReceived(data=b"89012345", end_stream=False, stream_id=0), <add> )
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_ordered(self): <0> stream = QuicStream() <1> <2> # add data at start <3> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <4> self.assertEqual(bytes(stream._recv_buffer), b"01234567") <5> self.assertEqual(list(stream._recv_ranges), [range(0, 8)]) <6> self.assertEqual(stream._recv_buffer_start, 0) <7> <8> # pull data <9> self.assertEqual(stream.pull_data(), b"01234567") <10> self.assertEqual(bytes(stream._recv_buffer), b"") <11> self.assertEqual(list(stream._recv_ranges), []) <12> self.assertEqual(stream._recv_buffer_start, 8) <13> <14> # add more data <15> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) <16> self.assertEqual(bytes(stream._recv_buffer), b"89012345") <17> self.assertEqual(list(stream._recv_ranges), [range(8, 16)]) <18> self.assertEqual(stream._recv_buffer_start, 8) <19> <20> # pull data <21> self.assertEqual(stream.pull_data(), b"89012345") <22> self.assertEqual(bytes(stream._recv_buffer), b"") <23> self.assertEqual(list(stream._recv_ranges), []) <24> self.assertEqual(stream._recv_buffer_start, 16) <25>
===========unchanged ref 0=========== at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: aioquic.quic.events.StreamDataReceived data: bytes end_stream: bool stream_id: int at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.quic.stream.QuicStream.__init__ self._recv_buffer = bytearray() self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_ranges = RangeSet() at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop at: aioquic.quic.stream.QuicStream.add_frame self._recv_buffer_start += count self._recv_buffer += bytearray(gap) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 3=========== # module: aioquic.quic.stream class QuicStream: + def _pull_data(self) -> bytes: + """ + Remove data from the front of the buffer. + """ + try: + has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start + except IndexError: + has_data_to_read = False + if not has_data_to_read: + return b"" + + r = self._recv_ranges.shift() + pos = r.stop - r.start + data = bytes(self._recv_buffer[:pos]) + del self._recv_buffer[:pos] + self._recv_buffer_start = r.stop + return data + ===========changed ref 4=========== # module: aioquic.quic.stream class QuicStream: - def pull_data(self) -> bytes: - """ - Pull received data. - """ - try: - has_data_to_read = self._recv_ranges[0].start == self._recv_buffer_start - except IndexError: - has_data_to_read = False - if not has_data_to_read: - return b"" - - r = self._recv_ranges.shift() - pos = r.stop - r.start - data = bytes(self._recv_buffer[:pos]) - del self._recv_buffer[:pos] - self._recv_buffer_start = r.stop - return data -
tests.test_stream/QuicStreamTest.test_recv_unordered
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<0>:<add> stream = QuicStream(stream_id=0) <del> stream = QuicStream() <3>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")), None <del> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) <4>:<add> ) <11>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <12>:<del> self.assertEqual(bytes(stream._recv_buffer), b"0123456789012345") <13>:<del> self.assertEqual(list(stream._recv_ranges), [range(0, 16)]) <14>:<del> self.assertEqual(stream._recv_buffer_start, 0) <15>:<del> <16>:<del> # pull data <17>:<del> self.assertEqual(stream.pull_data(), b"0123456789012345") <18>:<add> StreamDataReceived(data=b"0123456789012345", end_stream=False, stream_id=0), <add> )
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_unordered(self): <0> stream = QuicStream() <1> <2> # add data at offset 8 <3> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) <4> self.assertEqual( <5> bytes(stream._recv_buffer), b"\x00\x00\x00\x00\x00\x00\x00\x0089012345" <6> ) <7> self.assertEqual(list(stream._recv_ranges), [range(8, 16)]) <8> self.assertEqual(stream._recv_buffer_start, 0) <9> <10> # add data at offset 0 <11> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <12> self.assertEqual(bytes(stream._recv_buffer), b"0123456789012345") <13> self.assertEqual(list(stream._recv_ranges), [range(0, 16)]) <14> self.assertEqual(stream._recv_buffer_start, 0) <15> <16> # pull data <17> self.assertEqual(stream.pull_data(), b"0123456789012345") <18> self.assertEqual(bytes(stream._recv_buffer), b"") <19> self.assertEqual(list(stream._recv_ranges), []) <20> self.assertEqual(stream._recv_buffer_start, 16) <21>
===========unchanged ref 0=========== at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.quic.stream.QuicStream.__init__ self._recv_buffer = bytearray() self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_ranges = RangeSet() at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop at: aioquic.quic.stream.QuicStream.add_frame self._recv_buffer_start += count self._recv_buffer += bytearray(gap) at: tests.test_stream.QuicStreamTest.test_recv_unordered stream = QuicStream(stream_id=0) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): - def test_recv_ordered_2(self): - stream = QuicStream() - - # add data at start - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - self.assertEqual(bytes(stream._recv_buffer), b"01234567") - self.assertEqual(list(stream._recv_ranges), [range(0, 8)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # add more data - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) - self.assertEqual(bytes(stream._recv_buffer), b"0123456789012345") - self.assertEqual(list(stream._recv_ranges), [range(0, 16)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # pull data - self.assertEqual(stream.pull_data(), b"0123456789012345") - self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(list(stream._recv_ranges), []) - self.assertEqual(stream._recv_buffer_start, 16) -
tests.test_stream/QuicStreamTest.test_recv_offset_only
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<0>:<add> stream = QuicStream(stream_id=0) <del> stream = QuicStream() <3>:<add> self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"")) <9>:<add> self.assertEqual(stream.add_frame(QuicStreamFrame(offset=8, data=b"")), None) <del> stream.add_frame(QuicStreamFrame(offset=8, data=b""))
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_offset_only(self): <0> stream = QuicStream() <1> <2> # add data at offset 0 <3> stream.add_frame(QuicStreamFrame(offset=0, data=b"")) <4> self.assertEqual(bytes(stream._recv_buffer), b"") <5> self.assertEqual(list(stream._recv_ranges), []) <6> self.assertEqual(stream._recv_buffer_start, 0) <7> <8> # add data at offset 8 <9> stream.add_frame(QuicStreamFrame(offset=8, data=b"")) <10> self.assertEqual( <11> bytes(stream._recv_buffer), b"\x00\x00\x00\x00\x00\x00\x00\x00" <12> ) <13> self.assertEqual(list(stream._recv_ranges), []) <14> self.assertEqual(stream._recv_buffer_start, 0) <15>
===========unchanged ref 0=========== at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.quic.stream.QuicStream.__init__ self._recv_buffer = bytearray() self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_ranges = RangeSet() at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop at: aioquic.quic.stream.QuicStream.add_frame self._recv_buffer_start += count self._recv_buffer += bytearray(gap) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): - def test_recv_ordered_2(self): - stream = QuicStream() - - # add data at start - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - self.assertEqual(bytes(stream._recv_buffer), b"01234567") - self.assertEqual(list(stream._recv_ranges), [range(0, 8)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # add more data - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) - self.assertEqual(bytes(stream._recv_buffer), b"0123456789012345") - self.assertEqual(list(stream._recv_ranges), [range(0, 16)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # pull data - self.assertEqual(stream.pull_data(), b"0123456789012345") - self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(list(stream._recv_ranges), []) - self.assertEqual(stream._recv_buffer_start, 16) -
tests.test_stream/QuicStreamTest.test_recv_already_fully_consumed
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<0>:<add> stream = QuicStream(stream_id=0) <del> stream = QuicStream() <2>:<add> # add data at offset 0 <add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <3>:<del> self.assertEqual(stream.pull_data(), b"01234567") <4>:<del> <5>:<del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <6>:<add> StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), <add> ) <10>:<add> # add data again at offset 0 <add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), None <add> ) <add> self.assertEqual(bytes(stream._recv_buffer), b"") <del> self.assertEqual(stream.pull_data(), b"") <11>:<add> self.assertEqual(list(stream._recv_ranges), [])
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_already_fully_consumed(self): <0> stream = QuicStream() <1> <2> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <3> self.assertEqual(stream.pull_data(), b"01234567") <4> <5> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <6> self.assertEqual(bytes(stream._recv_buffer), b"") <7> self.assertEqual(list(stream._recv_ranges), []) <8> self.assertEqual(stream._recv_buffer_start, 8) <9> <10> self.assertEqual(stream.pull_data(), b"") <11> self.assertEqual(stream._recv_buffer_start, 8) <12>
===========unchanged ref 0=========== at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.quic.stream.QuicStream.__init__ self._recv_buffer_start = 0 # the offset for the start of the buffer at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop at: aioquic.quic.stream.QuicStream.add_frame self._recv_buffer_start += count at: tests.test_stream.QuicStreamTest.test_recv_already_fully_consumed stream = QuicStream(stream_id=0) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_offset_only(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() # add data at offset 0 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=0, data=b"")) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # add data at offset 8 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=8, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=8, data=b"")) self.assertEqual( bytes(stream._recv_buffer), b"\x00\x00\x00\x00\x00\x00\x00\x00" ) self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 4=========== # module: tests.test_stream class QuicStreamTest(TestCase): - def test_recv_ordered_2(self): - stream = QuicStream() - - # add data at start - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - self.assertEqual(bytes(stream._recv_buffer), b"01234567") - self.assertEqual(list(stream._recv_ranges), [range(0, 8)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # add more data - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) - self.assertEqual(bytes(stream._recv_buffer), b"0123456789012345") - self.assertEqual(list(stream._recv_ranges), [range(0, 16)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # pull data - self.assertEqual(stream.pull_data(), b"0123456789012345") - self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(list(stream._recv_ranges), []) - self.assertEqual(stream._recv_buffer_start, 16) -
tests.test_stream/QuicStreamTest.test_recv_already_partially_consumed
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<0>:<add> stream = QuicStream(stream_id=0) <del> stream = QuicStream() <2>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <3>:<add> StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), <add> ) <del> self.assertEqual(stream.pull_data(), b"01234567") <5>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"0123456789012345")), <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"0123456789012345")) <6>:<add> StreamDataReceived(data=b"89012345", end_stream=False, stream_id=0), <add> ) <add> self.assertEqual(bytes(stream._recv_buffer), b"") <del> self.assertEqual(bytes(stream._recv_buffer), b"89012345") <7>:<add> self.assertEqual(list(stream._recv_ranges), []) <del> self.assertEqual(list(stream._recv_ranges), [range(8, 16)]) <8>:<del> self.assertEqual(stream._recv_buffer_start, 8) <9>:<del> <10>:<del> self.assertEqual(stream.pull_data(), b"89012345")
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_already_partially_consumed(self): <0> stream = QuicStream() <1> <2> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <3> self.assertEqual(stream.pull_data(), b"01234567") <4> <5> stream.add_frame(QuicStreamFrame(offset=0, data=b"0123456789012345")) <6> self.assertEqual(bytes(stream._recv_buffer), b"89012345") <7> self.assertEqual(list(stream._recv_ranges), [range(8, 16)]) <8> self.assertEqual(stream._recv_buffer_start, 8) <9> <10> self.assertEqual(stream.pull_data(), b"89012345") <11> self.assertEqual(stream._recv_buffer_start, 16) <12>
===========unchanged ref 0=========== at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: aioquic.quic.stream.QuicStream.__init__ self._recv_buffer = bytearray() self._recv_buffer_start = 0 # the offset for the start of the buffer self._recv_ranges = RangeSet() at: aioquic.quic.stream.QuicStream._pull_data self._recv_buffer_start = r.stop at: aioquic.quic.stream.QuicStream.add_frame self._recv_buffer_start += count self._recv_buffer += bytearray(gap) at: tests.test_stream.QuicStreamTest.test_recv_already_partially_consumed stream = QuicStream(stream_id=0) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_offset_only(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() # add data at offset 0 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=0, data=b"")) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # add data at offset 8 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=8, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=8, data=b"")) self.assertEqual( bytes(stream._recv_buffer), b"\x00\x00\x00\x00\x00\x00\x00\x00" ) self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 4=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_already_fully_consumed(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() + # add data at offset 0 + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - self.assertEqual(stream.pull_data(), b"01234567") - - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 8) + # add data again at offset 0 + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), None + ) + self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(stream.pull_data(), b"") + self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 8)
tests.test_stream/QuicStreamTest.test_recv_fin
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<1>:<del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <2>:<del> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <4>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), <add> StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), <add> ) <add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), <add> StreamDataReceived(data=b"89012345", end_stream=True, stream_id=0), <add> ) <del> self.assertEqual(stream.pull_data(), b"0123456789012345")
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin(self): <0> stream = QuicStream(stream_id=0) <1> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <2> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <3> <4> self.assertEqual(stream.pull_data(), b"0123456789012345") <5>
===========unchanged ref 0=========== at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) ===========changed ref 0=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 1=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_offset_only(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() # add data at offset 0 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=0, data=b"")) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # add data at offset 8 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=8, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=8, data=b"")) self.assertEqual( bytes(stream._recv_buffer), b"\x00\x00\x00\x00\x00\x00\x00\x00" ) self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_already_fully_consumed(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() + # add data at offset 0 + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - self.assertEqual(stream.pull_data(), b"01234567") - - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 8) + # add data again at offset 0 + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), None + ) + self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(stream.pull_data(), b"") + self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 8) ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_already_partially_consumed(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) - self.assertEqual(stream.pull_data(), b"01234567") + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"0123456789012345")), - stream.add_frame(QuicStreamFrame(offset=0, data=b"0123456789012345")) + StreamDataReceived(data=b"89012345", end_stream=False, stream_id=0), + ) + self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(bytes(stream._recv_buffer), b"89012345") + self.assertEqual(list(stream._recv_ranges), []) - self.assertEqual(list(stream._recv_ranges), [range(8, 16)]) - self.assertEqual(stream._recv_buffer_start, 8) - - self.assertEqual(stream.pull_data(), b"89012345") self.assertEqual(stream._recv_buffer_start, 16) ===========changed ref 4=========== # module: tests.test_stream class QuicStreamTest(TestCase): - def test_recv_ordered_2(self): - stream = QuicStream() - - # add data at start - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - self.assertEqual(bytes(stream._recv_buffer), b"01234567") - self.assertEqual(list(stream._recv_ranges), [range(0, 8)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # add more data - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345")) - self.assertEqual(bytes(stream._recv_buffer), b"0123456789012345") - self.assertEqual(list(stream._recv_ranges), [range(0, 16)]) - self.assertEqual(stream._recv_buffer_start, 0) - - # pull data - self.assertEqual(stream.pull_data(), b"0123456789012345") - self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(list(stream._recv_ranges), []) - self.assertEqual(stream._recv_buffer_start, 16) -
tests.test_stream/QuicStreamTest.test_recv_fin_out_of_order
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<1>:<del> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <2>:<del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <4>:<add> # add data at offset 8 with FIN <add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), <add> None, <add> ) <del> self.assertEqual(stream.pull_data(), b"0123456789012345")
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin_out_of_order(self): <0> stream = QuicStream(stream_id=0) <1> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <2> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <3> <4> self.assertEqual(stream.pull_data(), b"0123456789012345") <5>
===========unchanged ref 0=========== at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: tests.test_stream.QuicStreamTest.test_recv_fin_out_of_order stream = QuicStream(stream_id=0) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin(self): stream = QuicStream(stream_id=0) - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), + StreamDataReceived(data=b"89012345", end_stream=True, stream_id=0), + ) - self.assertEqual(stream.pull_data(), b"0123456789012345") ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 4=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_offset_only(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() # add data at offset 0 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=0, data=b"")) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # add data at offset 8 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=8, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=8, data=b"")) self.assertEqual( bytes(stream._recv_buffer), b"\x00\x00\x00\x00\x00\x00\x00\x00" ) self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 5=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_already_fully_consumed(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() + # add data at offset 0 + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - self.assertEqual(stream.pull_data(), b"01234567") - - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 8) + # add data again at offset 0 + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), None + ) + self.assertEqual(bytes(stream._recv_buffer), b"") - self.assertEqual(stream.pull_data(), b"") + self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 8)
tests.test_stream/QuicStreamTest.test_recv_fin_twice
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<1>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <2>:<add> StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), <add> ) <add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), <del> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <3>:<add> StreamDataReceived(data=b"89012345", end_stream=True, stream_id=0), <add> ) <del> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <5>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), <add> StreamDataReceived(data=b"", end_stream=True, stream_id=0), <add> ) <del> self.assertEqual(stream.pull_data(), b"0123456789012345")
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin_twice(self): <0> stream = QuicStream(stream_id=0) <1> stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) <2> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <3> stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) <4> <5> self.assertEqual(stream.pull_data(), b"0123456789012345") <6>
===========unchanged ref 0=========== at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: tests.test_stream.QuicStreamTest.test_recv_fin_then_data stream = QuicStream(stream_id=0) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None at: unittest.case._AssertRaisesContext.__exit__ self.exception = exc_value.with_traceback(None) ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin_out_of_order(self): stream = QuicStream(stream_id=0) - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) + # add data at offset 8 with FIN + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), + None, + ) - self.assertEqual(stream.pull_data(), b"0123456789012345") ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin(self): stream = QuicStream(stream_id=0) - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), + StreamDataReceived(data=b"89012345", end_stream=True, stream_id=0), + ) - self.assertEqual(stream.pull_data(), b"0123456789012345") ===========changed ref 4=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) ===========changed ref 5=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_offset_only(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() # add data at offset 0 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=0, data=b"")) self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # add data at offset 8 + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=8, data=b"")), None) - stream.add_frame(QuicStreamFrame(offset=8, data=b"")) self.assertEqual( bytes(stream._recv_buffer), b"\x00\x00\x00\x00\x00\x00\x00\x00" ) self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0)
tests.test_stream/QuicStreamTest.test_recv_fin_without_data
Modified
aiortc~aioquic
438970cf2d90c55b23019e6628e9ea5341303bf5
[stream] speed up handling of in-order stream data
<1>:<add> self.assertEqual( <add> stream.add_frame(QuicStreamFrame(offset=0, data=b"", fin=True)), <del> stream.add_frame(QuicStreamFrame(offset=0, data=b"", fin=True)) <2>:<add> StreamDataReceived(data=b"", end_stream=True, stream_id=0), <add> ) <3>:<del> self.assertEqual(stream.pull_data(), b"") <4>:<del>
# module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin_without_data(self): <0> stream = QuicStream(stream_id=0) <1> stream.add_frame(QuicStreamFrame(offset=0, data=b"", fin=True)) <2> <3> self.assertEqual(stream.pull_data(), b"") <4>
===========unchanged ref 0=========== at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: aioquic.quic.packet QuicStreamFrame(data: bytes=b"", fin: bool=False, offset: int=0) at: aioquic.quic.stream.QuicStream add_frame(frame: QuicStreamFrame) -> Optional[events.StreamDataReceived] at: tests.test_stream.QuicStreamTest.test_recv_fin_twice stream = QuicStream(stream_id=0) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: """ Add a frame of received data. """ pos = frame.offset - self._recv_buffer_start count = len(frame.data) frame_end = frame.offset + count # we should receive no more data beyond FIN! if self._recv_buffer_fin is not None and frame_end > self._recv_buffer_fin: raise Exception("Data received beyond FIN") - - if pos + count > 0: - # frame has been partially consumed - if pos < 0: - count += pos - frame.data = frame.data[-pos:] - frame.offset -= pos - pos = 0 - - # marked received - if count: - self._recv_ranges.add(frame.offset, frame_end) - if frame_end > self._recv_highest: - self._recv_highest = frame_end - - # add data - gap = pos - len(self._recv_buffer) - if gap > 0: - self._recv_buffer += bytearray(gap) - self._recv_buffer[pos : pos + count] = frame.data - if frame.fin: self._recv_buffer_fin = frame_end + if frame_end > self._recv_highest: + self._recv_highest = frame_end + # fast path: new in-order chunk + if pos == 0 and count and not self._recv_buffer: + self._recv_buffer_start += count - if self._connection: - data = self.pull_data() - self._connection._events.append( + return events.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._</s> ===========changed ref 1=========== # module: aioquic.quic.stream class QuicStream: # reader + def add_frame(self, frame: QuicStreamFrame) -> Optional[events.StreamDataReceived]: - def add_frame(self, frame: QuicStreamFrame) -> None: # offset: 1 <s>.StreamDataReceived( - events.StreamDataReceived( - data=data, - end_stream=(self._recv_buffer_start == self._recv_buffer_fin), - stream_id=self.__stream_id, - ) + data=frame.data, end_stream=frame.fin, stream_id=self.__stream_id ) ===========changed ref 2=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin_out_of_order(self): stream = QuicStream(stream_id=0) - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) + # add data at offset 8 with FIN + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), + None, + ) - self.assertEqual(stream.pull_data(), b"0123456789012345") ===========changed ref 3=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin(self): stream = QuicStream(stream_id=0) - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), + StreamDataReceived(data=b"89012345", end_stream=True, stream_id=0), + ) - self.assertEqual(stream.pull_data(), b"0123456789012345") ===========changed ref 4=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_fin_twice(self): stream = QuicStream(stream_id=0) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")), - stream.add_frame(QuicStreamFrame(offset=0, data=b"01234567")) + StreamDataReceived(data=b"01234567", end_stream=False, stream_id=0), + ) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) + StreamDataReceived(data=b"89012345", end_stream=True, stream_id=0), + ) - stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)) + self.assertEqual( + stream.add_frame(QuicStreamFrame(offset=8, data=b"89012345", fin=True)), + StreamDataReceived(data=b"", end_stream=True, stream_id=0), + ) - self.assertEqual(stream.pull_data(), b"0123456789012345") ===========changed ref 5=========== # module: tests.test_stream class QuicStreamTest(TestCase): def test_recv_empty(self): + stream = QuicStream(stream_id=0) - stream = QuicStream() self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0) # empty + self.assertEqual(stream.add_frame(QuicStreamFrame(offset=0, data=b"")), None) - self.assertEqual(stream.pull_data(), b"") self.assertEqual(bytes(stream._recv_buffer), b"") self.assertEqual(list(stream._recv_ranges), []) self.assertEqual(stream._recv_buffer_start, 0)
aioquic.h3.connection/H3Stream.__init__
Modified
aiortc~aioquic
1034a462d43ddd9a51788733de5d5d50bd4536fd
[http3] raise exception if headers or data are sent in wrong state
<6>:<add> self.headers_recv_state: HeadersState = HeadersState.INITIAL <del> self.headers_state: HeadersState = HeadersState.INITIAL <7>:<add> self.headers_send_state: HeadersState = HeadersState.INITIAL <8>:<add> self.stream_id = stream_id
# module: aioquic.h3.connection class H3Stream: + def __init__(self, stream_id: int) -> None: - def __init__(self) -> None: <0> self.blocked = False <1> self.blocked_frame_size: Optional[int] = None <2> self.buffer = b"" <3> self.ended = False <4> self.frame_size: Optional[int] = None <5> self.frame_type: Optional[int] = None <6> self.headers_state: HeadersState = HeadersState.INITIAL <7> self.push_id: Optional[int] = None <8> self.stream_type: Optional[int] = None <9>
===========unchanged ref 0=========== at: aioquic.h3.connection HeadersState()
aioquic.h3.connection/H3Connection.handle_event
Modified
aiortc~aioquic
1034a462d43ddd9a51788733de5d5d50bd4536fd
[http3] raise exception if headers or data are sent in wrong state
<7>:<del> if stream_id not in self._stream: <8>:<del> self._stream[stream_id] = H3Stream() <9>:<add> stream = self._get_or_create_stream(stream_id) <12>:<add> stream, event.data, event.end_stream <del> stream_id, event.data, event.end_stream <16>:<add> stream, event.data, event.end_stream <del> stream_id, event.data, event.end_stream
# module: aioquic.h3.connection class H3Connection: def handle_event(self, event: QuicEvent) -> List[H3Event]: <0> """ <1> Handle a QUIC event and return a list of HTTP events. <2> <3> :param event: The QUIC event to handle. <4> """ <5> if isinstance(event, StreamDataReceived) and not self._is_done: <6> stream_id = event.stream_id <7> if stream_id not in self._stream: <8> self._stream[stream_id] = H3Stream() <9> try: <10> if stream_id % 4 == 0: <11> return self._receive_request_or_push_data( <12> stream_id, event.data, event.end_stream <13> ) <14> elif stream_is_unidirectional(stream_id): <15> return self._receive_stream_data_uni( <16> stream_id, event.data, event.end_stream <17> ) <18> except ProtocolError as exc: <19> self._is_done = True <20> self._quic.close( <21> error_code=exc.error_code, reason_phrase=exc.reason_phrase <22> ) <23> return [] <24>
===========unchanged ref 0=========== at: aioquic.h3.connection ProtocolError(reason_phrase: str="") at: aioquic.h3.connection.H3Connection _get_or_create_stream(stream_id: int) -> H3Stream _init_connection() -> None _receive_request_or_push_data(stream: H3Stream, data: bytes, stream_ended: bool) -> List[H3Event] _receive_request_or_push_data(self, stream: H3Stream, data: bytes, stream_ended: bool) -> List[H3Event] _receive_stream_data_uni(stream: H3Stream, data: bytes, stream_ended: bool) -> List[H3Event] _receive_stream_data_uni(self, stream: H3Stream, data: bytes, stream_ended: bool) -> List[H3Event] at: aioquic.h3.connection.H3Connection.__init__ self._is_done = False self._quic = quic at: aioquic.h3.connection.ProtocolError error_code = ErrorCode.HTTP_GENERAL_PROTOCOL_ERROR at: aioquic.h3.connection.ProtocolError.__init__ self.reason_phrase = reason_phrase at: aioquic.h3.events H3Event() at: aioquic.quic.connection stream_is_unidirectional(stream_id: int) -> bool at: aioquic.quic.connection.QuicConnection close(error_code: int=QuicErrorCode.NO_ERROR, frame_type: Optional[int]=None, reason_phrase: str="") -> None at: aioquic.quic.events QuicEvent() StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: typing List = _alias(list, 1, inst=False, name='List') ===========changed ref 0=========== # module: aioquic.h3.connection class H3Stream: + def __init__(self, stream_id: int) -> None: - def __init__(self) -> None: self.blocked = False self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None + self.headers_recv_state: HeadersState = HeadersState.INITIAL - self.headers_state: HeadersState = HeadersState.INITIAL + self.headers_send_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None + self.stream_id = stream_id self.stream_type: Optional[int] = None
aioquic.h3.connection/H3Connection.send_data
Modified
aiortc~aioquic
1034a462d43ddd9a51788733de5d5d50bd4536fd
[http3] raise exception if headers or data are sent in wrong state
<11>:<add> # check DATA frame is allowed <add> stream = self._get_or_create_stream(stream_id) <add> if stream.headers_send_state != HeadersState.AFTER_HEADERS: <add> raise UnexpectedFrame("DATA frame is not allowed in this state") <add>
# module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: <0> """ <1> Send data on the given stream. <2> <3> To retrieve datagram which need to be sent over the network call the QUIC <4> connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` <5> method. <6> <7> :param stream_id: The stream ID on which to send the data. <8> :param data: The data to send. <9> :param end_stream: Whether to end the stream. <10> """ <11> # log frame <12> if self._quic_logger is not None: <13> self._quic_logger.log_event( <14> category="HTTP", <15> event="frame_created", <16> data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), <17> ) <18> <19> self._quic.send_stream_data( <20> stream_id, encode_frame(FrameType.DATA, data), end_stream <21> ) <22>
===========unchanged ref 0=========== at: aioquic.h3.connection HeadersState() UnexpectedFrame(reason_phrase: str="") at: aioquic.h3.connection.H3Connection _get_or_create_stream(stream_id: int) -> H3Stream at: aioquic.h3.connection.H3Connection.__init__ self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger at: aioquic.h3.connection.H3Stream.__init__ self.headers_send_state: HeadersState = HeadersState.INITIAL at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class H3Stream: + def __init__(self, stream_id: int) -> None: - def __init__(self) -> None: self.blocked = False self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None + self.headers_recv_state: HeadersState = HeadersState.INITIAL - self.headers_state: HeadersState = HeadersState.INITIAL + self.headers_send_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None + self.stream_id = stream_id self.stream_type: Optional[int] = None ===========changed ref 1=========== # module: aioquic.h3.connection class H3Connection: def handle_event(self, event: QuicEvent) -> List[H3Event]: """ Handle a QUIC event and return a list of HTTP events. :param event: The QUIC event to handle. """ if isinstance(event, StreamDataReceived) and not self._is_done: stream_id = event.stream_id - if stream_id not in self._stream: - self._stream[stream_id] = H3Stream() + stream = self._get_or_create_stream(stream_id) try: if stream_id % 4 == 0: return self._receive_request_or_push_data( + stream, event.data, event.end_stream - stream_id, event.data, event.end_stream ) elif stream_is_unidirectional(stream_id): return self._receive_stream_data_uni( + stream, event.data, event.end_stream - stream_id, event.data, event.end_stream ) except ProtocolError as exc: self._is_done = True self._quic.close( error_code=exc.error_code, reason_phrase=exc.reason_phrase ) return []
aioquic.h3.connection/H3Connection.send_headers
Modified
aiortc~aioquic
1034a462d43ddd9a51788733de5d5d50bd4536fd
[http3] raise exception if headers or data are sent in wrong state
<11>:<add> # check HEADERS frame is allowed <add> stream = self._get_or_create_stream(stream_id) <add> if stream.headers_send_state == HeadersState.AFTER_TRAILERS: <add> raise UnexpectedFrame("HEADERS frame is not allowed in this state") <add> <23>:<add> # update state and send headers <add> if stream.headers_send_state == HeadersState.INITIAL: <add> stream.headers_send_state = HeadersState.AFTER_HEADERS <add> else: <add> stream.headers_send_state = HeadersState.AFTER_TRAILERS
# module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: <0> """ <1> Send headers on the given stream. <2> <3> To retrieve datagram which need to be sent over the network call the QUIC <4> connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` <5> method. <6> <7> :param stream_id: The stream ID on which to send the headers. <8> :param headers: The HTTP headers to send. <9> :param end_stream: Whether to end the stream. <10> """ <11> frame_data = self._encode_headers(stream_id, headers) <12> <13> # log frame <14> if self._quic_logger is not None: <15> self._quic_logger.log_event( <16> category="HTTP", <17> event="frame_created", <18> data=qlog_encode_headers_frame( <19> byte_length=len(frame_data), headers=headers, stream_id=stream_id <20> ), <21> ) <22> <23> self._quic.send_stream_data( <24> stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream <25> ) <26>
===========unchanged ref 0=========== at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) HeadersState() UnexpectedFrame(reason_phrase: str="") encode_frame(frame_type: int, frame_data: bytes) -> bytes at: aioquic.h3.connection.H3Connection _encode_headers(stream_id: int, headers: Headers) -> bytes _get_or_create_stream(stream_id: int) -> H3Stream at: aioquic.h3.connection.H3Connection.__init__ self._quic = quic self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger at: aioquic.h3.connection.H3Stream.__init__ self.headers_send_state: HeadersState = HeadersState.INITIAL at: aioquic.h3.events Headers = List[Tuple[bytes, bytes]] at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class H3Stream: + def __init__(self, stream_id: int) -> None: - def __init__(self) -> None: self.blocked = False self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None + self.headers_recv_state: HeadersState = HeadersState.INITIAL - self.headers_state: HeadersState = HeadersState.INITIAL + self.headers_send_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None + self.stream_id = stream_id self.stream_type: Optional[int] = None ===========changed ref 1=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ + # check DATA frame is allowed + stream = self._get_or_create_stream(stream_id) + if stream.headers_send_state != HeadersState.AFTER_HEADERS: + raise UnexpectedFrame("DATA frame is not allowed in this state") + # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), ) self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream ) ===========changed ref 2=========== # module: aioquic.h3.connection class H3Connection: def handle_event(self, event: QuicEvent) -> List[H3Event]: """ Handle a QUIC event and return a list of HTTP events. :param event: The QUIC event to handle. """ if isinstance(event, StreamDataReceived) and not self._is_done: stream_id = event.stream_id - if stream_id not in self._stream: - self._stream[stream_id] = H3Stream() + stream = self._get_or_create_stream(stream_id) try: if stream_id % 4 == 0: return self._receive_request_or_push_data( + stream, event.data, event.end_stream - stream_id, event.data, event.end_stream ) elif stream_is_unidirectional(stream_id): return self._receive_stream_data_uni( + stream, event.data, event.end_stream - stream_id, event.data, event.end_stream ) except ProtocolError as exc: self._is_done = True self._quic.close( error_code=exc.error_code, reason_phrase=exc.reason_phrase ) return []
aioquic.h3.connection/H3Connection._handle_request_or_push_frame
Modified
aiortc~aioquic
1034a462d43ddd9a51788733de5d5d50bd4536fd
[http3] raise exception if headers or data are sent in wrong state
<4>:<del> stream = self._stream[stream_id] <8>:<add> if stream.headers_recv_state != HeadersState.AFTER_HEADERS: <del> if stream.headers_state != HeadersState.AFTER_HEADERS: <17>:<add> stream_id=stream.stream_id, <del> stream_id=stream_id, <22>:<add> if stream.headers_recv_state == HeadersState.AFTER_TRAILERS: <del> if stream.headers_state == HeadersState.AFTER_TRAILERS: <26>:<add> headers = self._decode_headers(stream.stream_id, frame_data) <del> headers = self._decode_headers(stream_id, frame_data) <38>:<add> stream_id=stream.stream_id, <del> stream_id=stream_id,
# module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], + stream: H3Stream, - stream_id: int, stream_ended: bool, ) -> List[H3Event]: <0> """ <1> Handle a frame received on a request or push stream. <2> """ <3> http_events: List[H3Event] = [] <4> stream = self._stream[stream_id] <5> <6> if frame_type == FrameType.DATA: <7> # check DATA frame is allowed <8> if stream.headers_state != HeadersState.AFTER_HEADERS: <9> raise UnexpectedFrame("DATA frame is not allowed in this state") <10> <11> if stream_ended or frame_data: <12> http_events.append( <13> DataReceived( <14> data=frame_data, <15> push_id=stream.push_id, <16> stream_ended=stream_ended, <17> stream_id=stream_id, <18> ) <19> ) <20> elif frame_type == FrameType.HEADERS: <21> # check HEADERS frame is allowed <22> if stream.headers_state == HeadersState.AFTER_TRAILERS: <23> raise UnexpectedFrame("HEADERS frame is not allowed in this state") <24> <25> # try to decode HEADERS, may raise pylsqpack.StreamBlocked <26> headers = self._decode_headers(stream_id, frame_data) <27> <28> # log frame <29> if self._quic_logger is not None: <30> self._quic_logger.log_event( <31> category="HTTP", <32> event="frame_parsed", <33> data=qlog_encode_headers_frame( <34> byte_length=stream.blocked_frame_size <35> if frame_data is None <36> else len(frame_data), <37> headers=headers, <38> stream_id=stream_id, <39> ), <40> ) <41> <42> # update state and emit</s>
===========below chunk 0=========== # module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], + stream: H3Stream, - stream_id: int, stream_ended: bool, ) -> List[H3Event]: # offset: 1 if stream.headers_state == HeadersState.INITIAL: stream.headers_state = HeadersState.AFTER_HEADERS else: stream.headers_state = HeadersState.AFTER_TRAILERS http_events.append( HeadersReceived( headers=headers, push_id=stream.push_id, stream_id=stream_id, stream_ended=stream_ended, ) ) elif stream.frame_type == FrameType.PUSH_PROMISE and stream.push_id is None: if not self._is_client: raise UnexpectedFrame("Clients must not send PUSH_PROMISE") frame_buf = Buffer(data=frame_data) push_id = frame_buf.pull_uint_var() headers = self._decode_headers(stream_id, frame_data[frame_buf.tell() :]) # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_parsed", data=qlog_encode_push_promise_frame( byte_length=len(frame_data), headers=headers, push_id=push_id, stream_id=stream_id, ), ) # emit event http_events.append( PushPromiseReceived( headers=headers, push_id=push_id, stream_id=stream_id ) ) elif frame_type in ( FrameType.PRIORITY, FrameType.CANCEL_PUSH, FrameType.SETTINGS, FrameType.PUSH_PROMISE, FrameType.GOAWAY</s> ===========below chunk 1=========== # module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], + stream: H3Stream, - stream_id: int, stream_ended: bool, ) -> List[H3Event]: # offset: 2 <s>CANCEL_PUSH, FrameType.SETTINGS, FrameType.PUSH_PROMISE, FrameType.GOAWAY, FrameType.MAX_PUSH_ID, FrameType.DUPLICATE_PUSH, ): raise WrongStream( "Invalid frame type on request stream" if stream.push_id is None else "Invalid frame type on push stream" ) return http_events ===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer tell() -> int pull_uint_var() -> int at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) HeadersState() Setting(x: Union[str, bytes, bytearray], base: int) Setting(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) UnexpectedFrame(reason_phrase: str="") WrongStream(reason_phrase: str="") parse_max_push_id(data: bytes) -> int parse_settings(data: bytes) -> Dict[int, int] qlog_encode_headers_frame(byte_length: int, headers: Headers, stream_id: int) -> Dict qlog_encode_push_promise_frame(byte_length: int, headers: Headers, push_id: int, stream_id: int) -> Dict H3Stream(stream_id: int) at: aioquic.h3.connection.H3Connection _decode_headers(stream_id: int, frame_data: Optional[bytes]) -> Headers at: aioquic.h3.connection.H3Connection.__init__ self._is_client = quic.configuration.is_client self._quic = quic self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._encoder = pylsqpack.Encoder() self._max_push_id: Optional[int] = 8 if self._is_client else None self._local_encoder_stream_id: Optional[int] = None ===========unchanged ref 1=========== at: aioquic.h3.connection.H3Connection._init_connection self._local_encoder_stream_id = self._create_uni_stream( StreamType.QPACK_ENCODER ) at: aioquic.h3.connection.H3Stream.__init__ self.blocked_frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_recv_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None self.stream_id = stream_id at: aioquic.h3.events H3Event() DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.h3.events.DataReceived data: bytes stream_id: int stream_ended: bool push_id: Optional[int] = None at: aioquic.h3.events.HeadersReceived headers: Headers stream_id: int stream_ended: bool push_id: Optional[int] = None at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None at: typing List = _alias(list, 1, inst=False, name='List') at: typing.Mapping get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T] get(key: _KT) -> Optional[_VT_co] ===========changed ref 0=========== # module: aioquic.h3.connection class H3Connection: + def _get_or_create_stream(self, stream_id: int) -> H3Stream: + if stream_id not in self._stream: + self._stream[stream_id] = H3Stream(stream_id) + return self._stream[stream_id] + ===========changed ref 1=========== # module: aioquic.h3.connection class H3Stream: + def __init__(self, stream_id: int) -> None: - def __init__(self) -> None: self.blocked = False self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None + self.headers_recv_state: HeadersState = HeadersState.INITIAL - self.headers_state: HeadersState = HeadersState.INITIAL + self.headers_send_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None + self.stream_id = stream_id self.stream_type: Optional[int] = None
aioquic.h3.connection/H3Connection._receive_request_or_push_data
Modified
aiortc~aioquic
1034a462d43ddd9a51788733de5d5d50bd4536fd
[http3] raise exception if headers or data are sent in wrong state
<5>:<del> stream = self._stream[stream_id] <22>:<add> stream_id=stream.stream_id, <del> stream_id=stream_id, <36>:<add> stream_id=stream.stream_id, <del> stream_id=stream_id,
# module: aioquic.h3.connection class H3Connection: def _receive_request_or_push_data( + self, stream: H3Stream, data: bytes, stream_ended: bool - self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: <0> """ <1> Handle data received on a request or push stream. <2> """ <3> http_events: List[H3Event] = [] <4> <5> stream = self._stream[stream_id] <6> stream.buffer += data <7> if stream_ended: <8> stream.ended = True <9> if stream.blocked: <10> return http_events <11> <12> # shortcut for DATA frame fragments <13> if ( <14> stream.frame_type == FrameType.DATA <15> and stream.frame_size is not None <16> and len(stream.buffer) < stream.frame_size <17> ): <18> http_events.append( <19> DataReceived( <20> data=stream.buffer, <21> push_id=stream.push_id, <22> stream_id=stream_id, <23> stream_ended=False, <24> ) <25> ) <26> stream.frame_size -= len(stream.buffer) <27> stream.buffer = b"" <28> return http_events <29> <30> # handle lone FIN <31> if stream_ended and not stream.buffer: <32> http_events.append( <33> DataReceived( <34> data=b"", <35> push_id=stream.push_id, <36> stream_id=stream_id, <37> stream_ended=True, <38> ) <39> ) <40> return http_events <41> <42> buf = Buffer(data=stream.buffer) <43> consumed = 0 <44> <45> while not buf.eof(): <46> # fetch next frame header <47> if stream.frame_size is None: <48> try: <49> stream.frame_type = buf.pull_uint_var() <50> stream.frame_size = buf.pull_uint</s>
===========below chunk 0=========== # module: aioquic.h3.connection class H3Connection: def _receive_request_or_push_data( + self, stream: H3Stream, data: bytes, stream_ended: bool - self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: # offset: 1 except BufferReadError: break consumed = buf.tell() # log frame if ( self._quic_logger is not None and stream.frame_type == FrameType.DATA ): self._quic_logger.log_event( category="HTTP", event="frame_parsed", data=qlog_encode_data_frame( byte_length=stream.frame_size, stream_id=stream_id ), ) # check how much data is available chunk_size = min(stream.frame_size, buf.capacity - consumed) if stream.frame_type != FrameType.DATA and chunk_size < stream.frame_size: break # read available data frame_data = buf.pull_bytes(chunk_size) consumed = buf.tell() # detect end of frame stream.frame_size -= chunk_size if not stream.frame_size: stream.frame_size = None try: http_events.extend( self._handle_request_or_push_frame( frame_type=stream.frame_type, frame_data=frame_data, stream_id=stream_id, stream_ended=stream.ended and buf.eof(), ) ) except pylsqpack.StreamBlocked: stream.blocked = True stream.blocked_frame_size = len(frame_data) break # remove processed data from buffer stream.buffer = stream.buffer[consumed:] return http_events ===========unchanged ref 0=========== at: aioquic._buffer BufferReadError(*args: object) Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer eof() -> bool tell() -> int pull_bytes(length: int) -> bytes pull_uint_var() -> int at: aioquic.buffer encode_uint_var(value: int) -> bytes at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) Setting(x: Union[str, bytes, bytearray], base: int) Setting(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, bytearray], base: int) encode_frame(frame_type: int, frame_data: bytes) -> bytes encode_settings(settings: Dict[int, int]) -> bytes qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict H3Stream(stream_id: int) at: aioquic.h3.connection.H3Connection _create_uni_stream(stream_type: int) -> int at: aioquic.h3.connection.H3Connection.__init__ self._max_table_capacity = 0x100 self._blocked_streams = 0x10 self._is_client = quic.configuration.is_client self._quic = quic self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._max_push_id: Optional[int] = 8 if self._is_client else None self._local_control_stream_id: Optional[int] = None ===========unchanged ref 1=========== self._local_decoder_stream_id: Optional[int] = None self._local_encoder_stream_id: Optional[int] = None at: aioquic.h3.connection.H3Connection._handle_control_frame self._max_push_id = parse_max_push_id(frame_data) at: aioquic.h3.connection.H3Connection._init_connection self._local_control_stream_id = self._create_uni_stream(StreamType.CONTROL) at: aioquic.h3.connection.H3Stream.__init__ self.blocked = False self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.push_id: Optional[int] = None self.stream_id = stream_id at: aioquic.h3.events H3Event() DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None at: typing List = _alias(list, 1, inst=False, name='List') ===========changed ref 0=========== # module: aioquic.h3.connection class H3Connection: + def _get_or_create_stream(self, stream_id: int) -> H3Stream: + if stream_id not in self._stream: + self._stream[stream_id] = H3Stream(stream_id) + return self._stream[stream_id] + ===========changed ref 1=========== # module: aioquic.h3.connection class H3Stream: + def __init__(self, stream_id: int) -> None: - def __init__(self) -> None: self.blocked = False self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None + self.headers_recv_state: HeadersState = HeadersState.INITIAL - self.headers_state: HeadersState = HeadersState.INITIAL + self.headers_send_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None + self.stream_id = stream_id self.stream_type: Optional[int] = None
aioquic.h3.connection/H3Connection._receive_stream_data_uni
Modified
aiortc~aioquic
1034a462d43ddd9a51788733de5d5d50bd4536fd
[http3] raise exception if headers or data are sent in wrong state
<2>:<del> stream = self._stream[stream_id] <24>:<add> self._peer_control_stream_id = stream.stream_id <del> self._peer_control_stream_id = stream_id <30>:<add> self._peer_decoder_stream_id = stream.stream_id <del> self._peer_decoder_stream_id = stream_id <36>:<add> self._peer_encoder_stream_id = stream.stream_id <del> self._peer_encoder_stream_id = stream_id
# module: aioquic.h3.connection class H3Connection: def _receive_stream_data_uni( + self, stream: H3Stream, data: bytes, stream_ended: bool - self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: <0> http_events: List[H3Event] = [] <1> <2> stream = self._stream[stream_id] <3> stream.buffer += data <4> if stream_ended: <5> stream.ended = True <6> <7> buf = Buffer(data=stream.buffer) <8> consumed = 0 <9> unblocked_streams: Set[int] = set() <10> <11> while stream.stream_type == StreamType.PUSH or not buf.eof(): <12> # fetch stream type for unidirectional streams <13> if stream.stream_type is None: <14> try: <15> stream.stream_type = buf.pull_uint_var() <16> except BufferReadError: <17> break <18> consumed = buf.tell() <19> <20> # check unicity <21> if stream.stream_type == StreamType.CONTROL: <22> if self._peer_control_stream_id is not None: <23> raise StreamCreationError("Only one control stream is allowed") <24> self._peer_control_stream_id = stream_id <25> elif stream.stream_type == StreamType.QPACK_DECODER: <26> if self._peer_decoder_stream_id is not None: <27> raise StreamCreationError( <28> "Only one QPACK decoder stream is allowed" <29> ) <30> self._peer_decoder_stream_id = stream_id <31> elif stream.stream_type == StreamType.QPACK_ENCODER: <32> if self._peer_encoder_stream_id is not None: <33> raise StreamCreationError( <34> "Only one QPACK encoder stream is allowed" <35> ) <36> self._peer_encoder_stream_id = stream_id <37> <38> if stream.stream_type == StreamType.CONTROL: <39> # fetch</s>
===========below chunk 0=========== # module: aioquic.h3.connection class H3Connection: def _receive_stream_data_uni( + self, stream: H3Stream, data: bytes, stream_ended: bool - self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: # offset: 1 try: frame_type = buf.pull_uint_var() frame_length = buf.pull_uint_var() frame_data = buf.pull_bytes(frame_length) except BufferReadError: break consumed = buf.tell() self._handle_control_frame(frame_type, frame_data) elif stream.stream_type == StreamType.PUSH: # fetch push id if stream.push_id is None: try: stream.push_id = buf.pull_uint_var() except BufferReadError: break consumed = buf.tell() # remove processed data from buffer stream.buffer = stream.buffer[consumed:] return self._receive_request_or_push_data(stream_id, b"", stream_ended) elif stream.stream_type == StreamType.QPACK_DECODER: # feed unframed data to decoder data = buf.pull_bytes(buf.capacity - buf.tell()) consumed = buf.tell() try: self._encoder.feed_decoder(data) except pylsqpack.DecoderStreamError as exc: raise QpackDecoderStreamError() from exc elif stream.stream_type == StreamType.QPACK_ENCODER: # feed unframed data to encoder data = buf.pull_bytes(buf.capacity - buf.tell()) consumed = buf.tell() try: unblocked_streams.update(self._decoder.feed_encoder(data)) except pylsqpack.EncoderStreamError as exc: raise QpackEncoderStreamError() from exc else: # unknown stream type, discard data buf.</s> ===========below chunk 1=========== # module: aioquic.h3.connection class H3Connection: def _receive_stream_data_uni( + self, stream: H3Stream, data: bytes, stream_ended: bool - self, stream_id: int, data: bytes, stream_ended: bool ) -> List[H3Event]: # offset: 2 <s> exc: raise QpackEncoderStreamError() from exc else: # unknown stream type, discard data buf.seek(buf.capacity) consumed = buf.tell() # remove processed data from buffer stream.buffer = stream.buffer[consumed:] # process unblocked streams for stream_id in unblocked_streams: stream = self._stream[stream_id] # resume headers http_events.extend( self._handle_request_or_push_frame( frame_type=FrameType.HEADERS, frame_data=None, stream_id=stream_id, stream_ended=stream.ended and not stream.buffer, ) ) stream.blocked = False stream.blocked_frame_size = None # resume processing if stream.buffer: http_events.extend( self._receive_request_or_push_data(stream_id, b"", stream.ended) ) return http_events ===========unchanged ref 0=========== at: aioquic._buffer BufferReadError(*args: object) Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer eof() -> bool seek(pos: int) -> None tell() -> int pull_bytes(length: int) -> bytes pull_uint_var() -> int at: aioquic.h3.connection StreamType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, bytearray], base: int) QpackDecoderStreamError(reason_phrase: str="") QpackEncoderStreamError(reason_phrase: str="") StreamCreationError(reason_phrase: str="") H3Stream(stream_id: int) at: aioquic.h3.connection.H3Connection _handle_control_frame(frame_type: int, frame_data: bytes) -> None _handle_request_or_push_frame(self, frame_type: int, frame_data: Optional[bytes], stream: H3Stream, stream_ended: bool) -> List[H3Event] _handle_request_or_push_frame(frame_type: int, frame_data: Optional[bytes], stream: H3Stream, stream_ended: bool) -> List[H3Event] _receive_request_or_push_data(stream: H3Stream, data: bytes, stream_ended: bool) -> List[H3Event] _receive_request_or_push_data(self, stream: H3Stream, data: bytes, stream_ended: bool) -> List[H3Event] at: aioquic.h3.connection.H3Connection.__init__ self._decoder = pylsqpack.Decoder( self._max_table_capacity, self._blocked_streams ) self._encoder = pylsqpack.Encoder() self._stream: Dict[int, H3Stream] = {} ===========unchanged ref 1=========== self._peer_control_stream_id: Optional[int] = None self._peer_decoder_stream_id: Optional[int] = None self._peer_encoder_stream_id: Optional[int] = None at: aioquic.h3.connection.H3Connection._receive_request_or_push_data http_events: List[H3Event] = [] buf = Buffer(data=stream.buffer) consumed = buf.tell() consumed = 0 frame_data = buf.pull_bytes(chunk_size) at: aioquic.h3.connection.H3Stream.__init__ self.blocked = False self.blocked_frame_size: Optional[int] = None self.buffer = b"" self.ended = False self.frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.push_id: Optional[int] = None self.stream_id = stream_id self.stream_type: Optional[int] = None at: aioquic.h3.events H3Event() at: typing List = _alias(list, 1, inst=False, name='List') Set = _alias(set, 1, inst=False, name='Set')
aioquic.quic.packet/pull_quic_header
Modified
aiortc~aioquic
162a4ea0eb54e00ed37d3b6ca7fbec1354438745
[packet] ensure received SCID / DCID do not exceed 20 bytes
<9>:<add> if destination_cid_length > CONNECTION_ID_MAX_SIZE: <add> raise ValueError( <add> "Destination CID is too long (%d bytes)" % destination_cid_length <add> ) <12>:<add> if source_cid_length > CONNECTION_ID_MAX_SIZE: <add> raise ValueError("Source CID is too long (%d bytes)" % source_cid_length)
# module: aioquic.quic.packet def pull_quic_header(buf: Buffer, host_cid_length: Optional[int] = None) -> QuicHeader: <0> first_byte = buf.pull_uint8() <1> <2> original_destination_cid = b"" <3> token = b"" <4> if is_long_header(first_byte): <5> # long header packet <6> version = buf.pull_uint32() <7> <8> destination_cid_length = buf.pull_uint8() <9> destination_cid = buf.pull_bytes(destination_cid_length) <10> <11> source_cid_length = buf.pull_uint8() <12> source_cid = buf.pull_bytes(source_cid_length) <13> <14> if version == QuicProtocolVersion.NEGOTIATION: <15> # version negotiation <16> packet_type = None <17> rest_length = buf.capacity - buf.tell() <18> else: <19> if not (first_byte & PACKET_FIXED_BIT): <20> raise ValueError("Packet fixed bit is zero") <21> <22> packet_type = first_byte & PACKET_TYPE_MASK <23> if packet_type == PACKET_TYPE_INITIAL: <24> token_length = buf.pull_uint_var() <25> token = buf.pull_bytes(token_length) <26> rest_length = buf.pull_uint_var() <27> elif packet_type == PACKET_TYPE_RETRY: <28> original_destination_cid_length = buf.pull_uint8() <29> original_destination_cid = buf.pull_bytes( <30> original_destination_cid_length <31> ) <32> token = buf.pull_bytes(buf.capacity - buf.tell()) <33> rest_length = 0 <34> else: <35> rest_length = buf.pull_uint_var() <36> <37> return QuicHeader( <38> is_long_header=True, <39> version=version, <40> packet_type=packet_type, <41> destination_cid=destination_cid, <42> source_cid</s>
===========below chunk 0=========== # module: aioquic.quic.packet def pull_quic_header(buf: Buffer, host_cid_length: Optional[int] = None) -> QuicHeader: # offset: 1 original_destination_cid=original_destination_cid, token=token, rest_length=rest_length, ) else: # short header packet if not (first_byte & PACKET_FIXED_BIT): raise ValueError("Packet fixed bit is zero") packet_type = first_byte & PACKET_TYPE_MASK destination_cid = buf.pull_bytes(host_cid_length) return QuicHeader( is_long_header=False, version=None, packet_type=packet_type, destination_cid=destination_cid, source_cid=b"", token=b"", rest_length=buf.capacity - buf.tell(), ) ===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer tell() -> int pull_bytes(length: int) -> bytes pull_uint8() -> int pull_uint32() -> int pull_uint_var() -> int at: aioquic.quic.packet PACKET_FIXED_BIT = 0x40 PACKET_TYPE_INITIAL = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x00 PACKET_TYPE_RETRY = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x30 PACKET_TYPE_MASK = 0xF0 CONNECTION_ID_MAX_SIZE = 20 QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QuicHeader(is_long_header: bool, version: Optional[int], packet_type: int, destination_cid: bytes, source_cid: bytes, original_destination_cid: bytes=b"", token: bytes=b"", rest_length: int=0) is_long_header(first_byte: int) -> bool at: aioquic.quic.packet.QuicHeader is_long_header: bool version: Optional[int] packet_type: int destination_cid: bytes source_cid: bytes original_destination_cid: bytes = b"" token: bytes = b"" rest_length: int = 0 ===========changed ref 0=========== # module: aioquic.quic.packet PACKET_LONG_HEADER = 0x80 PACKET_FIXED_BIT = 0x40 PACKET_SPIN_BIT = 0x20 PACKET_TYPE_INITIAL = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x00 PACKET_TYPE_ZERO_RTT = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x10 PACKET_TYPE_HANDSHAKE = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x20 PACKET_TYPE_RETRY = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x30 PACKET_TYPE_ONE_RTT = PACKET_FIXED_BIT PACKET_TYPE_MASK = 0xF0 + CONNECTION_ID_MAX_SIZE = 20 PACKET_NUMBER_MAX_SIZE = 4
aioquic.quic.connection/QuicConnection._initialize
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
# module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: <0> # TLS <1> self.tls = tls.Context(is_client=self._is_client, logger=self._logger) <2> self.tls.alpn_protocols = self._configuration.alpn_protocols <3> self.tls.certificate = self._configuration.certificate <4> self.tls.certificate_private_key = self._configuration.private_key <5> self.tls.handshake_extensions = [ <6> ( <7> tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS, <8> self._serialize_transport_parameters(), <9> ) <10> ] <11> self.tls.server_name = self._configuration.server_name <12> <13> # TLS session resumption <14> session_ticket = self._configuration.session_ticket <15> if ( <16> self._is_client <17> and session_ticket is not None <18> and session_ticket.is_valid <19> and session_ticket.server_name == self._configuration.server_name <20> ): <21> self.tls.session_ticket = self._configuration.session_ticket <22> <23> # parse saved QUIC transport parameters - for 0-RTT <24> if session_ticket.max_early_data_size == 0xFFFFFFFF: <25> for ext_type, ext_data in session_ticket.other_extensions: <26> if ext_type == tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS: <27> self._parse_transport_parameters( <28> ext_data, from_session_ticket=True <29> ) <30> break <31> <32> # TLS callbacks <33> self.tls.alpn_cb = self._alpn_handler <34> if self._session_ticket_fetcher is not None: <35> self.tls.get_session_ticket_cb = self._session_ticket_fetcher <36> if self._session_ticket_handler is not None: <37> self.tls.new_session_ticket_cb = self._session_ticket_handler <38> self.tls.</s>
===========below chunk 0=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # offset: 1 # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair(), tls.Epoch.ZERO_RTT: CryptoPair(), tls.Epoch.HANDSHAKE: CryptoPair(), tls.Epoch.ONE_RTT: CryptoPair(), } self._crypto_buffers = { tls.Epoch.INITIAL: Buffer(capacity=4096), tls.Epoch.HANDSHAKE: Buffer(capacity=4096), tls.Epoch.ONE_RTT: Buffer(capacity=4096), } self._crypto_streams = { tls.Epoch.INITIAL: QuicStream(), tls.Epoch.HANDSHAKE: QuicStream(), tls.Epoch.ONE_RTT: QuicStream(), } self._spaces = { tls.Epoch.INITIAL: QuicPacketSpace(), tls.Epoch.HANDSHAKE: QuicPacketSpace(), tls.Epoch.ONE_RTT: QuicPacketSpace(), } self._cryptos[tls.Epoch.INITIAL].setup_initial( cid=peer_cid, is_client=self._is_client ) self._loss.spaces = list(self._spaces.values()) self._packet_number = 0 ===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [QuicProtocolVersion.DRAFT_22] ) at: aioquic.quic.connection.QuicConnection _alpn_handler(alpn_protocol: str) -> None _parse_transport_parameters(data: bytes, from_session_ticket: bool=False) -> None _serialize_transport_parameters() -> bytes _update_traffic_key(direction: tls.Direction, epoch: tls.Epoch, cipher_suite: tls.CipherSuite, secret: bytes) -> None at: aioquic.quic.connection.QuicConnection.__init__ self._configuration = configuration self._is_client = configuration.is_client self._cryptos: Dict[tls.Epoch, CryptoPair] = {} self._crypto_buffers: Dict[tls.Epoch, Buffer] = {} self._crypto_streams: Dict[tls.Epoch, QuicStream] = {} self._packet_number = 0 self._spaces: Dict[tls.Epoch, QuicPacketSpace] = {} self._version: Optional[int] = None self._logger = QuicConnectionAdapter( logger, {"id": dump_cid(logger_connection_id)} ) ===========unchanged ref 1=========== self._loss = QuicPacketRecovery( is_client_without_1rtt=self._is_client, quic_logger=self._quic_logger, send_probe=self._send_probe, ) self._session_ticket_fetcher = session_ticket_fetcher self._session_ticket_handler = session_ticket_handler at: aioquic.quic.connection.QuicConnection.connect self._version = self._configuration.supported_versions[0] at: aioquic.quic.connection.QuicConnection.datagrams_to_send self._packet_number = builder.packet_number at: aioquic.quic.connection.QuicConnection.receive_datagram self._version = QuicProtocolVersion(header.version) self._version = QuicProtocolVersion(max(common)) at: aioquic.quic.crypto CryptoPair() at: aioquic.quic.crypto.CryptoPair setup_initial(cid: bytes, is_client: bool, version: int) -> None at: aioquic.quic.recovery QuicPacketSpace() at: aioquic.quic.recovery.QuicPacketRecovery.__init__ self.spaces: List[QuicPacketSpace] = [] at: aioquic.quic.stream QuicStream(stream_id: Optional[int]=None, max_stream_data_local: int=0, max_stream_data_remote: int=0) at: aioquic.tls Epoch() ExtensionType(x: Union[str, bytes, bytearray], base: int) ExtensionType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) Context(is_client: bool, logger: Optional[Union[logging.Logger, logging.LoggerAdapter]]=None) at: aioquic.tls.Context.__init__ self.alpn_protocols: Optional[List[str]] = None self.certificate: Optional[x509.Certificate] = None ===========unchanged ref 2=========== self.certificate_private_key: Optional[ Union[dsa.DSAPublicKey, ec.EllipticCurvePublicKey, rsa.RSAPublicKey] ] = None self.handshake_extensions: List[Extension] = [] self.session_ticket: Optional[SessionTicket] = None self.server_name: Optional[str] = None self.alpn_cb: Optional[AlpnHandler] = None self.get_session_ticket_cb: Optional[SessionTicketFetcher] = None self.new_session_ticket_cb: Optional[SessionTicketHandler] = None self.update_traffic_key_cb: Callable[ [Direction, Epoch, CipherSuite, bytes], None ] = lambda d, e, c, s: None at: aioquic.tls.SessionTicket age_add: int cipher_suite: CipherSuite not_valid_after: datetime.datetime not_valid_before: datetime.datetime resumption_secret: bytes server_name: str ticket: bytes max_early_data_size: Optional[int] = None other_extensions: List[Tuple[int, bytes]] = field(default_factory=list) ===========changed ref 0=========== # module: aioquic.quic.packet class QuicProtocolVersion(IntEnum): NEGOTIATION = 0 DRAFT_17 = 0xFF000011 DRAFT_18 = 0xFF000012 DRAFT_19 = 0xFF000013 DRAFT_20 = 0xFF000014 DRAFT_21 = 0xFF000015 DRAFT_22 = 0xFF000016 + DRAFT_23 = 0xFF000017
tests.test_connection/QuicConnectionTest.test_receive_datagram_wrong_version
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<8>:<add> crypto.setup_initial(client.host_cid, is_client=False, version=client._version) <del> crypto.setup_initial(client.host_cid, is_client=False)
# module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_wrong_version(self): <0> client = create_standalone_client(self) <1> <2> builder = QuicPacketBuilder( <3> host_cid=client._peer_cid, <4> peer_cid=client.host_cid, <5> version=0xFF000011, # DRAFT_16 <6> ) <7> crypto = CryptoPair() <8> crypto.setup_initial(client.host_cid, is_client=False) <9> builder.start_packet(PACKET_TYPE_INITIAL, crypto) <10> builder.buffer.push_bytes(bytes(1200)) <11> builder.end_packet() <12> <13> for datagram in builder.flush()[0]: <14> client.receive_datagram(datagram, SERVER_ADDR, now=time.time()) <15> self.assertEqual(drop(client), 0) <16>
===========unchanged ref 0=========== at: aioquic._buffer.Buffer push_bytes(value: bytes) -> None at: aioquic.quic.connection.QuicConnection.__init__ self.host_cid = self._host_cids[0].cid self._peer_cid = os.urandom(configuration.connection_id_length) self._version: Optional[int] = None at: aioquic.quic.connection.QuicConnection.change_connection_id self._peer_cid = connection_id.cid at: aioquic.quic.connection.QuicConnection.connect self._version = self._configuration.supported_versions[0] at: aioquic.quic.connection.QuicConnection.receive_datagram self._version = QuicProtocolVersion(header.version) self._version = QuicProtocolVersion(max(common)) self._peer_cid = header.source_cid self.host_cid = context.host_cid at: aioquic.quic.crypto CryptoPair() at: aioquic.quic.crypto.CryptoPair setup_initial(cid: bytes, is_client: bool, version: int) -> None at: aioquic.quic.packet PACKET_TYPE_INITIAL = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x00 at: aioquic.quic.packet_builder QuicPacketBuilder(*, host_cid: bytes, peer_cid: bytes, version: int, pad_first_datagram: bool=False, packet_number: int=0, peer_token: bytes=b"", quic_logger: Optional[QuicLoggerTrace]=None, spin_bit: bool=False) at: aioquic.quic.packet_builder.QuicPacketBuilder flush() -> Tuple[List[bytes], List[QuicSentPacket]] start_packet(packet_type: int, crypto: CryptoPair) -> None end_packet() -> bool ===========unchanged ref 1=========== at: aioquic.quic.packet_builder.QuicPacketBuilder.__init__ self.buffer = Buffer(PACKET_MAX_SIZE) at: tests.test_connection SERVER_ADDR = ("2.3.4.5", 4433) create_standalone_client(self) drop(sender) at: time time() -> float at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.packet class QuicProtocolVersion(IntEnum): NEGOTIATION = 0 DRAFT_17 = 0xFF000011 DRAFT_18 = 0xFF000012 DRAFT_19 = 0xFF000013 DRAFT_20 = 0xFF000014 DRAFT_21 = 0xFF000015 DRAFT_22 = 0xFF000016 + DRAFT_23 = 0xFF000017 ===========changed ref 1=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # TLS self.tls = tls.Context(is_client=self._is_client, logger=self._logger) self.tls.alpn_protocols = self._configuration.alpn_protocols self.tls.certificate = self._configuration.certificate self.tls.certificate_private_key = self._configuration.private_key self.tls.handshake_extensions = [ ( tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS, self._serialize_transport_parameters(), ) ] self.tls.server_name = self._configuration.server_name # TLS session resumption session_ticket = self._configuration.session_ticket if ( self._is_client and session_ticket is not None and session_ticket.is_valid and session_ticket.server_name == self._configuration.server_name ): self.tls.session_ticket = self._configuration.session_ticket # parse saved QUIC transport parameters - for 0-RTT if session_ticket.max_early_data_size == 0xFFFFFFFF: for ext_type, ext_data in session_ticket.other_extensions: if ext_type == tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS: self._parse_transport_parameters( ext_data, from_session_ticket=True ) break # TLS callbacks self.tls.alpn_cb = self._alpn_handler if self._session_ticket_fetcher is not None: self.tls.get_session_ticket_cb = self._session_ticket_fetcher if self._session_ticket_handler is not None: self.tls.new_session_ticket_cb = self._session_ticket_handler self.tls.update_traffic_key_cb = self._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair</s> ===========changed ref 2=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # offset: 1 <s>._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair(), tls.Epoch.ZERO_RTT: CryptoPair(), tls.Epoch.HANDSHAKE: CryptoPair(), tls.Epoch.ONE_RTT: CryptoPair(), } self._crypto_buffers = { tls.Epoch.INITIAL: Buffer(capacity=4096), tls.Epoch.HANDSHAKE: Buffer(capacity=4096), tls.Epoch.ONE_RTT: Buffer(capacity=4096), } self._crypto_streams = { tls.Epoch.INITIAL: QuicStream(), tls.Epoch.HANDSHAKE: QuicStream(), tls.Epoch.ONE_RTT: QuicStream(), } self._spaces = { tls.Epoch.INITIAL: QuicPacketSpace(), tls.Epoch.HANDSHAKE: QuicPacketSpace(), tls.Epoch.ONE_RTT: QuicPacketSpace(), } self._cryptos[tls.Epoch.INITIAL].setup_initial( + cid=peer_cid, is_client=self._is_client, version=self._version - cid=peer_cid, is_client=self._is_client ) self._loss.spaces = list(self._spaces.values()) self._packet_number = 0
tests.test_crypto/CryptoTest.create_crypto
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<2>:<add> cid=binascii.unhexlify("8394c8f03e515708"), <del> cid=binascii.unhexlify("8394c8f03e515708"), is_client=is_client <3>:<add> is_client=is_client, <add> version=version,
# module: tests.test_crypto class CryptoTest(TestCase): + def create_crypto(self, is_client, version=QuicProtocolVersion.DRAFT_22): - def create_crypto(self, is_client): <0> pair = CryptoPair() <1> pair.setup_initial( <2> cid=binascii.unhexlify("8394c8f03e515708"), is_client=is_client <3> ) <4> return pair <5>
===========unchanged ref 0=========== at: aioquic.quic.crypto CryptoPair() at: aioquic.quic.crypto.CryptoPair setup_initial(cid: bytes, is_client: bool, version: int) -> None at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: binascii unhexlify(hexstr: _Ascii, /) -> bytes ===========changed ref 0=========== # module: aioquic.quic.packet class QuicProtocolVersion(IntEnum): NEGOTIATION = 0 DRAFT_17 = 0xFF000011 DRAFT_18 = 0xFF000012 DRAFT_19 = 0xFF000013 DRAFT_20 = 0xFF000014 DRAFT_21 = 0xFF000015 DRAFT_22 = 0xFF000016 + DRAFT_23 = 0xFF000017 ===========changed ref 1=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_wrong_version(self): client = create_standalone_client(self) builder = QuicPacketBuilder( host_cid=client._peer_cid, peer_cid=client.host_cid, version=0xFF000011, # DRAFT_16 ) crypto = CryptoPair() + crypto.setup_initial(client.host_cid, is_client=False, version=client._version) - crypto.setup_initial(client.host_cid, is_client=False) builder.start_packet(PACKET_TYPE_INITIAL, crypto) builder.buffer.push_bytes(bytes(1200)) builder.end_packet() for datagram in builder.flush()[0]: client.receive_datagram(datagram, SERVER_ADDR, now=time.time()) self.assertEqual(drop(client), 0) ===========changed ref 2=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # TLS self.tls = tls.Context(is_client=self._is_client, logger=self._logger) self.tls.alpn_protocols = self._configuration.alpn_protocols self.tls.certificate = self._configuration.certificate self.tls.certificate_private_key = self._configuration.private_key self.tls.handshake_extensions = [ ( tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS, self._serialize_transport_parameters(), ) ] self.tls.server_name = self._configuration.server_name # TLS session resumption session_ticket = self._configuration.session_ticket if ( self._is_client and session_ticket is not None and session_ticket.is_valid and session_ticket.server_name == self._configuration.server_name ): self.tls.session_ticket = self._configuration.session_ticket # parse saved QUIC transport parameters - for 0-RTT if session_ticket.max_early_data_size == 0xFFFFFFFF: for ext_type, ext_data in session_ticket.other_extensions: if ext_type == tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS: self._parse_transport_parameters( ext_data, from_session_ticket=True ) break # TLS callbacks self.tls.alpn_cb = self._alpn_handler if self._session_ticket_fetcher is not None: self.tls.get_session_ticket_cb = self._session_ticket_fetcher if self._session_ticket_handler is not None: self.tls.new_session_ticket_cb = self._session_ticket_handler self.tls.update_traffic_key_cb = self._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair</s> ===========changed ref 3=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # offset: 1 <s>._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair(), tls.Epoch.ZERO_RTT: CryptoPair(), tls.Epoch.HANDSHAKE: CryptoPair(), tls.Epoch.ONE_RTT: CryptoPair(), } self._crypto_buffers = { tls.Epoch.INITIAL: Buffer(capacity=4096), tls.Epoch.HANDSHAKE: Buffer(capacity=4096), tls.Epoch.ONE_RTT: Buffer(capacity=4096), } self._crypto_streams = { tls.Epoch.INITIAL: QuicStream(), tls.Epoch.HANDSHAKE: QuicStream(), tls.Epoch.ONE_RTT: QuicStream(), } self._spaces = { tls.Epoch.INITIAL: QuicPacketSpace(), tls.Epoch.HANDSHAKE: QuicPacketSpace(), tls.Epoch.ONE_RTT: QuicPacketSpace(), } self._cryptos[tls.Epoch.INITIAL].setup_initial( + cid=peer_cid, is_client=self._is_client, version=self._version - cid=peer_cid, is_client=self._is_client ) self._loss.spaces = list(self._spaces.values()) self._packet_number = 0
tests.test_packet_builder/create_builder
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<3>:<add> pad_first_datagram=pad_first_datagram, <6>:<add> version=QuicProtocolVersion.DRAFT_22, <del> version=QuicProtocolVersion.DRAFT_20,
# module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): <0> return QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> peer_cid=bytes(8), <4> peer_token=b"", <5> spin_bit=False, <6> version=QuicProtocolVersion.DRAFT_20, <7> ) <8>
===========unchanged ref 0=========== at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: aioquic.quic.packet_builder QuicPacketBuilder(*, host_cid: bytes, peer_cid: bytes, version: int, pad_first_datagram: bool=False, packet_number: int=0, peer_token: bytes=b"", quic_logger: Optional[QuicLoggerTrace]=None, spin_bit: bool=False) ===========changed ref 0=========== # module: aioquic.quic.packet class QuicProtocolVersion(IntEnum): NEGOTIATION = 0 DRAFT_17 = 0xFF000011 DRAFT_18 = 0xFF000012 DRAFT_19 = 0xFF000013 DRAFT_20 = 0xFF000014 DRAFT_21 = 0xFF000015 DRAFT_22 = 0xFF000016 + DRAFT_23 = 0xFF000017 ===========changed ref 1=========== # module: tests.test_crypto class CryptoTest(TestCase): + def create_crypto(self, is_client, version=QuicProtocolVersion.DRAFT_22): - def create_crypto(self, is_client): pair = CryptoPair() pair.setup_initial( + cid=binascii.unhexlify("8394c8f03e515708"), - cid=binascii.unhexlify("8394c8f03e515708"), is_client=is_client + is_client=is_client, + version=version, ) return pair ===========changed ref 2=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_wrong_version(self): client = create_standalone_client(self) builder = QuicPacketBuilder( host_cid=client._peer_cid, peer_cid=client.host_cid, version=0xFF000011, # DRAFT_16 ) crypto = CryptoPair() + crypto.setup_initial(client.host_cid, is_client=False, version=client._version) - crypto.setup_initial(client.host_cid, is_client=False) builder.start_packet(PACKET_TYPE_INITIAL, crypto) builder.buffer.push_bytes(bytes(1200)) builder.end_packet() for datagram in builder.flush()[0]: client.receive_datagram(datagram, SERVER_ADDR, now=time.time()) self.assertEqual(drop(client), 0) ===========changed ref 3=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # TLS self.tls = tls.Context(is_client=self._is_client, logger=self._logger) self.tls.alpn_protocols = self._configuration.alpn_protocols self.tls.certificate = self._configuration.certificate self.tls.certificate_private_key = self._configuration.private_key self.tls.handshake_extensions = [ ( tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS, self._serialize_transport_parameters(), ) ] self.tls.server_name = self._configuration.server_name # TLS session resumption session_ticket = self._configuration.session_ticket if ( self._is_client and session_ticket is not None and session_ticket.is_valid and session_ticket.server_name == self._configuration.server_name ): self.tls.session_ticket = self._configuration.session_ticket # parse saved QUIC transport parameters - for 0-RTT if session_ticket.max_early_data_size == 0xFFFFFFFF: for ext_type, ext_data in session_ticket.other_extensions: if ext_type == tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS: self._parse_transport_parameters( ext_data, from_session_ticket=True ) break # TLS callbacks self.tls.alpn_cb = self._alpn_handler if self._session_ticket_fetcher is not None: self.tls.get_session_ticket_cb = self._session_ticket_fetcher if self._session_ticket_handler is not None: self.tls.new_session_ticket_cb = self._session_ticket_handler self.tls.update_traffic_key_cb = self._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair</s> ===========changed ref 4=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # offset: 1 <s>._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair(), tls.Epoch.ZERO_RTT: CryptoPair(), tls.Epoch.HANDSHAKE: CryptoPair(), tls.Epoch.ONE_RTT: CryptoPair(), } self._crypto_buffers = { tls.Epoch.INITIAL: Buffer(capacity=4096), tls.Epoch.HANDSHAKE: Buffer(capacity=4096), tls.Epoch.ONE_RTT: Buffer(capacity=4096), } self._crypto_streams = { tls.Epoch.INITIAL: QuicStream(), tls.Epoch.HANDSHAKE: QuicStream(), tls.Epoch.ONE_RTT: QuicStream(), } self._spaces = { tls.Epoch.INITIAL: QuicPacketSpace(), tls.Epoch.HANDSHAKE: QuicPacketSpace(), tls.Epoch.ONE_RTT: QuicPacketSpace(), } self._cryptos[tls.Epoch.INITIAL].setup_initial( + cid=peer_cid, is_client=self._is_client, version=self._version - cid=peer_cid, is_client=self._is_client ) self._loss.spaces = list(self._spaces.values()) self._packet_number = 0
tests.test_packet_builder/QuicPacketBuilderTest.test_long_header_empty
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<0>:<add> builder = create_builder() <del> builder = QuicPacketBuilder( <1>:<del> host_cid=bytes(8), <2>:<del> packet_number=0, <3>:<del> peer_cid=bytes(8), <4>:<del> peer_token=b"", <5>:<del> spin_bit=False, <6>:<del> version=QuicProtocolVersion.DRAFT_20, <7>:<del> ) <8>:<add> crypto = create_crypto() <del> crypto = CryptoPair()
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): <0> builder = QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> peer_cid=bytes(8), <4> peer_token=b"", <5> spin_bit=False, <6> version=QuicProtocolVersion.DRAFT_20, <7> ) <8> crypto = CryptoPair() <9> <10> builder.start_packet(PACKET_TYPE_INITIAL, crypto) <11> self.assertEqual(builder.remaining_space, 1236) <12> <13> # nothing to write <14> <15> self.assertFalse(builder.end_packet()) <16> self.assertEqual(builder.buffer.tell(), 0) <17> self.assertEqual(builder.packet_number, 0) <18> <19> datagrams, packets = builder.flush() <20> self.assertEqual(len(datagrams), 0) <21> self.assertEqual(packets, []) <22>
===========unchanged ref 0=========== at: aioquic._buffer.Buffer tell() -> int at: aioquic.quic.crypto CryptoPair() at: aioquic.quic.crypto.CryptoPair setup_initial(cid: bytes, is_client: bool, version: int) -> None at: aioquic.quic.packet PACKET_TYPE_INITIAL = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x00 QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: aioquic.quic.packet_builder.QuicPacketBuilder start_packet(packet_type: int, crypto: CryptoPair) -> None end_packet() -> bool at: aioquic.quic.packet_builder.QuicPacketBuilder.__init__ self.buffer = Buffer(PACKET_MAX_SIZE) at: tests.test_packet_builder create_builder(pad_first_datagram=False) at: unittest.case TestCase(methodName: str=...) at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None assertFalse(expr: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 1=========== # module: aioquic.quic.packet class QuicProtocolVersion(IntEnum): NEGOTIATION = 0 DRAFT_17 = 0xFF000011 DRAFT_18 = 0xFF000012 DRAFT_19 = 0xFF000013 DRAFT_20 = 0xFF000014 DRAFT_21 = 0xFF000015 DRAFT_22 = 0xFF000016 + DRAFT_23 = 0xFF000017 ===========changed ref 2=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 3=========== # module: tests.test_crypto class CryptoTest(TestCase): + def create_crypto(self, is_client, version=QuicProtocolVersion.DRAFT_22): - def create_crypto(self, is_client): pair = CryptoPair() pair.setup_initial( + cid=binascii.unhexlify("8394c8f03e515708"), - cid=binascii.unhexlify("8394c8f03e515708"), is_client=is_client + is_client=is_client, + version=version, ) return pair ===========changed ref 4=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_wrong_version(self): client = create_standalone_client(self) builder = QuicPacketBuilder( host_cid=client._peer_cid, peer_cid=client.host_cid, version=0xFF000011, # DRAFT_16 ) crypto = CryptoPair() + crypto.setup_initial(client.host_cid, is_client=False, version=client._version) - crypto.setup_initial(client.host_cid, is_client=False) builder.start_packet(PACKET_TYPE_INITIAL, crypto) builder.buffer.push_bytes(bytes(1200)) builder.end_packet() for datagram in builder.flush()[0]: client.receive_datagram(datagram, SERVER_ADDR, now=time.time()) self.assertEqual(drop(client), 0) ===========changed ref 5=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # TLS self.tls = tls.Context(is_client=self._is_client, logger=self._logger) self.tls.alpn_protocols = self._configuration.alpn_protocols self.tls.certificate = self._configuration.certificate self.tls.certificate_private_key = self._configuration.private_key self.tls.handshake_extensions = [ ( tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS, self._serialize_transport_parameters(), ) ] self.tls.server_name = self._configuration.server_name # TLS session resumption session_ticket = self._configuration.session_ticket if ( self._is_client and session_ticket is not None and session_ticket.is_valid and session_ticket.server_name == self._configuration.server_name ): self.tls.session_ticket = self._configuration.session_ticket # parse saved QUIC transport parameters - for 0-RTT if session_ticket.max_early_data_size == 0xFFFFFFFF: for ext_type, ext_data in session_ticket.other_extensions: if ext_type == tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS: self._parse_transport_parameters( ext_data, from_session_ticket=True ) break # TLS callbacks self.tls.alpn_cb = self._alpn_handler if self._session_ticket_fetcher is not None: self.tls.get_session_ticket_cb = self._session_ticket_fetcher if self._session_ticket_handler is not None: self.tls.new_session_ticket_cb = self._session_ticket_handler self.tls.update_traffic_key_cb = self._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair</s> ===========changed ref 6=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # offset: 1 <s>._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair(), tls.Epoch.ZERO_RTT: CryptoPair(), tls.Epoch.HANDSHAKE: CryptoPair(), tls.Epoch.ONE_RTT: CryptoPair(), } self._crypto_buffers = { tls.Epoch.INITIAL: Buffer(capacity=4096), tls.Epoch.HANDSHAKE: Buffer(capacity=4096), tls.Epoch.ONE_RTT: Buffer(capacity=4096), } self._crypto_streams = { tls.Epoch.INITIAL: QuicStream(), tls.Epoch.HANDSHAKE: QuicStream(), tls.Epoch.ONE_RTT: QuicStream(), } self._spaces = { tls.Epoch.INITIAL: QuicPacketSpace(), tls.Epoch.HANDSHAKE: QuicPacketSpace(), tls.Epoch.ONE_RTT: QuicPacketSpace(), } self._cryptos[tls.Epoch.INITIAL].setup_initial( + cid=peer_cid, is_client=self._is_client, version=self._version - cid=peer_cid, is_client=self._is_client ) self._loss.spaces = list(self._spaces.values()) self._packet_number = 0
tests.test_packet_builder/QuicPacketBuilderTest.test_long_header_padding
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<0>:<del> builder = QuicPacketBuilder( <1>:<del> host_cid=bytes(8), <2>:<del> packet_number=0, <3>:<del> pad_first_datagram=True, <4>:<del> peer_cid=bytes(8), <5>:<del> peer_token=b"", <6>:<del> spin_bit=False, <7>:<del> version=QuicProtocolVersion.DRAFT_20, <8>:<del> ) <9>:<add> builder = create_builder(pad_first_datagram=True) <add> crypto = create_crypto() <del> crypto = CryptoPair() <10>:<del> crypto.setup_initial(bytes(8), is_client=True)
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): <0> builder = QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> pad_first_datagram=True, <4> peer_cid=bytes(8), <5> peer_token=b"", <6> spin_bit=False, <7> version=QuicProtocolVersion.DRAFT_20, <8> ) <9> crypto = CryptoPair() <10> crypto.setup_initial(bytes(8), is_client=True) <11> <12> # INITIAL, fully padded <13> builder.start_packet(PACKET_TYPE_INITIAL, crypto) <14> self.assertEqual(builder.remaining_space, 1236) <15> builder.start_frame(QuicFrameType.CRYPTO) <16> builder.buffer.push_bytes(bytes(100)) <17> self.assertTrue(builder.end_packet()) <18> self.assertEqual(builder.buffer.tell(), 1280) <19> <20> # check datagrams <21> datagrams, packets = builder.flush() <22> self.assertEqual(len(datagrams), 1) <23> self.assertEqual(len(datagrams[0]), 1280) <24> self.assertEqual( <25> packets, <26> [ <27> QuicSentPacket( <28> epoch=Epoch.INITIAL, <29> in_flight=True, <30> is_ack_eliciting=True, <31> is_crypto_packet=True, <32> packet_number=0, <33> packet_type=PACKET_TYPE_INITIAL, <34> sent_bytes=1280, <35> ) <36> ], <37> ) <38>
===========unchanged ref 0=========== at: aioquic.quic.packet PACKET_TYPE_INITIAL = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x00 QuicFrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QuicFrameType(x: Union[str, bytes, bytearray], base: int) at: aioquic.quic.packet_builder QuicSentPacket(epoch: Epoch, in_flight: bool, is_ack_eliciting: bool, is_crypto_packet: bool, packet_number: int, packet_type: int, sent_time: Optional[float]=None, sent_bytes: int=0, delivery_handlers: List[Tuple[QuicDeliveryHandler, Any]]=field( default_factory=list ), quic_logger_frames: List[Dict]=field(default_factory=list)) at: aioquic.quic.packet_builder.QuicSentPacket epoch: Epoch in_flight: bool is_ack_eliciting: bool is_crypto_packet: bool packet_number: int packet_type: int sent_time: Optional[float] = None sent_bytes: int = 0 delivery_handlers: List[Tuple[QuicDeliveryHandler, Any]] = field( default_factory=list ) quic_logger_frames: List[Dict] = field(default_factory=list) at: aioquic.tls Epoch() at: tests.test_packet_builder create_builder(pad_first_datagram=False) create_crypto() at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 1=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 2=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 3=========== # module: aioquic.quic.packet class QuicProtocolVersion(IntEnum): NEGOTIATION = 0 DRAFT_17 = 0xFF000011 DRAFT_18 = 0xFF000012 DRAFT_19 = 0xFF000013 DRAFT_20 = 0xFF000014 DRAFT_21 = 0xFF000015 DRAFT_22 = 0xFF000016 + DRAFT_23 = 0xFF000017 ===========changed ref 4=========== # module: tests.test_crypto class CryptoTest(TestCase): + def create_crypto(self, is_client, version=QuicProtocolVersion.DRAFT_22): - def create_crypto(self, is_client): pair = CryptoPair() pair.setup_initial( + cid=binascii.unhexlify("8394c8f03e515708"), - cid=binascii.unhexlify("8394c8f03e515708"), is_client=is_client + is_client=is_client, + version=version, ) return pair ===========changed ref 5=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_wrong_version(self): client = create_standalone_client(self) builder = QuicPacketBuilder( host_cid=client._peer_cid, peer_cid=client.host_cid, version=0xFF000011, # DRAFT_16 ) crypto = CryptoPair() + crypto.setup_initial(client.host_cid, is_client=False, version=client._version) - crypto.setup_initial(client.host_cid, is_client=False) builder.start_packet(PACKET_TYPE_INITIAL, crypto) builder.buffer.push_bytes(bytes(1200)) builder.end_packet() for datagram in builder.flush()[0]: client.receive_datagram(datagram, SERVER_ADDR, now=time.time()) self.assertEqual(drop(client), 0) ===========changed ref 6=========== # module: aioquic.quic.connection class QuicConnection: def _initialize(self, peer_cid: bytes) -> None: # TLS self.tls = tls.Context(is_client=self._is_client, logger=self._logger) self.tls.alpn_protocols = self._configuration.alpn_protocols self.tls.certificate = self._configuration.certificate self.tls.certificate_private_key = self._configuration.private_key self.tls.handshake_extensions = [ ( tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS, self._serialize_transport_parameters(), ) ] self.tls.server_name = self._configuration.server_name # TLS session resumption session_ticket = self._configuration.session_ticket if ( self._is_client and session_ticket is not None and session_ticket.is_valid and session_ticket.server_name == self._configuration.server_name ): self.tls.session_ticket = self._configuration.session_ticket # parse saved QUIC transport parameters - for 0-RTT if session_ticket.max_early_data_size == 0xFFFFFFFF: for ext_type, ext_data in session_ticket.other_extensions: if ext_type == tls.ExtensionType.QUIC_TRANSPORT_PARAMETERS: self._parse_transport_parameters( ext_data, from_session_ticket=True ) break # TLS callbacks self.tls.alpn_cb = self._alpn_handler if self._session_ticket_fetcher is not None: self.tls.get_session_ticket_cb = self._session_ticket_fetcher if self._session_ticket_handler is not None: self.tls.new_session_ticket_cb = self._session_ticket_handler self.tls.update_traffic_key_cb = self._update_traffic_key # packet spaces self._cryptos = { tls.Epoch.INITIAL: CryptoPair</s>
tests.test_packet_builder/QuicPacketBuilderTest.test_long_header_then_short_header
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<0>:<add> builder = create_builder() <del> builder = QuicPacketBuilder( <1>:<del> host_cid=bytes(8), <2>:<del> packet_number=0, <3>:<del> peer_cid=bytes(8), <4>:<del> peer_token=b"", <5>:<del> spin_bit=False, <6>:<del> version=QuicProtocolVersion.DRAFT_20, <7>:<del> ) <8>:<add> crypto = create_crypto() <del> crypto = CryptoPair() <9>:<del> crypto.setup_initial(bytes(8), is_client=True)
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_then_short_header(self): <0> builder = QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> peer_cid=bytes(8), <4> peer_token=b"", <5> spin_bit=False, <6> version=QuicProtocolVersion.DRAFT_20, <7> ) <8> crypto = CryptoPair() <9> crypto.setup_initial(bytes(8), is_client=True) <10> <11> # INITIAL, fully padded <12> builder.start_packet(PACKET_TYPE_INITIAL, crypto) <13> self.assertEqual(builder.remaining_space, 1236) <14> builder.start_frame(QuicFrameType.CRYPTO) <15> builder.buffer.push_bytes(bytes(builder.remaining_space)) <16> self.assertTrue(builder.end_packet()) <17> self.assertEqual(builder.buffer.tell(), 1280) <18> <19> # ONE_RTT, fully padded <20> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <21> self.assertEqual(builder.remaining_space, 1253) <22> builder.start_frame(QuicFrameType.STREAM_BASE) <23> builder.buffer.push_bytes(bytes(builder.remaining_space)) <24> self.assertTrue(builder.end_packet()) <25> self.assertEqual(builder.buffer.tell(), 0) <26> <27> # check datagrams <28> datagrams, packets = builder.flush() <29> self.assertEqual(len(datagrams), 2) <30> self.assertEqual(len(datagrams[0]), 1280) <31> self.assertEqual(len(datagrams[1]), 1280) <32> self.assertEqual( <33> packets, <34> [ <35> QuicSentPacket( <36> epoch=Epoch.INITIAL, <37> in_flight=True, <38> is_ack_eliciting=True,</s>
===========below chunk 0=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_then_short_header(self): # offset: 1 packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ), QuicSentPacket( epoch=Epoch.ONE_RTT, in_flight=True, is_ack_eliciting=True, is_crypto_packet=False, packet_number=1, packet_type=PACKET_TYPE_ONE_RTT, sent_bytes=1280, ), ], ) ===========unchanged ref 0=========== at: aioquic.quic.packet PACKET_TYPE_INITIAL = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x00 PACKET_TYPE_HANDSHAKE = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x20 PACKET_TYPE_ONE_RTT = PACKET_FIXED_BIT QuicFrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QuicFrameType(x: Union[str, bytes, bytearray], base: int) at: aioquic.quic.packet_builder QuicSentPacket(epoch: Epoch, in_flight: bool, is_ack_eliciting: bool, is_crypto_packet: bool, packet_number: int, packet_type: int, sent_time: Optional[float]=None, sent_bytes: int=0, delivery_handlers: List[Tuple[QuicDeliveryHandler, Any]]=field( default_factory=list ), quic_logger_frames: List[Dict]=field(default_factory=list)) at: aioquic.tls Epoch() at: tests.test_packet_builder create_builder(pad_first_datagram=False) create_crypto() at: tests.test_packet_builder.QuicPacketBuilderTest.test_long_header_then_short_header builder = create_builder() crypto = create_crypto() at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 1=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 2=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 3=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - pad_first_datagram=True, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + builder = create_builder(pad_first_datagram=True) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(100)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ) ], ) ===========changed ref 4=========== # module: aioquic.quic.packet class QuicProtocolVersion(IntEnum): NEGOTIATION = 0 DRAFT_17 = 0xFF000011 DRAFT_18 = 0xFF000012 DRAFT_19 = 0xFF000013 DRAFT_20 = 0xFF000014 DRAFT_21 = 0xFF000015 DRAFT_22 = 0xFF000016 + DRAFT_23 = 0xFF000017 ===========changed ref 5=========== # module: tests.test_crypto class CryptoTest(TestCase): + def create_crypto(self, is_client, version=QuicProtocolVersion.DRAFT_22): - def create_crypto(self, is_client): pair = CryptoPair() pair.setup_initial( + cid=binascii.unhexlify("8394c8f03e515708"), - cid=binascii.unhexlify("8394c8f03e515708"), is_client=is_client + is_client=is_client, + version=version, ) return pair ===========changed ref 6=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_wrong_version(self): client = create_standalone_client(self) builder = QuicPacketBuilder( host_cid=client._peer_cid, peer_cid=client.host_cid, version=0xFF000011, # DRAFT_16 ) crypto = CryptoPair() + crypto.setup_initial(client.host_cid, is_client=False, version=client._version) - crypto.setup_initial(client.host_cid, is_client=False) builder.start_packet(PACKET_TYPE_INITIAL, crypto) builder.buffer.push_bytes(bytes(1200)) builder.end_packet() for datagram in builder.flush()[0]: client.receive_datagram(datagram, SERVER_ADDR, now=time.time()) self.assertEqual(drop(client), 0)
tests.test_packet_builder/QuicPacketBuilderTest.test_long_header_then_long_header
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<0>:<add> builder = create_builder() <del> builder = QuicPacketBuilder( <1>:<del> host_cid=bytes(8), <2>:<del> packet_number=0, <3>:<del> peer_cid=bytes(8), <4>:<del> peer_token=b"", <5>:<del> spin_bit=False, <6>:<del> version=QuicProtocolVersion.DRAFT_20, <7>:<del> ) <8>:<add> crypto = create_crypto() <del> crypto = CryptoPair() <9>:<del> crypto.setup_initial(bytes(8), is_client=True)
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_then_long_header(self): <0> builder = QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> peer_cid=bytes(8), <4> peer_token=b"", <5> spin_bit=False, <6> version=QuicProtocolVersion.DRAFT_20, <7> ) <8> crypto = CryptoPair() <9> crypto.setup_initial(bytes(8), is_client=True) <10> <11> # INITIAL <12> builder.start_packet(PACKET_TYPE_INITIAL, crypto) <13> self.assertEqual(builder.remaining_space, 1236) <14> builder.start_frame(QuicFrameType.CRYPTO) <15> builder.buffer.push_bytes(bytes(199)) <16> self.assertEqual(builder.buffer.tell(), 228) <17> self.assertTrue(builder.end_packet()) <18> self.assertEqual(builder.buffer.tell(), 244) <19> <20> # HANDSHAKE <21> builder.start_packet(PACKET_TYPE_HANDSHAKE, crypto) <22> self.assertEqual(builder.buffer.tell(), 271) <23> self.assertEqual(builder.remaining_space, 993) <24> builder.start_frame(QuicFrameType.CRYPTO) <25> builder.buffer.push_bytes(bytes(299)) <26> self.assertEqual(builder.buffer.tell(), 571) <27> self.assertTrue(builder.end_packet()) <28> self.assertEqual(builder.buffer.tell(), 587) <29> <30> # ONE_RTT <31> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <32> self.assertEqual(builder.remaining_space, 666) <33> builder.start_frame(QuicFrameType.CRYPTO) <34> builder.buffer.push_bytes(bytes(299)) <35> self.assertTrue(builder.end_packet()) <36> </s>
===========below chunk 0=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_then_long_header(self): # offset: 1 # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 914) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=244, ), QuicSentPacket( epoch=Epoch.HANDSHAKE, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=1, packet_type=PACKET_TYPE_HANDSHAKE, sent_bytes=343, ), QuicSentPacket( epoch=Epoch.ONE_RTT, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=2, packet_type=PACKET_TYPE_ONE_RTT, sent_bytes=327, ), ], ) ===========unchanged ref 0=========== at: aioquic.quic.packet PACKET_TYPE_INITIAL = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x00 PACKET_TYPE_HANDSHAKE = PACKET_LONG_HEADER | PACKET_FIXED_BIT | 0x20 PACKET_TYPE_ONE_RTT = PACKET_FIXED_BIT QuicFrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QuicFrameType(x: Union[str, bytes, bytearray], base: int) at: aioquic.quic.packet_builder QuicSentPacket(epoch: Epoch, in_flight: bool, is_ack_eliciting: bool, is_crypto_packet: bool, packet_number: int, packet_type: int, sent_time: Optional[float]=None, sent_bytes: int=0, delivery_handlers: List[Tuple[QuicDeliveryHandler, Any]]=field( default_factory=list ), quic_logger_frames: List[Dict]=field(default_factory=list)) at: aioquic.tls Epoch() at: tests.test_packet_builder create_builder(pad_first_datagram=False) create_crypto() at: tests.test_packet_builder.QuicPacketBuilderTest.test_long_header_then_long_header builder = create_builder() crypto = create_crypto() at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None assertFalse(expr: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 1=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 2=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 3=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - pad_first_datagram=True, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + builder = create_builder(pad_first_datagram=True) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(100)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ) ], )
tests.test_packet_builder/QuicPacketBuilderTest.test_short_header_empty
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<0>:<add> builder = create_builder() <del> builder = QuicPacketBuilder( <1>:<del> host_cid=bytes(8), <2>:<del> packet_number=0, <3>:<del> peer_cid=bytes(8), <4>:<del> peer_token=b"", <5>:<del> spin_bit=False, <6>:<del> version=QuicProtocolVersion.DRAFT_20, <7>:<del> ) <8>:<add> crypto = create_crypto() <del> crypto = CryptoPair()
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_empty(self): <0> builder = QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> peer_cid=bytes(8), <4> peer_token=b"", <5> spin_bit=False, <6> version=QuicProtocolVersion.DRAFT_20, <7> ) <8> crypto = CryptoPair() <9> <10> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <11> self.assertEqual(builder.remaining_space, 1253) <12> <13> # nothing to write <14> self.assertFalse(builder.end_packet()) <15> <16> # check builder <17> self.assertEqual(builder.buffer.tell(), 0) <18> self.assertEqual(builder.packet_number, 0) <19> <20> datagrams, packets = builder.flush() <21> self.assertEqual(len(datagrams), 0) <22> self.assertEqual(packets, []) <23>
===========unchanged ref 0=========== at: aioquic.quic.packet PACKET_TYPE_ONE_RTT = PACKET_FIXED_BIT QuicFrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) QuicFrameType(x: Union[str, bytes, bytearray], base: int) at: aioquic.quic.packet_builder QuicSentPacket(epoch: Epoch, in_flight: bool, is_ack_eliciting: bool, is_crypto_packet: bool, packet_number: int, packet_type: int, sent_time: Optional[float]=None, sent_bytes: int=0, delivery_handlers: List[Tuple[QuicDeliveryHandler, Any]]=field( default_factory=list ), quic_logger_frames: List[Dict]=field(default_factory=list)) at: aioquic.tls Epoch() at: tests.test_packet_builder.QuicPacketBuilderTest.test_short_header_padding builder = create_builder() at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 1=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 2=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 3=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - pad_first_datagram=True, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + builder = create_builder(pad_first_datagram=True) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(100)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ) ], ) ===========changed ref 4=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_then_short_header(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # ONE_RTT, fully padded builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) builder.start_frame(QuicFrameType.STREAM_BASE) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 2) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual(len(datagrams[1]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, </s> ===========changed ref 5=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_then_short_header(self): # offset: 1 <s> in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ), QuicSentPacket( epoch=Epoch.ONE_RTT, in_flight=True, is_ack_eliciting=True, is_crypto_packet=False, packet_number=1, packet_type=PACKET_TYPE_ONE_RTT, sent_bytes=1280, ), ], )
tests.test_packet_builder/QuicPacketBuilderTest.test_short_header_padding
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<0>:<add> builder = create_builder() <del> builder = QuicPacketBuilder( <1>:<del> host_cid=bytes(8), <2>:<del> packet_number=0, <3>:<del> peer_cid=bytes(8), <4>:<del> peer_token=b"", <5>:<del> spin_bit=False, <6>:<del> version=QuicProtocolVersion.DRAFT_20, <7>:<del> ) <8>:<add> crypto = create_crypto() <del> crypto = CryptoPair() <9>:<del> crypto.setup_initial(bytes(8), is_client=True)
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_padding(self): <0> builder = QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> peer_cid=bytes(8), <4> peer_token=b"", <5> spin_bit=False, <6> version=QuicProtocolVersion.DRAFT_20, <7> ) <8> crypto = CryptoPair() <9> crypto.setup_initial(bytes(8), is_client=True) <10> <11> # ONE_RTT, fully padded <12> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <13> self.assertEqual(builder.remaining_space, 1253) <14> builder.start_frame(QuicFrameType.CRYPTO) <15> builder.buffer.push_bytes(bytes(builder.remaining_space)) <16> self.assertTrue(builder.end_packet()) <17> <18> # check builder <19> self.assertEqual(builder.buffer.tell(), 0) <20> self.assertEqual(builder.packet_number, 1) <21> <22> # check datagrams <23> datagrams, packets = builder.flush() <24> self.assertEqual(len(datagrams), 1) <25> self.assertEqual(len(datagrams[0]), 1280) <26> self.assertEqual( <27> packets, <28> [ <29> QuicSentPacket( <30> epoch=Epoch.ONE_RTT, <31> in_flight=True, <32> is_ack_eliciting=True, <33> is_crypto_packet=True, <34> packet_number=0, <35> packet_type=PACKET_TYPE_ONE_RTT, <36> sent_bytes=1280, <37> ) <38> ], <39> ) <40>
===========unchanged ref 0=========== at: aioquic.quic.packet PACKET_TYPE_ONE_RTT = PACKET_FIXED_BIT at: aioquic.quic.packet_builder QuicPacketBuilderStop(*args: object) at: tests.test_packet_builder create_builder(pad_first_datagram=False) create_crypto() at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None assertRaises(expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any=...) -> _AssertRaisesContext[_E] assertRaises(expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None ===========changed ref 0=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 1=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 2=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) # nothing to write self.assertFalse(builder.end_packet()) # check builder self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 3=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 4=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - pad_first_datagram=True, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + builder = create_builder(pad_first_datagram=True) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(100)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ) ], ) ===========changed ref 5=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_then_short_header(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # ONE_RTT, fully padded builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) builder.start_frame(QuicFrameType.STREAM_BASE) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 2) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual(len(datagrams[1]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, </s>
tests.test_packet_builder/QuicPacketBuilderTest.test_short_header_max_total_bytes_1
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<6>:<add> crypto = create_crypto() <del> crypto = CryptoPair() <7>:<del> crypto.setup_initial(bytes(8), is_client=True)
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_max_total_bytes_1(self): <0> """ <1> max_total_bytes doesn't allow any packets. <2> """ <3> builder = create_builder() <4> builder.max_total_bytes = 11 <5> <6> crypto = CryptoPair() <7> crypto.setup_initial(bytes(8), is_client=True) <8> <9> with self.assertRaises(QuicPacketBuilderStop): <10> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <11>
===========unchanged ref 0=========== at: aioquic.quic.packet PACKET_TYPE_ONE_RTT = PACKET_FIXED_BIT at: aioquic.quic.packet_builder QuicPacketBuilderStop(*args: object) at: tests.test_packet_builder.QuicPacketBuilderTest.test_short_header_max_total_bytes_3 builder = create_builder() crypto = create_crypto() at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None assertRaises(expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any=...) -> _AssertRaisesContext[_E] assertRaises(expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None ===========changed ref 0=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) # nothing to write self.assertFalse(builder.end_packet()) # check builder self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 1=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 2=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 3=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_padding(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # ONE_RTT, fully padded builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) # check builder self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 1) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.ONE_RTT, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_ONE_RTT, sent_bytes=1280, ) ], ) ===========changed ref 4=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 5=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - pad_first_datagram=True, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + builder = create_builder(pad_first_datagram=True) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(100)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ) ], )
tests.test_packet_builder/QuicPacketBuilderTest.test_short_header_max_total_bytes_2
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<6>:<add> crypto = create_crypto() <del> crypto = CryptoPair() <7>:<del> crypto.setup_initial(bytes(8), is_client=True)
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_max_total_bytes_2(self): <0> """ <1> max_total_bytes allows a short packet. <2> """ <3> builder = create_builder() <4> builder.max_total_bytes = 800 <5> <6> crypto = CryptoPair() <7> crypto.setup_initial(bytes(8), is_client=True) <8> <9> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <10> self.assertEqual(builder.remaining_space, 773) <11> builder.buffer.push_bytes(bytes(builder.remaining_space)) <12> self.assertTrue(builder.end_packet()) <13> <14> with self.assertRaises(QuicPacketBuilderStop): <15> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <16>
===========changed ref 0=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_max_total_bytes_1(self): """ max_total_bytes doesn't allow any packets. """ builder = create_builder() builder.max_total_bytes = 11 + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) with self.assertRaises(QuicPacketBuilderStop): builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) ===========changed ref 1=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) # nothing to write self.assertFalse(builder.end_packet()) # check builder self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 2=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 3=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 4=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_padding(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # ONE_RTT, fully padded builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) # check builder self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 1) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.ONE_RTT, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_ONE_RTT, sent_bytes=1280, ) ], ) ===========changed ref 5=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 6=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - pad_first_datagram=True, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + builder = create_builder(pad_first_datagram=True) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(100)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ) ], )
tests.test_packet_builder/QuicPacketBuilderTest.test_short_header_max_total_bytes_3
Modified
aiortc~aioquic
4e7753f697d8d9d6013f3cc7fc83942c4351655f
[crypto] pass protocol version to setup_initial()
<3>:<add> crypto = create_crypto() <del> crypto = CryptoPair() <4>:<del> crypto.setup_initial(bytes(8), is_client=True)
# module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_max_total_bytes_3(self): <0> builder = create_builder() <1> builder.max_total_bytes = 2000 <2> <3> crypto = CryptoPair() <4> crypto.setup_initial(bytes(8), is_client=True) <5> <6> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <7> self.assertEqual(builder.remaining_space, 1253) <8> builder.buffer.push_bytes(bytes(builder.remaining_space)) <9> self.assertTrue(builder.end_packet()) <10> <11> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <12> self.assertEqual(builder.remaining_space, 693) <13> builder.buffer.push_bytes(bytes(builder.remaining_space)) <14> self.assertTrue(builder.end_packet()) <15> <16> with self.assertRaises(QuicPacketBuilderStop): <17> builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) <18>
===========changed ref 0=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_max_total_bytes_1(self): """ max_total_bytes doesn't allow any packets. """ builder = create_builder() builder.max_total_bytes = 11 + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) with self.assertRaises(QuicPacketBuilderStop): builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) ===========changed ref 1=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_max_total_bytes_2(self): """ max_total_bytes allows a short packet. """ builder = create_builder() builder.max_total_bytes = 800 + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 773) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) with self.assertRaises(QuicPacketBuilderStop): builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) ===========changed ref 2=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) # nothing to write self.assertFalse(builder.end_packet()) # check builder self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 3=========== # module: tests.test_packet_builder + def create_crypto(): + crypto = CryptoPair() + crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) + return crypto + ===========changed ref 4=========== # module: tests.test_packet_builder + def create_builder(pad_first_datagram=False): - def create_builder(): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, + pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_22, - version=QuicProtocolVersion.DRAFT_20, ) ===========changed ref 5=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_short_header_padding(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # ONE_RTT, fully padded builder.start_packet(PACKET_TYPE_ONE_RTT, crypto) self.assertEqual(builder.remaining_space, 1253) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(builder.remaining_space)) self.assertTrue(builder.end_packet()) # check builder self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 1) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.ONE_RTT, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_ONE_RTT, sent_bytes=1280, ) ], ) ===========changed ref 6=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_empty(self): + builder = create_builder() - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + crypto = create_crypto() - crypto = CryptoPair() builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) # nothing to write self.assertFalse(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 0) self.assertEqual(builder.packet_number, 0) datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 0) self.assertEqual(packets, []) ===========changed ref 7=========== # module: tests.test_packet_builder class QuicPacketBuilderTest(TestCase): def test_long_header_padding(self): - builder = QuicPacketBuilder( - host_cid=bytes(8), - packet_number=0, - pad_first_datagram=True, - peer_cid=bytes(8), - peer_token=b"", - spin_bit=False, - version=QuicProtocolVersion.DRAFT_20, - ) + builder = create_builder(pad_first_datagram=True) + crypto = create_crypto() - crypto = CryptoPair() - crypto.setup_initial(bytes(8), is_client=True) # INITIAL, fully padded builder.start_packet(PACKET_TYPE_INITIAL, crypto) self.assertEqual(builder.remaining_space, 1236) builder.start_frame(QuicFrameType.CRYPTO) builder.buffer.push_bytes(bytes(100)) self.assertTrue(builder.end_packet()) self.assertEqual(builder.buffer.tell(), 1280) # check datagrams datagrams, packets = builder.flush() self.assertEqual(len(datagrams), 1) self.assertEqual(len(datagrams[0]), 1280) self.assertEqual( packets, [ QuicSentPacket( epoch=Epoch.INITIAL, in_flight=True, is_ack_eliciting=True, is_crypto_packet=True, packet_number=0, packet_type=PACKET_TYPE_INITIAL, sent_bytes=1280, ) ], )
tests.test_crypto/CryptoTest.test_decrypt_chacha20
Modified
aiortc~aioquic
7365d96287a87424b98a3f4c17a13f5ca57c3d1c
[tests] use valid headers for test vectors
<4>:<add> "b42772df33c9719a32820d302aa664d080d7f5ea7a71a330f87864cb289ae8c0" <del> "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e" <9>:<add> CHACHA20_CLIENT_ENCRYPTED_PACKET, 25, 0 <del> CHACHA20_CLIENT_ENCRYPTED_PACKET, 34, 0
# module: tests.test_crypto class CryptoTest(TestCase): @skipIf(os.environ.get("TRAVIS") == "true", "travis lacks a modern OpenSSL") def test_decrypt_chacha20(self): <0> pair = CryptoPair() <1> pair.recv.setup( <2> CipherSuite.CHACHA20_POLY1305_SHA256, <3> binascii.unhexlify( <4> "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e" <5> ), <6> ) <7> <8> plain_header, plain_payload, packet_number = pair.decrypt_packet( <9> CHACHA20_CLIENT_ENCRYPTED_PACKET, 34, 0 <10> ) <11> self.assertEqual(plain_header, CHACHA20_CLIENT_PLAIN_HEADER) <12> self.assertEqual(plain_payload, CHACHA20_CLIENT_PLAIN_PAYLOAD) <13> self.assertEqual(packet_number, CHACHA20_CLIENT_PACKET_NUMBER) <14>
===========unchanged ref 0=========== at: _collections_abc.Mapping __slots__ = () __abc_tpflags__ = 1 << 6 # Py_TPFLAGS_MAPPING get(key, default=None) __reversed__ = None at: aioquic.quic.crypto CryptoPair() at: aioquic.quic.crypto.CryptoContext setup(cipher_suite: CipherSuite, secret: bytes) -> None at: aioquic.quic.crypto.CryptoPair decrypt_packet(packet: bytes, encrypted_offset: int, expected_packet_number: int) -> Tuple[bytes, bytes, int] at: aioquic.quic.crypto.CryptoPair.__init__ self.recv = CryptoContext() at: aioquic.tls CipherSuite(x: Union[str, bytes, bytearray], base: int) CipherSuite(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: binascii unhexlify(hexstr: _Ascii, /) -> bytes at: os environ = _createenviron() at: tests.test_crypto CHACHA20_CLIENT_PLAIN_HEADER = binascii.unhexlify( "e1ff0000160880b57c7b70d8524b0850fc2a28e240fd7640170002" ) CHACHA20_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( "e8ff0000160880b57c7b70d8524b0850fc2a28e240fd7640178313b04be98449" "eb10567e25ce930381f2a5b7da2db8db" ) at: tests.test_crypto.CryptoTest.test_derive_key_iv_hp key, iv, hp = derive_key_iv_hp(INITIAL_CIPHER_SUITE, secret) at: unittest.case skipIf(condition: object, reason: str) -> Callable[[_FT], _FT] ===========unchanged ref 1=========== at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_crypto CHACHA20_CLIENT_PACKET_NUMBER = 2 CHACHA20_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "e1ff0000160880b57c7b70d8524b0850fc2a28e240fd7640170002" - "e1ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240170002" ) + CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0201000000") - CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0200000000") CHACHA20_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "e8ff0000160880b57c7b70d8524b0850fc2a28e240fd7640178313b04be98449" + "eb10567e25ce930381f2a5b7da2db8db" - "e7ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240175554" - "c9ead500f378c5b1dd3eebab26c089128698919bee" ) LONG_CLIENT_PACKET_NUMBER = 2 LONG_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "c3ff000017088394c8f03e5157080000449e00000002" - "c3ff000012508394c8f03e51570800449f00000002" ) LONG_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify( "060040c4010000c003036660261ff947cea49cce6cfad687f457cf1b14531ba1" "4131a0e8f309a1d0b9</s> ===========changed ref 1=========== # module: tests.test_crypto # offset: 1 <s>7f457cf1b14531ba1" "4131a0e8f309a1d0b9c4000006130113031302010000910000000b0009000006" "736572766572ff01000100000a00140012001d00170018001901000101010201" "03010400230000003300260024001d00204cfdfcd178b784bf328cae793b136f" "2aedce005ff183d7bb1495207236647037002b0003020304000d0020001e0403" "05030603020308040805080604010501060102010402050206020202002d0002" "0101001c00024001" + ) + bytes(962) - ) + bytes(963) LONG_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "c2ff000017088394c8f03e5157080000449e9bd343fd65f354ebb400418b614f" - "c2ff000012508394c8f03e51570800449f9bd343fd65f354ebb400418b614f73" + "73765009c0162d594777f9e6ddeb32fba3865cffd7e26e3724d4997cdde8df34" - "765009c0162d594777f9e6ddeb32fba3865cffd7e26e3724d4997cdde8df34f8" + "f8868772fed2412d43046f44dc7c6adf5ee10da456d56c892c8f69594</s>
tests.test_crypto/CryptoTest.test_decrypt_long_client
Modified
aiortc~aioquic
7365d96287a87424b98a3f4c17a13f5ca57c3d1c
[tests] use valid headers for test vectors
<3>:<add> LONG_CLIENT_ENCRYPTED_PACKET, 18, 0 <del> LONG_CLIENT_ENCRYPTED_PACKET, 17, 0
# module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_long_client(self): <0> pair = self.create_crypto(is_client=False) <1> <2> plain_header, plain_payload, packet_number = pair.decrypt_packet( <3> LONG_CLIENT_ENCRYPTED_PACKET, 17, 0 <4> ) <5> self.assertEqual(plain_header, LONG_CLIENT_PLAIN_HEADER) <6> self.assertEqual(plain_payload, LONG_CLIENT_PLAIN_PAYLOAD) <7> self.assertEqual(packet_number, LONG_CLIENT_PACKET_NUMBER) <8>
===========unchanged ref 0=========== at: aioquic.quic.crypto.CryptoPair decrypt_packet(packet: bytes, encrypted_offset: int, expected_packet_number: int) -> Tuple[bytes, bytes, int] at: tests.test_crypto CHACHA20_CLIENT_PACKET_NUMBER = 2 LONG_CLIENT_PLAIN_HEADER = binascii.unhexlify( "c3ff000017088394c8f03e5157080000449e00000002" ) ===========unchanged ref 1=========== LONG_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( "c2ff000017088394c8f03e5157080000449e9bd343fd65f354ebb400418b614f" "73765009c0162d594777f9e6ddeb32fba3865cffd7e26e3724d4997cdde8df34" "f8868772fed2412d43046f44dc7c6adf5ee10da456d56c892c8f69594594e8dc" "abedb10d591130ca464588f2834eab931b10feb963c1947a05f57062692c2422" "48ad0133b31f6dcc585ba344ca5beb382fb619272e65dfccae59c08eb00b7d2a" "5bbccd888582df1d1aee040aea76ab4dfdcae126791e71561b1f58312edb31c1" "64ff1341fd2820e2399946bad901e425dae58a9859ef1825e7d757a6291d9ba6" "ee1a8c836dc0027cd705bd2bc67f56bad0024efaa3819cbb5d46cefdb7e0df3a" "d92b0689650e2b49ac29e6398bedc755541a3f3865bc4759bec74d721a28a045" "2c1260189e8e92f844c91b27a00fc5ed6d14d8fceb5a848bea0a3208162c7a95" "782fcf9a045b20b76710a2565372f2541181030e4350e199e62fa4e2e0bb</s> ===========unchanged ref 2=========== at: tests.test_crypto.CryptoTest create_crypto(is_client, version=QuicProtocolVersion.DRAFT_22) at: tests.test_crypto.CryptoTest.test_decrypt_chacha20 plain_header, plain_payload, packet_number = pair.decrypt_packet( CHACHA20_CLIENT_ENCRYPTED_PACKET, 25, 0 ) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_crypto class CryptoTest(TestCase): @skipIf(os.environ.get("TRAVIS") == "true", "travis lacks a modern OpenSSL") def test_decrypt_chacha20(self): pair = CryptoPair() pair.recv.setup( CipherSuite.CHACHA20_POLY1305_SHA256, binascii.unhexlify( + "b42772df33c9719a32820d302aa664d080d7f5ea7a71a330f87864cb289ae8c0" - "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e" ), ) plain_header, plain_payload, packet_number = pair.decrypt_packet( + CHACHA20_CLIENT_ENCRYPTED_PACKET, 25, 0 - CHACHA20_CLIENT_ENCRYPTED_PACKET, 34, 0 ) self.assertEqual(plain_header, CHACHA20_CLIENT_PLAIN_HEADER) self.assertEqual(plain_payload, CHACHA20_CLIENT_PLAIN_PAYLOAD) self.assertEqual(packet_number, CHACHA20_CLIENT_PACKET_NUMBER) ===========changed ref 1=========== # module: tests.test_crypto CHACHA20_CLIENT_PACKET_NUMBER = 2 CHACHA20_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "e1ff0000160880b57c7b70d8524b0850fc2a28e240fd7640170002" - "e1ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240170002" ) + CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0201000000") - CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0200000000") CHACHA20_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "e8ff0000160880b57c7b70d8524b0850fc2a28e240fd7640178313b04be98449" + "eb10567e25ce930381f2a5b7da2db8db" - "e7ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240175554" - "c9ead500f378c5b1dd3eebab26c089128698919bee" ) LONG_CLIENT_PACKET_NUMBER = 2 LONG_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "c3ff000017088394c8f03e5157080000449e00000002" - "c3ff000012508394c8f03e51570800449f00000002" ) LONG_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify( "060040c4010000c003036660261ff947cea49cce6cfad687f457cf1b14531ba1" "4131a0e8f309a1d0b9</s>
tests.test_crypto/CryptoTest.test_decrypt_long_server
Modified
aiortc~aioquic
7365d96287a87424b98a3f4c17a13f5ca57c3d1c
[tests] use valid headers for test vectors
<3>:<add> LONG_SERVER_ENCRYPTED_PACKET, 18, 0 <del> LONG_SERVER_ENCRYPTED_PACKET, 17, 0
# module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_long_server(self): <0> pair = self.create_crypto(is_client=True) <1> <2> plain_header, plain_payload, packet_number = pair.decrypt_packet( <3> LONG_SERVER_ENCRYPTED_PACKET, 17, 0 <4> ) <5> self.assertEqual(plain_header, LONG_SERVER_PLAIN_HEADER) <6> self.assertEqual(plain_payload, LONG_SERVER_PLAIN_PAYLOAD) <7> self.assertEqual(packet_number, LONG_SERVER_PACKET_NUMBER) <8>
===========unchanged ref 0=========== at: aioquic.quic.crypto.CryptoPair decrypt_packet(packet: bytes, encrypted_offset: int, expected_packet_number: int) -> Tuple[bytes, bytes, int] at: tests.test_crypto LONG_CLIENT_PACKET_NUMBER = 2 LONG_SERVER_PLAIN_HEADER = binascii.unhexlify( "c1ff0000170008f067a5502a4262b50040740001" ) LONG_SERVER_ENCRYPTED_PACKET = binascii.unhexlify( "caff0000170008f067a5502a4262b5004074d74b7e486176fa3b713f272a9bf0" "3ee28d3c8addb4e805b3a110b663122a75eee93c9177ac6b7a6b548e15a7b8f8" "8465e9eab253a760779b2e6a2c574882b48d3a3eed696e50d04d5ec59af85261" "e4cdbe264bd65f2b076760c69beef23aa714c9a174d6d4a8853548bf96b19c54" "6fffe1ab616b" ) at: tests.test_crypto.CryptoTest create_crypto(is_client, version=QuicProtocolVersion.DRAFT_22) at: tests.test_crypto.CryptoTest.test_decrypt_long_client plain_header, plain_payload, packet_number = pair.decrypt_packet( LONG_CLIENT_ENCRYPTED_PACKET, 18, 0 ) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_long_client(self): pair = self.create_crypto(is_client=False) plain_header, plain_payload, packet_number = pair.decrypt_packet( + LONG_CLIENT_ENCRYPTED_PACKET, 18, 0 - LONG_CLIENT_ENCRYPTED_PACKET, 17, 0 ) self.assertEqual(plain_header, LONG_CLIENT_PLAIN_HEADER) self.assertEqual(plain_payload, LONG_CLIENT_PLAIN_PAYLOAD) self.assertEqual(packet_number, LONG_CLIENT_PACKET_NUMBER) ===========changed ref 1=========== # module: tests.test_crypto class CryptoTest(TestCase): @skipIf(os.environ.get("TRAVIS") == "true", "travis lacks a modern OpenSSL") def test_decrypt_chacha20(self): pair = CryptoPair() pair.recv.setup( CipherSuite.CHACHA20_POLY1305_SHA256, binascii.unhexlify( + "b42772df33c9719a32820d302aa664d080d7f5ea7a71a330f87864cb289ae8c0" - "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e" ), ) plain_header, plain_payload, packet_number = pair.decrypt_packet( + CHACHA20_CLIENT_ENCRYPTED_PACKET, 25, 0 - CHACHA20_CLIENT_ENCRYPTED_PACKET, 34, 0 ) self.assertEqual(plain_header, CHACHA20_CLIENT_PLAIN_HEADER) self.assertEqual(plain_payload, CHACHA20_CLIENT_PLAIN_PAYLOAD) self.assertEqual(packet_number, CHACHA20_CLIENT_PACKET_NUMBER) ===========changed ref 2=========== # module: tests.test_crypto CHACHA20_CLIENT_PACKET_NUMBER = 2 CHACHA20_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "e1ff0000160880b57c7b70d8524b0850fc2a28e240fd7640170002" - "e1ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240170002" ) + CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0201000000") - CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0200000000") CHACHA20_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "e8ff0000160880b57c7b70d8524b0850fc2a28e240fd7640178313b04be98449" + "eb10567e25ce930381f2a5b7da2db8db" - "e7ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240175554" - "c9ead500f378c5b1dd3eebab26c089128698919bee" ) LONG_CLIENT_PACKET_NUMBER = 2 LONG_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "c3ff000017088394c8f03e5157080000449e00000002" - "c3ff000012508394c8f03e51570800449f00000002" ) LONG_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify( "060040c4010000c003036660261ff947cea49cce6cfad687f457cf1b14531ba1" "4131a0e8f309a1d0b9</s> ===========changed ref 3=========== # module: tests.test_crypto # offset: 1 <s>7f457cf1b14531ba1" "4131a0e8f309a1d0b9c4000006130113031302010000910000000b0009000006" "736572766572ff01000100000a00140012001d00170018001901000101010201" "03010400230000003300260024001d00204cfdfcd178b784bf328cae793b136f" "2aedce005ff183d7bb1495207236647037002b0003020304000d0020001e0403" "05030603020308040805080604010501060102010402050206020202002d0002" "0101001c00024001" + ) + bytes(962) - ) + bytes(963) LONG_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "c2ff000017088394c8f03e5157080000449e9bd343fd65f354ebb400418b614f" - "c2ff000012508394c8f03e51570800449f9bd343fd65f354ebb400418b614f73" + "73765009c0162d594777f9e6ddeb32fba3865cffd7e26e3724d4997cdde8df34" - "765009c0162d594777f9e6ddeb32fba3865cffd7e26e3724d4997cdde8df34f8" + "f8868772fed2412d43046f44dc7c6adf5ee10da456d56c892c8f69594</s>
tests.test_crypto/CryptoTest.test_decrypt_no_key
Modified
aiortc~aioquic
7365d96287a87424b98a3f4c17a13f5ca57c3d1c
[tests] use valid headers for test vectors
<2>:<add> pair.decrypt_packet(LONG_SERVER_ENCRYPTED_PACKET, 18, 0) <del> pair.decrypt_packet(LONG_SERVER_ENCRYPTED_PACKET, 17, 0)
# module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_no_key(self): <0> pair = CryptoPair() <1> with self.assertRaises(CryptoError): <2> pair.decrypt_packet(LONG_SERVER_ENCRYPTED_PACKET, 17, 0) <3>
===========unchanged ref 0=========== at: aioquic.quic.crypto CryptoPair() at: tests.test_crypto LONG_SERVER_PACKET_NUMBER = 1 at: tests.test_crypto.CryptoTest.test_decrypt_long_server plain_header, plain_payload, packet_number = pair.decrypt_packet( LONG_SERVER_ENCRYPTED_PACKET, 18, 0 ) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_long_server(self): pair = self.create_crypto(is_client=True) plain_header, plain_payload, packet_number = pair.decrypt_packet( + LONG_SERVER_ENCRYPTED_PACKET, 18, 0 - LONG_SERVER_ENCRYPTED_PACKET, 17, 0 ) self.assertEqual(plain_header, LONG_SERVER_PLAIN_HEADER) self.assertEqual(plain_payload, LONG_SERVER_PLAIN_PAYLOAD) self.assertEqual(packet_number, LONG_SERVER_PACKET_NUMBER) ===========changed ref 1=========== # module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_long_client(self): pair = self.create_crypto(is_client=False) plain_header, plain_payload, packet_number = pair.decrypt_packet( + LONG_CLIENT_ENCRYPTED_PACKET, 18, 0 - LONG_CLIENT_ENCRYPTED_PACKET, 17, 0 ) self.assertEqual(plain_header, LONG_CLIENT_PLAIN_HEADER) self.assertEqual(plain_payload, LONG_CLIENT_PLAIN_PAYLOAD) self.assertEqual(packet_number, LONG_CLIENT_PACKET_NUMBER) ===========changed ref 2=========== # module: tests.test_crypto class CryptoTest(TestCase): @skipIf(os.environ.get("TRAVIS") == "true", "travis lacks a modern OpenSSL") def test_decrypt_chacha20(self): pair = CryptoPair() pair.recv.setup( CipherSuite.CHACHA20_POLY1305_SHA256, binascii.unhexlify( + "b42772df33c9719a32820d302aa664d080d7f5ea7a71a330f87864cb289ae8c0" - "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e" ), ) plain_header, plain_payload, packet_number = pair.decrypt_packet( + CHACHA20_CLIENT_ENCRYPTED_PACKET, 25, 0 - CHACHA20_CLIENT_ENCRYPTED_PACKET, 34, 0 ) self.assertEqual(plain_header, CHACHA20_CLIENT_PLAIN_HEADER) self.assertEqual(plain_payload, CHACHA20_CLIENT_PLAIN_PAYLOAD) self.assertEqual(packet_number, CHACHA20_CLIENT_PACKET_NUMBER) ===========changed ref 3=========== # module: tests.test_crypto CHACHA20_CLIENT_PACKET_NUMBER = 2 CHACHA20_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "e1ff0000160880b57c7b70d8524b0850fc2a28e240fd7640170002" - "e1ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240170002" ) + CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0201000000") - CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0200000000") CHACHA20_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "e8ff0000160880b57c7b70d8524b0850fc2a28e240fd7640178313b04be98449" + "eb10567e25ce930381f2a5b7da2db8db" - "e7ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240175554" - "c9ead500f378c5b1dd3eebab26c089128698919bee" ) LONG_CLIENT_PACKET_NUMBER = 2 LONG_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "c3ff000017088394c8f03e5157080000449e00000002" - "c3ff000012508394c8f03e51570800449f00000002" ) LONG_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify( "060040c4010000c003036660261ff947cea49cce6cfad687f457cf1b14531ba1" "4131a0e8f309a1d0b9</s> ===========changed ref 4=========== # module: tests.test_crypto # offset: 1 <s>7f457cf1b14531ba1" "4131a0e8f309a1d0b9c4000006130113031302010000910000000b0009000006" "736572766572ff01000100000a00140012001d00170018001901000101010201" "03010400230000003300260024001d00204cfdfcd178b784bf328cae793b136f" "2aedce005ff183d7bb1495207236647037002b0003020304000d0020001e0403" "05030603020308040805080604010501060102010402050206020202002d0002" "0101001c00024001" + ) + bytes(962) - ) + bytes(963) LONG_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "c2ff000017088394c8f03e5157080000449e9bd343fd65f354ebb400418b614f" - "c2ff000012508394c8f03e51570800449f9bd343fd65f354ebb400418b614f73" + "73765009c0162d594777f9e6ddeb32fba3865cffd7e26e3724d4997cdde8df34" - "765009c0162d594777f9e6ddeb32fba3865cffd7e26e3724d4997cdde8df34f8" + "f8868772fed2412d43046f44dc7c6adf5ee10da456d56c892c8f69594</s>
tests.test_crypto/CryptoTest.test_encrypt_chacha20
Modified
aiortc~aioquic
7365d96287a87424b98a3f4c17a13f5ca57c3d1c
[tests] use valid headers for test vectors
<4>:<add> "b42772df33c9719a32820d302aa664d080d7f5ea7a71a330f87864cb289ae8c0" <del> "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e"
# module: tests.test_crypto class CryptoTest(TestCase): @skipIf(os.environ.get("TRAVIS") == "true", "travis lacks a modern OpenSSL") def test_encrypt_chacha20(self): <0> pair = CryptoPair() <1> pair.send.setup( <2> CipherSuite.CHACHA20_POLY1305_SHA256, <3> binascii.unhexlify( <4> "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e" <5> ), <6> ) <7> <8> packet = pair.encrypt_packet( <9> CHACHA20_CLIENT_PLAIN_HEADER, <10> CHACHA20_CLIENT_PLAIN_PAYLOAD, <11> CHACHA20_CLIENT_PACKET_NUMBER, <12> ) <13> self.assertEqual(packet, CHACHA20_CLIENT_ENCRYPTED_PACKET) <14>
===========unchanged ref 0=========== at: _collections_abc.Mapping get(key, default=None) at: aioquic.quic.crypto CryptoPair() at: aioquic.quic.crypto.CryptoContext setup(cipher_suite: CipherSuite, secret: bytes) -> None at: aioquic.quic.crypto.CryptoPair encrypt_packet(plain_header: bytes, plain_payload: bytes, packet_number: int) -> bytes at: aioquic.quic.crypto.CryptoPair.__init__ self.send = CryptoContext() at: aioquic.tls CipherSuite(x: Union[str, bytes, bytearray], base: int) CipherSuite(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: binascii unhexlify(hexstr: _Ascii, /) -> bytes at: os environ = _createenviron() at: tests.test_crypto CHACHA20_CLIENT_PACKET_NUMBER = 2 CHACHA20_CLIENT_PLAIN_HEADER = binascii.unhexlify( "e1ff0000160880b57c7b70d8524b0850fc2a28e240fd7640170002" ) CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0201000000") SHORT_SERVER_PACKET_NUMBER = 3 at: tests.test_crypto.CryptoTest.test_decrypt_short_server plain_header, plain_payload, packet_number = pair.decrypt_packet( SHORT_SERVER_ENCRYPTED_PACKET, 9, 0 ) at: unittest.case skipIf(condition: object, reason: str) -> Callable[[_FT], _FT] at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_no_key(self): pair = CryptoPair() with self.assertRaises(CryptoError): + pair.decrypt_packet(LONG_SERVER_ENCRYPTED_PACKET, 18, 0) - pair.decrypt_packet(LONG_SERVER_ENCRYPTED_PACKET, 17, 0) ===========changed ref 1=========== # module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_long_server(self): pair = self.create_crypto(is_client=True) plain_header, plain_payload, packet_number = pair.decrypt_packet( + LONG_SERVER_ENCRYPTED_PACKET, 18, 0 - LONG_SERVER_ENCRYPTED_PACKET, 17, 0 ) self.assertEqual(plain_header, LONG_SERVER_PLAIN_HEADER) self.assertEqual(plain_payload, LONG_SERVER_PLAIN_PAYLOAD) self.assertEqual(packet_number, LONG_SERVER_PACKET_NUMBER) ===========changed ref 2=========== # module: tests.test_crypto class CryptoTest(TestCase): def test_decrypt_long_client(self): pair = self.create_crypto(is_client=False) plain_header, plain_payload, packet_number = pair.decrypt_packet( + LONG_CLIENT_ENCRYPTED_PACKET, 18, 0 - LONG_CLIENT_ENCRYPTED_PACKET, 17, 0 ) self.assertEqual(plain_header, LONG_CLIENT_PLAIN_HEADER) self.assertEqual(plain_payload, LONG_CLIENT_PLAIN_PAYLOAD) self.assertEqual(packet_number, LONG_CLIENT_PACKET_NUMBER) ===========changed ref 3=========== # module: tests.test_crypto class CryptoTest(TestCase): @skipIf(os.environ.get("TRAVIS") == "true", "travis lacks a modern OpenSSL") def test_decrypt_chacha20(self): pair = CryptoPair() pair.recv.setup( CipherSuite.CHACHA20_POLY1305_SHA256, binascii.unhexlify( + "b42772df33c9719a32820d302aa664d080d7f5ea7a71a330f87864cb289ae8c0" - "fcc211ac3ff1f3fe1b096a41e701e30033cbd899494ebabbbc009ee2626d987e" ), ) plain_header, plain_payload, packet_number = pair.decrypt_packet( + CHACHA20_CLIENT_ENCRYPTED_PACKET, 25, 0 - CHACHA20_CLIENT_ENCRYPTED_PACKET, 34, 0 ) self.assertEqual(plain_header, CHACHA20_CLIENT_PLAIN_HEADER) self.assertEqual(plain_payload, CHACHA20_CLIENT_PLAIN_PAYLOAD) self.assertEqual(packet_number, CHACHA20_CLIENT_PACKET_NUMBER) ===========changed ref 4=========== # module: tests.test_crypto CHACHA20_CLIENT_PACKET_NUMBER = 2 CHACHA20_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "e1ff0000160880b57c7b70d8524b0850fc2a28e240fd7640170002" - "e1ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240170002" ) + CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0201000000") - CHACHA20_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify("0200000000") CHACHA20_CLIENT_ENCRYPTED_PACKET = binascii.unhexlify( + "e8ff0000160880b57c7b70d8524b0850fc2a28e240fd7640178313b04be98449" + "eb10567e25ce930381f2a5b7da2db8db" - "e7ff000014f5b06e20f064d8783dfab56c61e5e16e8024c0e1d6ddc2a43565a240175554" - "c9ead500f378c5b1dd3eebab26c089128698919bee" ) LONG_CLIENT_PACKET_NUMBER = 2 LONG_CLIENT_PLAIN_HEADER = binascii.unhexlify( + "c3ff000017088394c8f03e5157080000449e00000002" - "c3ff000012508394c8f03e51570800449f00000002" ) LONG_CLIENT_PLAIN_PAYLOAD = binascii.unhexlify( "060040c4010000c003036660261ff947cea49cce6cfad687f457cf1b14531ba1" "4131a0e8f309a1d0b9</s>
aioquic.quic.crypto/CryptoPair.setup_initial
Modified
aiortc~aioquic
dbcc2b1dabddd252a7ebda04c7435dcf60e8e82d
[crypto] add test vectors for draft-23
<5>:<add> if version < QuicProtocolVersion.DRAFT_23: <add> initial_salt = INITIAL_SALT_DRAFT_22 <add> else: <add> initial_salt = INITIAL_SALT_DRAFT_23 <add> <6>:<add> initial_secret = hkdf_extract(algorithm, initial_salt, cid) <del> initial_secret = hkdf_extract(algorithm, INITIAL_SALT, cid)
# module: aioquic.quic.crypto class CryptoPair: def setup_initial(self, cid: bytes, is_client: bool, version: int) -> None: <0> if is_client: <1> recv_label, send_label = b"server in", b"client in" <2> else: <3> recv_label, send_label = b"client in", b"server in" <4> <5> algorithm = cipher_suite_hash(INITIAL_CIPHER_SUITE) <6> initial_secret = hkdf_extract(algorithm, INITIAL_SALT, cid) <7> self.recv.setup( <8> INITIAL_CIPHER_SUITE, <9> hkdf_expand_label( <10> algorithm, initial_secret, recv_label, b"", algorithm.digest_size <11> ), <12> ) <13> self.send.setup( <14> INITIAL_CIPHER_SUITE, <15> hkdf_expand_label( <16> algorithm, initial_secret, send_label, b"", algorithm.digest_size <17> ), <18> ) <19>
===========unchanged ref 0=========== at: aioquic.quic.crypto INITIAL_CIPHER_SUITE = CipherSuite.AES_128_GCM_SHA256 INITIAL_SALT_DRAFT_22 = binascii.unhexlify("7fbcdb0e7c66bbe9193a96cd21519ebd7a02644a") INITIAL_SALT_DRAFT_23 = binascii.unhexlify("c3eef712c72ebb5a11a7d2432bb46365bef9f502") at: aioquic.quic.crypto.CryptoContext setup(cipher_suite: CipherSuite, secret: bytes) -> None at: aioquic.quic.crypto.CryptoPair.__init__ self.recv = CryptoContext() at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: aioquic.tls hkdf_expand_label(algorithm: hashes.HashAlgorithm, secret: bytes, label: bytes, hash_value: bytes, length: int) -> bytes hkdf_extract(algorithm: hashes.HashAlgorithm, salt: bytes, key_material: bytes) -> bytes cipher_suite_hash(cipher_suite: CipherSuite) -> hashes.HashAlgorithm ===========changed ref 0=========== # module: aioquic.quic.crypto CIPHER_SUITES = { CipherSuite.AES_128_GCM_SHA256: (b"aes-128-ecb", b"aes-128-gcm"), CipherSuite.AES_256_GCM_SHA384: (b"aes-256-ecb", b"aes-256-gcm"), CipherSuite.CHACHA20_POLY1305_SHA256: (b"chacha20", b"chacha20-poly1305"), } INITIAL_CIPHER_SUITE = CipherSuite.AES_128_GCM_SHA256 + INITIAL_SALT_DRAFT_22 = binascii.unhexlify("7fbcdb0e7c66bbe9193a96cd21519ebd7a02644a") - INITIAL_SALT = binascii.unhexlify("7fbcdb0e7c66bbe9193a96cd21519ebd7a02644a") + INITIAL_SALT_DRAFT_23 = binascii.unhexlify("c3eef712c72ebb5a11a7d2432bb46365bef9f502") SAMPLE_SIZE = 16
tests.test_connection/QuicConnectionTest.test_receive_datagram_retry
Modified
aiortc~aioquic
166dc2b837e068c2174c551ace9bdd048cd46604
[configuration] add initial support for draft-23
<4>:<add> version=QuicProtocolVersion.DRAFT_23, <del> version=QuicProtocolVersion.DRAFT_22,
# module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry(self): <0> client = create_standalone_client(self) <1> <2> client.receive_datagram( <3> encode_quic_retry( <4> version=QuicProtocolVersion.DRAFT_22, <5> source_cid=binascii.unhexlify("85abb547bf28be97"), <6> destination_cid=client.host_cid, <7> original_destination_cid=client._peer_cid, <8> retry_token=bytes(16), <9> ), <10> SERVER_ADDR, <11> now=time.time(), <12> ) <13> self.assertEqual(drop(client), 1) <14>
===========unchanged ref 0=========== at: aioquic.quic.connection.QuicConnection receive_datagram(data: bytes, addr: NetworkAddress, now: float) -> None at: aioquic.quic.connection.QuicConnection.__init__ self.host_cid = self._host_cids[0].cid self._peer_cid = os.urandom(configuration.connection_id_length) at: aioquic.quic.connection.QuicConnection.change_connection_id self._peer_cid = connection_id.cid at: aioquic.quic.connection.QuicConnection.receive_datagram self._peer_cid = header.source_cid self.host_cid = context.host_cid at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_quic_retry(version: int, source_cid: bytes, destination_cid: bytes, original_destination_cid: bytes, retry_token: bytes) -> bytes at: binascii unhexlify(hexstr: _Ascii, /) -> bytes at: tests.test_connection SERVER_ADDR = ("2.3.4.5", 4433) create_standalone_client(self) drop(sender) at: time time() -> float at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: """ A QUIC configuration. """ alpn_protocols: Optional[List[str]] = None """ A list of supported ALPN protocols. """ certificate: Any = None """ The server's TLS certificate. See :func:`cryptography.x509.load_pem_x509_certificate`. .. note:: This is only used by servers. """ connection_id_length: int = 8 """ The length in bytes of local connection IDs. """ idle_timeout: float = 60.0 """ The idle timeout in seconds. The connection is terminated if nothing is received for the given duration. """ is_client: bool = True """ Whether this is the client side of the QUIC connection. """ private_key: Any = None """ The server's TLS private key. See :func:`cryptography.hazmat.primitives.serialization.load_pem_private_key`. .. note:: This is only used by servers. """ quic_logger: Optional[QuicLogger] = None """ The :class:`~aioquic.quic.logger.QuicLogger` instance to log events to. """ secrets_log_file: TextIO = None """ A file-like object in which to log traffic secrets. This is useful to analyze traffic captures with Wireshark. """ server_name: Optional[str] = None """ The server name to send during the TLS handshake the Server Name Indication. .. note:: This is only used by clients. """ session_ticket: Optional[SessionTicket] = None """ The TLS session ticket which should be used for session resumption. """ supported_versions: List[int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + </s> ===========changed ref 1=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: # offset: 1 <s>int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - default_factory=lambda: [QuicProtocolVersion.DRAFT_22] )
tests.test_connection/QuicConnectionTest.test_receive_datagram_retry_wrong_destination_cid
Modified
aiortc~aioquic
166dc2b837e068c2174c551ace9bdd048cd46604
[configuration] add initial support for draft-23
<4>:<add> version=QuicProtocolVersion.DRAFT_23, <del> version=QuicProtocolVersion.DRAFT_22,
# module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry_wrong_destination_cid(self): <0> client = create_standalone_client(self) <1> <2> client.receive_datagram( <3> encode_quic_retry( <4> version=QuicProtocolVersion.DRAFT_22, <5> source_cid=binascii.unhexlify("85abb547bf28be97"), <6> destination_cid=binascii.unhexlify("c98343fe8f5f0ff4"), <7> original_destination_cid=client._peer_cid, <8> retry_token=bytes(16), <9> ), <10> SERVER_ADDR, <11> now=time.time(), <12> ) <13> self.assertEqual(drop(client), 0) <14>
===========unchanged ref 0=========== at: aioquic.quic.connection.QuicConnection receive_datagram(data: bytes, addr: NetworkAddress, now: float) -> None at: aioquic.quic.connection.QuicConnection.__init__ self._peer_cid = os.urandom(configuration.connection_id_length) at: aioquic.quic.connection.QuicConnection.change_connection_id self._peer_cid = connection_id.cid at: aioquic.quic.connection.QuicConnection.receive_datagram self._peer_cid = header.source_cid at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_quic_retry(version: int, source_cid: bytes, destination_cid: bytes, original_destination_cid: bytes, retry_token: bytes) -> bytes at: binascii unhexlify(hexstr: _Ascii, /) -> bytes at: tests.test_connection SERVER_ADDR = ("2.3.4.5", 4433) create_standalone_client(self) drop(sender) at: time time() -> float at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=client.host_cid, original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1) ===========changed ref 1=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: """ A QUIC configuration. """ alpn_protocols: Optional[List[str]] = None """ A list of supported ALPN protocols. """ certificate: Any = None """ The server's TLS certificate. See :func:`cryptography.x509.load_pem_x509_certificate`. .. note:: This is only used by servers. """ connection_id_length: int = 8 """ The length in bytes of local connection IDs. """ idle_timeout: float = 60.0 """ The idle timeout in seconds. The connection is terminated if nothing is received for the given duration. """ is_client: bool = True """ Whether this is the client side of the QUIC connection. """ private_key: Any = None """ The server's TLS private key. See :func:`cryptography.hazmat.primitives.serialization.load_pem_private_key`. .. note:: This is only used by servers. """ quic_logger: Optional[QuicLogger] = None """ The :class:`~aioquic.quic.logger.QuicLogger` instance to log events to. """ secrets_log_file: TextIO = None """ A file-like object in which to log traffic secrets. This is useful to analyze traffic captures with Wireshark. """ server_name: Optional[str] = None """ The server name to send during the TLS handshake the Server Name Indication. .. note:: This is only used by clients. """ session_ticket: Optional[SessionTicket] = None """ The TLS session ticket which should be used for session resumption. """ supported_versions: List[int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + </s> ===========changed ref 2=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: # offset: 1 <s>int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - default_factory=lambda: [QuicProtocolVersion.DRAFT_22] )
tests.test_connection/QuicConnectionTest.test_version_negotiation_ok
Modified
aiortc~aioquic
166dc2b837e068c2174c551ace9bdd048cd46604
[configuration] add initial support for draft-23
<7>:<add> supported_versions=[QuicProtocolVersion.DRAFT_23], <del> supported_versions=[QuicProtocolVersion.DRAFT_22],
# module: tests.test_connection class QuicConnectionTest(TestCase): def test_version_negotiation_ok(self): <0> client = create_standalone_client(self) <1> <2> # found a common version, retry <3> client.receive_datagram( <4> encode_quic_version_negotiation( <5> source_cid=client._peer_cid, <6> destination_cid=client.host_cid, <7> supported_versions=[QuicProtocolVersion.DRAFT_22], <8> ), <9> SERVER_ADDR, <10> now=time.time(), <11> ) <12> self.assertEqual(drop(client), 1) <13>
===========unchanged ref 0=========== at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_quic_version_negotiation(source_cid: bytes, destination_cid: bytes, supported_versions: List[int]) -> bytes at: tests.test_connection SERVER_ADDR = ("2.3.4.5", 4433) create_standalone_client(self) drop(sender) at: time time() -> float at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry_wrong_destination_cid(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=binascii.unhexlify("c98343fe8f5f0ff4"), original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 0) ===========changed ref 1=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=client.host_cid, original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1) ===========changed ref 2=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: """ A QUIC configuration. """ alpn_protocols: Optional[List[str]] = None """ A list of supported ALPN protocols. """ certificate: Any = None """ The server's TLS certificate. See :func:`cryptography.x509.load_pem_x509_certificate`. .. note:: This is only used by servers. """ connection_id_length: int = 8 """ The length in bytes of local connection IDs. """ idle_timeout: float = 60.0 """ The idle timeout in seconds. The connection is terminated if nothing is received for the given duration. """ is_client: bool = True """ Whether this is the client side of the QUIC connection. """ private_key: Any = None """ The server's TLS private key. See :func:`cryptography.hazmat.primitives.serialization.load_pem_private_key`. .. note:: This is only used by servers. """ quic_logger: Optional[QuicLogger] = None """ The :class:`~aioquic.quic.logger.QuicLogger` instance to log events to. """ secrets_log_file: TextIO = None """ A file-like object in which to log traffic secrets. This is useful to analyze traffic captures with Wireshark. """ server_name: Optional[str] = None """ The server name to send during the TLS handshake the Server Name Indication. .. note:: This is only used by clients. """ session_ticket: Optional[SessionTicket] = None """ The TLS session ticket which should be used for session resumption. """ supported_versions: List[int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + </s> ===========changed ref 3=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: # offset: 1 <s>int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - default_factory=lambda: [QuicProtocolVersion.DRAFT_22] )
tests.test_asyncio/HighLevelTest.test_connect_and_serve_with_version_negotiation
Modified
aiortc~aioquic
166dc2b837e068c2174c551ace9bdd048cd46604
[configuration] add initial support for draft-23
<8>:<add> supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_23], <del> supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_22],
# module: tests.test_asyncio class HighLevelTest(TestCase): def test_connect_and_serve_with_version_negotiation(self): <0> server, response = run( <1> asyncio.gather( <2> run_server(), <3> run_client( <4> "127.0.0.1", <5> configuration=QuicConfiguration( <6> is_client=True, <7> quic_logger=QuicLogger(), <8> supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_22], <9> ), <10> ), <11> ) <12> ) <13> self.assertEqual(response, b"gnip") <14> server.close() <15>
===========unchanged ref 0=========== at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] ) at: aioquic.quic.logger QuicLogger() at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) ===========unchanged ref 1=========== at: asyncio.tasks gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], coro_or_future4: _FutureT[_T4], *, loop: Optional[AbstractEventLoop]=..., return_exceptions: bool=...) -> Future[ Tuple[Union[_T1, BaseException], Union[_T2, BaseException], Union[_T3, BaseException], Union[_T4, BaseException]] ] gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], coro_or_future4: _FutureT[_T4], *, loop: Optional[AbstractEventLoop]=..., return_exceptions: Literal[False]=...) -> Future[Tuple[_T1, _T2, _T3, _T4]] gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], *, loop: Optional[AbstractEventLoop]=..., return_exceptions: Literal[False]=...) -> Future[Tuple[_T1, _T2]] gather(coro_or_future1: _FutureT[Any], coro_or_future2: _FutureT[Any], coro_or_future3: _FutureT[Any], coro_or_future4: _FutureT[Any], coro_or_future5: _FutureT[Any], coro_or_future6: _FutureT[Any], *coros_or_futures: _FutureT[Any], loop: Optional[AbstractEventLoop]=..., return_exceptions: bool=...) -> Future[List[Any]] gather(coro_or_future1: _FutureT[_T1], coro_or_future2: _FutureT[_T2], coro_or_future3: _FutureT[_T3], *, loop: Optional[AbstractEventLoop]=..., return_exceptions: Literal[False]=...) -> Future[</s> ===========unchanged ref 2=========== at: tests.test_asyncio run_client(host, port=4433, request=b"ping", *, create_protocol: Optional[Callable]=QuicConnectionProtocol, stream_handler: Optional[QuicStreamHandler]=None, **kwds) run_server(configuration=None) at: tests.utils run(coro) at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: """ A QUIC configuration. """ alpn_protocols: Optional[List[str]] = None """ A list of supported ALPN protocols. """ certificate: Any = None """ The server's TLS certificate. See :func:`cryptography.x509.load_pem_x509_certificate`. .. note:: This is only used by servers. """ connection_id_length: int = 8 """ The length in bytes of local connection IDs. """ idle_timeout: float = 60.0 """ The idle timeout in seconds. The connection is terminated if nothing is received for the given duration. """ is_client: bool = True """ Whether this is the client side of the QUIC connection. """ private_key: Any = None """ The server's TLS private key. See :func:`cryptography.hazmat.primitives.serialization.load_pem_private_key`. .. note:: This is only used by servers. """ quic_logger: Optional[QuicLogger] = None """ The :class:`~aioquic.quic.logger.QuicLogger` instance to log events to. """ secrets_log_file: TextIO = None """ A file-like object in which to log traffic secrets. This is useful to analyze traffic captures with Wireshark. """ server_name: Optional[str] = None """ The server name to send during the TLS handshake the Server Name Indication. .. note:: This is only used by clients. """ session_ticket: Optional[SessionTicket] = None """ The TLS session ticket which should be used for session resumption. """ supported_versions: List[int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + </s> ===========changed ref 1=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: # offset: 1 <s>int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - default_factory=lambda: [QuicProtocolVersion.DRAFT_22] ) ===========changed ref 2=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_version_negotiation_ok(self): client = create_standalone_client(self) # found a common version, retry client.receive_datagram( encode_quic_version_negotiation( source_cid=client._peer_cid, destination_cid=client.host_cid, + supported_versions=[QuicProtocolVersion.DRAFT_23], - supported_versions=[QuicProtocolVersion.DRAFT_22], ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1)
examples.interop/test_version_negotiation
Modified
aiortc~aioquic
166dc2b837e068c2174c551ace9bdd048cd46604
[configuration] add initial support for draft-23
<0>:<add> configuration.supported_versions = [ <add> 0x1A2A3A4A, <add> QuicProtocolVersion.DRAFT_23, <add> QuicProtocolVersion.DRAFT_22, <add> ] <del> configuration.supported_versions = [0x1A2A3A4A, QuicProtocolVersion.DRAFT_22]
# module: examples.interop def test_version_negotiation(server: Server, configuration: QuicConfiguration): <0> configuration.supported_versions = [0x1A2A3A4A, QuicProtocolVersion.DRAFT_22] <1> <2> async with connect( <3> server.host, server.port, configuration=configuration <4> ) as protocol: <5> await protocol.ping() <6> <7> # check log <8> for stamp, category, event, data in configuration.quic_logger.to_dict()[ <9> "traces" <10> ][0]["events"]: <11> if ( <12> category == "transport" <13> and event == "packet_received" <14> and data["packet_type"] == "version_negotiation" <15> ): <16> server.result |= Result.V <17>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.asyncio.protocol.QuicConnectionProtocol ping() -> None at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] ) at: aioquic.quic.logger.QuicLogger to_dict() -> Dict[str, Any] ===========unchanged ref 1=========== at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: examples.interop Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str="/", result: Result=field(default_factory=lambda: Result(0))) at: examples.interop.Server name: str host: str port: int = 4433 http3: bool = True retry_port: Optional[int] = 4434 path: str = "/" result: Result = field(default_factory=lambda: Result(0)) ===========changed ref 0=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: """ A QUIC configuration. """ alpn_protocols: Optional[List[str]] = None """ A list of supported ALPN protocols. """ certificate: Any = None """ The server's TLS certificate. See :func:`cryptography.x509.load_pem_x509_certificate`. .. note:: This is only used by servers. """ connection_id_length: int = 8 """ The length in bytes of local connection IDs. """ idle_timeout: float = 60.0 """ The idle timeout in seconds. The connection is terminated if nothing is received for the given duration. """ is_client: bool = True """ Whether this is the client side of the QUIC connection. """ private_key: Any = None """ The server's TLS private key. See :func:`cryptography.hazmat.primitives.serialization.load_pem_private_key`. .. note:: This is only used by servers. """ quic_logger: Optional[QuicLogger] = None """ The :class:`~aioquic.quic.logger.QuicLogger` instance to log events to. """ secrets_log_file: TextIO = None """ A file-like object in which to log traffic secrets. This is useful to analyze traffic captures with Wireshark. """ server_name: Optional[str] = None """ The server name to send during the TLS handshake the Server Name Indication. .. note:: This is only used by clients. """ session_ticket: Optional[SessionTicket] = None """ The TLS session ticket which should be used for session resumption. """ supported_versions: List[int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + </s> ===========changed ref 1=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: # offset: 1 <s>int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - default_factory=lambda: [QuicProtocolVersion.DRAFT_22] ) ===========changed ref 2=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_version_negotiation_ok(self): client = create_standalone_client(self) # found a common version, retry client.receive_datagram( encode_quic_version_negotiation( source_cid=client._peer_cid, destination_cid=client.host_cid, + supported_versions=[QuicProtocolVersion.DRAFT_23], - supported_versions=[QuicProtocolVersion.DRAFT_22], ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1) ===========changed ref 3=========== # module: tests.test_asyncio class HighLevelTest(TestCase): def test_connect_and_serve_with_version_negotiation(self): server, response = run( asyncio.gather( run_server(), run_client( "127.0.0.1", configuration=QuicConfiguration( is_client=True, quic_logger=QuicLogger(), + supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_23], - supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_22], ), ), ) ) self.assertEqual(response, b"gnip") server.close() ===========changed ref 4=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=client.host_cid, original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1)
tests.test_packet_builder/create_builder
Modified
aiortc~aioquic
166dc2b837e068c2174c551ace9bdd048cd46604
[configuration] add initial support for draft-23
<7>:<add> version=QuicProtocolVersion.DRAFT_23, <del> version=QuicProtocolVersion.DRAFT_22,
# module: tests.test_packet_builder def create_builder(pad_first_datagram=False): <0> return QuicPacketBuilder( <1> host_cid=bytes(8), <2> packet_number=0, <3> pad_first_datagram=pad_first_datagram, <4> peer_cid=bytes(8), <5> peer_token=b"", <6> spin_bit=False, <7> version=QuicProtocolVersion.DRAFT_22, <8> ) <9>
===========unchanged ref 0=========== at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: aioquic.quic.packet_builder QuicPacketBuilder(*, host_cid: bytes, peer_cid: bytes, version: int, pad_first_datagram: bool=False, packet_number: int=0, peer_token: bytes=b"", quic_logger: Optional[QuicLoggerTrace]=None, spin_bit: bool=False) ===========changed ref 0=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_version_negotiation_ok(self): client = create_standalone_client(self) # found a common version, retry client.receive_datagram( encode_quic_version_negotiation( source_cid=client._peer_cid, destination_cid=client.host_cid, + supported_versions=[QuicProtocolVersion.DRAFT_23], - supported_versions=[QuicProtocolVersion.DRAFT_22], ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1) ===========changed ref 1=========== # module: tests.test_asyncio class HighLevelTest(TestCase): def test_connect_and_serve_with_version_negotiation(self): server, response = run( asyncio.gather( run_server(), run_client( "127.0.0.1", configuration=QuicConfiguration( is_client=True, quic_logger=QuicLogger(), + supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_23], - supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_22], ), ), ) ) self.assertEqual(response, b"gnip") server.close() ===========changed ref 2=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=client.host_cid, original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1) ===========changed ref 3=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry_wrong_destination_cid(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=binascii.unhexlify("c98343fe8f5f0ff4"), original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 0) ===========changed ref 4=========== # module: examples.interop def test_version_negotiation(server: Server, configuration: QuicConfiguration): + configuration.supported_versions = [ + 0x1A2A3A4A, + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - configuration.supported_versions = [0x1A2A3A4A, QuicProtocolVersion.DRAFT_22] async with connect( server.host, server.port, configuration=configuration ) as protocol: await protocol.ping() # check log for stamp, category, event, data in configuration.quic_logger.to_dict()[ "traces" ][0]["events"]: if ( category == "transport" and event == "packet_received" and data["packet_type"] == "version_negotiation" ): server.result |= Result.V ===========changed ref 5=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: """ A QUIC configuration. """ alpn_protocols: Optional[List[str]] = None """ A list of supported ALPN protocols. """ certificate: Any = None """ The server's TLS certificate. See :func:`cryptography.x509.load_pem_x509_certificate`. .. note:: This is only used by servers. """ connection_id_length: int = 8 """ The length in bytes of local connection IDs. """ idle_timeout: float = 60.0 """ The idle timeout in seconds. The connection is terminated if nothing is received for the given duration. """ is_client: bool = True """ Whether this is the client side of the QUIC connection. """ private_key: Any = None """ The server's TLS private key. See :func:`cryptography.hazmat.primitives.serialization.load_pem_private_key`. .. note:: This is only used by servers. """ quic_logger: Optional[QuicLogger] = None """ The :class:`~aioquic.quic.logger.QuicLogger` instance to log events to. """ secrets_log_file: TextIO = None """ A file-like object in which to log traffic secrets. This is useful to analyze traffic captures with Wireshark. """ server_name: Optional[str] = None """ The server name to send during the TLS handshake the Server Name Indication. .. note:: This is only used by clients. """ session_ticket: Optional[SessionTicket] = None """ The TLS session ticket which should be used for session resumption. """ supported_versions: List[int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + </s> ===========changed ref 6=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: # offset: 1 <s>int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - default_factory=lambda: [QuicProtocolVersion.DRAFT_22] )
tests.test_packet_builder/create_crypto
Modified
aiortc~aioquic
166dc2b837e068c2174c551ace9bdd048cd46604
[configuration] add initial support for draft-23
<1>:<add> crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_23) <del> crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22)
# module: tests.test_packet_builder def create_crypto(): <0> crypto = CryptoPair() <1> crypto.setup_initial(bytes(8), is_client=True, version=QuicProtocolVersion.DRAFT_22) <2> return crypto <3>
===========unchanged ref 0=========== at: aioquic.quic.crypto CryptoPair() at: aioquic.quic.crypto.CryptoPair setup_initial(cid: bytes, is_client: bool, version: int) -> None at: aioquic.quic.packet QuicProtocolVersion(x: Union[str, bytes, bytearray], base: int) QuicProtocolVersion(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) ===========changed ref 0=========== # module: tests.test_packet_builder def create_builder(pad_first_datagram=False): return QuicPacketBuilder( host_cid=bytes(8), packet_number=0, pad_first_datagram=pad_first_datagram, peer_cid=bytes(8), peer_token=b"", spin_bit=False, + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, ) ===========changed ref 1=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_version_negotiation_ok(self): client = create_standalone_client(self) # found a common version, retry client.receive_datagram( encode_quic_version_negotiation( source_cid=client._peer_cid, destination_cid=client.host_cid, + supported_versions=[QuicProtocolVersion.DRAFT_23], - supported_versions=[QuicProtocolVersion.DRAFT_22], ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1) ===========changed ref 2=========== # module: tests.test_asyncio class HighLevelTest(TestCase): def test_connect_and_serve_with_version_negotiation(self): server, response = run( asyncio.gather( run_server(), run_client( "127.0.0.1", configuration=QuicConfiguration( is_client=True, quic_logger=QuicLogger(), + supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_23], - supported_versions=[0x1A2A3A4A, QuicProtocolVersion.DRAFT_22], ), ), ) ) self.assertEqual(response, b"gnip") server.close() ===========changed ref 3=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=client.host_cid, original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 1) ===========changed ref 4=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_receive_datagram_retry_wrong_destination_cid(self): client = create_standalone_client(self) client.receive_datagram( encode_quic_retry( + version=QuicProtocolVersion.DRAFT_23, - version=QuicProtocolVersion.DRAFT_22, source_cid=binascii.unhexlify("85abb547bf28be97"), destination_cid=binascii.unhexlify("c98343fe8f5f0ff4"), original_destination_cid=client._peer_cid, retry_token=bytes(16), ), SERVER_ADDR, now=time.time(), ) self.assertEqual(drop(client), 0) ===========changed ref 5=========== # module: examples.interop def test_version_negotiation(server: Server, configuration: QuicConfiguration): + configuration.supported_versions = [ + 0x1A2A3A4A, + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - configuration.supported_versions = [0x1A2A3A4A, QuicProtocolVersion.DRAFT_22] async with connect( server.host, server.port, configuration=configuration ) as protocol: await protocol.ping() # check log for stamp, category, event, data in configuration.quic_logger.to_dict()[ "traces" ][0]["events"]: if ( category == "transport" and event == "packet_received" and data["packet_type"] == "version_negotiation" ): server.result |= Result.V ===========changed ref 6=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: """ A QUIC configuration. """ alpn_protocols: Optional[List[str]] = None """ A list of supported ALPN protocols. """ certificate: Any = None """ The server's TLS certificate. See :func:`cryptography.x509.load_pem_x509_certificate`. .. note:: This is only used by servers. """ connection_id_length: int = 8 """ The length in bytes of local connection IDs. """ idle_timeout: float = 60.0 """ The idle timeout in seconds. The connection is terminated if nothing is received for the given duration. """ is_client: bool = True """ Whether this is the client side of the QUIC connection. """ private_key: Any = None """ The server's TLS private key. See :func:`cryptography.hazmat.primitives.serialization.load_pem_private_key`. .. note:: This is only used by servers. """ quic_logger: Optional[QuicLogger] = None """ The :class:`~aioquic.quic.logger.QuicLogger` instance to log events to. """ secrets_log_file: TextIO = None """ A file-like object in which to log traffic secrets. This is useful to analyze traffic captures with Wireshark. """ server_name: Optional[str] = None """ The server name to send during the TLS handshake the Server Name Indication. .. note:: This is only used by clients. """ session_ticket: Optional[SessionTicket] = None """ The TLS session ticket which should be used for session resumption. """ supported_versions: List[int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + </s> ===========changed ref 7=========== # module: aioquic.quic.configuration @dataclass class QuicConfiguration: # offset: 1 <s>int] = field( + default_factory=lambda: [ + QuicProtocolVersion.DRAFT_23, + QuicProtocolVersion.DRAFT_22, + ] - default_factory=lambda: [QuicProtocolVersion.DRAFT_22] )
aioquic.h3.connection/H3Connection.send_data
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<14>:<add> raise FrameUnexpected("DATA frame is not allowed in this state") <del> raise UnexpectedFrame("DATA frame is not allowed in this state")
# module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: <0> """ <1> Send data on the given stream. <2> <3> To retrieve datagram which need to be sent over the network call the QUIC <4> connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` <5> method. <6> <7> :param stream_id: The stream ID on which to send the data. <8> :param data: The data to send. <9> :param end_stream: Whether to end the stream. <10> """ <11> # check DATA frame is allowed <12> stream = self._get_or_create_stream(stream_id) <13> if stream.headers_send_state != HeadersState.AFTER_HEADERS: <14> raise UnexpectedFrame("DATA frame is not allowed in this state") <15> <16> # log frame <17> if self._quic_logger is not None: <18> self._quic_logger.log_event( <19> category="HTTP", <20> event="frame_created", <21> data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), <22> ) <23> <24> self._quic.send_stream_data( <25> stream_id, encode_frame(FrameType.DATA, data), end_stream <26> ) <27>
===========unchanged ref 0=========== at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) HeadersState() FrameUnexpected(reason_phrase: str="") encode_frame(frame_type: int, frame_data: bytes) -> bytes qlog_encode_data_frame(byte_length: int, stream_id: int) -> Dict at: aioquic.h3.connection.H3Connection _get_or_create_stream(stream_id: int) -> H3Stream at: aioquic.h3.connection.H3Connection.__init__ self._quic = quic self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger at: aioquic.h3.connection.H3Stream.__init__ self.headers_send_state: HeadersState = HeadersState.INITIAL at: aioquic.h3.events Headers = List[Tuple[bytes, bytes]] at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None ===========changed ref 0=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 1=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 2=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 3=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 4=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202
aioquic.h3.connection/H3Connection.send_headers
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<14>:<add> raise FrameUnexpected("HEADERS frame is not allowed in this state") <del> raise UnexpectedFrame("HEADERS frame is not allowed in this state")
# module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: <0> """ <1> Send headers on the given stream. <2> <3> To retrieve datagram which need to be sent over the network call the QUIC <4> connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` <5> method. <6> <7> :param stream_id: The stream ID on which to send the headers. <8> :param headers: The HTTP headers to send. <9> :param end_stream: Whether to end the stream. <10> """ <11> # check HEADERS frame is allowed <12> stream = self._get_or_create_stream(stream_id) <13> if stream.headers_send_state == HeadersState.AFTER_TRAILERS: <14> raise UnexpectedFrame("HEADERS frame is not allowed in this state") <15> <16> frame_data = self._encode_headers(stream_id, headers) <17> <18> # log frame <19> if self._quic_logger is not None: <20> self._quic_logger.log_event( <21> category="HTTP", <22> event="frame_created", <23> data=qlog_encode_headers_frame( <24> byte_length=len(frame_data), headers=headers, stream_id=stream_id <25> ), <26> ) <27> <28> # update state and send headers <29> if stream.headers_send_state == HeadersState.INITIAL: <30> stream.headers_send_state = HeadersState.AFTER_HEADERS <31> else: <32> stream.headers_send_state = HeadersState.AFTER_TRAILERS <33> self._quic.send_stream_data( <34> stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream <35> ) <36>
===========unchanged ref 0=========== at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) HeadersState() FrameUnexpected(reason_phrase: str="") encode_frame(frame_type: int, frame_data: bytes) -> bytes qlog_encode_headers_frame(byte_length: int, headers: Headers, stream_id: int) -> Dict at: aioquic.h3.connection.H3Connection _encode_headers(stream_id: int, headers: Headers) -> bytes _get_or_create_stream(stream_id: int) -> H3Stream at: aioquic.h3.connection.H3Connection.__init__ self._quic = quic self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger at: aioquic.h3.connection.H3Stream.__init__ self.headers_send_state: HeadersState = HeadersState.INITIAL at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None ===========changed ref 0=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 1=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 2=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 3=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ # check DATA frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state != HeadersState.AFTER_HEADERS: + raise FrameUnexpected("DATA frame is not allowed in this state") - raise UnexpectedFrame("DATA frame is not allowed in this state") # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), ) self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream ) ===========changed ref 4=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 5=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202
aioquic.h3.connection/H3Connection._handle_control_frame
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<12>:<add> raise FrameUnexpected("Servers must not send MAX_PUSH_ID") <del> raise UnexpectedFrame("Servers must not send MAX_PUSH_ID") <20>:<add> raise FrameUnexpected("Invalid frame type on control stream") <del> raise WrongStream("Invalid frame type on control stream")
# module: aioquic.h3.connection class H3Connection: def _handle_control_frame(self, frame_type: int, frame_data: bytes) -> None: <0> """ <1> Handle a frame received on the peer's control stream. <2> """ <3> if frame_type == FrameType.SETTINGS: <4> settings = parse_settings(frame_data) <5> encoder = self._encoder.apply_settings( <6> max_table_capacity=settings.get(Setting.QPACK_MAX_TABLE_CAPACITY, 0), <7> blocked_streams=settings.get(Setting.QPACK_BLOCKED_STREAMS, 0), <8> ) <9> self._quic.send_stream_data(self._local_encoder_stream_id, encoder) <10> elif frame_type == FrameType.MAX_PUSH_ID: <11> if self._is_client: <12> raise UnexpectedFrame("Servers must not send MAX_PUSH_ID") <13> self._max_push_id = parse_max_push_id(frame_data) <14> elif frame_type in ( <15> FrameType.DATA, <16> FrameType.HEADERS, <17> FrameType.PUSH_PROMISE, <18> FrameType.DUPLICATE_PUSH, <19> ): <20> raise WrongStream("Invalid frame type on control stream") <21>
===========unchanged ref 0=========== at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) Setting(x: Union[str, bytes, bytearray], base: int) Setting(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameUnexpected(reason_phrase: str="") parse_max_push_id(data: bytes) -> int parse_settings(data: bytes) -> Dict[int, int] at: aioquic.h3.connection.H3Connection.__init__ self._is_client = quic.configuration.is_client self._quic = quic self._encoder = pylsqpack.Encoder() self._max_push_id: Optional[int] = 8 if self._is_client else None self._local_encoder_stream_id: Optional[int] = None at: aioquic.h3.connection.H3Connection._init_connection self._local_encoder_stream_id = self._create_uni_stream( StreamType.QPACK_ENCODER ) at: aioquic.quic.connection.QuicConnection send_stream_data(stream_id: int, data: bytes, end_stream: bool=False) -> None at: typing.Mapping get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T] get(key: _KT) -> Optional[_VT_co] ===========changed ref 0=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 1=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 2=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 3=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ # check DATA frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state != HeadersState.AFTER_HEADERS: + raise FrameUnexpected("DATA frame is not allowed in this state") - raise UnexpectedFrame("DATA frame is not allowed in this state") # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), ) self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream ) ===========changed ref 4=========== # module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: """ Send headers on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the headers. :param headers: The HTTP headers to send. :param end_stream: Whether to end the stream. """ # check HEADERS frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state == HeadersState.AFTER_TRAILERS: + raise FrameUnexpected("HEADERS frame is not allowed in this state") - raise UnexpectedFrame("HEADERS frame is not allowed in this state") frame_data = self._encode_headers(stream_id, headers) # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_headers_frame( byte_length=len(frame_data), headers=headers, stream_id=stream_id ), ) # update state and send headers if stream.headers_send_state == HeadersState.INITIAL: stream.headers_send_state = HeadersState.AFTER_HEADERS else: stream.headers_send_state = HeadersState.AFTER_TRAILERS self._quic.send_stream_data( stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream ) ===========changed ref 5=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 6=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202
aioquic.h3.connection/H3Connection._handle_request_or_push_frame
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<8>:<add> raise FrameUnexpected("DATA frame is not allowed in this state") <del> raise UnexpectedFrame("DATA frame is not allowed in this state") <22>:<add> raise FrameUnexpected("HEADERS frame is not allowed in this state") <del> raise UnexpectedFrame("HEADERS frame is not allowed in this state")
# module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], stream: H3Stream, stream_ended: bool, ) -> List[H3Event]: <0> """ <1> Handle a frame received on a request or push stream. <2> """ <3> http_events: List[H3Event] = [] <4> <5> if frame_type == FrameType.DATA: <6> # check DATA frame is allowed <7> if stream.headers_recv_state != HeadersState.AFTER_HEADERS: <8> raise UnexpectedFrame("DATA frame is not allowed in this state") <9> <10> if stream_ended or frame_data: <11> http_events.append( <12> DataReceived( <13> data=frame_data, <14> push_id=stream.push_id, <15> stream_ended=stream_ended, <16> stream_id=stream.stream_id, <17> ) <18> ) <19> elif frame_type == FrameType.HEADERS: <20> # check HEADERS frame is allowed <21> if stream.headers_recv_state == HeadersState.AFTER_TRAILERS: <22> raise UnexpectedFrame("HEADERS frame is not allowed in this state") <23> <24> # try to decode HEADERS, may raise pylsqpack.StreamBlocked <25> headers = self._decode_headers(stream.stream_id, frame_data) <26> <27> # log frame <28> if self._quic_logger is not None: <29> self._quic_logger.log_event( <30> category="HTTP", <31> event="frame_parsed", <32> data=qlog_encode_headers_frame( <33> byte_length=stream.blocked_frame_size <34> if frame_data is None <35> else len(frame_data), <36> headers=headers, <37> stream_id=stream.stream_id, <38> ), <39> ) <40> <41> # update state and emit headers <42> if stream.headers_recv_state ==</s>
===========below chunk 0=========== # module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], stream: H3Stream, stream_ended: bool, ) -> List[H3Event]: # offset: 1 stream.headers_recv_state = HeadersState.AFTER_HEADERS else: stream.headers_recv_state = HeadersState.AFTER_TRAILERS http_events.append( HeadersReceived( headers=headers, push_id=stream.push_id, stream_id=stream.stream_id, stream_ended=stream_ended, ) ) elif stream.frame_type == FrameType.PUSH_PROMISE and stream.push_id is None: if not self._is_client: raise UnexpectedFrame("Clients must not send PUSH_PROMISE") frame_buf = Buffer(data=frame_data) push_id = frame_buf.pull_uint_var() headers = self._decode_headers( stream.stream_id, frame_data[frame_buf.tell() :] ) # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_parsed", data=qlog_encode_push_promise_frame( byte_length=len(frame_data), headers=headers, push_id=push_id, stream_id=stream.stream_id, ), ) # emit event http_events.append( PushPromiseReceived( headers=headers, push_id=push_id, stream_id=stream.stream_id ) ) elif frame_type in ( FrameType.PRIORITY, FrameType.CANCEL_PUSH, FrameType.SETTINGS, FrameType.PUSH_PROMISE, FrameType.GOAWAY, FrameType.MAX</s> ===========below chunk 1=========== # module: aioquic.h3.connection class H3Connection: def _handle_request_or_push_frame( self, frame_type: int, frame_data: Optional[bytes], stream: H3Stream, stream_ended: bool, ) -> List[H3Event]: # offset: 2 <s>Type.SETTINGS, FrameType.PUSH_PROMISE, FrameType.GOAWAY, FrameType.MAX_PUSH_ID, FrameType.DUPLICATE_PUSH, ): raise WrongStream( "Invalid frame type on request stream" if stream.push_id is None else "Invalid frame type on push stream" ) return http_events ===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer tell() -> int pull_uint_var() -> int at: aioquic.h3.connection FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) HeadersState() StreamType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, bytearray], base: int) FrameUnexpected(reason_phrase: str="") qlog_encode_headers_frame(byte_length: int, headers: Headers, stream_id: int) -> Dict qlog_encode_push_promise_frame(byte_length: int, headers: Headers, push_id: int, stream_id: int) -> Dict H3Stream(stream_id: int) at: aioquic.h3.connection.H3Connection _create_uni_stream(stream_type: int) -> int _create_uni_stream(self, stream_type: int) -> int _decode_headers(stream_id: int, frame_data: Optional[bytes]) -> Headers at: aioquic.h3.connection.H3Connection.__init__ self._is_client = quic.configuration.is_client self._quic_logger: Optional[QuicLoggerTrace] = quic._quic_logger self._local_control_stream_id: Optional[int] = None at: aioquic.h3.connection.H3Stream.__init__ self.blocked_frame_size: Optional[int] = None self.frame_type: Optional[int] = None self.headers_recv_state: HeadersState = HeadersState.INITIAL self.push_id: Optional[int] = None ===========unchanged ref 1=========== self.stream_id = stream_id at: aioquic.h3.events H3Event() DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) PushPromiseReceived(headers: Headers, push_id: int, stream_id: int) at: aioquic.h3.events.DataReceived data: bytes stream_id: int stream_ended: bool push_id: Optional[int] = None at: aioquic.h3.events.HeadersReceived headers: Headers stream_id: int stream_ended: bool push_id: Optional[int] = None at: aioquic.h3.events.PushPromiseReceived headers: Headers push_id: int stream_id: int at: aioquic.quic.logger.QuicLoggerTrace log_event(*, category: str, event: str, data: Dict) -> None at: typing List = _alias(list, 1, inst=False, name='List') ===========changed ref 0=========== # module: aioquic.h3.connection class H3Connection: def _handle_control_frame(self, frame_type: int, frame_data: bytes) -> None: """ Handle a frame received on the peer's control stream. """ if frame_type == FrameType.SETTINGS: settings = parse_settings(frame_data) encoder = self._encoder.apply_settings( max_table_capacity=settings.get(Setting.QPACK_MAX_TABLE_CAPACITY, 0), blocked_streams=settings.get(Setting.QPACK_BLOCKED_STREAMS, 0), ) self._quic.send_stream_data(self._local_encoder_stream_id, encoder) elif frame_type == FrameType.MAX_PUSH_ID: if self._is_client: + raise FrameUnexpected("Servers must not send MAX_PUSH_ID") - raise UnexpectedFrame("Servers must not send MAX_PUSH_ID") self._max_push_id = parse_max_push_id(frame_data) elif frame_type in ( FrameType.DATA, FrameType.HEADERS, FrameType.PUSH_PROMISE, FrameType.DUPLICATE_PUSH, ): + raise FrameUnexpected("Invalid frame type on control stream") - raise WrongStream("Invalid frame type on control stream") ===========changed ref 1=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 2=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 3=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME -
tests.test_h3/H3ConnectionTest.test_handle_control_frame_headers
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<18>:<add> (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on control stream"), <del> (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on control stream"),
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_control_frame_headers(self): <0> """ <1> We should not receive HEADERS on the control stream. <2> """ <3> quic_server = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=False) <5> ) <6> h3_server = H3Connection(quic_server) <7> <8> h3_server.handle_event( <9> StreamDataReceived( <10> stream_id=2, <11> data=encode_uint_var(StreamType.CONTROL) <12> + encode_frame(FrameType.HEADERS, b""), <13> end_stream=False, <14> ) <15> ) <16> self.assertEqual( <17> quic_server.closed, <18> (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on control stream"), <19> ) <20>
===========unchanged ref 0=========== at: aioquic.buffer encode_uint_var(value: int) -> bytes at: aioquic.h3.connection ErrorCode(x: Union[str, bytes, bytearray], base: int) ErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, bytearray], base: int) encode_frame(frame_type: int, frame_data: bytes) -> bytes H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None ===========unchanged ref 1=========== secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] ) at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: aioquic.quic.events.StreamDataReceived data: bytes end_stream: bool stream_id: int at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection.__init__ self.closed = None at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: tests.test_h3.H3ConnectionTest maxDiff = None at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 1=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 ===========changed ref 2=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 3=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 4=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 5=========== # module: aioquic.h3.connection class H3Connection: def _handle_control_frame(self, frame_type: int, frame_data: bytes) -> None: """ Handle a frame received on the peer's control stream. """ if frame_type == FrameType.SETTINGS: settings = parse_settings(frame_data) encoder = self._encoder.apply_settings( max_table_capacity=settings.get(Setting.QPACK_MAX_TABLE_CAPACITY, 0), blocked_streams=settings.get(Setting.QPACK_BLOCKED_STREAMS, 0), ) self._quic.send_stream_data(self._local_encoder_stream_id, encoder) elif frame_type == FrameType.MAX_PUSH_ID: if self._is_client: + raise FrameUnexpected("Servers must not send MAX_PUSH_ID") - raise UnexpectedFrame("Servers must not send MAX_PUSH_ID") self._max_push_id = parse_max_push_id(frame_data) elif frame_type in ( FrameType.DATA, FrameType.HEADERS, FrameType.PUSH_PROMISE, FrameType.DUPLICATE_PUSH, ): + raise FrameUnexpected("Invalid frame type on control stream") - raise WrongStream("Invalid frame type on control stream")
tests.test_h3/H3ConnectionTest.test_handle_control_frame_max_push_id_from_server
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<18>:<add> (ErrorCode.HTTP_FRAME_UNEXPECTED, "Servers must not send MAX_PUSH_ID"), <del> (ErrorCode.HTTP_UNEXPECTED_FRAME, "Servers must not send MAX_PUSH_ID"),
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_control_frame_max_push_id_from_server(self): <0> """ <1> A client should not receive MAX_PUSH_ID on the control stream. <2> """ <3> quic_client = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=True) <5> ) <6> h3_client = H3Connection(quic_client) <7> <8> h3_client.handle_event( <9> StreamDataReceived( <10> stream_id=3, <11> data=encode_uint_var(StreamType.CONTROL) <12> + encode_frame(FrameType.MAX_PUSH_ID, b""), <13> end_stream=False, <14> ) <15> ) <16> self.assertEqual( <17> quic_client.closed, <18> (ErrorCode.HTTP_UNEXPECTED_FRAME, "Servers must not send MAX_PUSH_ID"), <19> ) <20>
===========unchanged ref 0=========== at: aioquic.buffer encode_uint_var(value: int) -> bytes at: aioquic.h3.connection ErrorCode(x: Union[str, bytes, bytearray], base: int) ErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, bytearray], base: int) encode_frame(frame_type: int, frame_data: bytes) -> bytes H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection.__init__ self.closed = None ===========unchanged ref 1=========== at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 1=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_control_frame_headers(self): """ We should not receive HEADERS on the control stream. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=2, data=encode_uint_var(StreamType.CONTROL) + encode_frame(FrameType.HEADERS, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on control stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on control stream"), ) ===========changed ref 3=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 4=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 5=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 6=========== # module: aioquic.h3.connection class H3Connection: def _handle_control_frame(self, frame_type: int, frame_data: bytes) -> None: """ Handle a frame received on the peer's control stream. """ if frame_type == FrameType.SETTINGS: settings = parse_settings(frame_data) encoder = self._encoder.apply_settings( max_table_capacity=settings.get(Setting.QPACK_MAX_TABLE_CAPACITY, 0), blocked_streams=settings.get(Setting.QPACK_BLOCKED_STREAMS, 0), ) self._quic.send_stream_data(self._local_encoder_stream_id, encoder) elif frame_type == FrameType.MAX_PUSH_ID: if self._is_client: + raise FrameUnexpected("Servers must not send MAX_PUSH_ID") - raise UnexpectedFrame("Servers must not send MAX_PUSH_ID") self._max_push_id = parse_max_push_id(frame_data) elif frame_type in ( FrameType.DATA, FrameType.HEADERS, FrameType.PUSH_PROMISE, FrameType.DUPLICATE_PUSH, ): + raise FrameUnexpected("Invalid frame type on control stream") - raise WrongStream("Invalid frame type on control stream")
tests.test_h3/H3ConnectionTest.test_handle_push_frame_wrong_frame_type
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<19>:<add> (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on push stream"), <del> (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on push stream"),
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_push_frame_wrong_frame_type(self): <0> """ <1> We should not received SETTINGS on a push stream. <2> """ <3> quic_client = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=True) <5> ) <6> h3_client = H3Connection(quic_client) <7> <8> h3_client.handle_event( <9> StreamDataReceived( <10> stream_id=15, <11> data=encode_uint_var(StreamType.PUSH) <12> + encode_uint_var(0) # push ID <13> + encode_frame(FrameType.SETTINGS, b""), <14> end_stream=False, <15> ) <16> ) <17> self.assertEqual( <18> quic_client.closed, <19> (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on push stream"), <20> ) <21>
===========unchanged ref 0=========== at: aioquic.buffer encode_uint_var(value: int) -> bytes at: aioquic.h3.connection ErrorCode(x: Union[str, bytes, bytearray], base: int) ErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) StreamType(x: Union[str, bytes, bytearray], base: int) encode_frame(frame_type: int, frame_data: bytes) -> bytes H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection.__init__ self.closed = None ===========unchanged ref 1=========== at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 1=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_control_frame_max_push_id_from_server(self): """ A client should not receive MAX_PUSH_ID on the control stream. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) h3_client = H3Connection(quic_client) h3_client.handle_event( StreamDataReceived( stream_id=3, data=encode_uint_var(StreamType.CONTROL) + encode_frame(FrameType.MAX_PUSH_ID, b""), end_stream=False, ) ) self.assertEqual( quic_client.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Servers must not send MAX_PUSH_ID"), - (ErrorCode.HTTP_UNEXPECTED_FRAME, "Servers must not send MAX_PUSH_ID"), ) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_control_frame_headers(self): """ We should not receive HEADERS on the control stream. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=2, data=encode_uint_var(StreamType.CONTROL) + encode_frame(FrameType.HEADERS, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on control stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on control stream"), ) ===========changed ref 4=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 5=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 6=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME -
tests.test_h3/H3ConnectionTest.test_handle_request_frame_data_before_headers
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<16>:<add> ErrorCode.HTTP_FRAME_UNEXPECTED, <del> ErrorCode.HTTP_UNEXPECTED_FRAME,
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_data_before_headers(self): <0> """ <1> We should not receive DATA before receiving headers. <2> """ <3> quic_server = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=False) <5> ) <6> h3_server = H3Connection(quic_server) <7> <8> h3_server.handle_event( <9> StreamDataReceived( <10> stream_id=0, data=encode_frame(FrameType.DATA, b""), end_stream=False <11> ) <12> ) <13> self.assertEqual( <14> quic_server.closed, <15> ( <16> ErrorCode.HTTP_UNEXPECTED_FRAME, <17> "DATA frame is not allowed in this state", <18> ), <19> ) <20>
===========unchanged ref 0=========== at: aioquic.h3.connection ErrorCode(x: Union[str, bytes, bytearray], base: int) ErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_frame(frame_type: int, frame_data: bytes) -> bytes H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection.__init__ self.closed = None at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 1=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_push_frame_wrong_frame_type(self): """ We should not received SETTINGS on a push stream. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) h3_client = H3Connection(quic_client) h3_client.handle_event( StreamDataReceived( stream_id=15, data=encode_uint_var(StreamType.PUSH) + encode_uint_var(0) # push ID + encode_frame(FrameType.SETTINGS, b""), end_stream=False, ) ) self.assertEqual( quic_client.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on push stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on push stream"), ) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_control_frame_max_push_id_from_server(self): """ A client should not receive MAX_PUSH_ID on the control stream. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) h3_client = H3Connection(quic_client) h3_client.handle_event( StreamDataReceived( stream_id=3, data=encode_uint_var(StreamType.CONTROL) + encode_frame(FrameType.MAX_PUSH_ID, b""), end_stream=False, ) ) self.assertEqual( quic_client.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Servers must not send MAX_PUSH_ID"), - (ErrorCode.HTTP_UNEXPECTED_FRAME, "Servers must not send MAX_PUSH_ID"), ) ===========changed ref 4=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_control_frame_headers(self): """ We should not receive HEADERS on the control stream. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=2, data=encode_uint_var(StreamType.CONTROL) + encode_frame(FrameType.HEADERS, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on control stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on control stream"), ) ===========changed ref 5=========== # module: aioquic.h3.connection - class WrongStream(ProtocolError): - error_code = ErrorCode.HTTP_WRONG_STREAM - ===========changed ref 6=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME - ===========changed ref 7=========== # module: aioquic.h3.connection - class UnexpectedFrame(ProtocolError): - error_code = ErrorCode.HTTP_UNEXPECTED_FRAME -
tests.test_h3/H3ConnectionTest.test_handle_request_frame_headers_after_trailers
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<36>:<add> ErrorCode.HTTP_FRAME_UNEXPECTED, <del> ErrorCode.HTTP_UNEXPECTED_FRAME,
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_headers_after_trailers(self): <0> """ <1> We should not receive HEADERS after receiving trailers. <2> """ <3> quic_client = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=True) <5> ) <6> quic_server = FakeQuicConnection( <7> configuration=QuicConfiguration(is_client=False) <8> ) <9> <10> h3_client = H3Connection(quic_client) <11> h3_server = H3Connection(quic_server) <12> <13> stream_id = quic_client.get_next_available_stream_id() <14> h3_client.send_headers( <15> stream_id=stream_id, <16> headers=[ <17> (b":method", b"GET"), <18> (b":scheme", b"https"), <19> (b":authority", b"localhost"), <20> (b":path", b"/"), <21> ], <22> ) <23> h3_client.send_headers( <24> stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=True <25> ) <26> h3_transfer(quic_client, h3_server) <27> <28> h3_server.handle_event( <29> StreamDataReceived( <30> stream_id=0, data=encode_frame(FrameType.HEADERS, b""), end_stream=False <31> ) <32> ) <33> self.assertEqual( <34> quic_server.closed, <35> ( <36> ErrorCode.HTTP_UNEXPECTED_FRAME, <37> "HEADERS frame is not allowed in this state", <38> ), <39> ) <40>
===========unchanged ref 0=========== at: aioquic.h3.connection ErrorCode(x: Union[str, bytes, bytearray], base: int) ErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_frame(frame_type: int, frame_data: bytes) -> bytes H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: tests.test_h3 h3_transfer(quic_sender, h3_receiver) FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection get_next_available_stream_id(is_unidirectional=False) at: tests.test_h3.FakeQuicConnection.__init__ self.closed = None ===========unchanged ref 1=========== at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: """ Send headers on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the headers. :param headers: The HTTP headers to send. :param end_stream: Whether to end the stream. """ # check HEADERS frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state == HeadersState.AFTER_TRAILERS: + raise FrameUnexpected("HEADERS frame is not allowed in this state") - raise UnexpectedFrame("HEADERS frame is not allowed in this state") frame_data = self._encode_headers(stream_id, headers) # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_headers_frame( byte_length=len(frame_data), headers=headers, stream_id=stream_id ), ) # update state and send headers if stream.headers_send_state == HeadersState.INITIAL: stream.headers_send_state = HeadersState.AFTER_HEADERS else: stream.headers_send_state = HeadersState.AFTER_TRAILERS self._quic.send_stream_data( stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream ) ===========changed ref 1=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 2=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_data_before_headers(self): """ We should not receive DATA before receiving headers. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.DATA, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "DATA frame is not allowed in this state", ), )
tests.test_h3/H3ConnectionTest.test_handle_request_frame_push_promise_from_client
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<17>:<add> (ErrorCode.HTTP_FRAME_UNEXPECTED, "Clients must not send PUSH_PROMISE"), <del> (ErrorCode.HTTP_UNEXPECTED_FRAME, "Clients must not send PUSH_PROMISE"),
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_push_promise_from_client(self): <0> """ <1> A server should not receive PUSH_PROMISE on a request stream. <2> """ <3> quic_server = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=False) <5> ) <6> h3_server = H3Connection(quic_server) <7> <8> h3_server.handle_event( <9> StreamDataReceived( <10> stream_id=0, <11> data=encode_frame(FrameType.PUSH_PROMISE, b""), <12> end_stream=False, <13> ) <14> ) <15> self.assertEqual( <16> quic_server.closed, <17> (ErrorCode.HTTP_UNEXPECTED_FRAME, "Clients must not send PUSH_PROMISE"), <18> ) <19>
===========unchanged ref 0=========== at: aioquic.h3.connection ErrorCode(x: Union[str, bytes, bytearray], base: int) ErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_frame(frame_type: int, frame_data: bytes) -> bytes H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection.__init__ self.closed = None at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 1=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_data_before_headers(self): """ We should not receive DATA before receiving headers. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.DATA, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "DATA frame is not allowed in this state", ), ) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_headers_after_trailers(self): """ We should not receive HEADERS after receiving trailers. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], ) h3_client.send_headers( stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=True ) h3_transfer(quic_client, h3_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.HEADERS, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "HEADERS frame is not allowed in this state", ), ) ===========changed ref 4=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_push_frame_wrong_frame_type(self): """ We should not received SETTINGS on a push stream. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) h3_client = H3Connection(quic_client) h3_client.handle_event( StreamDataReceived( stream_id=15, data=encode_uint_var(StreamType.PUSH) + encode_uint_var(0) # push ID + encode_frame(FrameType.SETTINGS, b""), end_stream=False, ) ) self.assertEqual( quic_client.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on push stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on push stream"), )
tests.test_h3/H3ConnectionTest.test_handle_request_frame_wrong_frame_type
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<14>:<add> (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on request stream"), <del> (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on request stream"),
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_wrong_frame_type(self): <0> quic_server = FakeQuicConnection( <1> configuration=QuicConfiguration(is_client=False) <2> ) <3> h3_server = H3Connection(quic_server) <4> <5> h3_server.handle_event( <6> StreamDataReceived( <7> stream_id=0, <8> data=encode_frame(FrameType.SETTINGS, b""), <9> end_stream=False, <10> ) <11> ) <12> self.assertEqual( <13> quic_server.closed, <14> (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on request stream"), <15> ) <16>
===========unchanged ref 0=========== at: aioquic.h3.connection ErrorCode(x: Union[str, bytes, bytearray], base: int) ErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) FrameType(x: Union[str, bytes, bytearray], base: int) FrameType(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) encode_frame(frame_type: int, frame_data: bytes) -> bytes H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.events StreamDataReceived(data: bytes, end_stream: bool, stream_id: int) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection.__init__ self.closed = None at: tests.test_h3.FakeQuicConnection.close self.closed = (error_code, reason_phrase) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): + HTTP_NO_ERROR = 0x100 - HTTP_NO_ERROR = 0x00 + HTTP_GENERAL_PROTOCOL_ERROR = 0x101 - HTTP_GENERAL_PROTOCOL_ERROR = 0x01 + HTTP_INTERNAL_ERROR = 0x102 - HTTP_INTERNAL_ERROR = 0x03 - HTTP_REQUEST_CANCELLED = 0x05 - HTTP_INCOMPLETE_REQUEST = 0x06 - HTTP_CONNECT_ERROR = 0x07 - HTTP_EXCESSIVE_LOAD = 0x08 - HTTP_VERSION_FALLBACK = 0x09 - HTTP_WRONG_STREAM = 0x0A - HTTP_ID_ERROR = 0x0B + HTTP_STREAM_CREATION_ERROR = 0x103 - HTTP_STREAM_CREATION_ERROR = 0x0D + HTTP_CLOSED_CRITICAL_STREAM = 0x104 - HTTP_CLOSED_CRITICAL_STREAM = 0x0F + HTTP_FRAME_UNEXPECTED = 0x105 + HTTP_FRAME_ERROR = 0x106 + HTTP_EXCESSIVE_LOAD = 0x107 + HTTP_ID_ERROR = 0x108 + HTTP_SETTINGS_ERROR = 0x109 - HTTP_EARLY_RESPONSE = 0x11 + HTTP_MISSING_SETTINGS = 0x10A - HTTP_MISSING_SETTINGS = 0x12 - HTTP_UNEXPECTED_FRAME = 0x13 + HTTP_REQUEST_REJECTED = 0x10B - HTTP_REQUEST_REJECTED = 0x14 + HTTP_REQUEST_CANCELLED = 0x10C + HTTP_REQUEST_INCOMPLETE = 0x10D + HTTP_EARLY_RESPONSE = 0x10E + HTTP_CONNECT_ERROR = 0x10F - HTTP_SETTINGS_ERROR = 0xFF + HTTP_VERSION_FALLBACK = 0x110 HTTP_QPACK_DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP</s> ===========changed ref 1=========== # module: aioquic.h3.connection class ErrorCode(IntEnum): # offset: 1 <s>DECOMPRESSION_FAILED = 0x200 HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201 HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_push_promise_from_client(self): """ A server should not receive PUSH_PROMISE on a request stream. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.PUSH_PROMISE, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Clients must not send PUSH_PROMISE"), - (ErrorCode.HTTP_UNEXPECTED_FRAME, "Clients must not send PUSH_PROMISE"), ) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_data_before_headers(self): """ We should not receive DATA before receiving headers. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.DATA, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "DATA frame is not allowed in this state", ), ) ===========changed ref 4=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_headers_after_trailers(self): """ We should not receive HEADERS after receiving trailers. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], ) h3_client.send_headers( stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=True ) h3_transfer(quic_client, h3_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.HEADERS, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "HEADERS frame is not allowed in this state", ), )
tests.test_h3/H3ConnectionTest.test_send_data_after_trailers
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<21>:<add> with self.assertRaises(FrameUnexpected): <del> with self.assertRaises(UnexpectedFrame):
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_send_data_after_trailers(self): <0> """ <1> We should not send DATA after trailers. <2> """ <3> quic_client = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=True) <5> ) <6> h3_client = H3Connection(quic_client) <7> <8> stream_id = quic_client.get_next_available_stream_id() <9> h3_client.send_headers( <10> stream_id=stream_id, <11> headers=[ <12> (b":method", b"GET"), <13> (b":scheme", b"https"), <14> (b":authority", b"localhost"), <15> (b":path", b"/"), <16> ], <17> ) <18> h3_client.send_headers( <19> stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=False <20> ) <21> with self.assertRaises(UnexpectedFrame): <22> h3_client.send_data(stream_id=stream_id, data=b"hello", end_stream=False) <23>
===========unchanged ref 0=========== at: aioquic.h3.connection FrameUnexpected(reason_phrase: str="") H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection send_data(stream_id: int, data: bytes, end_stream: bool) -> None send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection get_next_available_stream_id(is_unidirectional=False) at: unittest.case.TestCase assertRaises(expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any=...) -> _AssertRaisesContext[_E] assertRaises(expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ # check DATA frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state != HeadersState.AFTER_HEADERS: + raise FrameUnexpected("DATA frame is not allowed in this state") - raise UnexpectedFrame("DATA frame is not allowed in this state") # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), ) self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream ) ===========changed ref 1=========== # module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: """ Send headers on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the headers. :param headers: The HTTP headers to send. :param end_stream: Whether to end the stream. """ # check HEADERS frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state == HeadersState.AFTER_TRAILERS: + raise FrameUnexpected("HEADERS frame is not allowed in this state") - raise UnexpectedFrame("HEADERS frame is not allowed in this state") frame_data = self._encode_headers(stream_id, headers) # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_headers_frame( byte_length=len(frame_data), headers=headers, stream_id=stream_id ), ) # update state and send headers if stream.headers_send_state == HeadersState.INITIAL: stream.headers_send_state = HeadersState.AFTER_HEADERS else: stream.headers_send_state = HeadersState.AFTER_TRAILERS self._quic.send_stream_data( stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream ) ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_wrong_frame_type(self): quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.SETTINGS, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on request stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on request stream"), ) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_push_promise_from_client(self): """ A server should not receive PUSH_PROMISE on a request stream. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.PUSH_PROMISE, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Clients must not send PUSH_PROMISE"), - (ErrorCode.HTTP_UNEXPECTED_FRAME, "Clients must not send PUSH_PROMISE"), ) ===========changed ref 4=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_data_before_headers(self): """ We should not receive DATA before receiving headers. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.DATA, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "DATA frame is not allowed in this state", ), )
tests.test_h3/H3ConnectionTest.test_send_data_before_headers
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<9>:<add> with self.assertRaises(FrameUnexpected): <del> with self.assertRaises(UnexpectedFrame):
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_send_data_before_headers(self): <0> """ <1> We should not send DATA before headers. <2> """ <3> quic_client = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=True) <5> ) <6> h3_client = H3Connection(quic_client) <7> <8> stream_id = quic_client.get_next_available_stream_id() <9> with self.assertRaises(UnexpectedFrame): <10> h3_client.send_data(stream_id=stream_id, data=b"hello", end_stream=False) <11>
===========unchanged ref 0=========== at: aioquic.h3.connection FrameUnexpected(reason_phrase: str="") H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection send_data(stream_id: int, data: bytes, end_stream: bool) -> None at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection get_next_available_stream_id(is_unidirectional=False) at: unittest.case.TestCase assertRaises(expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any=...) -> _AssertRaisesContext[_E] assertRaises(expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class H3Connection: def send_data(self, stream_id: int, data: bytes, end_stream: bool) -> None: """ Send data on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the data. :param data: The data to send. :param end_stream: Whether to end the stream. """ # check DATA frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state != HeadersState.AFTER_HEADERS: + raise FrameUnexpected("DATA frame is not allowed in this state") - raise UnexpectedFrame("DATA frame is not allowed in this state") # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_data_frame(byte_length=len(data), stream_id=stream_id), ) self._quic.send_stream_data( stream_id, encode_frame(FrameType.DATA, data), end_stream ) ===========changed ref 1=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_send_data_after_trailers(self): """ We should not send DATA after trailers. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) h3_client = H3Connection(quic_client) stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], ) h3_client.send_headers( stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=False ) + with self.assertRaises(FrameUnexpected): - with self.assertRaises(UnexpectedFrame): h3_client.send_data(stream_id=stream_id, data=b"hello", end_stream=False) ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_wrong_frame_type(self): quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.SETTINGS, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on request stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on request stream"), ) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_push_promise_from_client(self): """ A server should not receive PUSH_PROMISE on a request stream. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.PUSH_PROMISE, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Clients must not send PUSH_PROMISE"), - (ErrorCode.HTTP_UNEXPECTED_FRAME, "Clients must not send PUSH_PROMISE"), ) ===========changed ref 4=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_data_before_headers(self): """ We should not receive DATA before receiving headers. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.DATA, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "DATA frame is not allowed in this state", ), )
tests.test_h3/H3ConnectionTest.test_send_headers_after_trailers
Modified
aiortc~aioquic
34e9ba073e961cb911209ea7fa5cbfd89ffc53d0
[http3] update error codes for draft-23
<21>:<add> with self.assertRaises(FrameUnexpected): <del> with self.assertRaises(UnexpectedFrame):
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_send_headers_after_trailers(self): <0> """ <1> We should not send HEADERS after trailers. <2> """ <3> quic_client = FakeQuicConnection( <4> configuration=QuicConfiguration(is_client=True) <5> ) <6> h3_client = H3Connection(quic_client) <7> <8> stream_id = quic_client.get_next_available_stream_id() <9> h3_client.send_headers( <10> stream_id=stream_id, <11> headers=[ <12> (b":method", b"GET"), <13> (b":scheme", b"https"), <14> (b":authority", b"localhost"), <15> (b":path", b"/"), <16> ], <17> ) <18> h3_client.send_headers( <19> stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=False <20> ) <21> with self.assertRaises(UnexpectedFrame): <22> h3_client.send_headers( <23> stream_id=stream_id, <24> headers=[(b"x-other-trailer", b"foo")], <25> end_stream=False, <26> ) <27>
===========unchanged ref 0=========== at: aioquic.h3.connection FrameUnexpected(reason_phrase: str="") H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: tests.test_h3 FakeQuicConnection(configuration) at: tests.test_h3.FakeQuicConnection get_next_available_stream_id(is_unidirectional=False) at: unittest.case.TestCase assertRaises(expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any=...) -> _AssertRaisesContext[_E] assertRaises(expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None ===========changed ref 0=========== # module: aioquic.h3.connection class H3Connection: def send_headers( self, stream_id: int, headers: Headers, end_stream: bool = False ) -> None: """ Send headers on the given stream. To retrieve datagram which need to be sent over the network call the QUIC connection's :meth:`~aioquic.connection.QuicConnection.datagrams_to_send` method. :param stream_id: The stream ID on which to send the headers. :param headers: The HTTP headers to send. :param end_stream: Whether to end the stream. """ # check HEADERS frame is allowed stream = self._get_or_create_stream(stream_id) if stream.headers_send_state == HeadersState.AFTER_TRAILERS: + raise FrameUnexpected("HEADERS frame is not allowed in this state") - raise UnexpectedFrame("HEADERS frame is not allowed in this state") frame_data = self._encode_headers(stream_id, headers) # log frame if self._quic_logger is not None: self._quic_logger.log_event( category="HTTP", event="frame_created", data=qlog_encode_headers_frame( byte_length=len(frame_data), headers=headers, stream_id=stream_id ), ) # update state and send headers if stream.headers_send_state == HeadersState.INITIAL: stream.headers_send_state = HeadersState.AFTER_HEADERS else: stream.headers_send_state = HeadersState.AFTER_TRAILERS self._quic.send_stream_data( stream_id, encode_frame(FrameType.HEADERS, frame_data), end_stream ) ===========changed ref 1=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_send_data_before_headers(self): """ We should not send DATA before headers. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) h3_client = H3Connection(quic_client) stream_id = quic_client.get_next_available_stream_id() + with self.assertRaises(FrameUnexpected): - with self.assertRaises(UnexpectedFrame): h3_client.send_data(stream_id=stream_id, data=b"hello", end_stream=False) ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_send_data_after_trailers(self): """ We should not send DATA after trailers. """ quic_client = FakeQuicConnection( configuration=QuicConfiguration(is_client=True) ) h3_client = H3Connection(quic_client) stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], ) h3_client.send_headers( stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=False ) + with self.assertRaises(FrameUnexpected): - with self.assertRaises(UnexpectedFrame): h3_client.send_data(stream_id=stream_id, data=b"hello", end_stream=False) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_wrong_frame_type(self): quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.SETTINGS, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Invalid frame type on request stream"), - (ErrorCode.HTTP_WRONG_STREAM, "Invalid frame type on request stream"), ) ===========changed ref 4=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_push_promise_from_client(self): """ A server should not receive PUSH_PROMISE on a request stream. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.PUSH_PROMISE, b""), end_stream=False, ) ) self.assertEqual( quic_server.closed, + (ErrorCode.HTTP_FRAME_UNEXPECTED, "Clients must not send PUSH_PROMISE"), - (ErrorCode.HTTP_UNEXPECTED_FRAME, "Clients must not send PUSH_PROMISE"), ) ===========changed ref 5=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_handle_request_frame_data_before_headers(self): """ We should not receive DATA before receiving headers. """ quic_server = FakeQuicConnection( configuration=QuicConfiguration(is_client=False) ) h3_server = H3Connection(quic_server) h3_server.handle_event( StreamDataReceived( stream_id=0, data=encode_frame(FrameType.DATA, b""), end_stream=False ) ) self.assertEqual( quic_server.closed, ( + ErrorCode.HTTP_FRAME_UNEXPECTED, - ErrorCode.HTTP_UNEXPECTED_FRAME, "DATA frame is not allowed in this state", ), )
tests.test_connection/QuicConnectionTest.test_connect_with_alpn
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["h3-23", "hq-23"]}, <del> client_options={"alpn_protocols": ["hq-22", "h3-22"]}, <2>:<add> server_options={"alpn_protocols": ["hq-23"]}, <del> server_options={"alpn_protocols": ["hq-22"]}, <7>:<add> self.assertEqual(event.alpn_protocol, "hq-23") <del> self.assertEqual(event.alpn_protocol, "hq-22") <10>:<add> self.assertEqual(event.alpn_protocol, "hq-23") <del> self.assertEqual(event.alpn_protocol, "hq-22") <17>:<add> self.assertEqual(event.alpn_protocol, "hq-23") <del> self.assertEqual(event.alpn_protocol, "hq-22") <20>:<add> self.assertEqual(event.alpn_protocol, "hq-23") <del> self.assertEqual(event.alpn_protocol, "hq-22")
# module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["hq-22", "h3-22"]}, <2> server_options={"alpn_protocols": ["hq-22"]}, <3> ) as (client, server): <4> # check handshake completed <5> event = client.next_event() <6> self.assertEqual(type(event), events.ProtocolNegotiated) <7> self.assertEqual(event.alpn_protocol, "hq-22") <8> event = client.next_event() <9> self.assertEqual(type(event), events.HandshakeCompleted) <10> self.assertEqual(event.alpn_protocol, "hq-22") <11> for i in range(7): <12> self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) <13> self.assertIsNone(client.next_event()) <14> <15> event = server.next_event() <16> self.assertEqual(type(event), events.ProtocolNegotiated) <17> self.assertEqual(event.alpn_protocol, "hq-22") <18> event = server.next_event() <19> self.assertEqual(type(event), events.HandshakeCompleted) <20> self.assertEqual(event.alpn_protocol, "hq-22") <21> for i in range(7): <22> self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) <23> self.assertIsNone(server.next_event()) <24>
===========unchanged ref 0=========== at: aioquic.quic.events ConnectionIdIssued(connection_id: bytes) HandshakeCompleted(alpn_protocol: Optional[str], early_data_accepted: bool, session_resumed: bool) ProtocolNegotiated(alpn_protocol: Optional[str]) at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None assertIsNone(obj: Any, msg: Any=...) -> None
tests.test_h0/H0ConnectionTest.test_connect
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["hq-23"]}, <del> client_options={"alpn_protocols": ["hq-22"]}, <2>:<add> server_options={"alpn_protocols": ["hq-23"]}, <del> server_options={"alpn_protocols": ["hq-22"]},
# module: tests.test_h0 class H0ConnectionTest(TestCase): def test_connect(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["hq-22"]}, <2> server_options={"alpn_protocols": ["hq-22"]}, <3> ) as (quic_client, quic_server): <4> h0_client = H0Connection(quic_client) <5> h0_server = H0Connection(quic_server) <6> <7> # send request <8> stream_id = quic_client.get_next_available_stream_id() <9> h0_client.send_headers( <10> stream_id=stream_id, <11> headers=[ <12> (b":method", b"GET"), <13> (b":scheme", b"https"), <14> (b":authority", b"localhost"), <15> (b":path", b"/"), <16> ], <17> ) <18> h0_client.send_data(stream_id=stream_id, data=b"", end_stream=True) <19> <20> # receive request <21> events = h0_transfer(quic_client, h0_server) <22> self.assertEqual(len(events), 2) <23> <24> self.assertTrue(isinstance(events[0], HeadersReceived)) <25> self.assertEqual( <26> events[0].headers, [(b":method", b"GET"), (b":path", b"/")] <27> ) <28> self.assertEqual(events[0].stream_id, stream_id) <29> self.assertEqual(events[0].stream_ended, False) <30> <31> self.assertTrue(isinstance(events[1], DataReceived)) <32> self.assertEqual(events[1].data, b"") <33> self.assertEqual(events[1].stream_id, stream_id) <34> self.assertEqual(events[1].stream_ended, True) <35> <36> # send response <37> h0_server.send_</s>
===========below chunk 0=========== # module: tests.test_h0 class H0ConnectionTest(TestCase): def test_connect(self): # offset: 1 stream_id=stream_id, headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), ], ) h0_server.send_data( stream_id=stream_id, data=b"<html><body>hello</body></html>", end_stream=True, ) # receive response events = h0_transfer(quic_server, h0_client) self.assertEqual(len(events), 2) self.assertTrue(isinstance(events[0], HeadersReceived)) self.assertEqual(events[0].headers, []) self.assertEqual(events[0].stream_id, stream_id) self.assertEqual(events[0].stream_ended, False) self.assertTrue(isinstance(events[1], DataReceived)) self.assertEqual(events[1].data, b"<html><body>hello</body></html>") self.assertEqual(events[1].stream_id, stream_id) self.assertEqual(events[1].stream_ended, True) ===========unchanged ref 0=========== at: aioquic.h0.connection H0Connection(quic: QuicConnection) at: aioquic.h0.connection.H0Connection send_data(stream_id: int, data: bytes, end_stream: bool) -> None send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.h3.events DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h0 h0_transfer(quic_sender, h0_receiver) at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s> ===========changed ref 1=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): # offset: 1 <s>.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.next_event())
tests.test_h0/H0ConnectionTest.test_headers_only
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["hq-23"]}, <del> client_options={"alpn_protocols": ["hq-22"]}, <2>:<add> server_options={"alpn_protocols": ["hq-23"]}, <del> server_options={"alpn_protocols": ["hq-22"]},
# module: tests.test_h0 class H0ConnectionTest(TestCase): def test_headers_only(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["hq-22"]}, <2> server_options={"alpn_protocols": ["hq-22"]}, <3> ) as (quic_client, quic_server): <4> h0_client = H0Connection(quic_client) <5> h0_server = H0Connection(quic_server) <6> <7> # send request <8> stream_id = quic_client.get_next_available_stream_id() <9> h0_client.send_headers( <10> stream_id=stream_id, <11> headers=[ <12> (b":method", b"HEAD"), <13> (b":scheme", b"https"), <14> (b":authority", b"localhost"), <15> (b":path", b"/"), <16> ], <17> end_stream=True, <18> ) <19> <20> # receive request <21> events = h0_transfer(quic_client, h0_server) <22> self.assertEqual(len(events), 2) <23> <24> self.assertTrue(isinstance(events[0], HeadersReceived)) <25> self.assertEqual( <26> events[0].headers, [(b":method", b"HEAD"), (b":path", b"/")] <27> ) <28> self.assertEqual(events[0].stream_id, stream_id) <29> self.assertEqual(events[0].stream_ended, False) <30> <31> self.assertTrue(isinstance(events[1], DataReceived)) <32> self.assertEqual(events[1].data, b"") <33> self.assertEqual(events[1].stream_id, stream_id) <34> self.assertEqual(events[1].stream_ended, True) <35> <36> # send response <37> h0_server.send_headers( <38> stream_id=stream_id, <39> headers=[ <40> </s>
===========below chunk 0=========== # module: tests.test_h0 class H0ConnectionTest(TestCase): def test_headers_only(self): # offset: 1 (b"content-type", b"text/html; charset=utf-8"), ], end_stream=True, ) # receive response events = h0_transfer(quic_server, h0_client) self.assertEqual(len(events), 2) self.assertTrue(isinstance(events[0], HeadersReceived)) self.assertEqual(events[0].headers, []) self.assertEqual(events[0].stream_id, stream_id) self.assertEqual(events[0].stream_ended, False) self.assertTrue(isinstance(events[1], DataReceived)) self.assertEqual(events[1].data, b"") self.assertEqual(events[1].stream_id, stream_id) self.assertEqual(events[1].stream_ended, True) ===========unchanged ref 0=========== at: aioquic.h0.connection H0Connection(quic: QuicConnection) at: aioquic.h0.connection.H0Connection send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.h3.events DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h0 h0_transfer(quic_sender, h0_receiver) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertTrue(expr: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_h0 class H0ConnectionTest(TestCase): def test_connect(self): with client_and_server( + client_options={"alpn_protocols": ["hq-23"]}, - client_options={"alpn_protocols": ["hq-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (quic_client, quic_server): h0_client = H0Connection(quic_client) h0_server = H0Connection(quic_server) # send request stream_id = quic_client.get_next_available_stream_id() h0_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], ) h0_client.send_data(stream_id=stream_id, data=b"", end_stream=True) # receive request events = h0_transfer(quic_client, h0_server) self.assertEqual(len(events), 2) self.assertTrue(isinstance(events[0], HeadersReceived)) self.assertEqual( events[0].headers, [(b":method", b"GET"), (b":path", b"/")] ) self.assertEqual(events[0].stream_id, stream_id) self.assertEqual(events[0].stream_ended, False) self.assertTrue(isinstance(events[1], DataReceived)) self.assertEqual(events[1].data, b"") self.assertEqual(events[1].stream_id, stream_id) self.assertEqual(events[1].stream_ended, True) # send response h0_</s> ===========changed ref 1=========== # module: tests.test_h0 class H0ConnectionTest(TestCase): def test_connect(self): # offset: 1 <s>id) self.assertEqual(events[1].stream_ended, True) # send response h0_server.send_headers( stream_id=stream_id, headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), ], ) h0_server.send_data( stream_id=stream_id, data=b"<html><body>hello</body></html>", end_stream=True, ) # receive response events = h0_transfer(quic_server, h0_client) self.assertEqual(len(events), 2) self.assertTrue(isinstance(events[0], HeadersReceived)) self.assertEqual(events[0].headers, []) self.assertEqual(events[0].stream_id, stream_id) self.assertEqual(events[0].stream_ended, False) self.assertTrue(isinstance(events[1], DataReceived)) self.assertEqual(events[1].data, b"<html><body>hello</body></html>") self.assertEqual(events[1].stream_id, stream_id) self.assertEqual(events[1].stream_ended, True) ===========changed ref 2=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s> ===========changed ref 3=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): # offset: 1 <s>.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.next_event())
docs.http_client/http_client
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<0>:<add> configuration = QuicConfiguration(alpn_protocols=["hq-23"]) <del> configuration = QuicConfiguration(alpn_protocols=["hq-22"])
# module: docs.http_client def http_client(host, port): <0> configuration = QuicConfiguration(alpn_protocols=["hq-22"]) <1> <2> async with connect(host, port, configuration=configuration) as connection: <3> reader, writer = await connection.create_stream() <4> writer.write(b"GET /\r\n") <5> writer.write_eof() <6> <7> response = await reader.read() <8> sys.stdout.buffer.write(response) <9>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.asyncio.protocol.QuicConnectionProtocol create_stream(is_unidirectional: bool=False) -> Tuple[asyncio.StreamReader, asyncio.StreamWriter] at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] ) ===========unchanged ref 1=========== at: asyncio.streams.StreamReader _source_traceback = None read(n: int=...) -> bytes at: asyncio.streams.StreamWriter write(data: bytes) -> None write_eof() -> None at: sys stdout: TextIO at: typing.BinaryIO __slots__ = () write(s: AnyStr) -> int at: typing.TextIO __slots__ = () ===========changed ref 0=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s> ===========changed ref 1=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): # offset: 1 <s>.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.next_event()) ===========changed ref 2=========== # module: tests.test_h0 class H0ConnectionTest(TestCase): def test_headers_only(self): with client_and_server( + client_options={"alpn_protocols": ["hq-23"]}, - client_options={"alpn_protocols": ["hq-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (quic_client, quic_server): h0_client = H0Connection(quic_client) h0_server = H0Connection(quic_server) # send request stream_id = quic_client.get_next_available_stream_id() h0_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"HEAD"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], end_stream=True, ) # receive request events = h0_transfer(quic_client, h0_server) self.assertEqual(len(events), 2) self.assertTrue(isinstance(events[0], HeadersReceived)) self.assertEqual( events[0].headers, [(b":method", b"HEAD"), (b":path", b"/")] ) self.assertEqual(events[0].stream_id, stream_id) self.assertEqual(events[0].stream_ended, False) self.assertTrue(isinstance(events[1], DataReceived)) self.assertEqual(events[1].data, b"") self.assertEqual(events[1].stream_id, stream_id) self.assertEqual(events[1].stream_ended, True) # send response h0_server.send_headers( stream_id=stream_id, headers=[</s>
examples.interop/test_http_0
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<3>:<add> configuration.alpn_protocols = ["hq-23", "hq-22"] <del> configuration.alpn_protocols = ["hq-22"]
# module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): <0> if server.path is None: <1> return <2> <3> configuration.alpn_protocols = ["hq-22"] <4> async with connect( <5> server.host, <6> server.port, <7> configuration=configuration, <8> create_protocol=HttpClient, <9> ) as protocol: <10> protocol = cast(HttpClient, protocol) <11> <12> # perform HTTP request <13> events = await protocol.get(server.host, server.path) <14> if events and isinstance(events[0], HeadersReceived): <15> server.result |= Result.D <16>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.h3.events HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] ) ===========unchanged ref 1=========== at: examples.interop Result() Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str="/", result: Result=field(default_factory=lambda: Result(0))) at: examples.interop.Server name: str host: str port: int = 4433 http3: bool = True retry_port: Optional[int] = 4434 path: str = "/" result: Result = field(default_factory=lambda: Result(0)) at: http3_client HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: http3_client.HttpClient get(authority: str, path: str) -> Deque[H3Event] at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any ===========changed ref 0=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 1=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s> ===========changed ref 2=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): # offset: 1 <s>.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.next_event())
examples.interop/test_http_3
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<3>:<add> configuration.alpn_protocols = ["h3-23", "h3-22"] <del> configuration.alpn_protocols = ["h3-22"]
# module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): <0> if server.path is None: <1> return <2> <3> configuration.alpn_protocols = ["h3-22"] <4> async with connect( <5> server.host, <6> server.port, <7> configuration=configuration, <8> create_protocol=HttpClient, <9> ) as protocol: <10> protocol = cast(HttpClient, protocol) <11> <12> # perform HTTP request <13> events = await protocol.get(server.host, server.path) <14> if events and isinstance(events[0], HeadersReceived): <15> server.result |= Result.D <16> server.result |= Result.three <17>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.h3.events HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None at: examples.interop Result() Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str="/", result: Result=field(default_factory=lambda: Result(0))) at: examples.interop.Server host: str port: int = 4433 path: str = "/" result: Result = field(default_factory=lambda: Result(0)) ===========unchanged ref 1=========== at: http3_client HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: http3_client.HttpClient get(authority: str, path: str) -> Deque[H3Event] at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any ===========changed ref 0=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 1=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 2=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s> ===========changed ref 3=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): # offset: 1 <s>.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.next_event())
examples.interop/test_throughput
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<15>:<add> configuration.alpn_protocols = ["h3-23", "h3-22"] <del> configuration.alpn_protocols = ["h3-22"] <17>:<add> configuration.alpn_protocols = ["hq-23", "hq-22"] <del> configuration.alpn_protocols = ["hq-22"]
# module: examples.interop def test_throughput(server: Server, configuration: QuicConfiguration): <0> failures = 0 <1> <2> for size in [5000000, 10000000]: <3> print("Testing %d bytes download" % size) <4> path = "/%d" % size <5> <6> # perform HTTP request over TCP <7> start = time.time() <8> response = requests.get("https://" + server.host + path, verify=False) <9> tcp_octets = len(response.content) <10> tcp_elapsed = time.time() - start <11> assert tcp_octets == size, "HTTP/TCP response size mismatch" <12> <13> # perform HTTP request over QUIC <14> if server.http3: <15> configuration.alpn_protocols = ["h3-22"] <16> else: <17> configuration.alpn_protocols = ["hq-22"] <18> start = time.time() <19> async with connect( <20> server.host, <21> server.port, <22> configuration=configuration, <23> create_protocol=HttpClient, <24> ) as protocol: <25> protocol = cast(HttpClient, protocol) <26> <27> http_events = await protocol.get(server.host, path) <28> quic_elapsed = time.time() - start <29> quic_octets = 0 <30> for http_event in http_events: <31> if isinstance(http_event, DataReceived): <32> quic_octets += len(http_event.data) <33> assert quic_octets == size, "HTTP/QUIC response size mismatch" <34> <35> print(" - HTTP/TCP completed in %.3f s" % tcp_elapsed) <36> print(" - HTTP/QUIC completed in %.3f s" % quic_elapsed) <37> <38> if quic_elapsed > 1.1 * tcp_elapsed: <39> failures += 1 <40> print(" => FAIL") <41> else: <42> print(" => PASS") <43> <44> if failures == 0: <45> server.result |= Result.T <46>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.h3.events DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None at: examples.interop Result() Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str="/", result: Result=field(default_factory=lambda: Result(0))) at: examples.interop.Server host: str port: int = 4433 http3: bool = True result: Result = field(default_factory=lambda: Result(0)) ===========unchanged ref 1=========== at: http3_client HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: http3_client.HttpClient get(authority: str, path: str) -> Deque[H3Event] at: requests.api get(url: Union[Text, bytes], params: Optional[ Union[ SupportsItems[_ParamsMappingKeyType, _ParamsMappingValueType], Tuple[_ParamsMappingKeyType, _ParamsMappingValueType], Iterable[Tuple[_ParamsMappingKeyType, _ParamsMappingValueType]], Union[Text, bytes], ] ]=..., **kwargs) -> Response at: requests.models.Response __attrs__ = [ "_content", "status_code", "headers", "url", "history", "encoding", "reason", "cookies", "elapsed", "request", ] at: time time() -> float at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any ===========changed ref 0=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three ===========changed ref 1=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 2=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 3=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s> ===========changed ref 4=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): # offset: 1 <s>.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.next_event())
examples.interop/run
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<4>:<add> alpn_protocols=["h3-23", "h3-22", "hq-23", "hq-22"], <del> alpn_protocols=["hq-22", "h3-22"],
# module: examples.interop def run(servers, tests, quic_log=False, secrets_log_file=None) -> None: <0> for server in servers: <1> for test_name, test_func in tests: <2> print("\n=== %s %s ===\n" % (server.name, test_name)) <3> configuration = QuicConfiguration( <4> alpn_protocols=["hq-22", "h3-22"], <5> is_client=True, <6> quic_logger=QuicLogger(), <7> secrets_log_file=secrets_log_file, <8> ) <9> if test_name == "test_throughput": <10> timeout = 60 <11> else: <12> timeout = 5 <13> try: <14> await asyncio.wait_for( <15> test_func(server, configuration), timeout=timeout <16> ) <17> except Exception as exc: <18> print(exc) <19> <20> if quic_log: <21> with open("%s-%s.qlog" % (server.name, test_name), "w") as logger_fp: <22> json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4) <23> <24> print("") <25> print_result(server) <26> <27> # print summary <28> if len(servers) > 1: <29> print("SUMMARY") <30> for server in servers: <31> print_result(server) <32>
===========unchanged ref 0=========== at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration quic_logger: Optional[QuicLogger] = None at: aioquic.quic.logger QuicLogger() at: aioquic.quic.logger.QuicLogger to_dict() -> Dict[str, Any] at: asyncio.tasks wait_for(fut: _FutureT[_T], timeout: Optional[float], *, loop: Optional[AbstractEventLoop]=...) -> Future[_T] at: examples.interop print_result(server: Server) -> None at: examples.interop.Server name: str at: json dump(obj: Any, fp: IO[str], *, skipkeys: bool=..., ensure_ascii: bool=..., check_circular: bool=..., allow_nan: bool=..., cls: Optional[Type[JSONEncoder]]=..., indent: Union[None, int, str]=..., separators: Optional[Tuple[str, str]]=..., default: Optional[Callable[[Any], Any]]=..., sort_keys: bool=..., **kwds: Any) -> None ===========changed ref 0=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three ===========changed ref 1=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 2=========== # module: examples.interop def test_throughput(server: Server, configuration: QuicConfiguration): failures = 0 for size in [5000000, 10000000]: print("Testing %d bytes download" % size) path = "/%d" % size # perform HTTP request over TCP start = time.time() response = requests.get("https://" + server.host + path, verify=False) tcp_octets = len(response.content) tcp_elapsed = time.time() - start assert tcp_octets == size, "HTTP/TCP response size mismatch" # perform HTTP request over QUIC if server.http3: + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] else: + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] start = time.time() async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) http_events = await protocol.get(server.host, path) quic_elapsed = time.time() - start quic_octets = 0 for http_event in http_events: if isinstance(http_event, DataReceived): quic_octets += len(http_event.data) assert quic_octets == size, "HTTP/QUIC response size mismatch" print(" - HTTP/TCP completed in %.3f s" % tcp_elapsed) print(" - HTTP/QUIC completed in %.3f s" % quic_elapsed) if quic_elapsed > 1.1 * tcp_elapsed: failures += 1 print(" => FAIL") else: print(" => PASS") if failures == 0: server.result |= Result.T ===========changed ref 3=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 4=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s>
tests.test_h3/H3ConnectionTest.test_request
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["h3-23"]}, <del> client_options={"alpn_protocols": ["h3-22"]}, <2>:<add> server_options={"alpn_protocols": ["h3-23"]}, <del> server_options={"alpn_protocols": ["h3-22"]},
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["h3-22"]}, <2> server_options={"alpn_protocols": ["h3-22"]}, <3> ) as (quic_client, quic_server): <4> h3_client = H3Connection(quic_client) <5> h3_server = H3Connection(quic_server) <6> <7> # make first request <8> self._make_request(h3_client, h3_server) <9> <10> # make second request <11> self._make_request(h3_client, h3_server) <12> <13> # make third request -> dynamic table <14> self._make_request(h3_client, h3_server) <15>
===========unchanged ref 0=========== at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h3.H3ConnectionTest maxDiff = None _make_request(h3_client, h3_server) ===========changed ref 0=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 1=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 2=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three ===========changed ref 3=========== # module: examples.interop def run(servers, tests, quic_log=False, secrets_log_file=None) -> None: for server in servers: for test_name, test_func in tests: print("\n=== %s %s ===\n" % (server.name, test_name)) configuration = QuicConfiguration( + alpn_protocols=["h3-23", "h3-22", "hq-23", "hq-22"], - alpn_protocols=["hq-22", "h3-22"], is_client=True, quic_logger=QuicLogger(), secrets_log_file=secrets_log_file, ) if test_name == "test_throughput": timeout = 60 else: timeout = 5 try: await asyncio.wait_for( test_func(server, configuration), timeout=timeout ) except Exception as exc: print(exc) if quic_log: with open("%s-%s.qlog" % (server.name, test_name), "w") as logger_fp: json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4) print("") print_result(server) # print summary if len(servers) > 1: print("SUMMARY") for server in servers: print_result(server) ===========changed ref 4=========== # module: examples.interop def test_throughput(server: Server, configuration: QuicConfiguration): failures = 0 for size in [5000000, 10000000]: print("Testing %d bytes download" % size) path = "/%d" % size # perform HTTP request over TCP start = time.time() response = requests.get("https://" + server.host + path, verify=False) tcp_octets = len(response.content) tcp_elapsed = time.time() - start assert tcp_octets == size, "HTTP/TCP response size mismatch" # perform HTTP request over QUIC if server.http3: + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] else: + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] start = time.time() async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) http_events = await protocol.get(server.host, path) quic_elapsed = time.time() - start quic_octets = 0 for http_event in http_events: if isinstance(http_event, DataReceived): quic_octets += len(http_event.data) assert quic_octets == size, "HTTP/QUIC response size mismatch" print(" - HTTP/TCP completed in %.3f s" % tcp_elapsed) print(" - HTTP/QUIC completed in %.3f s" % quic_elapsed) if quic_elapsed > 1.1 * tcp_elapsed: failures += 1 print(" => FAIL") else: print(" => PASS") if failures == 0: server.result |= Result.T ===========changed ref 5=========== # module: tests.test_connection class QuicConnectionTest(TestCase): def test_connect_with_alpn(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23", "hq-23"]}, - client_options={"alpn_protocols": ["hq-22", "h3-22"]}, + server_options={"alpn_protocols": ["hq-23"]}, - server_options={"alpn_protocols": ["hq-22"]}, ) as (client, server): # check handshake completed event = client.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = client.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(client.next_event()), events.ConnectionIdIssued) self.assertIsNone(client.next_event()) event = server.next_event() self.assertEqual(type(event), events.ProtocolNegotiated) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") event = server.next_event() self.assertEqual(type(event), events.HandshakeCompleted) + self.assertEqual(event.alpn_protocol, "hq-23") - self.assertEqual(event.alpn_protocol, "hq-22") for i in range(7): self.assertEqual(type(server.next_event()), events.ConnectionIdIssued) self.assertIsNone(server.</s>
tests.test_h3/H3ConnectionTest.test_request_headers_only
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["h3-23"]}, <del> client_options={"alpn_protocols": ["h3-22"]}, <2>:<add> server_options={"alpn_protocols": ["h3-23"]}, <del> server_options={"alpn_protocols": ["h3-22"]},
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_headers_only(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["h3-22"]}, <2> server_options={"alpn_protocols": ["h3-22"]}, <3> ) as (quic_client, quic_server): <4> h3_client = H3Connection(quic_client) <5> h3_server = H3Connection(quic_server) <6> <7> # send request <8> stream_id = quic_client.get_next_available_stream_id() <9> h3_client.send_headers( <10> stream_id=stream_id, <11> headers=[ <12> (b":method", b"HEAD"), <13> (b":scheme", b"https"), <14> (b":authority", b"localhost"), <15> (b":path", b"/"), <16> (b"x-foo", b"client"), <17> ], <18> end_stream=True, <19> ) <20> <21> # receive request <22> events = h3_transfer(quic_client, h3_server) <23> self.assertEqual( <24> events, <25> [ <26> HeadersReceived( <27> headers=[ <28> (b":method", b"HEAD"), <29> (b":scheme", b"https"), <30> (b":authority", b"localhost"), <31> (b":path", b"/"), <32> (b"x-foo", b"client"), <33> ], <34> stream_id=stream_id, <35> stream_ended=True, <36> ) <37> ], <38> ) <39> <40> # send response <41> h3_server.send_headers( <42> stream_id=stream_id, <43> headers=[ <44> (b":status", b"200"), <45> (b"content-type", b"text/html; charset=utf-8"), <46> (b</s>
===========below chunk 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_headers_only(self): # offset: 1 ], end_stream=True, ) # receive response events = h3_transfer(quic_server, h3_client) self.assertEqual( events, [ HeadersReceived( headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), (b"x-foo", b"server"), ], stream_id=stream_id, stream_ended=True, ) ], ) ===========unchanged ref 0=========== at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.h3.events HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.h3.events.HeadersReceived headers: Headers stream_id: int stream_ended: bool push_id: Optional[int] = None at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h3 h3_transfer(quic_sender, h3_receiver) at: unittest.case.TestCase failureException: Type[BaseException] longMessage: bool maxDiff: Optional[int] _testMethodName: str _testMethodDoc: str assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # make first request self._make_request(h3_client, h3_server) # make second request self._make_request(h3_client, h3_server) # make third request -> dynamic table self._make_request(h3_client, h3_server) ===========changed ref 1=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 2=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 3=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three ===========changed ref 4=========== # module: examples.interop def run(servers, tests, quic_log=False, secrets_log_file=None) -> None: for server in servers: for test_name, test_func in tests: print("\n=== %s %s ===\n" % (server.name, test_name)) configuration = QuicConfiguration( + alpn_protocols=["h3-23", "h3-22", "hq-23", "hq-22"], - alpn_protocols=["hq-22", "h3-22"], is_client=True, quic_logger=QuicLogger(), secrets_log_file=secrets_log_file, ) if test_name == "test_throughput": timeout = 60 else: timeout = 5 try: await asyncio.wait_for( test_func(server, configuration), timeout=timeout ) except Exception as exc: print(exc) if quic_log: with open("%s-%s.qlog" % (server.name, test_name), "w") as logger_fp: json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4) print("") print_result(server) # print summary if len(servers) > 1: print("SUMMARY") for server in servers: print_result(server)
tests.test_h3/H3ConnectionTest.test_request_with_server_push_max_push_id
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["h3-23"]}, <del> client_options={"alpn_protocols": ["h3-22"]}, <2>:<add> server_options={"alpn_protocols": ["h3-23"]}, <del> server_options={"alpn_protocols": ["h3-22"]},
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_server_push_max_push_id(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["h3-22"]}, <2> server_options={"alpn_protocols": ["h3-22"]}, <3> ) as (quic_client, quic_server): <4> h3_client = H3Connection(quic_client) <5> h3_server = H3Connection(quic_server) <6> <7> # send request <8> stream_id = quic_client.get_next_available_stream_id() <9> h3_client.send_headers( <10> stream_id=stream_id, <11> headers=[ <12> (b":method", b"GET"), <13> (b":scheme", b"https"), <14> (b":authority", b"localhost"), <15> (b":path", b"/"), <16> ], <17> end_stream=True, <18> ) <19> <20> # receive request <21> events = h3_transfer(quic_client, h3_server) <22> self.assertEqual( <23> events, <24> [ <25> HeadersReceived( <26> headers=[ <27> (b":method", b"GET"), <28> (b":scheme", b"https"), <29> (b":authority", b"localhost"), <30> (b":path", b"/"), <31> ], <32> stream_id=stream_id, <33> stream_ended=True, <34> ) <35> ], <36> ) <37> <38> # send push promises <39> for i in range(0, 8): <40> h3_server.send_push_promise( <41> stream_id=stream_id, <42> headers=[ <43> (b":method", b"GET"), <44> (b":scheme", b"https"), <45> (b":authority", b"localhost"), <46> (b":path", "/</s>
===========below chunk 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_server_push_max_push_id(self): # offset: 1 ], ) # send one too many with self.assertRaises(NoAvailablePushIDError): h3_server.send_push_promise( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/8.css"), ], ) ===========unchanged ref 0=========== at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection send_push_promise(stream_id: int, headers: Headers) -> int send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.h3.events HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.h3.exceptions NoAvailablePushIDError(*args: object) at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h3 h3_transfer(quic_sender, h3_receiver) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None assertRaises(expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any=...) -> _AssertRaisesContext[_E] assertRaises(expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]], callable: Callable[..., Any], *args: Any, **kwargs: Any) -> None ===========changed ref 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # make first request self._make_request(h3_client, h3_server) # make second request self._make_request(h3_client, h3_server) # make third request -> dynamic table self._make_request(h3_client, h3_server) ===========changed ref 1=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_headers_only(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # send request stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"HEAD"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), (b"x-foo", b"client"), ], end_stream=True, ) # receive request events = h3_transfer(quic_client, h3_server) self.assertEqual( events, [ HeadersReceived( headers=[ (b":method", b"HEAD"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), (b"x-foo", b"client"), ], stream_id=stream_id, stream_ended=True, ) ], ) # send response h3_server.send_headers( stream_id=stream_id, headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), (b"x-foo",</s> ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_headers_only(self): # offset: 1 <s> (b"content-type", b"text/html; charset=utf-8"), (b"x-foo", b"server"), ], end_stream=True, ) # receive response events = h3_transfer(quic_server, h3_client) self.assertEqual( events, [ HeadersReceived( headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), (b"x-foo", b"server"), ], stream_id=stream_id, stream_ended=True, ) ], ) ===========changed ref 3=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 4=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 5=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three
tests.test_h3/H3ConnectionTest.test_uni_stream_grease
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["h3-23"]}, <del> client_options={"alpn_protocols": ["h3-22"]}, <2>:<add> server_options={"alpn_protocols": ["h3-23"]}, <del> server_options={"alpn_protocols": ["h3-22"]},
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_uni_stream_grease(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["h3-22"]}, <2> server_options={"alpn_protocols": ["h3-22"]}, <3> ) as (quic_client, quic_server): <4> h3_server = H3Connection(quic_server) <5> <6> quic_client.send_stream_data( <7> 14, b"\xff\xff\xff\xff\xff\xff\xff\xfeGREASE is the word" <8> ) <9> self.assertEqual(h3_transfer(quic_client, h3_server), []) <10>
===========unchanged ref 0=========== at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h3 h3_transfer(quic_sender, h3_receiver) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_server_push_max_push_id(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # send request stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], end_stream=True, ) # receive request events = h3_transfer(quic_client, h3_server) self.assertEqual( events, [ HeadersReceived( headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], stream_id=stream_id, stream_ended=True, ) ], ) # send push promises for i in range(0, 8): h3_server.send_push_promise( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", "/{}.css".format(</s> ===========changed ref 1=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_server_push_max_push_id(self): # offset: 1 <s> b"https"), (b":authority", b"localhost"), (b":path", "/{}.css".format(i).encode("ascii")), ], ) # send one too many with self.assertRaises(NoAvailablePushIDError): h3_server.send_push_promise( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/8.css"), ], ) ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # make first request self._make_request(h3_client, h3_server) # make second request self._make_request(h3_client, h3_server) # make third request -> dynamic table self._make_request(h3_client, h3_server) ===========changed ref 3=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 4=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 5=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three
tests.test_h3/H3ConnectionTest.test_request_with_trailers
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["h3-23"]}, <del> client_options={"alpn_protocols": ["h3-22"]}, <2>:<add> server_options={"alpn_protocols": ["h3-23"]}, <del> server_options={"alpn_protocols": ["h3-22"]},
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_trailers(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["h3-22"]}, <2> server_options={"alpn_protocols": ["h3-22"]}, <3> ) as (quic_client, quic_server): <4> h3_client = H3Connection(quic_client) <5> h3_server = H3Connection(quic_server) <6> <7> # send request with trailers <8> stream_id = quic_client.get_next_available_stream_id() <9> h3_client.send_headers( <10> stream_id=stream_id, <11> headers=[ <12> (b":method", b"GET"), <13> (b":scheme", b"https"), <14> (b":authority", b"localhost"), <15> (b":path", b"/"), <16> ], <17> end_stream=False, <18> ) <19> h3_client.send_headers( <20> stream_id=stream_id, <21> headers=[(b"x-some-trailer", b"foo")], <22> end_stream=True, <23> ) <24> <25> # receive request <26> events = h3_transfer(quic_client, h3_server) <27> self.assertEqual( <28> events, <29> [ <30> HeadersReceived( <31> headers=[ <32> (b":method", b"GET"), <33> (b":scheme", b"https"), <34> (b":authority", b"localhost"), <35> (b":path", b"/"), <36> ], <37> stream_id=stream_id, <38> stream_ended=False, <39> ), <40> HeadersReceived( <41> headers=[(b"x-some-trailer", b"foo")], <42> stream_id=stream_id, <43> stream_ended=True, <44> ), <45> ]</s>
===========below chunk 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_trailers(self): # offset: 1 ) # send response h3_server.send_headers( stream_id=stream_id, headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), ], end_stream=False, ) h3_server.send_data( stream_id=stream_id, data=b"<html><body>hello</body></html>", end_stream=False, ) h3_server.send_headers( stream_id=stream_id, headers=[(b"x-some-trailer", b"bar")], end_stream=True, ) # receive response events = h3_transfer(quic_server, h3_client) self.assertEqual( events, [ HeadersReceived( headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), ], stream_id=stream_id, stream_ended=False, ), DataReceived( data=b"<html><body>hello</body></html>", stream_id=stream_id, stream_ended=False, ), HeadersReceived( headers=[(b"x-some-trailer", b"bar")], stream_id=stream_id, stream_ended=True, ), ], ) ===========unchanged ref 0=========== at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection send_data(stream_id: int, data: bytes, end_stream: bool) -> None send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.h3.events DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.h3.events.DataReceived data: bytes stream_id: int stream_ended: bool push_id: Optional[int] = None at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h3 h3_transfer(quic_sender, h3_receiver) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_uni_stream_grease(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_server = H3Connection(quic_server) quic_client.send_stream_data( 14, b"\xff\xff\xff\xff\xff\xff\xff\xfeGREASE is the word" ) self.assertEqual(h3_transfer(quic_client, h3_server), []) ===========changed ref 1=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_server_push_max_push_id(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # send request stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], end_stream=True, ) # receive request events = h3_transfer(quic_client, h3_server) self.assertEqual( events, [ HeadersReceived( headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], stream_id=stream_id, stream_ended=True, ) ], ) # send push promises for i in range(0, 8): h3_server.send_push_promise( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", "/{}.css".format(</s> ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_server_push_max_push_id(self): # offset: 1 <s> b"https"), (b":authority", b"localhost"), (b":path", "/{}.css".format(i).encode("ascii")), ], ) # send one too many with self.assertRaises(NoAvailablePushIDError): h3_server.send_push_promise( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/8.css"), ], ) ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # make first request self._make_request(h3_client, h3_server) # make second request self._make_request(h3_client, h3_server) # make third request -> dynamic table self._make_request(h3_client, h3_server)
tests.test_h3/H3ConnectionTest.test_uni_stream_type
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> client_options={"alpn_protocols": ["h3-23"]}, <del> client_options={"alpn_protocols": ["h3-22"]}, <2>:<add> server_options={"alpn_protocols": ["h3-23"]}, <del> server_options={"alpn_protocols": ["h3-22"]},
# module: tests.test_h3 class H3ConnectionTest(TestCase): def test_uni_stream_type(self): <0> with client_and_server( <1> client_options={"alpn_protocols": ["h3-22"]}, <2> server_options={"alpn_protocols": ["h3-22"]}, <3> ) as (quic_client, quic_server): <4> h3_server = H3Connection(quic_server) <5> <6> # unknown stream type 9 <7> stream_id = quic_client.get_next_available_stream_id(is_unidirectional=True) <8> self.assertEqual(stream_id, 2) <9> quic_client.send_stream_data(stream_id, b"\x09") <10> self.assertEqual(h3_transfer(quic_client, h3_server), []) <11> self.assertEqual(list(h3_server._stream.keys()), [2]) <12> self.assertEqual(h3_server._stream[2].buffer, b"") <13> self.assertEqual(h3_server._stream[2].stream_type, 9) <14> <15> # unknown stream type 64, one byte at a time <16> stream_id = quic_client.get_next_available_stream_id(is_unidirectional=True) <17> self.assertEqual(stream_id, 6) <18> <19> quic_client.send_stream_data(stream_id, b"\x40") <20> self.assertEqual(h3_transfer(quic_client, h3_server), []) <21> self.assertEqual(list(h3_server._stream.keys()), [2, 6]) <22> self.assertEqual(h3_server._stream[2].buffer, b"") <23> self.assertEqual(h3_server._stream[2].stream_type, 9) <24> self.assertEqual(h3_server._stream[6].buffer, b"\x40") <25> self.assertEqual(h3_server._stream[6].stream_type,</s>
===========below chunk 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_uni_stream_type(self): # offset: 1 quic_client.send_stream_data(stream_id, b"\x40") self.assertEqual(h3_transfer(quic_client, h3_server), []) self.assertEqual(list(h3_server._stream.keys()), [2, 6]) self.assertEqual(h3_server._stream[2].buffer, b"") self.assertEqual(h3_server._stream[2].stream_type, 9) self.assertEqual(h3_server._stream[6].buffer, b"") self.assertEqual(h3_server._stream[6].stream_type, 64) ===========unchanged ref 0=========== at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection.__init__ self._stream: Dict[int, H3Stream] = {} at: aioquic.h3.connection.H3Stream.__init__ self.buffer = b"" self.stream_type: Optional[int] = None at: tests.test_connection client_and_server(client_kwargs={}, client_options={}, client_patch=lambda x: None, handshake=True, server_kwargs={}, server_options={}, server_patch=lambda x: None, transport_options={}) at: tests.test_h3 h3_transfer(quic_sender, h3_receiver) at: unittest.case.TestCase assertEqual(first: Any, second: Any, msg: Any=...) -> None ===========changed ref 0=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_uni_stream_grease(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_server = H3Connection(quic_server) quic_client.send_stream_data( 14, b"\xff\xff\xff\xff\xff\xff\xff\xfeGREASE is the word" ) self.assertEqual(h3_transfer(quic_client, h3_server), []) ===========changed ref 1=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_trailers(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # send request with trailers stream_id = quic_client.get_next_available_stream_id() h3_client.send_headers( stream_id=stream_id, headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], end_stream=False, ) h3_client.send_headers( stream_id=stream_id, headers=[(b"x-some-trailer", b"foo")], end_stream=True, ) # receive request events = h3_transfer(quic_client, h3_server) self.assertEqual( events, [ HeadersReceived( headers=[ (b":method", b"GET"), (b":scheme", b"https"), (b":authority", b"localhost"), (b":path", b"/"), ], stream_id=stream_id, stream_ended=False, ), HeadersReceived( headers=[(b"x-some-trailer", b"foo")], stream_id=stream_id, stream_ended=True, ), ], )</s> ===========changed ref 2=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request_with_trailers(self): # offset: 1 <s>], stream_id=stream_id, stream_ended=True, ), ], ) # send response h3_server.send_headers( stream_id=stream_id, headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), ], end_stream=False, ) h3_server.send_data( stream_id=stream_id, data=b"<html><body>hello</body></html>", end_stream=False, ) h3_server.send_headers( stream_id=stream_id, headers=[(b"x-some-trailer", b"bar")], end_stream=True, ) # receive response events = h3_transfer(quic_server, h3_client) self.assertEqual( events, [ HeadersReceived( headers=[ (b":status", b"200"), (b"content-type", b"text/html; charset=utf-8"), ], stream_id=stream_id, stream_ended=False, ), DataReceived( data=b"<html><body>hello</body></html>", stream_id=stream_id, stream_ended=False, ), HeadersReceived( headers=[(b"x-some-trailer", b"bar")], stream_id=stream_id, stream_ended=True, ), ], )
examples.http3_server/HttpServerProtocol.quic_event_received
Modified
aiortc~aioquic
b8c652bb6051522bbf495ad9ea72e25a1cbd273d
[http] announce support for h3-23 and hq-23
<1>:<add> if event.alpn_protocol.startswith("h3-"): <del> if event.alpn_protocol == "h3-22": <3>:<add> elif event.alpn_protocol.startswith("hq-"): <del> elif event.alpn_protocol == "hq-22":
# module: examples.http3_server class HttpServerProtocol(QuicConnectionProtocol): def quic_event_received(self, event: QuicEvent): <0> if isinstance(event, ProtocolNegotiated): <1> if event.alpn_protocol == "h3-22": <2> self._http = H3Connection(self._quic) <3> elif event.alpn_protocol == "hq-22": <4> self._http = H0Connection(self._quic) <5> <6> #  pass event to the HTTP layer <7> if self._http is not None: <8> for http_event in self._http.handle_event(event): <9> self.http_event_received(http_event) <10>
===========unchanged ref 0=========== at: aioquic.asyncio.protocol.QuicConnectionProtocol quic_event_received(self, event: events.QuicEvent) -> None at: aioquic.asyncio.protocol.QuicConnectionProtocol.__init__ self._quic = quic at: aioquic.h0.connection H0Connection(quic: QuicConnection) at: aioquic.h0.connection.H0Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.quic.events QuicEvent() ProtocolNegotiated(alpn_protocol: Optional[str]) at: examples.http3_server.HttpServerProtocol http_event_received(event: H3Event) -> None at: examples.http3_server.HttpServerProtocol.__init__ self._http: Optional[HttpConnection] = None ===========changed ref 0=========== # module: docs.http_client def http_client(host, port): + configuration = QuicConfiguration(alpn_protocols=["hq-23"]) - configuration = QuicConfiguration(alpn_protocols=["hq-22"]) async with connect(host, port, configuration=configuration) as connection: reader, writer = await connection.create_stream() writer.write(b"GET /\r\n") writer.write_eof() response = await reader.read() sys.stdout.buffer.write(response) ===========changed ref 1=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["hq-23", "hq-22"] - configuration.alpn_protocols = ["hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 2=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return + configuration.alpn_protocols = ["h3-23", "h3-22"] - configuration.alpn_protocols = ["h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three ===========changed ref 3=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_uni_stream_grease(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_server = H3Connection(quic_server) quic_client.send_stream_data( 14, b"\xff\xff\xff\xff\xff\xff\xff\xfeGREASE is the word" ) self.assertEqual(h3_transfer(quic_client, h3_server), []) ===========changed ref 4=========== # module: tests.test_h3 class H3ConnectionTest(TestCase): def test_request(self): with client_and_server( + client_options={"alpn_protocols": ["h3-23"]}, - client_options={"alpn_protocols": ["h3-22"]}, + server_options={"alpn_protocols": ["h3-23"]}, - server_options={"alpn_protocols": ["h3-22"]}, ) as (quic_client, quic_server): h3_client = H3Connection(quic_client) h3_server = H3Connection(quic_server) # make first request self._make_request(h3_client, h3_server) # make second request self._make_request(h3_client, h3_server) # make third request -> dynamic table self._make_request(h3_client, h3_server) ===========changed ref 5=========== # module: examples.interop def run(servers, tests, quic_log=False, secrets_log_file=None) -> None: for server in servers: for test_name, test_func in tests: print("\n=== %s %s ===\n" % (server.name, test_name)) configuration = QuicConfiguration( + alpn_protocols=["h3-23", "h3-22", "hq-23", "hq-22"], - alpn_protocols=["hq-22", "h3-22"], is_client=True, quic_logger=QuicLogger(), secrets_log_file=secrets_log_file, ) if test_name == "test_throughput": timeout = 60 else: timeout = 5 try: await asyncio.wait_for( test_func(server, configuration), timeout=timeout ) except Exception as exc: print(exc) if quic_log: with open("%s-%s.qlog" % (server.name, test_name), "w") as logger_fp: json.dump(configuration.quic_logger.to_dict(), logger_fp, indent=4) print("") print_result(server) # print summary if len(servers) > 1: print("SUMMARY") for server in servers: print_result(server)
examples.http3_client/HttpClient.get
Modified
aiortc~aioquic
1fe0bc1229a3ea120ba1da369ae51690b59b71c1
[examples] make it possible to perform POST request
<3>:<del> stream_id = self._quic.get_next_available_stream_id() <4>:<del> self._http.send_headers( <5>:<del> stream_id=stream_id, <6>:<del> headers=[ <7>:<del> (b":method", b"GET"), <8>:<del> (b":scheme", b"https"), <9>:<del> (b":authority", authority.encode("utf8")), <10>:<del> (b":path", path.encode("utf8")), <11>:<del> (b"user-agent", b"aioquic"), <12>:<del> ], <13>:<add> return await self._request( <add> HttpRequest(method="GET", url=URL(url), headers=headers) <14>:<del> self._http.send_data(stream_id=stream_id, data=b"", end_stream=True) <16>:<del> waiter = self._loop.create_future() <17>:<del> self._request_events[stream_id] = deque() <18>:<del> self._request_waiter[stream_id] = waiter <19>:<del> self.transmit() <20>:<del> <21>:<del> return await asyncio.shield(waiter) <22>:<del>
# module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]: - def get(self, authority: str, path: str) -> Deque[H3Event]: <0> """ <1> Perform a GET request. <2> """ <3> stream_id = self._quic.get_next_available_stream_id() <4> self._http.send_headers( <5> stream_id=stream_id, <6> headers=[ <7> (b":method", b"GET"), <8> (b":scheme", b"https"), <9> (b":authority", authority.encode("utf8")), <10> (b":path", path.encode("utf8")), <11> (b"user-agent", b"aioquic"), <12> ], <13> ) <14> self._http.send_data(stream_id=stream_id, data=b"", end_stream=True) <15> <16> waiter = self._loop.create_future() <17> self._request_events[stream_id] = deque() <18> self._request_waiter[stream_id] = waiter <19> self.transmit() <20> <21> return await asyncio.shield(waiter) <22>
===========unchanged ref 0=========== at: aioquic.asyncio.protocol QuicConnectionProtocol(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: aioquic.asyncio.protocol.QuicConnectionProtocol __init__(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) __init__(self, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: aioquic.asyncio.protocol.QuicConnectionProtocol.__init__ self._quic = quic at: aioquic.h0.connection H0Connection(quic: QuicConnection) at: aioquic.h3.connection H3Connection(quic: QuicConnection) at: aioquic.h3.events H3Event() at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] ) at: asyncio.futures Future(*, loop: Optional[AbstractEventLoop]=...) Future = _CFuture = _asyncio.Future at: asyncio.queues.Queue __class_getitem__ = classmethod(GenericAlias) put_nowait(item: _T) -> None at: examples.http3_client HttpConnection = Union[H0Connection, H3Connection] ===========unchanged ref 1=========== WebSocket(http: HttpConnection, stream_id: int, transmit: Callable[[], None]) at: examples.http3_client.WebSocket.__init__ self.queue: asyncio.Queue[str] = asyncio.Queue() at: typing Deque = _alias(collections.deque, 1, name='Deque') Dict = _alias(dict, 2, inst=False, name='Dict') ===========changed ref 0=========== # module: examples.http3_client + class HttpRequest: + def __init__( + self, method: str, url: URL, content: bytes = b"", headers: Dict = {} + ) -> None: + self.content = content + self.headers = headers + self.method = method + self.url = url + ===========changed ref 1=========== # module: examples.http3_client + class URL: + def __init__(self, url: str): + parsed = urlparse(url) + + self.authority = parsed.netloc + self.full_path = parsed.path + if parsed.query: + self.full_path += "?" + parsed.query + self.scheme = parsed.scheme +
examples.http3_client/run
Modified
aiortc~aioquic
1fe0bc1229a3ea120ba1da369ae51690b59b71c1
[examples] make it possible to perform POST request
<44>:<add> if data is not None: <add> http_events = await client.post( <add> url, <add> data=data.encode("utf8"), <add> headers={"content-type": "application/x-www-form-urlencoded"}, <add> ) <add> else: <add> http_events = await client.get(url) <del> http_events = await client.get(parsed.netloc, path)
# module: examples.http3_client + def run(configuration: QuicConfiguration, url: str, data: str) -> None: - def run(configuration: QuicConfiguration, url: str) -> None: <0> # parse URL <1> parsed = urlparse(url) <2> assert parsed.scheme in ( <3> "https", <4> "wss", <5> ), "Only https:// or wss:// URLs are supported." <6> if ":" in parsed.netloc: <7> host, port_str = parsed.netloc.split(":") <8> port = int(port_str) <9> else: <10> host = parsed.netloc <11> port = 443 <12> <13> path = parsed.path <14> if parsed.query: <15> path += "?" + parsed.query <16> <17> async with connect( <18> host, <19> port, <20> configuration=configuration, <21> create_protocol=HttpClient, <22> session_ticket_handler=save_session_ticket, <23> ) as client: <24> client = cast(HttpClient, client) <25> <26> if parsed.scheme == "wss": <27> ws = await client.websocket( <28> parsed.netloc, path, subprotocols=["chat", "superchat"] <29> ) <30> <31> # send some messages and receive reply <32> for i in range(2): <33> message = "Hello {}, WebSocket!".format(i) <34> print("> " + message) <35> await ws.send(message) <36> <37> message = await ws.recv() <38> print("< " + message) <39> <40> await ws.close() <41> else: <42> # perform request <43> start = time.time() <44> http_events = await client.get(parsed.netloc, path) <45> elapsed = time.time() - start <46> <47> # print speed <48> octets = 0 <49> for http_event in http_events: <50> if isinstance(http_event, DataReceived): <51> octets += len(http_event.data) <52> logger.info( <53> "Received %</s>
===========below chunk 0=========== # module: examples.http3_client + def run(configuration: QuicConfiguration, url: str, data: str) -> None: - def run(configuration: QuicConfiguration, url: str) -> None: # offset: 1 % (octets, elapsed, octets * 8 / elapsed / 1000000) ) # print response for http_event in http_events: if isinstance(http_event, HeadersReceived): headers = b"" for k, v in http_event.headers: headers += k + b": " + v + b"\r\n" if headers: sys.stderr.buffer.write(headers + b"\r\n") sys.stderr.buffer.flush() elif isinstance(http_event, DataReceived): sys.stdout.buffer.write(http_event.data) sys.stdout.buffer.flush() ===========unchanged ref 0=========== at: _asyncio.Future set_result(result, /) at: _pickle dump(obj, file, protocol=None, *, fix_imports=True, buffer_callback=None) at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.asyncio.protocol.QuicConnectionProtocol quic_event_received(self, event: events.QuicEvent) -> None at: aioquic.h0.connection.H0Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.h3.connection.H3Connection handle_event(event: QuicEvent) -> List[H3Event] at: aioquic.h3.events H3Event() DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) ===========unchanged ref 1=========== at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.events QuicEvent() at: asyncio.futures.Future _state = _PENDING _result = None _exception = None _loop = None _source_traceback = None _cancel_message = None _cancelled_exc = None _asyncio_future_blocking = False __log_traceback = False __class_getitem__ = classmethod(GenericAlias) set_result(result: _T, /) -> None __iter__ = __await__ # make compatible with 'yield from'. at: collections.deque append(x: _T) -> None at: examples.http3_client logger = logging.getLogger("client") HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) args = parser.parse_args() at: examples.http3_client.HttpClient websocket(authority: str, path: str, subprotocols: List[str]=[]) -> WebSocket ===========unchanged ref 2=========== at: examples.http3_client.HttpClient.__init__ self._http = H3Connection(self._quic) self._http: Optional[HttpConnection] = None self._http = H0Connection(self._quic) self._request_events: Dict[int, Deque[H3Event]] = {} self._request_waiter: Dict[int, asyncio.Future[Deque[H3Event]]] = {} self._websockets: Dict[int, WebSocket] = {} at: examples.http3_client.WebSocket http_event_received(event: H3Event) at: logging.Logger info(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None at: pickle dump, dumps, load, loads = _dump, _dumps, _load, _loads at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any at: typing.MutableMapping pop(key: _KT) -> _VT pop(key: _KT, default: Union[_VT, _T]=...) -> Union[_VT, _T] at: urllib.parse urlparse(url: str, scheme: Optional[str]=..., allow_fragments: bool=...) -> ParseResult urlparse(url: Optional[bytes], scheme: Optional[bytes]=..., allow_fragments: bool=...) -> ParseResultBytes ===========changed ref 0=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]: + """ + Perform a POST request. + """ + return await self._request( + HttpRequest(method="POST", url=URL(url), content=data, headers=headers) + ) + ===========changed ref 1=========== # module: examples.http3_client + class HttpRequest: + def __init__( + self, method: str, url: URL, content: bytes = b"", headers: Dict = {} + ) -> None: + self.content = content + self.headers = headers + self.method = method + self.url = url + ===========changed ref 2=========== # module: examples.http3_client + class URL: + def __init__(self, url: str): + parsed = urlparse(url) + + self.authority = parsed.netloc + self.full_path = parsed.path + if parsed.query: + self.full_path += "?" + parsed.query + self.scheme = parsed.scheme +
examples.httpx_client/run
Modified
aiortc~aioquic
1fe0bc1229a3ea120ba1da369ae51690b59b71c1
[examples] make it possible to perform POST request
<17>:<add> client = AsyncClient(dispatch=cast(AsyncDispatcher, dispatch)) <del> client = AsyncClient(dispatch=dispatch) <21>:<add> if data is not None: <add> response = await client.post( <add> url, <add> data=data.encode("utf8"), <add> headers={"content-type": "application/x-www-form-urlencoded"}, <add> ) <add> else: <add> response = await client.get(url) <del> response = await client.get(url) <22>:<add>
# module: examples.httpx_client + def run(configuration: QuicConfiguration, url: str, data: str) -> None: - def run(configuration: QuicConfiguration, url: str) -> None: <0> # parse URL <1> parsed = urlparse(url) <2> assert parsed.scheme == "https", "Only https:// URLs are supported." <3> if ":" in parsed.netloc: <4> host, port_str = parsed.netloc.split(":") <5> port = int(port_str) <6> else: <7> host = parsed.netloc <8> port = 443 <9> <10> async with connect( <11> host, <12> port, <13> configuration=configuration, <14> create_protocol=H3Dispatcher, <15> session_ticket_handler=save_session_ticket, <16> ) as dispatch: <17> client = AsyncClient(dispatch=dispatch) <18> <19> # perform request <20> start = time.time() <21> response = await client.get(url) <22> elapsed = time.time() - start <23> <24> # print speed <25> octets = len(response.content) <26> logger.info( <27> "Received %d bytes in %.1f s (%.3f Mbps)" <28> % (octets, elapsed, octets * 8 / elapsed / 1000000) <29> ) <30> <31> # print response <32> for header, value in response.headers.items(): <33> sys.stderr.write(header + ": " + value + "\r\n") <34> sys.stdout.buffer.write(response.content) <35> sys.stdout.buffer.flush() <36>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: examples.httpx_client logger = logging.getLogger("client") H3Dispatcher(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) save_session_ticket(ticket) ===========unchanged ref 1=========== at: httpx._client AsyncClient(*, auth: AuthTypes | None=None, params: QueryParamTypes | None=None, headers: HeaderTypes | None=None, cookies: CookieTypes | None=None, verify: VerifyTypes=True, cert: CertTypes | None=None, http1: bool=True, http2: bool=False, proxy: ProxyTypes | None=None, proxies: ProxiesTypes | None=None, mounts: None | (typing.Mapping[str, AsyncBaseTransport | None])=None, timeout: TimeoutTypes=DEFAULT_TIMEOUT_CONFIG, follow_redirects: bool=False, limits: Limits=DEFAULT_LIMITS, max_redirects: int=DEFAULT_MAX_REDIRECTS, event_hooks: None | (typing.Mapping[str, list[EventHook]])=None, base_url: URL | str="", transport: AsyncBaseTransport | None=None, app: typing.Callable[..., typing.Any] | None=None, trust_env: bool=True, default_encoding: str | typing.Callable[[bytes], str]="utf-8") at: httpx._client.AsyncClient get(url: URL | str, *, params: QueryParamTypes | None=None, headers: HeaderTypes | None=None, cookies: CookieTypes | None=None, auth: AuthTypes | UseClientDefault | None=USE_CLIENT_DEFAULT, follow_redirects: bool | UseClientDefault=USE_CLIENT_DEFAULT, timeout: TimeoutTypes | UseClientDefault=USE_CLIENT_DEFAULT, extensions: RequestExtensions | None=None) -> Response post(url: URL | str, *, content: RequestContent | None=None, data: RequestData | None=None, files: RequestFiles | None=None, json: typing.Any | None=None, params: QueryParamTypes | None=None, headers: HeaderTypes | None=None, cookies: CookieTypes | None=None, auth: AuthTypes | UseClientDefault=USE_CLIENT_DEFAULT, follow_redirects: bool | UseClientDefault=USE_CLIENT_DEFAULT, timeout: TimeoutTypes | UseClientDefault=USE_CLIENT_DEFAULT, extensions: RequestExtensions | None=None) -> Response ===========unchanged ref 2=========== at: logging.Logger info(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None at: time time() -> float at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any at: urllib.parse urlparse(url: str, scheme: Optional[str]=..., allow_fragments: bool=...) -> ParseResult urlparse(url: Optional[bytes], scheme: Optional[bytes]=..., allow_fragments: bool=...) -> ParseResultBytes ===========changed ref 0=========== # module: examples.http3_client + class HttpRequest: + def __init__( + self, method: str, url: URL, content: bytes = b"", headers: Dict = {} + ) -> None: + self.content = content + self.headers = headers + self.method = method + self.url = url + ===========changed ref 1=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]: + """ + Perform a POST request. + """ + return await self._request( + HttpRequest(method="POST", url=URL(url), content=data, headers=headers) + ) + ===========changed ref 2=========== # module: examples.http3_client + class URL: + def __init__(self, url: str): + parsed = urlparse(url) + + self.authority = parsed.netloc + self.full_path = parsed.path + if parsed.query: + self.full_path += "?" + parsed.query + self.scheme = parsed.scheme + ===========changed ref 3=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]: - def get(self, authority: str, path: str) -> Deque[H3Event]: """ Perform a GET request. """ - stream_id = self._quic.get_next_available_stream_id() - self._http.send_headers( - stream_id=stream_id, - headers=[ - (b":method", b"GET"), - (b":scheme", b"https"), - (b":authority", authority.encode("utf8")), - (b":path", path.encode("utf8")), - (b"user-agent", b"aioquic"), - ], + return await self._request( + HttpRequest(method="GET", url=URL(url), headers=headers) ) - self._http.send_data(stream_id=stream_id, data=b"", end_stream=True) - waiter = self._loop.create_future() - self._request_events[stream_id] = deque() - self._request_waiter[stream_id] = waiter - self.transmit() - - return await asyncio.shield(waiter) - ===========changed ref 4=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def _request(self, request: HttpRequest): + stream_id = self._quic.get_next_available_stream_id() + self._http.send_headers( + stream_id=stream_id, + headers=[ + (b":method", request.method.encode("utf8")), + (b":scheme", request.url.scheme.encode("utf8")), + (b":authority", str(request.url.authority).encode("utf8")), + (b":path", request.url.full_path.encode("utf8")), + (b"user-agent", b"aioquic"), + ] + + [ + (k.encode("utf8"), v.encode("utf8")) + for (k, v) in request.headers.items() + ], + ) + self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True) + + waiter = self._loop.create_future() + self._request_events[stream_id] = deque() + self._request_waiter[stream_id] = waiter + self.transmit() + + return await asyncio.shield(waiter) +
examples.interop/test_http_0
Modified
aiortc~aioquic
1fe0bc1229a3ea120ba1da369ae51690b59b71c1
[examples] make it possible to perform POST request
<13>:<add> events = await protocol.get( <add> "https://{}:{}{}".format(server.host, server.port, server.path) <add> ) <del> events = await protocol.get(server.host, server.path)
# module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): <0> if server.path is None: <1> return <2> <3> configuration.alpn_protocols = ["hq-23", "hq-22"] <4> async with connect( <5> server.host, <6> server.port, <7> configuration=configuration, <8> create_protocol=HttpClient, <9> ) as protocol: <10> protocol = cast(HttpClient, protocol) <11> <12> # perform HTTP request <13> events = await protocol.get(server.host, server.path) <14> if events and isinstance(events[0], HeadersReceived): <15> server.result |= Result.D <16>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.h3.events HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None certificate: Any = None connection_id_length: int = 8 idle_timeout: float = 60.0 is_client: bool = True private_key: Any = None quic_logger: Optional[QuicLogger] = None secrets_log_file: TextIO = None server_name: Optional[str] = None session_ticket: Optional[SessionTicket] = None supported_versions: List[int] = field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] ) ===========unchanged ref 1=========== at: examples.interop Result() Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str="/", result: Result=field(default_factory=lambda: Result(0))) at: examples.interop.Server name: str host: str port: int = 4433 http3: bool = True retry_port: Optional[int] = 4434 path: str = "/" result: Result = field(default_factory=lambda: Result(0)) at: http3_client HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: http3_client.HttpClient get(url: str, headers: Dict={}) -> Deque[H3Event] at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any ===========changed ref 0=========== # module: examples.http3_client + class HttpRequest: + def __init__( + self, method: str, url: URL, content: bytes = b"", headers: Dict = {} + ) -> None: + self.content = content + self.headers = headers + self.method = method + self.url = url + ===========changed ref 1=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]: + """ + Perform a POST request. + """ + return await self._request( + HttpRequest(method="POST", url=URL(url), content=data, headers=headers) + ) + ===========changed ref 2=========== # module: examples.http3_client + class URL: + def __init__(self, url: str): + parsed = urlparse(url) + + self.authority = parsed.netloc + self.full_path = parsed.path + if parsed.query: + self.full_path += "?" + parsed.query + self.scheme = parsed.scheme + ===========changed ref 3=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]: - def get(self, authority: str, path: str) -> Deque[H3Event]: """ Perform a GET request. """ - stream_id = self._quic.get_next_available_stream_id() - self._http.send_headers( - stream_id=stream_id, - headers=[ - (b":method", b"GET"), - (b":scheme", b"https"), - (b":authority", authority.encode("utf8")), - (b":path", path.encode("utf8")), - (b"user-agent", b"aioquic"), - ], + return await self._request( + HttpRequest(method="GET", url=URL(url), headers=headers) ) - self._http.send_data(stream_id=stream_id, data=b"", end_stream=True) - waiter = self._loop.create_future() - self._request_events[stream_id] = deque() - self._request_waiter[stream_id] = waiter - self.transmit() - - return await asyncio.shield(waiter) - ===========changed ref 4=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def _request(self, request: HttpRequest): + stream_id = self._quic.get_next_available_stream_id() + self._http.send_headers( + stream_id=stream_id, + headers=[ + (b":method", request.method.encode("utf8")), + (b":scheme", request.url.scheme.encode("utf8")), + (b":authority", str(request.url.authority).encode("utf8")), + (b":path", request.url.full_path.encode("utf8")), + (b"user-agent", b"aioquic"), + ] + + [ + (k.encode("utf8"), v.encode("utf8")) + for (k, v) in request.headers.items() + ], + ) + self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True) + + waiter = self._loop.create_future() + self._request_events[stream_id] = deque() + self._request_waiter[stream_id] = waiter + self.transmit() + + return await asyncio.shield(waiter) +
examples.interop/test_http_3
Modified
aiortc~aioquic
1fe0bc1229a3ea120ba1da369ae51690b59b71c1
[examples] make it possible to perform POST request
<13>:<add> events = await protocol.get( <add> "https://{}:{}{}".format(server.host, server.port, server.path) <add> ) <del> events = await protocol.get(server.host, server.path)
# module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): <0> if server.path is None: <1> return <2> <3> configuration.alpn_protocols = ["h3-23", "h3-22"] <4> async with connect( <5> server.host, <6> server.port, <7> configuration=configuration, <8> create_protocol=HttpClient, <9> ) as protocol: <10> protocol = cast(HttpClient, protocol) <11> <12> # perform HTTP request <13> events = await protocol.get(server.host, server.path) <14> if events and isinstance(events[0], HeadersReceived): <15> server.result |= Result.D <16> server.result |= Result.three <17>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.h3.events HeadersReceived(headers: Headers, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None at: examples.interop Result() Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str="/", result: Result=field(default_factory=lambda: Result(0))) at: examples.interop.Server host: str port: int = 4433 path: str = "/" result: Result = field(default_factory=lambda: Result(0)) ===========unchanged ref 1=========== at: http3_client HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: http3_client.HttpClient get(url: str, headers: Dict={}) -> Deque[H3Event] at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any ===========changed ref 0=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return configuration.alpn_protocols = ["hq-23", "hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request + events = await protocol.get( + "https://{}:{}{}".format(server.host, server.port, server.path) + ) - events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 1=========== # module: examples.http3_client + class HttpRequest: + def __init__( + self, method: str, url: URL, content: bytes = b"", headers: Dict = {} + ) -> None: + self.content = content + self.headers = headers + self.method = method + self.url = url + ===========changed ref 2=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]: + """ + Perform a POST request. + """ + return await self._request( + HttpRequest(method="POST", url=URL(url), content=data, headers=headers) + ) + ===========changed ref 3=========== # module: examples.http3_client + class URL: + def __init__(self, url: str): + parsed = urlparse(url) + + self.authority = parsed.netloc + self.full_path = parsed.path + if parsed.query: + self.full_path += "?" + parsed.query + self.scheme = parsed.scheme + ===========changed ref 4=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]: - def get(self, authority: str, path: str) -> Deque[H3Event]: """ Perform a GET request. """ - stream_id = self._quic.get_next_available_stream_id() - self._http.send_headers( - stream_id=stream_id, - headers=[ - (b":method", b"GET"), - (b":scheme", b"https"), - (b":authority", authority.encode("utf8")), - (b":path", path.encode("utf8")), - (b"user-agent", b"aioquic"), - ], + return await self._request( + HttpRequest(method="GET", url=URL(url), headers=headers) ) - self._http.send_data(stream_id=stream_id, data=b"", end_stream=True) - waiter = self._loop.create_future() - self._request_events[stream_id] = deque() - self._request_waiter[stream_id] = waiter - self.transmit() - - return await asyncio.shield(waiter) - ===========changed ref 5=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def _request(self, request: HttpRequest): + stream_id = self._quic.get_next_available_stream_id() + self._http.send_headers( + stream_id=stream_id, + headers=[ + (b":method", request.method.encode("utf8")), + (b":scheme", request.url.scheme.encode("utf8")), + (b":authority", str(request.url.authority).encode("utf8")), + (b":path", request.url.full_path.encode("utf8")), + (b"user-agent", b"aioquic"), + ] + + [ + (k.encode("utf8"), v.encode("utf8")) + for (k, v) in request.headers.items() + ], + ) + self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True) + + waiter = self._loop.create_future() + self._request_events[stream_id] = deque() + self._request_waiter[stream_id] = waiter + self.transmit() + + return await asyncio.shield(waiter) +
examples.interop/test_throughput
Modified
aiortc~aioquic
1fe0bc1229a3ea120ba1da369ae51690b59b71c1
[examples] make it possible to perform POST request
<27>:<add> http_events = await protocol.get( <del> http_events = await protocol.get(server.host, path) <28>:<add> "https://{}:{}{}".format(server.host, server.port, path) <add> )
# module: examples.interop def test_throughput(server: Server, configuration: QuicConfiguration): <0> failures = 0 <1> <2> for size in [5000000, 10000000]: <3> print("Testing %d bytes download" % size) <4> path = "/%d" % size <5> <6> # perform HTTP request over TCP <7> start = time.time() <8> response = requests.get("https://" + server.host + path, verify=False) <9> tcp_octets = len(response.content) <10> tcp_elapsed = time.time() - start <11> assert tcp_octets == size, "HTTP/TCP response size mismatch" <12> <13> # perform HTTP request over QUIC <14> if server.http3: <15> configuration.alpn_protocols = ["h3-23", "h3-22"] <16> else: <17> configuration.alpn_protocols = ["hq-23", "hq-22"] <18> start = time.time() <19> async with connect( <20> server.host, <21> server.port, <22> configuration=configuration, <23> create_protocol=HttpClient, <24> ) as protocol: <25> protocol = cast(HttpClient, protocol) <26> <27> http_events = await protocol.get(server.host, path) <28> quic_elapsed = time.time() - start <29> quic_octets = 0 <30> for http_event in http_events: <31> if isinstance(http_event, DataReceived): <32> quic_octets += len(http_event.data) <33> assert quic_octets == size, "HTTP/QUIC response size mismatch" <34> <35> print(" - HTTP/TCP completed in %.3f s" % tcp_elapsed) <36> print(" - HTTP/QUIC completed in %.3f s" % quic_elapsed) <37> <38> if quic_elapsed > 1.1 * tcp_elapsed: <39> failures += 1 <40> print(" => FAIL") <41> else: <42> print(" => PASS") <43> <44> if failures == 0: <45> server.result |= Result.T</s>
===========unchanged ref 0=========== at: aioquic.asyncio.client connect(host: str, port: int, *, configuration: Optional[QuicConfiguration]=None, create_protocol: Optional[Callable]=QuicConnectionProtocol, session_ticket_handler: Optional[SessionTicketHandler]=None, stream_handler: Optional[QuicStreamHandler]=None) -> AsyncGenerator[QuicConnectionProtocol, None] connect(*args, **kwds) at: aioquic.h3.events DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: aioquic.quic.configuration QuicConfiguration(alpn_protocols: Optional[List[str]]=None, certificate: Any=None, connection_id_length: int=8, idle_timeout: float=60.0, is_client: bool=True, private_key: Any=None, quic_logger: Optional[QuicLogger]=None, secrets_log_file: TextIO=None, server_name: Optional[str]=None, session_ticket: Optional[SessionTicket]=None, supported_versions: List[int]=field( default_factory=lambda: [ QuicProtocolVersion.DRAFT_23, QuicProtocolVersion.DRAFT_22, ] )) at: aioquic.quic.configuration.QuicConfiguration alpn_protocols: Optional[List[str]] = None at: examples.interop Result() Server(name: str, host: str, port: int=4433, http3: bool=True, retry_port: Optional[int]=4434, path: str="/", result: Result=field(default_factory=lambda: Result(0))) at: examples.interop.Server host: str port: int = 4433 http3: bool = True result: Result = field(default_factory=lambda: Result(0)) ===========unchanged ref 1=========== at: http3_client HttpClient(quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None, /, *, quic: QuicConnection, stream_handler: Optional[QuicStreamHandler]=None) at: http3_client.HttpClient get(url: str, headers: Dict={}) -> Deque[H3Event] at: requests.api get(url: Union[Text, bytes], params: Optional[ Union[ SupportsItems[_ParamsMappingKeyType, _ParamsMappingValueType], Tuple[_ParamsMappingKeyType, _ParamsMappingValueType], Iterable[Tuple[_ParamsMappingKeyType, _ParamsMappingValueType]], Union[Text, bytes], ] ]=..., **kwargs) -> Response at: requests.models.Response __attrs__ = [ "_content", "status_code", "headers", "url", "history", "encoding", "reason", "cookies", "elapsed", "request", ] at: time time() -> float at: typing cast(typ: Type[_T], val: Any) -> _T cast(typ: str, val: Any) -> Any cast(typ: object, val: Any) -> Any ===========changed ref 0=========== # module: examples.interop def test_http_3(server: Server, configuration: QuicConfiguration): if server.path is None: return configuration.alpn_protocols = ["h3-23", "h3-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request + events = await protocol.get( + "https://{}:{}{}".format(server.host, server.port, server.path) + ) - events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D server.result |= Result.three ===========changed ref 1=========== # module: examples.interop def test_http_0(server: Server, configuration: QuicConfiguration): if server.path is None: return configuration.alpn_protocols = ["hq-23", "hq-22"] async with connect( server.host, server.port, configuration=configuration, create_protocol=HttpClient, ) as protocol: protocol = cast(HttpClient, protocol) # perform HTTP request + events = await protocol.get( + "https://{}:{}{}".format(server.host, server.port, server.path) + ) - events = await protocol.get(server.host, server.path) if events and isinstance(events[0], HeadersReceived): server.result |= Result.D ===========changed ref 2=========== # module: examples.http3_client + class HttpRequest: + def __init__( + self, method: str, url: URL, content: bytes = b"", headers: Dict = {} + ) -> None: + self.content = content + self.headers = headers + self.method = method + self.url = url + ===========changed ref 3=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def post(self, url: str, data: bytes, headers: Dict = {}) -> Deque[H3Event]: + """ + Perform a POST request. + """ + return await self._request( + HttpRequest(method="POST", url=URL(url), content=data, headers=headers) + ) + ===========changed ref 4=========== # module: examples.http3_client + class URL: + def __init__(self, url: str): + parsed = urlparse(url) + + self.authority = parsed.netloc + self.full_path = parsed.path + if parsed.query: + self.full_path += "?" + parsed.query + self.scheme = parsed.scheme + ===========changed ref 5=========== # module: examples.http3_client class HttpClient(QuicConnectionProtocol): + def get(self, url: str, headers: Dict = {}) -> Deque[H3Event]: - def get(self, authority: str, path: str) -> Deque[H3Event]: """ Perform a GET request. """ - stream_id = self._quic.get_next_available_stream_id() - self._http.send_headers( - stream_id=stream_id, - headers=[ - (b":method", b"GET"), - (b":scheme", b"https"), - (b":authority", authority.encode("utf8")), - (b":path", path.encode("utf8")), - (b"user-agent", b"aioquic"), - ], + return await self._request( + HttpRequest(method="GET", url=URL(url), headers=headers) ) - self._http.send_data(stream_id=stream_id, data=b"", end_stream=True) - waiter = self._loop.create_future() - self._request_events[stream_id] = deque() - self._request_waiter[stream_id] = waiter - self.transmit() - - return await asyncio.shield(waiter) -
aioquic.quic.connection/QuicConnection.change_connection_id
Modified
aiortc~aioquic
c6c677c662efbc68f02d89fc28e6030d58004ad1
[connection] clarify connection ID change log messages
<3>:<add> <add> After calling this method call :meth:`datagrams_to_send` to retrieve data <add> which needs to be sent. <7>:<add> "Retiring CID %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq <del> "Retiring %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq <16>:<add> "Switching to CID %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq <del> "Migrating to %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq
# module: aioquic.quic.connection class QuicConnection: def change_connection_id(self) -> None: <0> """ <1> Switch to the next available connection ID and retire <2> the previous one. <3> """ <4> if self._peer_cid_available: <5> # retire previous CID <6> self._logger.debug( <7> "Retiring %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq <8> ) <9> self._retire_connection_ids.append(self._peer_cid_seq) <10> <11> # assign new CID <12> connection_id = self._peer_cid_available.pop(0) <13> self._peer_cid_seq = connection_id.sequence_number <14> self._peer_cid = connection_id.cid <15> self._logger.debug( <16> "Migrating to %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq <17> ) <18>
===========unchanged ref 0=========== at: aioquic.quic.connection dump_cid(cid: bytes) -> str at: aioquic.quic.connection.QuicConnection.__init__ self._peer_cid = os.urandom(configuration.connection_id_length) self._peer_cid_seq: Optional[int] = None self._peer_cid_available: List[QuicConnectionId] = [] self._logger = QuicConnectionAdapter( logger, {"id": dump_cid(logger_connection_id)} ) self._retire_connection_ids: List[int] = [] at: aioquic.quic.connection.QuicConnection.receive_datagram self._peer_cid = header.source_cid self._peer_cid_seq = 0 at: aioquic.quic.connection.QuicConnectionId cid: bytes sequence_number: int stateless_reset_token: bytes = b"" was_sent: bool = False at: logging.LoggerAdapter logger: Logger extra: Mapping[str, Any] debug(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None
aioquic.quic.connection/QuicConnection._handle_retire_connection_id_frame
Modified
aiortc~aioquic
c6c677c662efbc68f02d89fc28e6030d58004ad1
[connection] clarify connection ID change log messages
<21>:<add> "Peer retiring CID %s (%d)", <del> "Peer retiring %s (%d)",
# module: aioquic.quic.connection class QuicConnection: def _handle_retire_connection_id_frame( self, context: QuicReceiveContext, frame_type: int, buf: Buffer ) -> None: <0> """ <1> Handle a RETIRE_CONNECTION_ID frame. <2> """ <3> sequence_number = buf.pull_uint_var() <4> <5> # log frame <6> if self._quic_logger is not None: <7> context.quic_logger_frames.append( <8> self._quic_logger.encode_retire_connection_id_frame(sequence_number) <9> ) <10> <11> # find the connection ID by sequence number <12> for index, connection_id in enumerate(self._host_cids): <13> if connection_id.sequence_number == sequence_number: <14> if connection_id.cid == context.host_cid: <15> raise QuicConnectionError( <16> error_code=QuicErrorCode.PROTOCOL_VIOLATION, <17> frame_type=frame_type, <18> reason_phrase="Cannot retire current connection ID", <19> ) <20> self._logger.debug( <21> "Peer retiring %s (%d)", <22> dump_cid(connection_id.cid), <23> connection_id.sequence_number, <24> ) <25> del self._host_cids[index] <26> self._events.append( <27> events.ConnectionIdRetired(connection_id=connection_id.cid) <28> ) <29> break <30> <31> # issue a new connection ID <32> self._replenish_connection_ids() <33>
===========unchanged ref 0=========== at: aioquic._buffer Buffer(capacity: Optional[int]=0, data: Optional[bytes]=None) at: aioquic._buffer.Buffer pull_uint_var() -> int at: aioquic.quic.connection dump_cid(cid: bytes) -> str QuicConnectionError(error_code: int, frame_type: int, reason_phrase: str) QuicReceiveContext(epoch: tls.Epoch, host_cid: bytes, network_path: QuicNetworkPath, quic_logger_frames: Optional[List[Any]], time: float) at: aioquic.quic.connection.QuicConnection.__init__ self._events: Deque[events.QuicEvent] = deque() self._host_cids = [ QuicConnectionId( cid=os.urandom(configuration.connection_id_length), sequence_number=0, stateless_reset_token=os.urandom(16), was_sent=True, ) ] self._quic_logger: Optional[QuicLoggerTrace] = None self._quic_logger = configuration.quic_logger.start_trace( is_client=configuration.is_client, odcid=logger_connection_id ) self._logger = QuicConnectionAdapter( logger, {"id": dump_cid(logger_connection_id)} ) at: aioquic.quic.connection.QuicConnection._close_end self._quic_logger = None at: aioquic.quic.connection.QuicConnection._handle_reset_stream_frame stream_id = buf.pull_uint_var() error_code = buf.pull_uint_var() at: aioquic.quic.connection.QuicConnectionId cid: bytes sequence_number: int at: aioquic.quic.connection.QuicReceiveContext epoch: tls.Epoch host_cid: bytes network_path: QuicNetworkPath ===========unchanged ref 1=========== quic_logger_frames: Optional[List[Any]] time: float at: aioquic.quic.events ConnectionIdRetired(connection_id: bytes) StreamReset(error_code: int, stream_id: int) at: aioquic.quic.events.ConnectionIdRetired connection_id: bytes at: aioquic.quic.events.StreamReset error_code: int stream_id: int at: aioquic.quic.logger.QuicLoggerTrace encode_retire_connection_id_frame(sequence_number: int) -> Dict at: aioquic.quic.packet QuicErrorCode(x: Union[str, bytes, bytearray], base: int) QuicErrorCode(x: Union[str, bytes, SupportsInt, _SupportsIndex, _SupportsTrunc]=...) at: collections.deque append(x: _T) -> None at: logging.LoggerAdapter debug(msg: Any, *args: Any, exc_info: _ExcInfoType=..., stack_info: bool=..., extra: Optional[Dict[str, Any]]=..., **kwargs: Any) -> None ===========changed ref 0=========== # module: aioquic.quic.connection class QuicConnection: def change_connection_id(self) -> None: """ Switch to the next available connection ID and retire the previous one. + + After calling this method call :meth:`datagrams_to_send` to retrieve data + which needs to be sent. """ if self._peer_cid_available: # retire previous CID self._logger.debug( + "Retiring CID %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq - "Retiring %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq ) self._retire_connection_ids.append(self._peer_cid_seq) # assign new CID connection_id = self._peer_cid_available.pop(0) self._peer_cid_seq = connection_id.sequence_number self._peer_cid = connection_id.cid self._logger.debug( + "Switching to CID %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq - "Migrating to %s (%d)", dump_cid(self._peer_cid), self._peer_cid_seq ) ===========changed ref 1=========== # module: aioquic.quic.connection class QuicConnection: def receive_datagram(self, data: bytes, addr: NetworkAddress, now: float) -> None: """ Handle an incoming datagram. :param data: The datagram which was received. :param addr: The network address from which the datagram was received. :param now: The current time. """ # stop handling packets when closing if self._state in END_STATES: return data = cast(bytes, data) if self._quic_logger is not None: self._quic_logger.log_event( category="transport", event="datagram_received", data={"byte_length": len(data), "count": 1}, ) buf = Buffer(data=data) while not buf.eof(): start_off = buf.tell() try: header = pull_quic_header( buf, host_cid_length=self._configuration.connection_id_length ) except ValueError: return # check destination CID matches destination_cid_seq: Optional[int] = None for connection_id in self._host_cids: if header.destination_cid == connection_id.cid: destination_cid_seq = connection_id.sequence_number break if self._is_client and destination_cid_seq is None: return # check protocol version if self._is_client and header.version == QuicProtocolVersion.NEGOTIATION: # version negotiation versions = [] while not buf.eof(): versions.append(buf.pull_uint32()) if self._quic_logger is not None: self._quic_logger.log_event( category="transport", event="packet_received", data={ "packet_type": "version_negotiation", "header": { "scid": dump_cid(header.source_cid), "dcid": dump_cid(</s>
examples.http3_server/WebSocketHandler.send
Modified
aiortc~aioquic
46675a17e147823012cd5618070013e4974bdeef
[http3 server] handle `websocket.close` used to reject websocket
<16>:<add> if self.websocket is not None: <add> data = self.websocket.send( <del> data = self.websocket.send( <17>:<add> wsproto.events.CloseConnection(code=message["code"]) <del> wsproto.events.CloseConnection(code=message["code"]) <18>:<add> ) <del> ) <19>:<add> else: <add> self.connection.send_headers( <add> stream_id=self.stream_id, headers=[(b":status", b"403")] <add> )
# module: examples.http3_server class WebSocketHandler: def send(self, message: Dict): <0> data = b"" <1> end_stream = False <2> if message["type"] == "websocket.accept": <3> subprotocol = message.get("subprotocol") <4> <5> self.websocket = wsproto.Connection(wsproto.ConnectionType.SERVER) <6> <7> headers = [ <8> (b":status", b"200"), <9> (b"server", b"aioquic"), <10> (b"date", formatdate(time.time(), usegmt=True).encode()), <11> ] <12> if subprotocol is not None: <13> headers.append((b"sec-websocket-protocol", subprotocol.encode("utf8"))) <14> self.connection.send_headers(stream_id=self.stream_id, headers=headers) <15> elif message["type"] == "websocket.close": <16> data = self.websocket.send( <17> wsproto.events.CloseConnection(code=message["code"]) <18> ) <19> end_stream = True <20> elif message["type"] == "websocket.send": <21> if message.get("text") is not None: <22> data = self.websocket.send( <23> wsproto.events.TextMessage(data=message["text"]) <24> ) <25> elif message.get("bytes") is not None: <26> data = self.websocket.send( <27> wsproto.events.Message(data=message["bytes"]) <28> ) <29> <30> if data: <31> self.connection.send_data( <32> stream_id=self.stream_id, data=data, end_stream=end_stream <33> ) <34> if end_stream: <35> self.closed = True <36> self.transmit() <37>
===========unchanged ref 0=========== at: aioquic.h0.connection.H0Connection send_data(stream_id: int, data: bytes, end_stream: bool) -> None send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.h3.connection.H3Connection send_data(stream_id: int, data: bytes, end_stream: bool) -> None send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: email.utils formatdate(timeval: Optional[float]=..., localtime: bool=..., usegmt: bool=...) -> str at: examples.http3_server.WebSocketHandler.__init__ self.connection = connection self.stream_id = stream_id self.websocket: Optional[wsproto.Connection] = None at: time time() -> float at: typing Dict = _alias(dict, 2, inst=False, name='Dict') at: typing.Mapping get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T] get(key: _KT) -> Optional[_VT_co]
examples.http3_server/WebSocketHandler.__init__
Modified
aiortc~aioquic
b9f4211643567cfb603d73483e11afd2b4f57239
[http3 server] delay websocket event handling until it is accepted
<2>:<add> self.http_event_queue: Deque[DataReceived] = deque()
# module: examples.http3_server class WebSocketHandler: def __init__( self, *, connection: HttpConnection, scope: Dict, stream_id: int, transmit: Callable[[], None], ): <0> self.closed = False <1> self.connection = connection <2> self.queue: asyncio.Queue[Dict] = asyncio.Queue() <3> self.scope = scope <4> self.stream_id = stream_id <5> self.transmit = transmit <6> self.websocket: Optional[wsproto.Connection] = None <7>
===========unchanged ref 0=========== at: aioquic.h3.events DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: asyncio.queues Queue(maxsize: int=..., *, loop: Optional[AbstractEventLoop]=...) at: collections deque(iterable: Iterable[_T]=..., maxlen: Optional[int]=...) at: examples.http3_server HttpConnection = Union[H0Connection, H3Connection] at: examples.http3_server.WebSocketHandler.send self.closed = True at: typing Callable = _CallableType(collections.abc.Callable, 2) Deque = _alias(collections.deque, 1, name='Deque') Dict = _alias(dict, 2, inst=False, name='Dict')
examples.http3_server/WebSocketHandler.http_event_received
Modified
aiortc~aioquic
b9f4211643567cfb603d73483e11afd2b4f57239
[http3 server] delay websocket event handling until it is accepted
<0>:<add> if isinstance(event, DataReceived) and not self.closed: <del> if isinstance(event, DataReceived): <1>:<add> if self.websocket is not None: <add> self.websocket.receive_data(event.data) <del> self.websocket.receive_data(event.data) <3>:<add> for ws_event in self.websocket.events(): <del> for ws_event in self.websocket.events(): <4>:<add> self.websocket_event_received(ws_event) <del> self.websocket_event_received(ws_event) <5>:<add> else: <add> # delay event processing until we get `websocket.accept` <add> # from the ASGI application <add> self.http_event_queue.append(event)
# module: examples.http3_server class WebSocketHandler: def http_event_received(self, event: H3Event) -> None: <0> if isinstance(event, DataReceived): <1> self.websocket.receive_data(event.data) <2> <3> for ws_event in self.websocket.events(): <4> self.websocket_event_received(ws_event) <5>
===========unchanged ref 0=========== at: aioquic.h3.events H3Event() DataReceived(data: bytes, stream_id: int, stream_ended: bool, push_id: Optional[int]=None) at: examples.http3_server.WebSocketHandler.__init__ self.closed = False at: examples.http3_server.WebSocketHandler.send self.websocket = wsproto.Connection(wsproto.ConnectionType.SERVER) self.closed = True ===========changed ref 0=========== # module: examples.http3_server class WebSocketHandler: def __init__( self, *, connection: HttpConnection, scope: Dict, stream_id: int, transmit: Callable[[], None], ): self.closed = False self.connection = connection + self.http_event_queue: Deque[DataReceived] = deque() self.queue: asyncio.Queue[Dict] = asyncio.Queue() self.scope = scope self.stream_id = stream_id self.transmit = transmit self.websocket: Optional[wsproto.Connection] = None
examples.http3_server/WebSocketHandler.send
Modified
aiortc~aioquic
b9f4211643567cfb603d73483e11afd2b4f57239
[http3 server] delay websocket event handling until it is accepted
<15>:<add> <add> # consume backlog <add> while self.http_event_queue: <add> self.http_event_received(self.http_event_queue.popleft()) <add>
# module: examples.http3_server class WebSocketHandler: def send(self, message: Dict): <0> data = b"" <1> end_stream = False <2> if message["type"] == "websocket.accept": <3> subprotocol = message.get("subprotocol") <4> <5> self.websocket = wsproto.Connection(wsproto.ConnectionType.SERVER) <6> <7> headers = [ <8> (b":status", b"200"), <9> (b"server", b"aioquic"), <10> (b"date", formatdate(time.time(), usegmt=True).encode()), <11> ] <12> if subprotocol is not None: <13> headers.append((b"sec-websocket-protocol", subprotocol.encode("utf8"))) <14> self.connection.send_headers(stream_id=self.stream_id, headers=headers) <15> elif message["type"] == "websocket.close": <16> if self.websocket is not None: <17> data = self.websocket.send( <18> wsproto.events.CloseConnection(code=message["code"]) <19> ) <20> else: <21> self.connection.send_headers( <22> stream_id=self.stream_id, headers=[(b":status", b"403")] <23> ) <24> end_stream = True <25> elif message["type"] == "websocket.send": <26> if message.get("text") is not None: <27> data = self.websocket.send( <28> wsproto.events.TextMessage(data=message["text"]) <29> ) <30> elif message.get("bytes") is not None: <31> data = self.websocket.send( <32> wsproto.events.Message(data=message["bytes"]) <33> ) <34> <35> if data: <36> self.connection.send_data( <37> stream_id=self.stream_id, data=data, end_stream=end_stream <38> ) <39> if end_stream: <40> self.closed = True <41> self.transmit() <42>
===========unchanged ref 0=========== at: aioquic.h0.connection.H0Connection send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: aioquic.h3.connection.H3Connection send_headers(stream_id: int, headers: Headers, end_stream: bool=False) -> None at: asyncio.queues.Queue __class_getitem__ = classmethod(GenericAlias) get() -> _T at: collections.deque popleft() -> _T at: email.utils formatdate(timeval: Optional[float]=..., localtime: bool=..., usegmt: bool=...) -> str at: examples.http3_server.WebSocketHandler http_event_received(event: H3Event) -> None http_event_received(self, event: H3Event) -> None at: examples.http3_server.WebSocketHandler.__init__ self.closed = False self.connection = connection self.http_event_queue: Deque[DataReceived] = deque() self.queue: asyncio.Queue[Dict] = asyncio.Queue() self.stream_id = stream_id self.websocket: Optional[wsproto.Connection] = None at: examples.http3_server.WebSocketHandler.send self.closed = True at: time time() -> float at: typing Dict = _alias(dict, 2, inst=False, name='Dict') at: typing.Mapping get(key: _KT, default: Union[_VT_co, _T]) -> Union[_VT_co, _T] get(key: _KT) -> Optional[_VT_co] ===========changed ref 0=========== # module: examples.http3_server class WebSocketHandler: def http_event_received(self, event: H3Event) -> None: + if isinstance(event, DataReceived) and not self.closed: - if isinstance(event, DataReceived): + if self.websocket is not None: + self.websocket.receive_data(event.data) - self.websocket.receive_data(event.data) + for ws_event in self.websocket.events(): - for ws_event in self.websocket.events(): + self.websocket_event_received(ws_event) - self.websocket_event_received(ws_event) + else: + # delay event processing until we get `websocket.accept` + # from the ASGI application + self.http_event_queue.append(event) ===========changed ref 1=========== # module: examples.http3_server class WebSocketHandler: def __init__( self, *, connection: HttpConnection, scope: Dict, stream_id: int, transmit: Callable[[], None], ): self.closed = False self.connection = connection + self.http_event_queue: Deque[DataReceived] = deque() self.queue: asyncio.Queue[Dict] = asyncio.Queue() self.scope = scope self.stream_id = stream_id self.transmit = transmit self.websocket: Optional[wsproto.Connection] = None
examples.http3_client/HttpClient._request
Modified
aiortc~aioquic
4a86e356f9392ad0eee7b798aac40556d7b61390
[http3 client] pass URL to websocket() method
<6>:<add> (b":authority", request.url.authority.encode("utf8")), <del> (b":authority", str(request.url.authority).encode("utf8")),
# module: examples.http3_client class HttpClient(QuicConnectionProtocol): def _request(self, request: HttpRequest): <0> stream_id = self._quic.get_next_available_stream_id() <1> self._http.send_headers( <2> stream_id=stream_id, <3> headers=[ <4> (b":method", request.method.encode("utf8")), <5> (b":scheme", request.url.scheme.encode("utf8")), <6> (b":authority", str(request.url.authority).encode("utf8")), <7> (b":path", request.url.full_path.encode("utf8")), <8> (b"user-agent", b"aioquic"), <9> ] <10> + [ <11> (k.encode("utf8"), v.encode("utf8")) <12> for (k, v) in request.headers.items() <13> ], <14> ) <15> self._http.send_data(stream_id=stream_id, data=request.content, end_stream=True) <16> <17> waiter = self._loop.create_future() <18> self._request_events[stream_id] = deque() <19> self._request_waiter[stream_id] = waiter <20> self.transmit() <21> <22> return await asyncio.shield(waiter) <23>
===========unchanged ref 0=========== at: aioquic.asyncio.protocol.QuicConnectionProtocol transmit() -> None at: aioquic.asyncio.protocol.QuicConnectionProtocol.__init__ self._quic = quic at: aioquic.quic.connection.QuicConnection get_next_available_stream_id(is_unidirectional=False) -> int at: examples.http3_client URL(url: str) HttpRequest(method: str, url: URL, content: bytes=b"", headers: Dict={}) WebSocket(http: HttpConnection, stream_id: int, transmit: Callable[[], None]) at: examples.http3_client.HttpClient.__init__ self._http = H3Connection(self._quic) self._http: Optional[HttpConnection] = None self._http = H0Connection(self._quic) self._websockets: Dict[int, WebSocket] = {} at: examples.http3_client.HttpRequest.__init__ self.url = url at: examples.http3_client.URL.__init__ self.authority = parsed.netloc self.full_path += "?" + parsed.query self.full_path = parsed.path at: typing List = _alias(list, 1, inst=False, name='List')