react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.55
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 +32 -19
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/lib/commonjs/CLAUDE.md +7 -2
- package/lib/commonjs/features/battery.js +16 -12
- package/lib/commonjs/features/battery.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +1 -1
- package/lib/commonjs/features/browser.js +74 -24
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +3 -4
- package/lib/commonjs/features/carConnection.js.map +1 -1
- package/lib/commonjs/features/equalizer.js +9 -5
- package/lib/commonjs/features/equalizer.js.map +1 -1
- package/lib/commonjs/features/errors.js +35 -21
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/favorites.js +15 -13
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +12 -6
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +16 -14
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +5 -1
- package/lib/commonjs/features/network.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js +28 -14
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/output.js +8 -4
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +10 -5
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +6 -5
- package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
- package/lib/commonjs/features/playback/playing.js +5 -3
- package/lib/commonjs/features/playback/playing.js.map +1 -1
- package/lib/commonjs/features/playback/progress.js +11 -5
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +3 -3
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +6 -5
- package/lib/commonjs/features/playback/volume.js.map +1 -1
- package/lib/commonjs/features/player/options.js +20 -10
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +34 -38
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +0 -1
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +48 -20
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +2 -1
- package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
- package/lib/commonjs/features/queue/shuffle.js +0 -1
- package/lib/commonjs/features/queue/shuffle.js.map +1 -1
- package/lib/commonjs/features/remoteControls.js +59 -35
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +15 -6
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +6 -9
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +13 -12
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +6 -4
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -1
- package/lib/commonjs/utils/useDebug.js +16 -3
- package/lib/commonjs/utils/useDebug.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +2 -4
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
- package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +1 -3
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/CLAUDE.md +7 -2
- package/lib/module/features/battery.js +16 -12
- package/lib/module/features/battery.js.map +1 -1
- package/lib/module/features/browser-config.js +1 -1
- package/lib/module/features/browser.js +74 -24
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +3 -4
- package/lib/module/features/carConnection.js.map +1 -1
- package/lib/module/features/equalizer.js +9 -5
- package/lib/module/features/equalizer.js.map +1 -1
- package/lib/module/features/errors.js +35 -21
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/favorites.js +15 -13
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +12 -6
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +16 -14
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +5 -1
- package/lib/module/features/network.js.map +1 -1
- package/lib/module/features/nowPlaying.js +28 -14
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/output.js +8 -4
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +10 -5
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +6 -5
- package/lib/module/features/playback/playWhenReady.js.map +1 -1
- package/lib/module/features/playback/playing.js +5 -3
- package/lib/module/features/playback/playing.js.map +1 -1
- package/lib/module/features/playback/progress.js +11 -5
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/state.js +3 -3
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +6 -1
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +6 -5
- package/lib/module/features/playback/volume.js.map +1 -1
- package/lib/module/features/player/options.js +20 -10
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +34 -38
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +0 -1
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +48 -20
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +2 -1
- package/lib/module/features/queue/repeatMode.js.map +1 -1
- package/lib/module/features/queue/shuffle.js +0 -1
- package/lib/module/features/queue/shuffle.js.map +1 -1
- package/lib/module/features/remoteControls.js +59 -35
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +15 -6
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +6 -9
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +13 -12
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +6 -4
- package/lib/module/utils/getTrackIdentity.js.map +1 -1
- package/lib/module/utils/useDebug.js +16 -3
- package/lib/module/utils/useDebug.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +2 -4
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/parseSearchResponse.js +3 -4
- package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/module/web/browser/sections.js +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +1 -3
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/features/battery.d.ts +17 -12
- package/lib/typescript/src/features/battery.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +64 -24
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +3 -4
- package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +9 -5
- package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts +37 -22
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/favorites.d.ts +15 -13
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +14 -8
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +37 -17
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +5 -1
- package/lib/typescript/src/features/network.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +28 -14
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +10 -5
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
- package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +16 -3
- package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +11 -5
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +8 -3
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +6 -5
- package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +52 -37
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +65 -60
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +0 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +48 -20
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +0 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +58 -25
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +15 -7
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +54 -57
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +181 -144
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +6 -9
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +13 -12
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +6 -4
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -1
- package/lib/typescript/src/utils/useDebug.d.ts +16 -3
- package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/CLAUDE.md +7 -2
- package/src/docs-floors.test.ts +71 -0
- package/src/features/battery.ts +17 -13
- package/src/features/browser-config.ts +1 -1
- package/src/features/browser.ts +65 -24
- package/src/features/carConnection.ts +3 -4
- package/src/features/equalizer.ts +9 -5
- package/src/features/errors.ts +37 -22
- package/src/features/favorites.ts +15 -13
- package/src/features/gate.ts +14 -8
- package/src/features/metadata.ts +37 -17
- package/src/features/network.ts +5 -1
- package/src/features/nowPlaying.ts +28 -14
- package/src/features/output.ts +8 -4
- package/src/features/playback/controls.ts +10 -5
- package/src/features/playback/playWhenReady.ts +6 -5
- package/src/features/playback/playing.ts +16 -3
- package/src/features/playback/progress.ts +11 -5
- package/src/features/playback/state.ts +8 -3
- package/src/features/playback/trackPlaybackTime.ts +9 -2
- package/src/features/playback/volume.ts +6 -5
- package/src/features/player/options.ts +54 -43
- package/src/features/player/setup.ts +67 -61
- package/src/features/queue/activeTrack.ts +0 -1
- package/src/features/queue/queue.ts +48 -20
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +0 -1
- package/src/features/remoteControls.ts +59 -35
- package/src/features/sleepTimer.ts +15 -7
- package/src/types/browser-nodes.ts +54 -57
- package/src/types/browser.ts +183 -146
- package/src/utils/LazyNativeEmitter.ts +6 -9
- package/src/utils/NativeUpdatedValue.ts +13 -12
- package/src/utils/getTrackIdentity.ts +6 -4
- package/src/utils/useDebug.ts +16 -3
- package/src/web/NativeAudioBrowser.ts +2 -4
- package/src/web/browser/parseSearchResponse.ts +3 -4
- package/src/web/browser/sections.ts +1 -1
- package/src/web/util/BrowserPathHelper.ts +1 -3
- package/website/guide/android-auto.md +25 -13
- package/website/guide/android-certificates.md +199 -120
- package/website/guide/artwork.md +93 -48
- package/website/guide/audio-output.md +86 -68
- package/website/guide/automotive.md +15 -10
- package/website/guide/basic-usage.md +5 -2
- package/website/guide/battery.md +50 -23
- package/website/guide/browser.md +155 -68
- package/website/guide/carplay.md +132 -49
- package/website/guide/configuration.md +85 -49
- package/website/guide/equalizer.md +36 -32
- package/website/guide/errors.md +106 -64
- package/website/guide/favorites.md +41 -31
- package/website/guide/gate.md +24 -10
- package/website/guide/getting-started.md +55 -2
- package/website/guide/hooks.md +53 -47
- package/website/guide/live-streams.md +80 -49
- package/website/guide/metadata.md +87 -53
- package/website/guide/migrating-from-track-player.md +94 -49
- package/website/guide/native-callback-fetch.md +46 -36
- package/website/guide/network.md +36 -20
- package/website/guide/now-playing.md +72 -44
- package/website/guide/playback.md +112 -35
- package/website/guide/queue.md +77 -43
- package/website/guide/remote-controls.md +87 -29
- package/website/guide/search.md +37 -22
- package/website/guide/sleep-timer.md +35 -14
- package/website/guide/track.md +59 -35
|
@@ -94,6 +94,7 @@ class SonosDiscovererTest {
|
|
|
94
94
|
fun `asks one speaker for the topology, however many answered the search`() {
|
|
95
95
|
topologyResponse = topology("RINCON_A" to "Dining Room")
|
|
96
96
|
|
|
97
|
+
// Three locations of the one mock speaker, which the discoverer takes for three speakers.
|
|
97
98
|
SonosDiscoverer(OkHttpClient(), scannerReturning(location, "$location?b", "$location?c"))
|
|
98
99
|
.discover()
|
|
99
100
|
|
|
@@ -123,6 +124,7 @@ class SonosDiscovererTest {
|
|
|
123
124
|
override fun dispatch(request: RecordedRequest): MockResponse =
|
|
124
125
|
when (request.requestUrl?.encodedPath) {
|
|
125
126
|
"/xml/device_description.xml" ->
|
|
127
|
+
// The fixture's speaker as RINCON_H, the member its topology marks hidden.
|
|
126
128
|
MockResponse().setBody(sonosXml.replace("RINCON_949F3EC213E001400", "RINCON_H"))
|
|
127
129
|
"/ZoneGroupTopology/Control" -> envelope(hiddenTopology)
|
|
128
130
|
else -> MockResponse().setResponseCode(404)
|
|
@@ -110,7 +110,7 @@ class SonosRemoteTest {
|
|
|
110
110
|
assertEquals(emptyList<Boolean>(), sessions)
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
-
/**
|
|
113
|
+
/** Polls, since commands run on a background thread that idling the main looper doesn't reach. */
|
|
114
114
|
private fun idleUntil(what: String, condition: () -> Boolean) {
|
|
115
115
|
repeat(200) {
|
|
116
116
|
shadowOf(Looper.getMainLooper()).idle()
|
|
@@ -75,6 +75,7 @@ class SonosRoutesTest {
|
|
|
75
75
|
val routes =
|
|
76
76
|
sonosRouteDescriptors(listOf(dining, living), null) { mapOf("RINCON_C" to 12)[it] }.routes
|
|
77
77
|
|
|
78
|
+
// A room whose volume is not yet known reports 0.
|
|
78
79
|
assertEquals(listOf(0, 12), routes.map { it.volume })
|
|
79
80
|
assertEquals(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE, routes[0].volumeHandling)
|
|
80
81
|
assertEquals(100, routes[0].volumeMax)
|
|
@@ -112,6 +113,7 @@ class SonosRoutesTest {
|
|
|
112
113
|
}
|
|
113
114
|
|
|
114
115
|
assertNull(SonosOutputs.selected)
|
|
116
|
+
// Once for the select, once for the unselect.
|
|
115
117
|
assertEquals(2, calls)
|
|
116
118
|
}
|
|
117
119
|
|
|
@@ -9,10 +9,6 @@ import org.junit.Assert.assertThrows
|
|
|
9
9
|
import org.junit.Before
|
|
10
10
|
import org.junit.Test
|
|
11
11
|
|
|
12
|
-
/**
|
|
13
|
-
* Command -> SOAP mapping for [SonosTransport], verified against a local MockWebServer standing in
|
|
14
|
-
* for a Sonos speaker's control endpoints.
|
|
15
|
-
*/
|
|
16
12
|
class SonosTransportTest {
|
|
17
13
|
|
|
18
14
|
private lateinit var server: MockWebServer
|
|
@@ -63,12 +59,12 @@ class SonosTransportTest {
|
|
|
63
59
|
setUri.getHeader("SOAPACTION"),
|
|
64
60
|
)
|
|
65
61
|
val setUriBody = setUri.body.readUtf8()
|
|
66
|
-
//
|
|
62
|
+
// A live stream goes out under Sonos's radio scheme.
|
|
67
63
|
assertEquals(
|
|
68
64
|
true,
|
|
69
65
|
setUriBody.contains("<CurrentURI>x-rincon-mp3radio://http://ice.example/stream</CurrentURI>"),
|
|
70
66
|
)
|
|
71
|
-
// DIDL
|
|
67
|
+
// The DIDL travels escaped, as text inside the envelope.
|
|
72
68
|
assertEquals(true, setUriBody.contains("<dc:title>Jazz FM</dc:title>"))
|
|
73
69
|
}
|
|
74
70
|
|
|
@@ -5,7 +5,6 @@ import org.junit.Assert.assertNull
|
|
|
5
5
|
import org.junit.Assert.assertTrue
|
|
6
6
|
import org.junit.Test
|
|
7
7
|
|
|
8
|
-
/** Byte-level build + parse of SSDP messages used for Sonos (ZonePlayer) discovery. */
|
|
9
8
|
class SsdpMessagesTest {
|
|
10
9
|
|
|
11
10
|
@Test
|
|
@@ -27,7 +26,6 @@ class SsdpMessagesTest {
|
|
|
27
26
|
val text = String(SsdpMessages.buildMSearch(searchTarget = "ssdp:all", mx = 3), Charsets.UTF_8)
|
|
28
27
|
assertTrue(text.contains("ST: ssdp:all\r\n"))
|
|
29
28
|
assertTrue(text.contains("MX: 3\r\n"))
|
|
30
|
-
// Always terminated by a blank line.
|
|
31
29
|
assertTrue(text.endsWith("\r\n\r\n"))
|
|
32
30
|
}
|
|
33
31
|
|
|
@@ -16,13 +16,8 @@ import org.mockito.Mockito.`when`
|
|
|
16
16
|
|
|
17
17
|
class AiaCertChaserTest {
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
|
|
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
|
+
// Subject and issuer differ on purpose: an unstubbed mock answers null to both, which
|
|
20
|
+
// completeChain reads as a self-signed root and stops on before fetching.
|
|
26
21
|
private fun certWithAia(extensionValue: ByteArray): X509Certificate =
|
|
27
22
|
mock(X509Certificate::class.java).also {
|
|
28
23
|
`when`(it.getExtensionValue("1.3.6.1.5.5.7.1.1")).thenReturn(extensionValue)
|
|
@@ -30,7 +25,6 @@ class AiaCertChaserTest {
|
|
|
30
25
|
`when`(it.issuerX500Principal).thenReturn(X500Principal("CN=issuer"))
|
|
31
26
|
}
|
|
32
27
|
|
|
33
|
-
/** A DER tag-length-value, with the length in whichever form fits. */
|
|
34
28
|
private fun der(tag: Int, content: ByteArray): ByteArray {
|
|
35
29
|
val length =
|
|
36
30
|
when (val n = content.size) {
|
|
@@ -42,7 +36,6 @@ class AiaCertChaserTest {
|
|
|
42
36
|
return byteArrayOf(tag.toByte()) + length + content
|
|
43
37
|
}
|
|
44
38
|
|
|
45
|
-
/** A well-formed AIA extension value listing [urls] as caIssuers locations. */
|
|
46
39
|
private fun aiaExtension(urls: List<String>): ByteArray {
|
|
47
40
|
val caIssuersOid = byteArrayOf(0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02)
|
|
48
41
|
val descriptions =
|
|
@@ -54,8 +47,7 @@ class AiaCertChaserTest {
|
|
|
54
47
|
|
|
55
48
|
@Test
|
|
56
49
|
fun `the AIA fixture builder round-trips through the parser`() {
|
|
57
|
-
//
|
|
58
|
-
// nothing at all, rather than by the cap doing its job.
|
|
50
|
+
// Without this, a malformed builder would let the URL-cap tests pass by parsing nothing.
|
|
59
51
|
val urls = listOf("http://ca1.example/i.crt", "http://ca2.example/i.crt")
|
|
60
52
|
|
|
61
53
|
assertEquals(urls, AiaCertChaser.extractCaIssuerUrls(certWithAia(aiaExtension(urls))))
|
|
@@ -63,10 +55,8 @@ class AiaCertChaserTest {
|
|
|
63
55
|
|
|
64
56
|
@Test(timeout = 5_000)
|
|
65
57
|
fun `a negative long-form length does not hang the parser`() {
|
|
66
|
-
// OCTET STRING { SEQUENCE { tag 0x00,
|
|
67
|
-
//
|
|
68
|
-
// reader by exactly the six bytes it just consumed: the tag is not a SEQUENCE, the
|
|
69
|
-
// loop `continue`s, and the reader is back where it started with more input to read.
|
|
58
|
+
// OCTET STRING { SEQUENCE { tag 0x00, length 0xFFFFFFFA = -6 } }: as an Int the length
|
|
59
|
+
// rewinds the reader by the six bytes it just read, back to the start.
|
|
70
60
|
val aia =
|
|
71
61
|
byteArrayOf(
|
|
72
62
|
0x04,
|
|
@@ -86,7 +76,7 @@ class AiaCertChaserTest {
|
|
|
86
76
|
|
|
87
77
|
@Test(timeout = 5_000)
|
|
88
78
|
fun `a length running past the buffer is treated as no AIA`() {
|
|
89
|
-
// SEQUENCE claiming 0x7F content bytes inside a 2-byte buffer.
|
|
79
|
+
// A SEQUENCE claiming 0x7F content bytes inside a 2-byte buffer.
|
|
90
80
|
val aia = byteArrayOf(0x04, 0x04, 0x30, 0x02, 0x30, 0x7F)
|
|
91
81
|
|
|
92
82
|
assertEquals(emptyList<String>(), AiaCertChaser.extractCaIssuerUrls(certWithAia(aia)))
|
|
@@ -112,7 +102,6 @@ class AiaCertChaserTest {
|
|
|
112
102
|
fun `completeChain appends fetched intermediate when server sends leaf only`() {
|
|
113
103
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
114
104
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
115
|
-
// Fetcher knows only the R13 URL (the leaf's AIA pointer); empty for the root URL.
|
|
116
105
|
val fetch = { url: String, _: Long ->
|
|
117
106
|
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
118
107
|
}
|
|
@@ -126,9 +115,8 @@ class AiaCertChaserTest {
|
|
|
126
115
|
fun `completeChain selects the real issuer from a multi-certificate response`() {
|
|
127
116
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
128
117
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
129
|
-
val unrelated = CertFixtures.cert("isrg-root-x1.pem")
|
|
118
|
+
val unrelated = CertFixtures.cert("isrg-root-x1.pem")
|
|
130
119
|
|
|
131
|
-
// A PKCS#7-style bundle where the genuine issuer is not first must still be selected.
|
|
132
120
|
val completed =
|
|
133
121
|
AiaCertChaser.completeChain(listOf(leaf)) { url, _ ->
|
|
134
122
|
if (url == "http://r13.i.lencr.org/") listOf(unrelated, r13) else emptyList()
|
|
@@ -159,8 +147,7 @@ class AiaCertChaserTest {
|
|
|
159
147
|
val root = CertFixtures.cert("isrg-root-x1.pem")
|
|
160
148
|
val fetched = mutableListOf<String>()
|
|
161
149
|
|
|
162
|
-
// R13's
|
|
163
|
-
// too far and pays for a second blocking fetch on the ordinary rescue path.
|
|
150
|
+
// R13's AIA points at the root, so without the anchors this fetches a second time.
|
|
164
151
|
val completed =
|
|
165
152
|
AiaCertChaser.completeChain(
|
|
166
153
|
listOf(leaf),
|
|
@@ -181,8 +168,7 @@ class AiaCertChaserTest {
|
|
|
181
168
|
val root = CertFixtures.cert("isrg-root-x1.pem")
|
|
182
169
|
var fetches = 0
|
|
183
170
|
|
|
184
|
-
//
|
|
185
|
-
// sent a complete chain and validation failed for some other reason.
|
|
171
|
+
// A complete chain, as with any failure that is not a missing intermediate.
|
|
186
172
|
val completed =
|
|
187
173
|
AiaCertChaser.completeChain(
|
|
188
174
|
listOf(leaf, r13),
|
|
@@ -198,9 +184,6 @@ class AiaCertChaserTest {
|
|
|
198
184
|
|
|
199
185
|
@Test
|
|
200
186
|
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
187
|
val manyUrls = (1..500).map { "http://ca$it.example/issuer.crt" }
|
|
205
188
|
val cert = certWithAia(aiaExtension(manyUrls))
|
|
206
189
|
val fetched = mutableListOf<String>()
|
|
@@ -215,8 +198,6 @@ class AiaCertChaserTest {
|
|
|
215
198
|
|
|
216
199
|
@Test
|
|
217
200
|
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
201
|
val urls = List(500) { "http://ca.example/issuer.crt" } + "http://ca-b.example/issuer.crt"
|
|
221
202
|
val cert = certWithAia(aiaExtension(urls))
|
|
222
203
|
val fetched = mutableListOf<String>()
|
|
@@ -236,8 +217,7 @@ class AiaCertChaserTest {
|
|
|
236
217
|
var nanos = 0L
|
|
237
218
|
val deadlines = mutableListOf<Long>()
|
|
238
219
|
|
|
239
|
-
// Each fetch
|
|
240
|
-
// though the URL cap alone would have allowed more.
|
|
220
|
+
// Each fetch takes 8s of a 20s budget, so the budget, not the URL cap, stops it at three.
|
|
241
221
|
AiaCertChaser.completeChain(
|
|
242
222
|
listOf(cert),
|
|
243
223
|
maxUrlsPerCert = 500,
|
|
@@ -251,8 +231,6 @@ class AiaCertChaserTest {
|
|
|
251
231
|
}
|
|
252
232
|
|
|
253
233
|
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
234
|
assertEquals(listOf(20_000_000_000L, 20_000_000_000L, 20_000_000_000L), deadlines)
|
|
257
235
|
}
|
|
258
236
|
|
|
@@ -270,21 +248,19 @@ class AiaCertChaserTest {
|
|
|
270
248
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
271
249
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
272
250
|
val root = CertFixtures.cert("isrg-root-x1.pem")
|
|
273
|
-
//
|
|
251
|
+
// As of just after issuance, so the test still passes once the leaf expires.
|
|
274
252
|
val date = Date(leaf.notBefore.time + 86_400_000L)
|
|
275
253
|
|
|
276
|
-
// Reproduces the Android bug: the server-sent leaf alone has no path to the trusted root.
|
|
277
254
|
assertThrows(CertPathValidatorException::class.java) { validatePath(listOf(leaf), root, date) }
|
|
278
255
|
|
|
279
|
-
// After AIA chasing splices in R13, the chain validates to the trusted root.
|
|
280
256
|
val completed =
|
|
281
257
|
AiaCertChaser.completeChain(listOf(leaf)) { url, _ ->
|
|
282
258
|
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
283
259
|
}
|
|
284
|
-
validatePath(completed, root, date)
|
|
260
|
+
validatePath(completed, root, date)
|
|
285
261
|
}
|
|
286
262
|
|
|
287
|
-
/** Validates [chain] (leaf
|
|
263
|
+
/** Validates [chain] (leaf first, anchor excluded) against [anchor] as of [date]. */
|
|
288
264
|
private fun validatePath(chain: List<X509Certificate>, anchor: X509Certificate, date: Date) {
|
|
289
265
|
val path = CertificateFactory.getInstance("X.509").generateCertPath(chain)
|
|
290
266
|
val params =
|
|
@@ -12,7 +12,7 @@ import org.junit.Test
|
|
|
12
12
|
|
|
13
13
|
class AiaChasingTrustManagerTest {
|
|
14
14
|
|
|
15
|
-
/** Records every chain it
|
|
15
|
+
/** Records the size of every chain it checks; trusts only chains of [trustsChainOfSize]. */
|
|
16
16
|
private class FakeDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
|
|
17
17
|
val checkedChainSizes = mutableListOf<Int>()
|
|
18
18
|
|
|
@@ -38,8 +38,6 @@ class AiaChasingTrustManagerTest {
|
|
|
38
38
|
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
// Must not throw: the leaf-only chain is rejected, AIA fills in R13, the [leaf, R13] chain
|
|
42
|
-
// passes.
|
|
43
41
|
tm.checkServerTrusted(arrayOf(leaf), "RSA")
|
|
44
42
|
|
|
45
43
|
assertEquals(listOf(1, 2), delegate.checkedChainSizes)
|
|
@@ -53,7 +51,7 @@ class AiaChasingTrustManagerTest {
|
|
|
53
51
|
|
|
54
52
|
assertThrows(CertificateException::class.java) { tm.checkServerTrusted(arrayOf(leaf), "RSA") }
|
|
55
53
|
|
|
56
|
-
//
|
|
54
|
+
// The unchanged chain is not checked a second time.
|
|
57
55
|
assertEquals(listOf(1), delegate.checkedChainSizes)
|
|
58
56
|
}
|
|
59
57
|
|
|
@@ -78,7 +76,7 @@ class AiaChasingTrustManagerTest {
|
|
|
78
76
|
|
|
79
77
|
/**
|
|
80
78
|
* Stands in for Android's `RootTrustManager` under a per-domain network security config: the
|
|
81
|
-
* hostname-aware overloads work, and the two-argument one
|
|
79
|
+
* hostname-aware overloads work, and the two-argument one always throws.
|
|
82
80
|
*/
|
|
83
81
|
private class FakeDomainConfigDelegate(private val trustsChainOfSize: Int) :
|
|
84
82
|
X509ExtendedTrustManager() {
|
|
@@ -129,8 +127,7 @@ class AiaChasingTrustManagerTest {
|
|
|
129
127
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
130
128
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
131
129
|
val root = CertFixtures.cert("isrg-root-x1.pem")
|
|
132
|
-
//
|
|
133
|
-
// the delegate rejects a chain that is not missing anything.
|
|
130
|
+
// Rejects a chain that lacks nothing (as for an expired leaf): r13's issuer is an anchor.
|
|
134
131
|
val delegate =
|
|
135
132
|
object : X509TrustManager {
|
|
136
133
|
override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) =
|
|
@@ -151,8 +148,6 @@ class AiaChasingTrustManagerTest {
|
|
|
151
148
|
tm.checkServerTrusted(arrayOf(leaf, r13), "RSA")
|
|
152
149
|
}
|
|
153
150
|
|
|
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
151
|
assertEquals(0, fetches)
|
|
157
152
|
}
|
|
158
153
|
|
|
@@ -160,7 +155,7 @@ class AiaChasingTrustManagerTest {
|
|
|
160
155
|
fun `the original failure is kept when the completed chain fails too`() {
|
|
161
156
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
162
157
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
163
|
-
// Trusts no chain
|
|
158
|
+
// Trusts no chain, so the retry fails too.
|
|
164
159
|
val delegate = FakeDelegate(trustsChainOfSize = -1)
|
|
165
160
|
val tm = AiaChasingTrustManager(delegate) { _, _ -> listOf(r13) }
|
|
166
161
|
|
|
@@ -222,7 +217,7 @@ class AiaChasingTrustManagerTest {
|
|
|
222
217
|
assertEquals(3, clientChecks)
|
|
223
218
|
}
|
|
224
219
|
|
|
225
|
-
/**
|
|
220
|
+
/** Carries the Android-specific hostname-aware method, as `RootTrustManager` does. */
|
|
226
221
|
@Suppress("unused")
|
|
227
222
|
private class HostAwareDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
|
|
228
223
|
val hosts = mutableListOf<String>()
|
|
@@ -257,7 +252,7 @@ class AiaChasingTrustManagerTest {
|
|
|
257
252
|
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
258
253
|
}
|
|
259
254
|
|
|
260
|
-
//
|
|
255
|
+
// X509TrustManagerExtensions looks this up reflectively and needs it to return a List.
|
|
261
256
|
val method =
|
|
262
257
|
tm.javaClass.getMethod(
|
|
263
258
|
"checkServerTrusted",
|
|
@@ -266,10 +261,10 @@ class AiaChasingTrustManagerTest {
|
|
|
266
261
|
String::class.java,
|
|
267
262
|
)
|
|
268
263
|
|
|
269
|
-
// ...and must reach the delegate's own host-aware method, so pinning still sees the host.
|
|
270
264
|
val accepted = tm.checkServerTrusted(arrayOf(leaf), "RSA", "ca.example")
|
|
271
265
|
|
|
272
266
|
assertEquals(listOf(leaf, r13), accepted)
|
|
267
|
+
// Once for the presented chain, once for the completed one.
|
|
273
268
|
assertEquals(listOf("ca.example", "ca.example"), delegate.hosts)
|
|
274
269
|
assertEquals(List::class.java, method.returnType)
|
|
275
270
|
}
|
|
@@ -278,9 +273,6 @@ class AiaChasingTrustManagerTest {
|
|
|
278
273
|
fun `the host-aware signature falls back to the extended overloads when the delegate lacks it`() {
|
|
279
274
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
280
275
|
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
276
|
val delegate = FakeDomainConfigDelegate(trustsChainOfSize = 2)
|
|
285
277
|
val tm =
|
|
286
278
|
AiaChasingExtendedTrustManager(delegate) { url, _ ->
|
|
@@ -293,7 +285,7 @@ class AiaChasingTrustManagerTest {
|
|
|
293
285
|
assertEquals(listOf(1, 2), delegate.hostnameAwareChecks)
|
|
294
286
|
}
|
|
295
287
|
|
|
296
|
-
/**
|
|
288
|
+
/** Validates fine but reports an empty accepted chain. */
|
|
297
289
|
@Suppress("unused")
|
|
298
290
|
private class SilentHostAwareDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
|
|
299
291
|
fun checkServerTrusted(
|
|
@@ -325,8 +317,6 @@ class AiaChasingTrustManagerTest {
|
|
|
325
317
|
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
326
318
|
}
|
|
327
319
|
|
|
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
320
|
val accepted = tm.checkServerTrusted(arrayOf(leaf), "RSA", "ca.example")
|
|
331
321
|
|
|
332
322
|
assertEquals(listOf(leaf, r13), accepted)
|
|
@@ -342,9 +332,6 @@ class AiaChasingTrustManagerTest {
|
|
|
342
332
|
if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
|
|
343
333
|
}
|
|
344
334
|
|
|
345
|
-
// The socket overload must reach the delegate's socket overload. Routing it through the
|
|
346
|
-
// two-argument form instead would throw the domain-config refusal, which is what a plain
|
|
347
|
-
// X509TrustManager wrapper causes for every connection in the process.
|
|
348
335
|
tm.checkServerTrusted(arrayOf(leaf), "RSA", null as Socket?)
|
|
349
336
|
|
|
350
337
|
assertEquals(listOf(1, 2), delegate.hostnameAwareChecks)
|
|
@@ -380,7 +367,7 @@ class AiaChasingTrustManagerTest {
|
|
|
380
367
|
fun `the extended variant does not weaken trust`() {
|
|
381
368
|
val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
|
|
382
369
|
val r13 = CertFixtures.cert("letsencrypt-r13.pem")
|
|
383
|
-
// Trusts
|
|
370
|
+
// Trusts no chain.
|
|
384
371
|
val delegate = FakeDomainConfigDelegate(trustsChainOfSize = -1)
|
|
385
372
|
val tm = AiaChasingExtendedTrustManager(delegate) { _, _ -> listOf(r13) }
|
|
386
373
|
|
|
@@ -388,7 +375,6 @@ class AiaChasingTrustManagerTest {
|
|
|
388
375
|
tm.checkServerTrusted(arrayOf(leaf), "RSA", null as Socket?)
|
|
389
376
|
}
|
|
390
377
|
|
|
391
|
-
// The completed chain was offered to the delegate and refused, rather than assumed good.
|
|
392
378
|
assertEquals(listOf(1, 2), delegate.hostnameAwareChecks)
|
|
393
379
|
}
|
|
394
380
|
}
|
|
@@ -18,11 +18,9 @@ import org.mockito.Mockito.mock
|
|
|
18
18
|
import org.mockito.Mockito.`when`
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
-
*
|
|
24
|
-
* nothing: these cover the *wiring*, so that removing the `isSafeUrl` guard or swapping
|
|
25
|
-
* `readCapped` back for a plain read-to-EOF fails a test rather than passing silently.
|
|
21
|
+
* [CachingCertificateFetcher.fetch] against a loopback server: the wiring of the safety helpers,
|
|
22
|
+
* which have their own unit tests, so dropping the `isSafeUrl` guard or the `readCapped` read fails
|
|
23
|
+
* here.
|
|
26
24
|
*/
|
|
27
25
|
class CachingCertificateFetcherCallSiteTest {
|
|
28
26
|
|
|
@@ -33,10 +31,6 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
33
31
|
server?.close()
|
|
34
32
|
}
|
|
35
33
|
|
|
36
|
-
/**
|
|
37
|
-
* Serves [response] to every connection, recording the request line of the first. [handled]
|
|
38
|
-
* counts accepted connections.
|
|
39
|
-
*/
|
|
40
34
|
private fun startServer(
|
|
41
35
|
response: ByteArray = "HTTP/1.0 404 Not Found\r\n\r\n".toByteArray(),
|
|
42
36
|
handled: AtomicInteger = AtomicInteger(),
|
|
@@ -58,7 +52,7 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
58
52
|
}
|
|
59
53
|
}
|
|
60
54
|
} catch (e: Exception) {
|
|
61
|
-
return@thread
|
|
55
|
+
return@thread
|
|
62
56
|
}
|
|
63
57
|
}
|
|
64
58
|
}
|
|
@@ -70,7 +64,6 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
70
64
|
val handled = AtomicInteger()
|
|
71
65
|
val port = startServer(handled = handled)
|
|
72
66
|
|
|
73
|
-
// Without the isSafeUrl guard this connects and emits "SET foo bar" as its own request line.
|
|
74
67
|
val certs = CachingCertificateFetcher().fetch("http://127.0.0.1:$port/\r\nSET foo bar\r\n")
|
|
75
68
|
|
|
76
69
|
assertTrue(certs.isEmpty())
|
|
@@ -104,9 +97,8 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
104
97
|
|
|
105
98
|
@Test(timeout = 30_000)
|
|
106
99
|
fun `an oversized response is abandoned rather than read to EOF`() {
|
|
107
|
-
//
|
|
108
|
-
//
|
|
109
|
-
// stopped reading, which shows up as the server's write not draining.
|
|
100
|
+
// An empty result alone proves nothing: 64 MiB crosses loopback in milliseconds and fails to
|
|
101
|
+
// parse either way. The client must stop reading, which shows as the server's write failing.
|
|
110
102
|
val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
|
|
111
103
|
server = socket
|
|
112
104
|
val written = AtomicInteger()
|
|
@@ -118,8 +110,6 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
118
110
|
val out = client.getOutputStream()
|
|
119
111
|
out.write("HTTP/1.0 200 OK\r\n\r\n".toByteArray())
|
|
120
112
|
val chunk = ByteArray(64 * 1024)
|
|
121
|
-
// 64 MiB — far past the 1 MiB cap. Once the client stops reading and closes, this
|
|
122
|
-
// throws a broken pipe, which is the signal we want.
|
|
123
113
|
repeat(1024) {
|
|
124
114
|
out.write(chunk)
|
|
125
115
|
written.addAndGet(chunk.size)
|
|
@@ -133,8 +123,7 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
133
123
|
|
|
134
124
|
assertTrue(certs.isEmpty())
|
|
135
125
|
assertTrue(finished.await(20, TimeUnit.SECONDS))
|
|
136
|
-
// Socket buffers
|
|
137
|
-
// must be nowhere near the 64 MiB it wanted to send.
|
|
126
|
+
// Socket buffers let the server write somewhat past the 1 MiB cap before the write fails.
|
|
138
127
|
assertTrue(
|
|
139
128
|
"server wrote ${written.get()} bytes; the read was not cut off",
|
|
140
129
|
written.get() < 16 shl 20,
|
|
@@ -143,8 +132,6 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
143
132
|
|
|
144
133
|
@Test(timeout = 30_000)
|
|
145
134
|
fun `a real certificate is fetched, parsed and then served from cache`() {
|
|
146
|
-
// The success path, end to end over a socket: every other wire test serves a failure, so a
|
|
147
|
-
// broken body offset or a broken cache write would not show up anywhere.
|
|
148
135
|
val der = CertFixtures.bytes("letsencrypt-r13.der")
|
|
149
136
|
val handled = AtomicInteger()
|
|
150
137
|
val port =
|
|
@@ -161,17 +148,13 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
161
148
|
assertEquals(1, certs.size)
|
|
162
149
|
assertEquals("CN=R13,O=Let's Encrypt,C=US", certs.first().subjectX500Principal.name)
|
|
163
150
|
|
|
164
|
-
// Second call must be served from the cache, not the network.
|
|
165
151
|
assertEquals(certs, fetcher.fetch(url))
|
|
166
152
|
assertEquals("a successful fetch must be cached", 1, handled.get())
|
|
167
153
|
}
|
|
168
154
|
|
|
169
|
-
/**
|
|
170
|
-
* A mock certificate whose AIA extension lists [url] as its one CA-Issuers location, so
|
|
171
|
-
* [AiaCertChaser.completeChain] chases it with this fetcher — the real wiring, end to end.
|
|
172
|
-
*/
|
|
155
|
+
/** A mock certificate whose AIA extension lists [url] as its one CA Issuers location. */
|
|
173
156
|
private fun certPointingAt(url: String): X509Certificate {
|
|
174
|
-
// Short-form DER lengths only
|
|
157
|
+
// Short-form DER lengths only, which a loopback URL under 128 bytes fits.
|
|
175
158
|
fun der(tag: Int, content: ByteArray) =
|
|
176
159
|
byteArrayOf(tag.toByte(), content.size.toByte()) + content
|
|
177
160
|
val caIssuersOid = byteArrayOf(0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02)
|
|
@@ -185,7 +168,7 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
185
168
|
)
|
|
186
169
|
return mock(X509Certificate::class.java).also {
|
|
187
170
|
`when`(it.getExtensionValue("1.3.6.1.5.5.7.1.1")).thenReturn(aia)
|
|
188
|
-
// Distinct principals, or the chaser
|
|
171
|
+
// Distinct principals, or the chaser takes the mock for a self-signed root and never fetches.
|
|
189
172
|
`when`(it.subjectX500Principal).thenReturn(X500Principal("CN=leaf"))
|
|
190
173
|
`when`(it.issuerX500Principal).thenReturn(X500Principal("CN=issuer"))
|
|
191
174
|
}
|
|
@@ -193,9 +176,8 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
193
176
|
|
|
194
177
|
@Test(timeout = 30_000)
|
|
195
178
|
fun `a drip-feeding server is cut off by the chase deadline, not only the per-fetch caps`() {
|
|
196
|
-
//
|
|
197
|
-
//
|
|
198
|
-
// walk's 1 s budget must cut the fetch *itself* — not merely decline to start the next one.
|
|
179
|
+
// A byte every 100 ms stays inside the read timeout, and the per-fetch read budget would allow
|
|
180
|
+
// 10 s: only the chase's 1 s budget cutting the fetch itself keeps this under 8 s.
|
|
199
181
|
val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
|
|
200
182
|
server = socket
|
|
201
183
|
thread(isDaemon = true) {
|
|
@@ -205,7 +187,7 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
205
187
|
val out = client.getOutputStream()
|
|
206
188
|
out.write("HTTP/1.0 200 OK\r\n\r\n".toByteArray())
|
|
207
189
|
out.flush()
|
|
208
|
-
repeat(300) {
|
|
190
|
+
repeat(300) {
|
|
209
191
|
out.write(0)
|
|
210
192
|
out.flush()
|
|
211
193
|
Thread.sleep(100)
|
|
@@ -224,16 +206,13 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
224
206
|
val elapsedMs = (System.nanoTime() - started) / 1_000_000
|
|
225
207
|
|
|
226
208
|
assertEquals(listOf(cert), completed)
|
|
227
|
-
// Well past the 1 s budget to absorb scheduling noise, but far short of the 10 s the
|
|
228
|
-
// per-fetch read budget alone would have allowed.
|
|
229
209
|
assertTrue("chase ran for $elapsedMs ms", elapsedMs < 8_000)
|
|
230
210
|
}
|
|
231
211
|
|
|
232
212
|
@Test(timeout = 30_000)
|
|
233
213
|
fun `the chase deadline spans redirect hops, not just fetch starts`() {
|
|
234
|
-
//
|
|
235
|
-
// the
|
|
236
|
-
// can end the fetch — without one it walks all 5 redirects, ~6 s here.
|
|
214
|
+
// Each hop stalls 1 s, inside every per-operation timeout, then redirects to itself; without
|
|
215
|
+
// the deadline the fetch walks all 5 redirects, about 6 s.
|
|
237
216
|
val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
|
|
238
217
|
server = socket
|
|
239
218
|
thread(isDaemon = true) {
|
|
@@ -271,7 +250,6 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
271
250
|
val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
|
|
272
251
|
server = socket
|
|
273
252
|
val accepted = CountDownLatch(1)
|
|
274
|
-
// Accept, then hold the connection open saying nothing at all.
|
|
275
253
|
thread(isDaemon = true) {
|
|
276
254
|
runCatching {
|
|
277
255
|
val client = socket.accept()
|
|
@@ -314,8 +292,6 @@ class CachingCertificateFetcherCallSiteTest {
|
|
|
314
292
|
|
|
315
293
|
@Test
|
|
316
294
|
fun `the cache is bounded`() {
|
|
317
|
-
// Far more distinct URLs than MAX_CACHE_ENTRIES; nothing is cached here (every fetch fails),
|
|
318
|
-
// but the bound is what stops an attacker-chosen URL space from growing without limit.
|
|
319
295
|
assertFalse(CachingCertificateFetcher.MAX_CACHE_ENTRIES <= 0)
|
|
320
296
|
assertTrue(CachingCertificateFetcher.MAX_CACHE_ENTRIES <= 128)
|
|
321
297
|
}
|
|
@@ -44,7 +44,6 @@ class CachingCertificateFetcherTest {
|
|
|
44
44
|
|
|
45
45
|
@Test
|
|
46
46
|
fun `decodes a chunked body`() {
|
|
47
|
-
// "DEAD" + "BEEF" split across two chunks, terminated by a zero-length chunk.
|
|
48
47
|
val raw =
|
|
49
48
|
("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n" +
|
|
50
49
|
"4\r\nDEAD\r\n4\r\nBEEF\r\n0\r\n\r\n")
|
|
@@ -75,8 +74,6 @@ class CachingCertificateFetcherTest {
|
|
|
75
74
|
)
|
|
76
75
|
}
|
|
77
76
|
|
|
78
|
-
// -- response cap (the AIA URL, so the host serving it, comes from the presented cert) --
|
|
79
|
-
|
|
80
77
|
// -- URL validation (the AIA URL is attacker-supplied text from the presented cert) --
|
|
81
78
|
|
|
82
79
|
@Test
|
|
@@ -87,8 +84,6 @@ class CachingCertificateFetcherTest {
|
|
|
87
84
|
|
|
88
85
|
@Test
|
|
89
86
|
fun `rejects a URL carrying CRLF, which would inject request lines`() {
|
|
90
|
-
// java.net.URL keeps the CRLF in `file`, and the cleartext fetch writes `file` straight
|
|
91
|
-
// into "GET $path HTTP/1.0\r\n" on a raw socket.
|
|
92
87
|
assertTrue(!CachingCertificateFetcher.isSafeUrl("http://127.0.0.1:6379/\r\nSET foo bar\r\n"))
|
|
93
88
|
assertTrue(!CachingCertificateFetcher.isSafeUrl("http://ca.example/a\nX-Injected: 1"))
|
|
94
89
|
}
|
|
@@ -98,6 +93,8 @@ class CachingCertificateFetcherTest {
|
|
|
98
93
|
assertTrue(!CachingCertificateFetcher.isSafeUrl("http://ca.example/a b"))
|
|
99
94
|
}
|
|
100
95
|
|
|
96
|
+
// -- response cap (the AIA URL, so the host serving it, comes from the presented cert) --
|
|
97
|
+
|
|
101
98
|
@Test
|
|
102
99
|
fun `reads a response that fits within the cap`() {
|
|
103
100
|
val body = ByteArray(64) { it.toByte() }
|
|
@@ -117,8 +114,6 @@ class CachingCertificateFetcherTest {
|
|
|
117
114
|
|
|
118
115
|
@Test
|
|
119
116
|
fun `a stream that never ends does not read without bound`() {
|
|
120
|
-
// Endless: read() always fills the buffer and never signals EOF, the shape a slow-drip
|
|
121
|
-
// server takes — the per-read timeout never fires because every read succeeds.
|
|
122
117
|
val endless =
|
|
123
118
|
object : InputStream() {
|
|
124
119
|
override fun read() = 0
|
|
@@ -131,9 +126,8 @@ class CachingCertificateFetcherTest {
|
|
|
131
126
|
|
|
132
127
|
@Test
|
|
133
128
|
fun `a slow drip is cut off by the deadline, not left to exhaust the byte cap`() {
|
|
134
|
-
//
|
|
135
|
-
//
|
|
136
|
-
// 10s budget must end it after ~10 — far short of the 1 MiB cap.
|
|
129
|
+
// The clock advances 1 s per one-byte read, so the 10 s budget ends it after about 10 reads;
|
|
130
|
+
// the 1 MiB byte cap alone would allow a million.
|
|
137
131
|
var reads = 0
|
|
138
132
|
val drip =
|
|
139
133
|
object : InputStream() {
|