avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-08-16 18:12:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(collabora): enforce the ssl option independently of extra_params

Browse Source
This commit is contained in:
Alexandre
2026-07-26 19:47:15 +02:00
parent ae2c19074a
commit ff4df36fba
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
collabora/rootfs/etc/cont-init.d/99-run.sh
View File

@@ -81,6 +81,12 @@ if bashio::config.has_value 'extra_params'; then
extra_params="$(bashio::config 'extra_params')" extra_params="$(bashio::config 'extra_params')"
fi fi
# The add-on ssl option is authoritative. coolwsd defaults ssl.enable to true,
# so merely clearing extra_params used to re-enable its self-signed HTTPS even
# when ssl was false, which breaks reverse proxies expecting plain HTTP.
extra_params="${extra_params//--o:ssl.enable=false/}"
extra_params="${extra_params//--o:ssl.enable=true/}"
if bashio::config.true 'ssl'; then if bashio::config.true 'ssl'; then
export DONT_GEN_SSL_CERT=true export DONT_GEN_SSL_CERT=true
bashio::config.require.ssl bashio::config.require.ssl
@@ -102,23 +108,24 @@ if bashio::config.true 'ssl'; then
cp -f "/ssl/${certfile}" /etc/coolwsd/cert.pem cp -f "/ssl/${certfile}" /etc/coolwsd/cert.pem
cp -f "/ssl/${certfile}" /etc/coolwsd/ca-chain.cert.pem cp -f "/ssl/${certfile}" /etc/coolwsd/ca-chain.cert.pem
chmod 600 /etc/coolwsd/key.pem chmod 600 /etc/coolwsd/key.pem
extra_params="${extra_params/--o:ssl.enable=false/}"
extra_params="${extra_params} \ extra_params="${extra_params} \
--o:ssl.enable=true \ --o:ssl.enable=true \
--o:ssl.termination=false \ --o:ssl.termination=false \
--o:ssl.cert_file_path=/etc/coolwsd/cert.pem \ --o:ssl.cert_file_path=/etc/coolwsd/cert.pem \
--o:ssl.key_file_path=/etc/coolwsd/key.pem \ --o:ssl.key_file_path=/etc/coolwsd/key.pem \
--o:ssl.ca_file_path=/etc/coolwsd/ca-chain.cert.pem" --o:ssl.ca_file_path=/etc/coolwsd/ca-chain.cert.pem"
elif [[ "$extra_params" != *ssl.termination* ]]; then else
# coolwsd defaults ssl.termination to false, so with ssl disabled it builds extra_params="${extra_params} --o:ssl.enable=false"
# http:// and ws:// URLs even when the browser reached it over https through if [[ "$extra_params" != *ssl.termination* ]]; then
# a reverse proxy, and the browser then refuses the connection. # With SSL disabled, termination must be enabled when a reverse proxy
# exposes Collabora over https, otherwise it advertises http/ws URLs.
if bashio::config.true 'ssl_termination'; then if bashio::config.true 'ssl_termination'; then
extra_params="${extra_params} --o:ssl.termination=true" extra_params="${extra_params} --o:ssl.termination=true"
elif ! bashio::config.has_value 'ssl_termination'; then elif ! bashio::config.has_value 'ssl_termination'; then
bashio::log.notice "If Collabora is reached over https through a reverse proxy, set ssl_termination to true" bashio::log.notice "If Collabora is reached over https through a reverse proxy, set ssl_termination to true"
fi fi
fi fi
fi
export extra_params export extra_params