diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-02 20:11:51 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-02 20:11:51 +0900 |
| commit | c2a2bd3a2573f585c902c39bd28b8c3cad10c317 (patch) | |
| tree | aa8138a0570966f26e3708b500041258074dcd24 /crates/shirabe/src/repository/composer_repository.rs | |
| parent | 7db937af313d857d0f66bebaf8ac72d518559bac (diff) | |
| download | php-shirabe-c2a2bd3a2573f585c902c39bd28b8c3cad10c317.tar.gz php-shirabe-c2a2bd3a2573f585c902c39bd28b8c3cad10c317.tar.zst php-shirabe-c2a2bd3a2573f585c902c39bd28b8c3cad10c317.zip | |
fix(repository): resolve remaining late-binding hazards from the audit
Three fixes for the ComposerRepository/FilesystemRepository/PlatformRepository
hazards where inner-composition delegation skipped PHP's late-bound virtual
dispatch:
- ComposerRepository::has_package now builds its packageMap through the
late-bound getPackages() equivalent, so lazy-providers repos surface the
LogicException and available-packages repos load their package list, as in
PHP, instead of silently answering false from the raw array.
- RepositoryInterface::get_repo_name returns anyhow::Result<String>: PHP's
getRepoName() counts through the late-bound initialize(), which is fallible
in file-reading subclasses. FilesystemRepository and PackageRepository now
run that initialization instead of freezing the inner array repository to an
empty state (which also made a later write() truncate installed.json).
Supporting changes keep the initialization chain callable from &self:
JsonFile::read takes &self (indent moved into a RefCell), FilesystemRepository
dev_mode became a Cell, and WritableArrayRepository dev_package_names a
RefCell.
- PlatformRepository::new routes constructor packages through its own
add_package so the override handling and full platform initialization run
as they do via PHP's parent constructor; the inner find_package/add_package
delegations inside add_package (and ComposerRepository::add_package) gained
the same is_initialized guard, since the constructor path would otherwise
freeze the repository.
Same defect class as 7db937af, 97b5211a and 3e367f78.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/repository/composer_repository.rs')
| -rw-r--r-- | crates/shirabe/src/repository/composer_repository.rs | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index 18de557b..c83ffcd9 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -1651,15 +1651,20 @@ impl ComposerRepository { Url::sanitize(self.get_packages_json_url()) ); for package in self.create_packages(repo_data, Some(source))? { - self.add_package(package); + self.add_package(package)?; } Ok(()) } /// Adds a new package to the repository - pub fn add_package(&mut self, package: BasePackageHandle) { + pub fn add_package(&mut self, package: BasePackageHandle) -> anyhow::Result<()> { self.configure_package_transport_options(package.clone()); - self.inner.add_package(package); + // PHP: ArrayRepository::addPackage() calls the late-bound $this->initialize(), which + // resolves to ComposerRepository::initialize (loading the root file). + if !self.inner.is_initialized() { + self.initialize()?; + } + self.inner.add_package(package) } /// Forwards the outermost handle's weak to the inner `ArrayRepository` so that packages added @@ -3425,11 +3430,25 @@ impl RepositoryInterface for ComposerRepository { self.inner.count() } + // PHP's ArrayRepository::hasPackage() builds its packageMap from the late-bound + // $this->getPackages(), which resolves to ComposerRepository::getPackages() — throwing a + // LogicException on lazy/provider repos and loading everything on available-packages repos. fn has_package(&mut self, package: PackageInterfaceHandle) -> anyhow::Result<bool> { - if !self.inner.is_initialized() { - self.initialize()?; + if self.inner.package_map.borrow().is_none() { + let mut map: IndexMap<String, BasePackageHandle> = IndexMap::new(); + for repo_package in ComposerRepository::get_packages(self)? { + map.insert(repo_package.get_unique_name(), repo_package); + } + *self.inner.package_map.borrow_mut() = Some(map); } - self.inner.has_package(package) + + Ok(self + .inner + .package_map + .borrow() + .as_ref() + .unwrap() + .contains_key(&package.get_unique_name())) } /// @inheritDoc @@ -3671,8 +3690,8 @@ impl RepositoryInterface for ComposerRepository { .collect()) } - fn get_repo_name(&self) -> String { - ComposerRepository::get_repo_name(self) + fn get_repo_name(&self) -> anyhow::Result<String> { + Ok(ComposerRepository::get_repo_name(self)) } fn as_advisory_provider(&self) -> Option<&dyn crate::repository::AdvisoryProviderInterface> { |
