diff --git a/wrolpi/collections/config.py b/wrolpi/collections/config.py index 6478928a..0d99a248 100644 --- a/wrolpi/collections/config.py +++ b/wrolpi/collections/config.py @@ -38,6 +38,7 @@ class PlaylistsSection(ConfigSection): name = 'playlists' def file_rows(self, config: dict) -> Tuple[Dict[str, dict], Set[str]]: + from .models import validate_collection_directory rows, invalid = dict(), set() for position, data in enumerate(config.get('playlists') or []): name = _playlist_name(data) @@ -49,8 +50,9 @@ class PlaylistsSection(ConfigSection): try: rows[name] = dict( description=data.get('description') or None, - # Optional custom directory (media-relative); None when not customized. - directory=media_relative(data['directory']) if data.get('directory') else None, + # Optional custom directory (media-relative, inside the media directory); None when not customized. + directory=media_relative(validate_collection_directory(data['directory'])) + if data.get('directory') else None, tag_name=data.get('tag_name') or None, ) except Exception as e: diff --git a/wrolpi/collections/test/test_playlists_config.py b/wrolpi/collections/test/test_playlists_config.py index 6d119cf0..f635ce57 100644 --- a/wrolpi/collections/test/test_playlists_config.py +++ b/wrolpi/collections/test/test_playlists_config.py @@ -471,3 +471,28 @@ async def test_import_unreadable_items_keeps_items(test_session, test_directory, test_session.expire_all() collection = test_session.query(Collection).filter_by(kind='playlist').one() assert len(collection.items) == 1 + + +@pytest.mark.asyncio +@pytest.mark.parametrize('directory', ['../outside', 'playlists/../../outside', '/outside']) +async def test_import_skips_directory_outside_media(test_session, test_directory, playlists_config, directory): + """A playlist directory outside the media directory is skipped (counted); the playlist keeps its directory.""" + collection = _make_playlist(test_session) + collection.directory = test_directory / 'playlists/survives' + test_session.commit() + + file = playlists_config.get_file() + file.parent.mkdir(parents=True, exist_ok=True) + file.write_text(yaml.dump(dict(version=1, playlists=[ + dict(name='Survives', directory=directory, items=[dict(url='/map?lat=1&lon=2&z=3', title='spot')]), + dict(name='Outside', directory=directory), + ]))) + + config_was_imported(test_session, 'playlists.yaml') + playlists_config.import_config() + + assert playlists_config.import_skipped == 2 + test_session.expire_all() + playlists = {i.name: i for i in test_session.query(Collection).filter_by(kind='playlist')} + assert set(playlists) == {'Survives'} + assert playlists['Survives'].directory == test_directory / 'playlists/survives'