diff --git a/NOTICE b/NOTICE index 89adff72..cd7391da 100644 --- a/NOTICE +++ b/NOTICE @@ -9,6 +9,12 @@ AI2Apps is an independent derivative project built on the open-source oMLX runtime. It is not affiliated with, sponsored by, or endorsed by the oMLX project or its maintainers. +This product includes the FRP client from the fatedier/frp project: +https://github.com/fatedier/frp +Copyright 2015 fatedier +FRP is distributed under the Apache License, Version 2.0. Its license and +pinned binary provenance are included under ai2apps/remote/third_party/. + Major AI2Apps modifications include scope-aware DeepSeek V4 expert banks, dynamic MoE cache policies, lossy expert replacement experiments, expert-store I/O, session-aware scope selection, observability, and product/API surfaces. diff --git a/ai2apps/_version.py b/ai2apps/_version.py index 2e379484..939e7737 100644 --- a/ai2apps/_version.py +++ b/ai2apps/_version.py @@ -1,3 +1,3 @@ """AI2Apps product version, independent from the embedded oMLX runtime.""" -__version__ = "0.1.0.dev2" +__version__ = "0.1.0.dev3" diff --git a/ai2apps/release_gate.py b/ai2apps/release_gate.py index 2d86ff98..d8448267 100644 --- a/ai2apps/release_gate.py +++ b/ai2apps/release_gate.py @@ -12,9 +12,10 @@ import tarfile import time import zipfile +from collections.abc import Iterable from dataclasses import asdict, dataclass from pathlib import Path, PurePosixPath -from typing import Any, Iterable +from typing import Any from ai2apps._version import __version__ from ai2apps.model_installer import CATALOG, AI2AppsInstaller @@ -260,6 +261,10 @@ def check_archives(checks: list[GateCheck], archives: Iterable[Path]) -> None: "ai2apps/model_installer.py", "ai2apps/engines/deepseek_v4_flash/scope-pack.json", "ai2apps/engines/qwen3_6_35b_a3b/scope-pack.json", + "ai2apps/remote/bin/darwin-arm64/frpc", + "ai2apps/remote/bin/darwin-x86_64/frpc", + "ai2apps/remote/third_party/frp-LICENSE", + "ai2apps/remote/third_party/frp-0.62.1-source.json", ) missing = [ suffix diff --git a/ai2apps/remote/bin/darwin-arm64/frpc b/ai2apps/remote/bin/darwin-arm64/frpc new file mode 100755 index 00000000..001a138f Binary files /dev/null and b/ai2apps/remote/bin/darwin-arm64/frpc differ diff --git a/ai2apps/remote/bin/darwin-x86_64/frpc b/ai2apps/remote/bin/darwin-x86_64/frpc new file mode 100755 index 00000000..20e614c3 Binary files /dev/null and b/ai2apps/remote/bin/darwin-x86_64/frpc differ diff --git a/ai2apps/remote/frpc.py b/ai2apps/remote/frpc.py index 6910fcd3..4168ca1d 100644 --- a/ai2apps/remote/frpc.py +++ b/ai2apps/remote/frpc.py @@ -17,13 +17,24 @@ PINNED_FRP_VERSION = "0.62.1" PINNED_FRP_CA_SHA256 = "2c460459daae289916e999a03baa3b4658fdfc0fb6a92243a002a601ad5017c0" +PINNED_FRP_BINARY_SHA256 = { + "darwin-arm64": "49afde483f55927c3eeac9141cae82857cb2f15b9e9d55f4ac45378e761eabcc", + "darwin-x86_64": "5ce5258b6ff1a232e9eb8e29247a55badb127e7fc66b5a58c299b442aba2bcb2", +} def _bundled_binary() -> Path | None: system = platform.system().lower() machine = platform.machine().lower() - candidate = Path(__file__).with_name("bin") / f"{system}-{machine}" / "frpc" - return candidate if candidate.is_file() else None + platform_key = f"{system}-{machine}" + expected_digest = PINNED_FRP_BINARY_SHA256.get(platform_key) + if expected_digest is None: + return None + candidate = Path(__file__).with_name("bin") / platform_key / "frpc" + if not candidate.is_file(): + return None + actual_digest = hashlib.sha256(candidate.read_bytes()).hexdigest() + return candidate if actual_digest == expected_digest else None def _read_bootstrap_token(runtime_directory: Path) -> str: @@ -73,7 +84,7 @@ def unavailable_reason(cls, runtime_directory: Path) -> str: return "FRP runtime configuration is not installed" @classmethod - def from_environment(cls, runtime_directory: Path) -> "RemoteFrpcConfig | None": + def from_environment(cls, runtime_directory: Path) -> RemoteFrpcConfig | None: runtime_directory = runtime_directory.resolve() configured_binary = os.environ.get("AI2APPS_FRP_BINARY", "").strip() runtime_binary = runtime_directory / "bin" / "frpc" diff --git a/ai2apps/remote/third_party/frp-0.62.1-source.json b/ai2apps/remote/third_party/frp-0.62.1-source.json new file mode 100644 index 00000000..ae7ada60 --- /dev/null +++ b/ai2apps/remote/third_party/frp-0.62.1-source.json @@ -0,0 +1,27 @@ +{ + "name": "frp", + "version": "0.62.1", + "license": "Apache-2.0", + "source": "https://github.com/fatedier/frp/releases/tag/v0.62.1", + "checksum_source": "https://github.com/fatedier/frp/releases/download/v0.62.1/frp_sha256_checksums.txt", + "archives": { + "darwin-arm64": { + "name": "frp_0.62.1_darwin_arm64.tar.gz", + "sha256": "f9fc616d994a87d790504da21c2f942cd4224637d9ade9a67482f3c23c7f2432" + }, + "darwin-x86_64": { + "name": "frp_0.62.1_darwin_amd64.tar.gz", + "sha256": "f951a5aa727a4880f32753ba3c41ecc9dee38a63658760354011e71ea83db995" + } + }, + "binaries": { + "darwin-arm64": { + "path": "bin/darwin-arm64/frpc", + "sha256": "49afde483f55927c3eeac9141cae82857cb2f15b9e9d55f4ac45378e761eabcc" + }, + "darwin-x86_64": { + "path": "bin/darwin-x86_64/frpc", + "sha256": "5ce5258b6ff1a232e9eb8e29247a55badb127e7fc66b5a58c299b442aba2bcb2" + } + } +} diff --git a/ai2apps/remote/third_party/frp-LICENSE b/ai2apps/remote/third_party/frp-LICENSE new file mode 100644 index 00000000..8f71f43f --- /dev/null +++ b/ai2apps/remote/third_party/frp-LICENSE @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/docs/ai2apps-mobile-entry.md b/docs/ai2apps-mobile-entry.md index 4f98e4a3..f86fc67c 100644 --- a/docs/ai2apps-mobile-entry.md +++ b/docs/ai2apps-mobile-entry.md @@ -416,7 +416,8 @@ Current implementation snapshot: - the authenticated desktop release packages the exact 2026 Remote Access CA (`SHA-256 2c460459daae289916e999a03baa3b4658fdfc0fb6a92243a002a601ad5017c0`) and rejects any replacement trust anchor; -- the runtime automatically discovers a packaged frpc or the private +- the macOS release packages pinned arm64 and x86_64 frpc binaries, verifies + their SHA-256 digests before use, and otherwise discovers the private `/platform/remote/bin/frpc` installation, while the FRP bootstrap credential is supplied out of band as an environment secret or a mode-0600 `/platform/remote/bootstrap-token` file; @@ -436,9 +437,9 @@ Formal integration smoke test — 2026-08-15: - production JWKS returned the expected Ed25519 `remote-mobile-v1` key; - the created public device origin reached the deployed edge and returned the expected offline response before frpc admission; -- official macOS arm64 frpc 0.62.1 was verified against archive SHA-256 - `f9fc616d994a87d790504da21c2f942cd4224637d9ade9a67482f3c23c7f2432` - and installed in the private runtime directory; +- official macOS arm64 and amd64 frpc 0.62.1 archives were verified against + SHA-256 `f9fc616d994a87d790504da21c2f942cd4224637d9ade9a67482f3c23c7f2432` + and `f951a5aa727a4880f32753ba3c41ecc9dee38a63658760354011e71ea83db995`; - public tunnel, handoff exchange and phone Chat acceptance remain gated only by provisioning the deployment-owned FRP bootstrap credential. This secret is deliberately not returned by the account API or committed to source. diff --git a/docs/release-gate.md b/docs/release-gate.md index 7b3d8d73..e8991767 100644 --- a/docs/release-gate.md +++ b/docs/release-gate.md @@ -14,8 +14,8 @@ Run the source/package checks before building a release: ai2apps-release-gate \ --mode preflight \ --run-tests \ - --archive dist/ai2apps-0.1.0.dev2-py3-none-any.whl \ - --archive dist/ai2apps-0.1.0.dev2.tar.gz \ + --archive dist/ai2apps-0.1.0.dev3-py3-none-any.whl \ + --archive dist/ai2apps-0.1.0.dev3.tar.gz \ --json artifacts/release-gate/preflight.json \ --markdown artifacts/release-gate/preflight.md ``` diff --git a/pyproject.toml b/pyproject.toml index 9a844b5f..dc5f5259 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -256,7 +256,12 @@ include = ["ai2apps*", "omlx*"] [tool.setuptools.package-data] "ai2apps" = ["engines/**/*.json"] -"ai2apps.remote" = ["frpc-device.toml", "frp-ca-2026.pem", "bin/**/*"] +"ai2apps.remote" = [ + "frpc-device.toml", + "frp-ca-2026.pem", + "bin/**/*", + "third_party/*", +] "ai2apps.browser" = ["readability.js"] "ai2apps.web" = [ "templates/**/*.html", diff --git a/tests/test_ai2apps_remote.py b/tests/test_ai2apps_remote.py index 7bc00bc2..a88e9a0a 100644 --- a/tests/test_ai2apps_remote.py +++ b/tests/test_ai2apps_remote.py @@ -17,7 +17,12 @@ RemoteTokenError, verify_remote_token, ) -from ai2apps.remote.frpc import PINNED_FRP_CA_SHA256, RemoteFrpcConfig +from ai2apps.remote import frpc as frpc_module +from ai2apps.remote.frpc import ( + PINNED_FRP_BINARY_SHA256, + PINNED_FRP_CA_SHA256, + RemoteFrpcConfig, +) from ai2apps.secrets import MemorySecretBackend from ai2apps.storage import PlatformDatabase @@ -164,6 +169,36 @@ def test_remote_frpc_config_uses_the_shipped_pinned_ca(tmp_path, monkeypatch): assert hashlib.sha256(config.ca_file.read_bytes()).hexdigest() == PINNED_FRP_CA_SHA256 +def test_bundled_frpc_binaries_match_pinned_digests_and_architectures(): + binary_root = frpc_module.Path(frpc_module.__file__).with_name("bin") + expected_cpu_types = { + "darwin-arm64": 0x0100000C, + "darwin-x86_64": 0x01000007, + } + + assert set(PINNED_FRP_BINARY_SHA256) == set(expected_cpu_types) + for platform_key, expected_digest in PINNED_FRP_BINARY_SHA256.items(): + binary = binary_root / platform_key / "frpc" + content = binary.read_bytes() + assert hashlib.sha256(content).hexdigest() == expected_digest + assert content[:4] == b"\xcf\xfa\xed\xfe" + assert int.from_bytes(content[4:8], "little") == expected_cpu_types[platform_key] + assert binary.stat().st_mode & 0o100 + + +def test_bundled_frpc_discovery_fails_closed_on_digest_mismatch(monkeypatch): + platform_key = f"{frpc_module.platform.system().lower()}-{frpc_module.platform.machine().lower()}" + expected_digest = PINNED_FRP_BINARY_SHA256.get(platform_key) + if expected_digest is None: + pytest.skip("current platform has no bundled frpc") + + monkeypatch.setitem(PINNED_FRP_BINARY_SHA256, platform_key, "0" * 64) + assert frpc_module._bundled_binary() is None + + monkeypatch.setitem(PINNED_FRP_BINARY_SHA256, platform_key, expected_digest) + assert frpc_module._bundled_binary() is not None + + def test_remote_frpc_config_rejects_an_unpinned_ca(tmp_path, monkeypatch): binary = tmp_path / "frpc" binary.write_text("#!/bin/sh\n", encoding="utf-8") diff --git a/tests/test_release_gate.py b/tests/test_release_gate.py index b6941e69..9d59e824 100644 --- a/tests/test_release_gate.py +++ b/tests/test_release_gate.py @@ -6,8 +6,8 @@ from ai2apps.model_installer import CATALOG from ai2apps.release_gate import ( - check_catalog, check_archives, + check_catalog, check_evidence, evidence_template, main, @@ -75,6 +75,12 @@ def _write_test_wheel(path: Path, requirement: str) -> None: archive.writestr( "ai2apps/engines/qwen3_6_35b_a3b/scope-pack.json", "{}" ) + archive.writestr("ai2apps/remote/bin/darwin-arm64/frpc", "arm64") + archive.writestr("ai2apps/remote/bin/darwin-x86_64/frpc", "x86_64") + archive.writestr("ai2apps/remote/third_party/frp-LICENSE", "license") + archive.writestr( + "ai2apps/remote/third_party/frp-0.62.1-source.json", "{}" + ) archive.writestr( "ai2apps-0.1.dist-info/METADATA", f"Metadata-Version: 2.4\nName: ai2apps\nVersion: 0.1\nRequires-Dist: {requirement}\n", @@ -125,6 +131,10 @@ def test_sdist_gate_reads_top_level_metadata_when_egg_info_is_present( "ai2apps-0.1/ai2apps/model_installer.py": b"", "ai2apps-0.1/ai2apps/engines/deepseek_v4_flash/scope-pack.json": b"{}", "ai2apps-0.1/ai2apps/engines/qwen3_6_35b_a3b/scope-pack.json": b"{}", + "ai2apps-0.1/ai2apps/remote/bin/darwin-arm64/frpc": b"arm64", + "ai2apps-0.1/ai2apps/remote/bin/darwin-x86_64/frpc": b"x86_64", + "ai2apps-0.1/ai2apps/remote/third_party/frp-LICENSE": b"license", + "ai2apps-0.1/ai2apps/remote/third_party/frp-0.62.1-source.json": b"{}", } with tarfile.open(sdist, "w:gz") as archive: for name, content in files.items():