react-native-audio-browser 0.2.0-next.10 → 0.2.0-next.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/android/build.gradle +6 -5
- package/android/gradle.properties +1 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +110 -25
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +254 -188
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +23 -3
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +77 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +68 -26
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +9 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +120 -67
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +21 -24
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +93 -73
- package/android/src/main/java/com/audiobrowser/player/Player.kt +48 -30
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +46 -5
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +86 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +20 -6
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +249 -86
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +44 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +35 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +45 -53
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +69 -30
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +6 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +345 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +91 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -53
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +87 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +152 -8
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +218 -10
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +41 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +161 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- package/ios/Browser/BrowserConfig.swift +102 -5
- package/ios/Browser/BrowserManager+URLResolution.swift +18 -14
- package/ios/Browser/BrowserManager.swift +131 -143
- package/ios/Browser/BrowserPathHelper.swift +44 -44
- package/ios/Browser/JsonModels.swift +187 -106
- package/ios/Browser/SearchDrillIn.swift +6 -6
- package/ios/Browser/SectionPresentation.swift +34 -0
- package/ios/Browser/SectionScope.swift +58 -24
- package/ios/Browser/StyleResolver.swift +47 -0
- package/ios/Browser/TabBarEntries.swift +2 -2
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CarPlayArtworkResolver.swift +8 -7
- package/ios/CarPlay/CarPlayController.swift +105 -67
- package/ios/CarPlay/CarPlayImageLoader.swift +38 -18
- package/ios/CarPlay/CarPlayListItemFactory.swift +217 -84
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +15 -12
- package/ios/Extension/Capability+RemoteCommand.swift +1 -1
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +11 -15
- package/ios/Extension/Section+Copying.swift +31 -0
- package/ios/Extension/Track+Copying.swift +6 -12
- package/ios/Extension/Track+Identity.swift +18 -0
- package/ios/HybridAudioBrowser.swift +113 -35
- package/ios/Model/NitroTypeStubs.swift +64 -23
- package/ios/Model/PlayerUpdateOptions.swift +7 -0
- package/ios/Player/NowPlayingUpdater.swift +1 -1
- package/ios/Player/PlaybackCoordinator.swift +2 -2
- package/ios/Player/RetryManager.swift +4 -3
- package/ios/Tests/BrowserPathHelperTests.swift +50 -20
- package/ios/Tests/CarPlayArtworkResolverTests.swift +24 -41
- package/ios/Tests/JsonModelsTests.swift +75 -1
- package/ios/Tests/PlaybackStateStoreTests.swift +4 -3
- package/ios/Tests/QueueManagerTests.swift +4 -4
- package/ios/Tests/ResolvedTrackCopyingTests.swift +37 -35
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SectionPresentationTests.swift +61 -0
- package/ios/Tests/SectionScopeTests.swift +87 -55
- package/ios/Tests/StyleResolverTests.swift +67 -0
- package/ios/Tests/TabBarEntriesTests.swift +18 -18
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/TrackSelector.swift +45 -30
- package/ios/Util/ArtworkImageFetcher.swift +16 -1
- package/lib/commonjs/AudioBrowser.js +11 -0
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +11 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +2 -2
- package/lib/commonjs/features/favorites.js +13 -10
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +2 -3
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +3 -1
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +2 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +14 -3
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +11 -4
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +21 -10
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +32 -24
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +144 -87
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +56 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +1 -0
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/features/browser-config.js +11 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +2 -2
- package/lib/module/features/favorites.js +13 -10
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/state.js +2 -3
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +3 -1
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +2 -0
- package/lib/module/features/player/validateOptions.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +14 -3
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +11 -4
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +21 -10
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +32 -24
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +144 -87
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/module/web/browser/sections.js +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +56 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/AudioBrowser.d.ts +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +2 -2
- package/lib/typescript/src/features/favorites.d.ts +13 -10
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +2 -3
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +21 -19
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +1 -8
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +5 -2
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +260 -127
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +33 -53
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +16 -17
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
- package/nitrogen/generated/android/c++/{JFavoritesMatchMode.hpp → JArtworkRendering.hpp} +15 -15
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +4 -3
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +10 -4
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +10 -4
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +2 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +9 -3
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +4 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +21 -14
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +9 -3
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +4 -3
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +16 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +8 -2
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +6 -7
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +2 -5
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +9 -3
- package/nitrogen/generated/android/c++/JOptions.hpp +2 -5
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -11
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +49 -51
- package/nitrogen/generated/android/c++/JSection.hpp +114 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +69 -0
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTrack.hpp +19 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +4 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +25 -18
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +10 -4
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +2 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +12 -18
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +50 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoriteConfig.kt → SectionStyle.kt} +12 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +6 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +23 -5
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +104 -82
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +16 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +16 -10
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +5 -5
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +54 -83
- package/nitrogen/generated/ios/swift/Section.swift +100 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +64 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +20 -73
- package/nitrogen/generated/ios/swift/TrackStyle.swift +28 -22
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +6 -6
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +30 -38
- package/nitrogen/generated/shared/c++/Section.hpp +106 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +96 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +15 -31
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +50 -34
- package/package.json +3 -2
- package/src/AudioBrowser.ts +1 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +11 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +2 -2
- package/src/features/favorites.ts +13 -10
- package/src/features/hook-wiring.test.ts +63 -15
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/state.ts +2 -3
- package/src/features/playback/trackPlaybackTime.ts +1 -1
- package/src/features/player/options.ts +27 -19
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +3 -1
- package/src/features/player/validateOptions.ts +2 -0
- package/src/features/queue/activeTrack.ts +14 -3
- package/src/features/queue/queue.ts +11 -4
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +40 -0
- package/src/specs/audio-browser.nitro.ts +4 -3
- package/src/style-resolution.test.ts +139 -0
- package/src/types/browser-native.ts +2 -2
- package/src/types/browser-nodes.ts +268 -136
- package/src/types/browser.ts +34 -55
- package/src/utils/LazyNativeEmitter.ts +20 -10
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.ts +37 -22
- package/src/web/browser/BrowserManager.ts +176 -95
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +52 -0
- package/src/web/util/BrowserPathHelper.ts +61 -13
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
|
@@ -7,6 +7,7 @@ import java.security.cert.PKIXParameters
|
|
|
7
7
|
import java.security.cert.TrustAnchor
|
|
8
8
|
import java.security.cert.X509Certificate
|
|
9
9
|
import java.util.Date
|
|
10
|
+
import javax.security.auth.x500.X500Principal
|
|
10
11
|
import org.junit.Assert.assertEquals
|
|
11
12
|
import org.junit.Assert.assertThrows
|
|
12
13
|
import org.junit.Test
|
|
@@ -15,12 +16,51 @@ import org.mockito.Mockito.`when`
|
|
|
15
16
|
|
|
16
17
|
class AiaCertChaserTest {
|
|
17
18
|
|
|
18
|
-
/**
|
|
19
|
+
/**
|
|
20
|
+
* A certificate whose AIA extension value is exactly [extensionValue].
|
|
21
|
+
*
|
|
22
|
+
* Subject and issuer are stubbed to distinct principals on purpose: an unstubbed mock answers
|
|
23
|
+
* null to both, which `completeChain` would read as a self-signed root and stop on before
|
|
24
|
+
* fetching anything.
|
|
25
|
+
*/
|
|
19
26
|
private fun certWithAia(extensionValue: ByteArray): X509Certificate =
|
|
20
27
|
mock(X509Certificate::class.java).also {
|
|
21
28
|
`when`(it.getExtensionValue("1.3.6.1.5.5.7.1.1")).thenReturn(extensionValue)
|
|
29
|
+
`when`(it.subjectX500Principal).thenReturn(X500Principal("CN=leaf"))
|
|
30
|
+
`when`(it.issuerX500Principal).thenReturn(X500Principal("CN=issuer"))
|
|
22
31
|
}
|
|
23
32
|
|
|
33
|
+
/** A DER tag-length-value, with the length in whichever form fits. */
|
|
34
|
+
private fun der(tag: Int, content: ByteArray): ByteArray {
|
|
35
|
+
val length =
|
|
36
|
+
when (val n = content.size) {
|
|
37
|
+
in 0..0x7F -> byteArrayOf(n.toByte())
|
|
38
|
+
in 0x80..0xFF -> byteArrayOf(0x81.toByte(), n.toByte())
|
|
39
|
+
in 0x100..0xFFFF -> byteArrayOf(0x82.toByte(), (n shr 8).toByte(), n.toByte())
|
|
40
|
+
else -> byteArrayOf(0x83.toByte(), (n shr 16).toByte(), (n shr 8).toByte(), n.toByte())
|
|
41
|
+
}
|
|
42
|
+
return byteArrayOf(tag.toByte()) + length + content
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** A well-formed AIA extension value listing [urls] as caIssuers locations. */
|
|
46
|
+
private fun aiaExtension(urls: List<String>): ByteArray {
|
|
47
|
+
val caIssuersOid = byteArrayOf(0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02)
|
|
48
|
+
val descriptions =
|
|
49
|
+
urls.fold(ByteArray(0)) { acc, url ->
|
|
50
|
+
acc + der(0x30, der(0x06, caIssuersOid) + der(0x86, url.toByteArray(Charsets.US_ASCII)))
|
|
51
|
+
}
|
|
52
|
+
return der(0x04, der(0x30, descriptions))
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
@Test
|
|
56
|
+
fun `the AIA fixture builder round-trips through the parser`() {
|
|
57
|
+
// Guards the two tests below: if this builder were malformed they would pass by parsing
|
|
58
|
+
// nothing at all, rather than by the cap doing its job.
|
|
59
|
+
val urls = listOf("http://ca1.example/i.crt", "http://ca2.example/i.crt")
|
|
60
|
+
|
|
61
|
+
assertEquals(urls, AiaCertChaser.extractCaIssuerUrls(certWithAia(aiaExtension(urls))))
|
|
62
|
+
}
|
|
63
|
+
|
|
24
64
|
@Test(timeout = 5_000)
|
|
25
65
|
fun `a negative long-form length does not hang the parser`() {
|
|
26
66
|
// OCTET STRING { SEQUENCE { tag 0x00, long-form length 0xFFFFFFFA = -6 } }.
|
|
@@ -73,7 +113,7 @@ class AiaCertChaserTest {
|
|
|
73
113
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
74
114
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
75
115
|
// Fetcher knows only the R13 URL (the leaf's AIA pointer); empty for the root URL.
|
|
76
|
-
val fetch = { url: String ->
|
|
116
|
+
val fetch = { url: String, _: Long ->
|
|
77
117
|
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
78
118
|
}
|
|
79
119
|
|
|
@@ -90,8 +130,8 @@ class AiaCertChaserTest {
|
|
|
90
130
|
|
|
91
131
|
// A PKCS#7-style bundle where the genuine issuer is not first must still be selected.
|
|
92
132
|
val completed =
|
|
93
|
-
AiaCertChaser.completeChain(listOf(leaf)) {
|
|
94
|
-
if (
|
|
133
|
+
AiaCertChaser.completeChain(listOf(leaf)) { url, _ ->
|
|
134
|
+
if (url == "http://r13.i.lencr.org/") listOf(unrelated, r13) else emptyList()
|
|
95
135
|
}
|
|
96
136
|
|
|
97
137
|
assertEquals(listOf(leaf, r13), completed)
|
|
@@ -103,7 +143,7 @@ class AiaCertChaserTest {
|
|
|
103
143
|
var fetches = 0
|
|
104
144
|
|
|
105
145
|
val completed =
|
|
106
|
-
AiaCertChaser.completeChain(listOf(root)) {
|
|
146
|
+
AiaCertChaser.completeChain(listOf(root)) { _, _ ->
|
|
107
147
|
fetches++
|
|
108
148
|
emptyList()
|
|
109
149
|
}
|
|
@@ -112,11 +152,115 @@ class AiaCertChaserTest {
|
|
|
112
152
|
assertEquals(0, fetches)
|
|
113
153
|
}
|
|
114
154
|
|
|
155
|
+
@Test
|
|
156
|
+
fun `completeChain stops at a chain that already reaches a trust anchor`() {
|
|
157
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
158
|
+
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
159
|
+
val root = CertFixtures.cert("isrg-root-x1.pem")
|
|
160
|
+
val fetched = mutableListOf<String>()
|
|
161
|
+
|
|
162
|
+
// R13's own AIA points at the ISRG root, so without knowing the anchors this walks one hop
|
|
163
|
+
// too far and pays for a second blocking fetch on the ordinary rescue path.
|
|
164
|
+
val completed =
|
|
165
|
+
AiaCertChaser.completeChain(
|
|
166
|
+
listOf(leaf),
|
|
167
|
+
anchorSubjects = setOf(root.subjectX500Principal),
|
|
168
|
+
) { url, _ ->
|
|
169
|
+
fetched.add(url)
|
|
170
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else listOf(root)
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
assertEquals(listOf(leaf, r13), completed)
|
|
174
|
+
assertEquals(listOf("http://r13.i.lencr.org/"), fetched)
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
@Test
|
|
178
|
+
fun `completeChain fetches nothing when the presented chain is already anchored`() {
|
|
179
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
180
|
+
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
181
|
+
val root = CertFixtures.cert("isrg-root-x1.pem")
|
|
182
|
+
var fetches = 0
|
|
183
|
+
|
|
184
|
+
// The shape of every non-path failure — expiry, hostname mismatch, CT — where the server
|
|
185
|
+
// sent a complete chain and validation failed for some other reason.
|
|
186
|
+
val completed =
|
|
187
|
+
AiaCertChaser.completeChain(
|
|
188
|
+
listOf(leaf, r13),
|
|
189
|
+
anchorSubjects = setOf(root.subjectX500Principal),
|
|
190
|
+
) { _, _ ->
|
|
191
|
+
fetches++
|
|
192
|
+
emptyList()
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
assertEquals(listOf(leaf, r13), completed)
|
|
196
|
+
assertEquals(0, fetches)
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
@Test
|
|
200
|
+
fun `completeChain tries only a few of a certificate's CA-Issuers URLs`() {
|
|
201
|
+
// The extension is authored by the server that just failed validation, and nothing limits
|
|
202
|
+
// how many URLs it lists. Each one costs a blocking connect on the handshake thread, so
|
|
203
|
+
// hundreds of them are a denial of service whatever each individual fetch costs.
|
|
204
|
+
val manyUrls = (1..500).map { "http://ca$it.example/issuer.crt" }
|
|
205
|
+
val cert = certWithAia(aiaExtension(manyUrls))
|
|
206
|
+
val fetched = mutableListOf<String>()
|
|
207
|
+
|
|
208
|
+
AiaCertChaser.completeChain(listOf(cert)) { url, _ ->
|
|
209
|
+
fetched.add(url)
|
|
210
|
+
emptyList()
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
assertEquals(AiaCertChaser.MAX_URLS_PER_CERT, fetched.size)
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
@Test
|
|
217
|
+
fun `duplicate CA-Issuers URLs do not consume the URL cap`() {
|
|
218
|
+
// 500 copies of one dead URL followed by a distinct one: the cap must buy distinct hosts,
|
|
219
|
+
// not three visits to the same dead one.
|
|
220
|
+
val urls = List(500) { "http://ca.example/issuer.crt" } + "http://ca-b.example/issuer.crt"
|
|
221
|
+
val cert = certWithAia(aiaExtension(urls))
|
|
222
|
+
val fetched = mutableListOf<String>()
|
|
223
|
+
|
|
224
|
+
AiaCertChaser.completeChain(listOf(cert)) { url, _ ->
|
|
225
|
+
fetched.add(url)
|
|
226
|
+
emptyList()
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
assertEquals(listOf("http://ca.example/issuer.crt", "http://ca-b.example/issuer.crt"), fetched)
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
@Test
|
|
233
|
+
fun `completeChain stops fetching once its wall-clock budget is spent`() {
|
|
234
|
+
val cert = certWithAia(aiaExtension((1..500).map { "http://ca$it.example/issuer.crt" }))
|
|
235
|
+
var fetches = 0
|
|
236
|
+
var nanos = 0L
|
|
237
|
+
val deadlines = mutableListOf<Long>()
|
|
238
|
+
|
|
239
|
+
// Each fetch "takes" 8s against a 20s budget, so the walk must stop after a handful even
|
|
240
|
+
// though the URL cap alone would have allowed more.
|
|
241
|
+
AiaCertChaser.completeChain(
|
|
242
|
+
listOf(cert),
|
|
243
|
+
maxUrlsPerCert = 500,
|
|
244
|
+
budgetMs = 20_000,
|
|
245
|
+
nowNanos = { nanos },
|
|
246
|
+
) { _, deadline ->
|
|
247
|
+
fetches++
|
|
248
|
+
deadlines.add(deadline)
|
|
249
|
+
nanos += 8_000_000_000
|
|
250
|
+
emptyList()
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
assertEquals(3, fetches)
|
|
254
|
+
// Every fetch is handed the same walk-wide deadline, so it can clip its own I/O to it —
|
|
255
|
+
// the budget bounds the fetches themselves, not just how many of them start.
|
|
256
|
+
assertEquals(listOf(20_000_000_000L, 20_000_000_000L, 20_000_000_000L), deadlines)
|
|
257
|
+
}
|
|
258
|
+
|
|
115
259
|
@Test
|
|
116
260
|
fun `completeChain stops when the issuer cannot be fetched`() {
|
|
117
261
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
118
262
|
|
|
119
|
-
val completed = AiaCertChaser.completeChain(listOf(leaf)) { emptyList() }
|
|
263
|
+
val completed = AiaCertChaser.completeChain(listOf(leaf)) { _, _ -> emptyList() }
|
|
120
264
|
|
|
121
265
|
assertEquals(listOf(leaf), completed)
|
|
122
266
|
}
|
|
@@ -134,8 +278,8 @@ class AiaCertChaserTest {
|
|
|
134
278
|
|
|
135
279
|
// After AIA chasing splices in R13, the chain validates to the trusted root.
|
|
136
280
|
val completed =
|
|
137
|
-
AiaCertChaser.completeChain(listOf(leaf)) {
|
|
138
|
-
if (
|
|
281
|
+
AiaCertChaser.completeChain(listOf(leaf)) { url, _ ->
|
|
282
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
139
283
|
}
|
|
140
284
|
validatePath(completed, root, date) // must not throw
|
|
141
285
|
}
|
|
@@ -34,8 +34,8 @@ class AiaChasingTrustManagerTest {
|
|
|
34
34
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
35
35
|
val delegate = FakeDelegate(trustsChainOfSize = 2)
|
|
36
36
|
val tm =
|
|
37
|
-
AiaChasingTrustManager(delegate) {
|
|
38
|
-
if (
|
|
37
|
+
AiaChasingTrustManager(delegate) { url, _ ->
|
|
38
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
// Must not throw: the leaf-only chain is rejected, AIA fills in R13, the [leaf, R13] chain
|
|
@@ -49,7 +49,7 @@ class AiaChasingTrustManagerTest {
|
|
|
49
49
|
fun `rethrows the original failure when no intermediate can be fetched`() {
|
|
50
50
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
51
51
|
val delegate = FakeDelegate(trustsChainOfSize = 2)
|
|
52
|
-
val tm = AiaChasingTrustManager(delegate) { emptyList() }
|
|
52
|
+
val tm = AiaChasingTrustManager(delegate) { _, _ -> emptyList() }
|
|
53
53
|
|
|
54
54
|
assertThrows(CertificateException::class.java) { tm.checkServerTrusted(arrayOf(leaf), "RSA") }
|
|
55
55
|
|
|
@@ -63,7 +63,7 @@ class AiaChasingTrustManagerTest {
|
|
|
63
63
|
val delegate = FakeDelegate(trustsChainOfSize = 1)
|
|
64
64
|
var fetches = 0
|
|
65
65
|
val tm =
|
|
66
|
-
AiaChasingTrustManager(delegate) {
|
|
66
|
+
AiaChasingTrustManager(delegate) { _, _ ->
|
|
67
67
|
fetches++
|
|
68
68
|
emptyList()
|
|
69
69
|
}
|
|
@@ -124,14 +124,222 @@ class AiaChasingTrustManagerTest {
|
|
|
124
124
|
override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
+
@Test
|
|
128
|
+
fun `a complete chain rejected for some other reason is not chased`() {
|
|
129
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
130
|
+
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
131
|
+
val root = CertFixtures.cert("isrg-root-x1.pem")
|
|
132
|
+
// Trusts nothing — an expired chain, a hostname mismatch, a CT refusal all look like this:
|
|
133
|
+
// the delegate rejects a chain that is not missing anything.
|
|
134
|
+
val delegate =
|
|
135
|
+
object : X509TrustManager {
|
|
136
|
+
override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) =
|
|
137
|
+
throw CertificateException("certificate expired")
|
|
138
|
+
|
|
139
|
+
override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) = Unit
|
|
140
|
+
|
|
141
|
+
override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf(root)
|
|
142
|
+
}
|
|
143
|
+
var fetches = 0
|
|
144
|
+
val tm =
|
|
145
|
+
AiaChasingTrustManager(delegate) { _, _ ->
|
|
146
|
+
fetches++
|
|
147
|
+
emptyList()
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
assertThrows(CertificateException::class.java) {
|
|
151
|
+
tm.checkServerTrusted(arrayOf(leaf, r13), "RSA")
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
// Chasing could not have helped, so it must not have reached out to a host named by a
|
|
155
|
+
// certificate that just failed validation.
|
|
156
|
+
assertEquals(0, fetches)
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
@Test
|
|
160
|
+
fun `the original failure is kept when the completed chain fails too`() {
|
|
161
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
162
|
+
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
163
|
+
// Trusts no chain of any size, so the retry fails as well.
|
|
164
|
+
val delegate = FakeDelegate(trustsChainOfSize = -1)
|
|
165
|
+
val tm = AiaChasingTrustManager(delegate) { _, _ -> listOf(r13) }
|
|
166
|
+
|
|
167
|
+
val thrown =
|
|
168
|
+
assertThrows(CertificateException::class.java) { tm.checkServerTrusted(arrayOf(leaf), "RSA") }
|
|
169
|
+
|
|
170
|
+
assertEquals(1, thrown.suppressed.size)
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
@Test
|
|
174
|
+
fun `client checks are forwarded, not routed through the server path`() {
|
|
175
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
176
|
+
var clientChecks = 0
|
|
177
|
+
val delegate =
|
|
178
|
+
object : X509ExtendedTrustManager() {
|
|
179
|
+
override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) =
|
|
180
|
+
throw CertificateException("server path must not be used for a client check")
|
|
181
|
+
|
|
182
|
+
override fun checkServerTrusted(
|
|
183
|
+
chain: Array<X509Certificate>,
|
|
184
|
+
authType: String,
|
|
185
|
+
socket: Socket?,
|
|
186
|
+
) = throw CertificateException("server path must not be used for a client check")
|
|
187
|
+
|
|
188
|
+
override fun checkServerTrusted(
|
|
189
|
+
chain: Array<X509Certificate>,
|
|
190
|
+
authType: String,
|
|
191
|
+
engine: SSLEngine?,
|
|
192
|
+
) = throw CertificateException("server path must not be used for a client check")
|
|
193
|
+
|
|
194
|
+
override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
|
|
195
|
+
clientChecks++
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
override fun checkClientTrusted(
|
|
199
|
+
chain: Array<X509Certificate>,
|
|
200
|
+
authType: String,
|
|
201
|
+
socket: Socket?,
|
|
202
|
+
) {
|
|
203
|
+
clientChecks++
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
override fun checkClientTrusted(
|
|
207
|
+
chain: Array<X509Certificate>,
|
|
208
|
+
authType: String,
|
|
209
|
+
engine: SSLEngine?,
|
|
210
|
+
) {
|
|
211
|
+
clientChecks++
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
|
|
215
|
+
}
|
|
216
|
+
val tm = AiaChasingExtendedTrustManager(delegate) { _, _ -> emptyList() }
|
|
217
|
+
|
|
218
|
+
tm.checkClientTrusted(arrayOf(leaf), "RSA")
|
|
219
|
+
tm.checkClientTrusted(arrayOf(leaf), "RSA", null as Socket?)
|
|
220
|
+
tm.checkClientTrusted(arrayOf(leaf), "RSA", null as SSLEngine?)
|
|
221
|
+
|
|
222
|
+
assertEquals(3, clientChecks)
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
/** A delegate carrying the Android-specific hostname-aware method, as `RootTrustManager` does. */
|
|
226
|
+
@Suppress("unused")
|
|
227
|
+
private class HostAwareDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
|
|
228
|
+
val hosts = mutableListOf<String>()
|
|
229
|
+
|
|
230
|
+
fun checkServerTrusted(
|
|
231
|
+
chain: Array<X509Certificate>,
|
|
232
|
+
authType: String,
|
|
233
|
+
host: String,
|
|
234
|
+
): List<X509Certificate> {
|
|
235
|
+
hosts.add(host)
|
|
236
|
+
if (chain.size != trustsChainOfSize) {
|
|
237
|
+
throw CertificateException("Trust anchor for certification path not found.")
|
|
238
|
+
}
|
|
239
|
+
return chain.toList()
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) =
|
|
243
|
+
throw CertificateException("the host-aware overload should have been used")
|
|
244
|
+
|
|
245
|
+
override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) = Unit
|
|
246
|
+
|
|
247
|
+
override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
@Test
|
|
251
|
+
fun `the X509TrustManagerExtensions signature is present and forwards the host`() {
|
|
252
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
253
|
+
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
254
|
+
val delegate = HostAwareDelegate(trustsChainOfSize = 2)
|
|
255
|
+
val tm =
|
|
256
|
+
AiaChasingExtendedTrustManager(delegate) { url, _ ->
|
|
257
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
// The method X509TrustManagerExtensions looks up reflectively must exist on the wrapper...
|
|
261
|
+
val method =
|
|
262
|
+
tm.javaClass.getMethod(
|
|
263
|
+
"checkServerTrusted",
|
|
264
|
+
Array<X509Certificate>::class.java,
|
|
265
|
+
String::class.java,
|
|
266
|
+
String::class.java,
|
|
267
|
+
)
|
|
268
|
+
|
|
269
|
+
// ...and must reach the delegate's own host-aware method, so pinning still sees the host.
|
|
270
|
+
val accepted = tm.checkServerTrusted(arrayOf(leaf), "RSA", "ca.example")
|
|
271
|
+
|
|
272
|
+
assertEquals(listOf(leaf, r13), accepted)
|
|
273
|
+
assertEquals(listOf("ca.example", "ca.example"), delegate.hosts)
|
|
274
|
+
assertEquals(List::class.java, method.returnType)
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
@Test
|
|
278
|
+
fun `the host-aware signature falls back to the extended overloads when the delegate lacks it`() {
|
|
279
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
280
|
+
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
281
|
+
// An extended delegate without the Android-specific String-host method, whose two-argument
|
|
282
|
+
// form refuses outright — the domain-config case. The fallback must route through its
|
|
283
|
+
// extended overloads, and must report the AIA-completed chain that actually validated.
|
|
284
|
+
val delegate = FakeDomainConfigDelegate(trustsChainOfSize = 2)
|
|
285
|
+
val tm =
|
|
286
|
+
AiaChasingExtendedTrustManager(delegate) { url, _ ->
|
|
287
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
val accepted = tm.checkServerTrusted(arrayOf(leaf), "RSA", "ca.example")
|
|
291
|
+
|
|
292
|
+
assertEquals(listOf(leaf, r13), accepted)
|
|
293
|
+
assertEquals(listOf(1, 2), delegate.hostnameAwareChecks)
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
/** A host-aware delegate that validates fine but reports an empty accepted chain. */
|
|
297
|
+
@Suppress("unused")
|
|
298
|
+
private class SilentHostAwareDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
|
|
299
|
+
fun checkServerTrusted(
|
|
300
|
+
chain: Array<X509Certificate>,
|
|
301
|
+
authType: String,
|
|
302
|
+
host: String,
|
|
303
|
+
): List<X509Certificate> {
|
|
304
|
+
if (chain.size != trustsChainOfSize) {
|
|
305
|
+
throw CertificateException("Trust anchor for certification path not found.")
|
|
306
|
+
}
|
|
307
|
+
return emptyList()
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) =
|
|
311
|
+
throw CertificateException("the host-aware overload should have been used")
|
|
312
|
+
|
|
313
|
+
override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) = Unit
|
|
314
|
+
|
|
315
|
+
override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
@Test
|
|
319
|
+
fun `a delegate reporting an empty accepted chain still yields the chain that validated`() {
|
|
320
|
+
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
321
|
+
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
322
|
+
val delegate = SilentHostAwareDelegate(trustsChainOfSize = 2)
|
|
323
|
+
val tm =
|
|
324
|
+
AiaChasingExtendedTrustManager(delegate) { url, _ ->
|
|
325
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
// An empty list from the delegate on success must not be passed through: the checked chain
|
|
329
|
+
// is what it accepted, and a pinning consumer given [] would fail a valid connection.
|
|
330
|
+
val accepted = tm.checkServerTrusted(arrayOf(leaf), "RSA", "ca.example")
|
|
331
|
+
|
|
332
|
+
assertEquals(listOf(leaf, r13), accepted)
|
|
333
|
+
}
|
|
334
|
+
|
|
127
335
|
@Test
|
|
128
336
|
fun `forwards to the hostname-aware overload the platform requires`() {
|
|
129
337
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
130
338
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
131
339
|
val delegate = FakeDomainConfigDelegate(trustsChainOfSize = 2)
|
|
132
340
|
val tm =
|
|
133
|
-
AiaChasingExtendedTrustManager(delegate) {
|
|
134
|
-
if (
|
|
341
|
+
AiaChasingExtendedTrustManager(delegate) { url, _ ->
|
|
342
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
135
343
|
}
|
|
136
344
|
|
|
137
345
|
// The socket overload must reach the delegate's socket overload. Routing it through the
|
|
@@ -147,7 +355,7 @@ class AiaChasingTrustManagerTest {
|
|
|
147
355
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
148
356
|
val delegate = FakeDomainConfigDelegate(trustsChainOfSize = 1)
|
|
149
357
|
|
|
150
|
-
AiaChasingExtendedTrustManager(delegate) { emptyList() }
|
|
358
|
+
AiaChasingExtendedTrustManager(delegate) { _, _ -> emptyList() }
|
|
151
359
|
.checkServerTrusted(arrayOf(leaf), "RSA", null as SSLEngine?)
|
|
152
360
|
|
|
153
361
|
assertEquals(listOf(1), delegate.hostnameAwareChecks)
|
|
@@ -159,8 +367,8 @@ class AiaChasingTrustManagerTest {
|
|
|
159
367
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
160
368
|
val delegate = FakeDelegate(trustsChainOfSize = 2)
|
|
161
369
|
val tm =
|
|
162
|
-
AiaChasingExtendedTrustManager(delegate) {
|
|
163
|
-
if (
|
|
370
|
+
AiaChasingExtendedTrustManager(delegate) { url, _ ->
|
|
371
|
+
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
164
372
|
}
|
|
165
373
|
|
|
166
374
|
tm.checkServerTrusted(arrayOf(leaf), "RSA", null as Socket?)
|
|
@@ -174,7 +382,7 @@ class AiaChasingTrustManagerTest {
|
|
|
174
382
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
175
383
|
// Trusts nothing, whatever the chain.
|
|
176
384
|
val delegate = FakeDomainConfigDelegate(trustsChainOfSize = -1)
|
|
177
|
-
val tm = AiaChasingExtendedTrustManager(delegate) { listOf(r13) }
|
|
385
|
+
val tm = AiaChasingExtendedTrustManager(delegate) { _, _ -> listOf(r13) }
|
|
178
386
|
|
|
179
387
|
assertThrows(CertificateException::class.java) {
|
|
180
388
|
tm.checkServerTrusted(arrayOf(leaf), "RSA", null as Socket?)
|