From 394cf68b611765810bf33865805b4bfc6806da54 Mon Sep 17 00:00:00 2001 From: jo Date: Mon, 20 Feb 2023 22:03:36 +0100 Subject: [PATCH] fix(playout): quote escape strings in liquidsoap entrypoint --- .../liquidsoap/entrypoint.liq.j2 | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/playout/libretime_playout/liquidsoap/entrypoint.liq.j2 b/playout/libretime_playout/liquidsoap/entrypoint.liq.j2 index a176214bc..389fe7519 100644 --- a/playout/libretime_playout/liquidsoap/entrypoint.liq.j2 +++ b/playout/libretime_playout/liquidsoap/entrypoint.liq.j2 @@ -3,39 +3,39 @@ # The ignore() lines are to squash unused variable warnings # Inputs -master_live_stream_mp = "{{ config.stream.inputs.main.mount }}" +master_live_stream_mp = {{ config.stream.inputs.main.mount | quote }} master_live_stream_port = {{ config.stream.inputs.main.port }} -dj_live_stream_mp = "{{ config.stream.inputs.show.mount }}" +dj_live_stream_mp = {{ config.stream.inputs.show.mount | quote }} dj_live_stream_port = {{ config.stream.inputs.show.port }} {% for output in config.stream.outputs.merged -%} # Output s{{ loop.index }} s{{ loop.index }}_enable = {{ output.enabled | lower }} -s{{ loop.index }}_output = "{{ output.kind }}" -s{{ loop.index }}_host = "{{ output.host }}" +s{{ loop.index }}_output = {{ output.kind | quote }} +s{{ loop.index }}_host = {{ output.host | quote }} s{{ loop.index }}_port = {{ output.port }} -s{{ loop.index }}_mount = "{{ output.mount }}" -s{{ loop.index }}_user = "{{ output.source_user }}" -s{{ loop.index }}_pass = "{{ output.source_password }}" +s{{ loop.index }}_mount = {{ output.mount | quote }} +s{{ loop.index }}_user = {{ output.source_user | quote }} +s{{ loop.index }}_pass = {{ output.source_password | quote }} -s{{ loop.index }}_channels = "{{ output.audio.channels.value }}" -s{{ loop.index }}_type = "{{ output.audio.format.value }}" +s{{ loop.index }}_channels = {{ output.audio.channels.value | quote }} +s{{ loop.index }}_type = {{ output.audio.format.value | quote }} s{{ loop.index }}_bitrate = {{ output.audio.bitrate }} -s{{ loop.index }}_name = "{{ output.name or '' }}" -s{{ loop.index }}_description = "{{ output.description or '' }}" -s{{ loop.index }}_genre = "{{ output.genre or '' }}" -s{{ loop.index }}_url = "{{ output.website or '' }}" +s{{ loop.index }}_name = {{ (output.name or '') | quote }} +s{{ loop.index }}_description = {{ (output.description or '') | quote }} +s{{ loop.index }}_genre = {{ (output.genre or '') | quote }} +s{{ loop.index }}_url = {{ (output.website or '') | quote }} {% endfor -%} icecast_vorbis_metadata = {{ icecast_vorbis_metadata | lower }} # System output output_sound_device = {{ config.stream.outputs.system[0].enabled | lower }} -output_sound_device_type = "{{ config.stream.outputs.system[0].kind.value }}" +output_sound_device_type = {{ config.stream.outputs.system[0].kind.value | quote }} # Settings -auth_path = "{{ paths.auth_filepath }}" +auth_path = {{ paths.auth_filepath | quote }} {% if paths.log_filepath is defined -%} set("log.file.path", "{{ paths.log_filepath }}") @@ -44,14 +44,14 @@ set("log.file", false) {%- endif %} set("server.telnet", true) -set("server.telnet.bind_addr", "{{ config.liquidsoap.server_listen_address }}") +set("server.telnet.bind_addr", {{ config.liquidsoap.server_listen_address | quote }}) set("server.telnet.port", {{ config.liquidsoap.server_listen_port }}) set("harbor.bind_addrs", ["{{ config.liquidsoap.harbor_listen_address | join('", "') }}"]) -station_name = ref "{{ info.station_name }}" +station_name = ref {{ info.station_name | quote }} -off_air_meta = ref "{{ preferences.message_offline }}" +off_air_meta = ref {{ preferences.message_offline | quote }} stream_metadata_type = ref {{ preferences.message_format.value }} default_dj_fade = ref {{ preferences.input_fade_transition }}