haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename: remaining lool->cool changes 

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ib7d4e804bebe52dead8d53b0e0bbaed0f08bf3d0
pull/3676/head
Andras Timar 2021-11-18 13:08:14 +01:00
parent a8a0ce22c2
commit f07ff8c7e0
196 changed files with 1568 additions and 1563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.gitignore vendored
View File

@ -12,9 +12,9 @@
.vscode
Makefile
Makefile.in
loolkitconfig.xcu
loolwsd.spec
loolwsd.xml
coolkitconfig.xcu
coolwsd.spec
coolwsd.xml
aclocal.m4
autom4te.cache
config.h
@ -33,7 +33,7 @@ ltmain.sh
missing
stamp-h1
m4
debian/loolwsd.postinst
debian/coolwsd.postinst
common/support-public-key.hpp
compile_commands.json
@ -55,7 +55,7 @@ jsstress
*.exe
cscope*
*.orig
loolwsd.log
coolwsd.log
*.log.*.gz
*.lo
*.mo
@ -72,19 +72,20 @@ browser/typescript_js
connect
lokitclient
coolwsd
loolwsd
coolforkit
coolmount
coolmap
coolconvert
loolsocketdump
loolstress
loolconfig
coolsocketdump
coolstress
coolconfig
loolconfig
coolforkit-nocaps
loadtest
unittest
loolwsd_fuzzer
coolwsd_fuzzer
clientnb
# make tags

26
.gitpod-files/loolwsd-gitpod.xml → .gitpod-files/coolwsd-gitpod.xml
View File

@ -9,7 +9,7 @@
<child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
<mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
<server_name desc="External hostname:port of the server running loolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default=""></server_name>
<server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default=""></server_name>
<file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing browser." type="path" relative="true" default="browser/../"></file_server_root_path>
<memproportion desc="The maximum percentage of system memory consumed by all of the Collabora Online Development Edition, after which we start cleaning up idle documents" type="double" default="80.0"></memproportion>
@ -53,7 +53,7 @@
See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
<lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
<file enable="true">
<property name="path" desc="Log file path.">/tmp/loolwsd.log</property>
<property name="path" desc="Log file path.">/tmp/coolwsd.log</property>
<property name="rotation" desc="Log file rotation strategy. See Poco FileChannel.">never</property>
<property name="archive" desc="Append either timestamp or number to the archived log filename.">timestamp</property>
<property name="compress" desc="Enable/disable log file compression.">true</property>
@ -71,7 +71,7 @@
<browser_logging desc="Logging in the browser console" default="true">true</browser_logging>
<trace desc="Dump commands and notifications for replay. When 'snapshot' is true, the source file is copied to the path first." enable="false">
<path desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/looltrace-%.gz" compress="true" snapshot="false"></path>
<path desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/cooltrace-%.gz" compress="true" snapshot="false"></path>
<filter>
<message desc="Regex pattern of messages to exclude"></message>
</filter>
@ -81,10 +81,10 @@
</trace>
<net desc="Network settings">
<!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, loolwsd unexpectedly listens on [::1] only.
<!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, coolwsd unexpectedly listens on [::1] only.
You need to change net.proto to IPv4, if you want to use 127.0.0.1. -->
<proto type="string" default="all" desc="Protocol to use IPv4, IPv6 or all for both">all</proto>
<listen type="string" default="any" desc="Listen address that loolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
<listen type="string" default="any" desc="Listen address that coolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
<service_root type="path" default="" desc="Prefix all the pages, websockets, etc. with this path."></service_root>
<proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
<post_allow desc="Allow/deny client IP address for POST(REST)." allow="true">
@ -96,16 +96,16 @@
<host desc="The IPv4 private 172.17.0.0/16 subnet (Docker).">172\.17\.[0-9]{1,3}\.[0-9]{1,3}</host>
<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3}</host>
</post_allow>
<frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (loolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
<connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
<frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
<connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
</net>
<ssl desc="SSL settings">
<enable type="bool" desc="Controls whether SSL encryption between browser and loolwsd is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="true">false</enable>
<termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
<cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
<key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
<ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
<enable type="bool" desc="Controls whether SSL encryption between browser and coolwsd is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="true">false</enable>
<termination desc="Connection via proxy where coolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
<cert_file_path desc="Path to the cert file" relative="false">/etc/coolwsd/cert.pem</cert_file_path>
<key_file_path desc="Path to the key file" relative="false">/etc/coolwsd/key.pem</key_file_path>
<ca_file_path desc="Path to the ca file" relative="false">/etc/coolwsd/ca-chain.cert.pem</ca_file_path>
<cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"></cipher_list>
<hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
<max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
@ -159,7 +159,7 @@
</webdav>
<ssl desc="SSL settings">
<as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
<enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults to following the ssl.enable setting"></enable>
<enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and coolwsd. When empty this defaults to following the ssl.enable setting"></enable>
<cert_file_path desc="Path to the cert file" relative="false"></cert_file_path>
<key_file_path desc="Path to the key file" relative="false"></key_file_path>
<ca_file_path desc="Path to the ca file. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." relative="false"></ca_file_path>

2
.gitpod.yml
View File

@ -34,5 +34,5 @@ github:
# 2. Update URL here under tasks
tasks:
- init: cd .. && wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-2021-assets.tar.gz
prebuild: tar xvf core-co-2021-assets.tar.gz && rm core-co-2021-assets.tar.gz && cd online && ./autogen.sh && ./configure --enable-silent-rules --with-lokit-path=/workspace/include --with-lo-path=/workspace/instdir --enable-debug --disable-setcap && cp .gitpod-files/loolwsd-gitpod.xml loolwsd.xml && mkdir .vscode && cp .gitpod-files/settings.json .vscode/settings.json && make -j `nproc`
prebuild: tar xvf core-co-2021-assets.tar.gz && rm core-co-2021-assets.tar.gz && cd online && ./autogen.sh && ./configure --enable-silent-rules --with-lokit-path=/workspace/include --with-lo-path=/workspace/instdir --enable-debug --disable-setcap && cp .gitpod-files/coolwsd-gitpod.xml coolwsd.xml && mkdir .vscode && cp .gitpod-files/settings.json .vscode/settings.json && make -j `nproc`

78
Makefile.am
View File

@ -42,31 +42,31 @@ dist_doc_DATA = wsd/README \
wsd/reference.md \
wsd/metrics.txt
coolwsddatadir = @LOOLWSD_DATADIR@
coolwsddatadir = @COOLWSD_DATADIR@
coolwsddata_DATA = discovery.xml \
favicon.ico
coolwsdconfigdir = @LOOLWSD_CONFIGDIR@
coolwsdconfigdir = @COOLWSD_CONFIGDIR@
coolwsdconfig_DATA = loolwsd.xml \
loolkitconfig.xcu
coolwsdconfig_DATA = coolwsd.xml \
coolkitconfig.xcu
apache2configdir = ${sysconfdir}/apache2/conf-available
apache2config_DATA = etc/apache2/loolwsd.conf
apache2config_DATA = etc/apache2/coolwsd.conf
nginxconfigdir = ${sysconfdir}/nginx/snippets
nginxconfig_DATA = etc/nginx/loolwsd.conf
nginxconfig_DATA = etc/nginx/coolwsd.conf
ACLOCAL_AMFLAGS = -I m4
# quick and easy for now.
include_paths = -I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd -I${top_srcdir}/kit ${ZLIB_CFLAGS}
AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' \
-DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' \
AM_CPPFLAGS = -pthread -DCOOLWSD_DATADIR='"@COOLWSD_DATADIR@"' \
-DCOOLWSD_CONFIGDIR='"@COOLWSD_CONFIGDIR@"' \
-DDEBUG_ABSSRCDIR='"@abs_srcdir@"' \
${include_paths}
@ -79,12 +79,12 @@ AM_LDFLAGS = -pthread -Wl,-E -lpam $(ZLIB_LIBS)
if ENABLE_SSL
AM_LDFLAGS += -lssl -lcrypto
else
loolwsd_fuzzer_LDADD = -lssl -lcrypto
coolwsd_fuzzer_LDADD = -lssl -lcrypto
coolwsd_LDADD = -lssl -lcrypto
coolconfig_LDADD = -lssl -lcrypto
endif
loolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 -DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)
coolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 -DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)
AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes --exclude=browser *
AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
@ -123,7 +123,7 @@ coolwsd_sources = common/Crypto.cpp \
wsd/Auth.cpp \
wsd/DocumentBroker.cpp \
wsd/ProxyProtocol.cpp \
wsd/LOOLWSD.cpp \
wsd/COOLWSD.cpp \
wsd/ClientSession.cpp \
wsd/FileServer.cpp \
wsd/FileServerUtil.cpp \
@ -144,8 +144,8 @@ noinst_PROGRAMS = clientnb \
connect \
lokitclient \
coolmap \
loolstress \
loolsocketdump
coolstress \
coolsocketdump
if ENABLE_LIBFUZZER
noinst_PROGRAMS += \
@ -153,7 +153,7 @@ noinst_PROGRAMS += \
clientsession_fuzzer \
httpresponse_fuzzer
else
noinst_PROGRAMS += loolwsd_fuzzer
noinst_PROGRAMS += coolwsd_fuzzer
endif
connect_SOURCES = tools/Connect.cpp \
@ -180,7 +180,7 @@ coolforkit_json = $(patsubst %.cpp,%.cmd,$(coolforkit_sources))
coolforkit_SOURCES = $(coolforkit_sources) \
$(shared_sources)
loolwsd_fuzzer_SOURCES = $(coolwsd_sources) \
coolwsd_fuzzer_SOURCES = $(coolwsd_sources) \
$(coolforkit_sources) \
$(shared_sources) \
kit/DummyLibreOfficeKit.cpp
@ -227,8 +227,8 @@ coolmap_SOURCES = tools/map.cpp
coolconvert_SOURCES = tools/Tool.cpp
loolstress_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\" ${include_paths}
loolstress_SOURCES = tools/Stress.cpp \
coolstress_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\" ${include_paths}
coolstress_SOURCES = tools/Stress.cpp \
common/DummyTraceEventEmitter.cpp \
$(shared_sources)
@ -239,7 +239,7 @@ coolconfig_SOURCES = tools/Config.cpp \
common/StringVector.cpp \
common/Util.cpp
loolsocketdump_SOURCES = tools/WebSocketDump.cpp \
coolsocketdump_SOURCES = tools/WebSocketDump.cpp \
common/DummyTraceEventEmitter.cpp \
$(shared_sources)
@ -251,7 +251,7 @@ wsd_headers = wsd/Admin.hpp \
wsd/ProxyProtocol.hpp \
wsd/Exceptions.hpp \
wsd/FileServer.hpp \
wsd/LOOLWSD.hpp \
wsd/COOLWSD.hpp \
wsd/ProofKey.hpp \
wsd/RequestDetails.hpp \
wsd/SenderQueue.hpp \
@ -314,11 +314,11 @@ kit_headers = kit/ChildSession.hpp \
kit/Watermark.hpp
noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \
tools/LOOLWebSocket.hpp \
tools/COOLWebSocket.hpp \
test/UnitHTTP.hpp \
test/HttpTestServer.hpp \
test/WopiTestServer.hpp \
test/countloolkits.hpp \
test/countcoolkits.hpp \
test/lokassert.hpp \
test/test.hpp \
test/testlog.hpp \
@ -337,27 +337,27 @@ dist-hook:
EXTRA_DIST = discovery.xml \
favicon.ico \
loolkitconfig.xcu \
loolwsd.init.rhel6 \
loolwsd.spec \
loolwsd.xml.in \
loolwsd.service \
sysconfig.loolwsd \
coolkitconfig.xcu \
coolwsd.init.rhel6 \
coolwsd.spec \
coolwsd.xml.in \
coolwsd.service \
sysconfig.coolwsd \
debian/compat \
debian/copyright \
debian/loolwsd.preinst \
debian/loolwsd.service \
debian/coolwsd.preinst \
debian/coolwsd.service \
debian/rules \
debian/source/format \
debian/changelog \
debian/control \
debian/loolwsd.postinst \
debian/loolwsd.postrm \
debian/coolwsd.postinst \
debian/coolwsd.postrm \
etc/key.pem \
etc/cert.pem \
etc/ca-chain.cert.pem \
etc/apache2/loolwsd.conf \
etc/nginx/loolwsd.conf \
etc/apache2/coolwsd.conf \
etc/nginx/coolwsd.conf \
scripts/unocommands.py \
scripts/refresh-git-hooks \
README.md \
@ -366,7 +366,7 @@ EXTRA_DIST = discovery.xml \
if ENABLE_LIBFUZZER
CLEANUP_COMMAND=true
else
# Use loolwsd to cleanup jails, if any. If it fails, we may have a broken/old loolwsd binary, remove it to rebuild.
# Use coolwsd to cleanup jails, if any. If it fails, we may have a broken/old coolwsd binary, remove it to rebuild.
# A CI box may switch branches without cleaning up the binaries, if coolwsd from a broken branch is used here
# it will fail all subsequent builds, until it's rebuilt from the new branch. So removing coolwsd after failing is needed.
CLEANUP_COMMAND=if test -s ./coolwsd; then echo "Cleaning up..." && ./coolwsd --disable-cool-user-checking --cleanup --o:logging.level=trace || rm ./coolwsd; fi
@ -390,7 +390,7 @@ else
CLEANUP_DEPS=coolwsd coolmount coolforkit
endif
# Build loolwsd and coolmount first, so we can cleanup before updating
# Build coolwsd and coolmount first, so we can cleanup before updating
# the systemplate directory, which we can't rm if it's mounted.
$(SYSTEM_STAMP): ${top_srcdir}/coolwsd-systemplate-setup $(CLEANUP_DEPS)
$(SET_CAPS_COMMAND)
@ -416,15 +416,15 @@ clean-local:
rm -rf "${top_srcdir}/loleaflet"
if ENABLE_DEBUG
# can write to /tmp/loolwsd.log
# can write to /tmp/coolwsd.log
OUTPUT_TO_FILE=true
else
# can't write to /var/log/loolwsd.log
# can't write to /var/log/coolwsd.log
OUTPUT_TO_FILE=false
endif
setup-wsd: all @JAILS_PATH@
@echo "Launching loolwsd"
@echo "Launching coolwsd"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
@ -476,7 +476,7 @@ run-trace: setup-wsd
--o:trace.outgoing.record=false
run-valgrind: setup-wsd
@echo "Launching coolwsd under valgrind (but not forkit/loolkit, yet)"
@echo "Launching coolwsd under valgrind (but not forkit/coolkit, yet)"
valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
./coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
--o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \

2
PROBLEMS
View File

@ -39,7 +39,7 @@
removed from the Kit/ChildSession.cppp as/when we move to a single
threaded Kit process.
- Occasionally Control-C (SIGINT) doesn't shut down loolwsd. One has
- Occasionally Control-C (SIGINT) doesn't shut down coolwsd. One has
to kill it with SIGKILL. Which of course leaves all the chroot jails
around.

4
android/app/appSettings.gradle.in
View File

@ -5,12 +5,12 @@ ext {
liboLauncherIcon = '@mipmap/@APP_IC_LAUNCHER@'
liboHasBranding = '@APP_HAS_BRANDING@'
liboBrandingDir = '@APP_BRANDING_DIR@'
liboOVersionHash = '@LOOLWSD_VERSION_HASH@'
liboOVersionHash = '@COOLWSD_VERSION_HASH@'
liboCoreVersionHash = '@CORE_VERSION_HASH@'
}
android.defaultConfig {
applicationId '@ANDROID_PACKAGE_NAME@'
versionCode @ANDROID_PACKAGE_VERSIONCODE@
versionName '@LOOLWSD_VERSION@'
versionName '@COOLWSD_VERSION@'
}

2
android/app/proguard-rules.pro vendored
View File

@ -12,7 +12,7 @@
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
-keepclassmembers class LOOLMessageHandler {
-keepclassmembers class COOLMessageHandler {
public *;
}

12
android/lib/build.gradle.in
View File

@ -93,9 +93,9 @@ task copyUnpackAssets(type: Copy) {
includes = ['**']
}
}
into('etc/loolwsd') {
from('/android/loolkitconfig.xcu')
includes = [ 'loolkitconfig.xcu' ]
into('etc/coolwsd') {
from('/android/coolkitconfig.xcu')
includes = [ 'coolkitconfig.xcu' ]
}
into('user/fonts') {
from "${liboInstdir}/share/fonts/truetype"
@ -189,9 +189,9 @@ task copyDocTemplates(type: Copy) {
}
task copyKitConfig(type: Copy) {
from "${file(rootProject.getRootDir()).getParent()}/loolkitconfig-mobile.xcu"
into "src/main/assets/etc/loolwsd"
rename { "loolkitconfig.xcu" }
from "${file(rootProject.getRootDir()).getParent()}/coolkitconfig-mobile.xcu"
into "src/main/assets/etc/coolwsd"
rename { "coolkitconfig.xcu" }
}
task createStrippedConfig {

6
android/lib/libSettings.gradle.in
View File

@ -3,9 +3,9 @@ ext {
liboSrcRoot = '@LOBUILDDIR@'
liboInstdir = '@LOBUILDDIR@/instdir'
liboExampleDocument = '@LOBUILDDIR@/android/default-document/example.odt'
liboVersionMajor = '@LOOLWSD_VERSION_MAJOR@'
liboVersionMinor = '@LOOLWSD_VERSION_MAJOR@'
liboOVersionHash = '@LOOLWSD_VERSION_HASH@'
liboVersionMajor = '@COOLWSD_VERSION_MAJOR@'
liboVersionMinor = '@COOLWSD_VERSION_MAJOR@'
liboOVersionHash = '@COOLWSD_VERSION_HASH@'
liboCoreVersionHash = '@CORE_VERSION_HASH@'
liboApplicationId = '@ANDROID_PACKAGE_NAME@'
liboBrandingDir = '@APP_BRANDING_DIR@'

6
android/lib/src/main/cpp/CMakeLists.txt.in
View File

@ -24,12 +24,12 @@ add_library(androidapp SHARED
../../../../../net/Socket.cpp
../../../../../wsd/ClientSession.cpp
../../../../../wsd/DocumentBroker.cpp
../../../../../wsd/LOOLWSD.cpp
../../../../../wsd/COOLWSD.cpp
../../../../../wsd/RequestDetails.cpp
../../../../../wsd/Storage.cpp
../../../../../wsd/TileCache.cpp)
target_compile_definitions(androidapp PRIVATE LOOLWSD_CONFIGDIR="/assets/etc/loolwsd")
target_compile_definitions(androidapp PRIVATE COOLWSD_CONFIGDIR="/assets/etc/coolwsd")
# According to the ABI, we need to use different source trees
if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
@ -58,7 +58,7 @@ target_include_directories(androidapp PRIVATE
. # path to androidapp.h
@abs_top_builddir@ # path to config.h
@abs_top_srcdir@
../../../../../common # the needed loolwsd includes
../../../../../common # the needed coolwsd includes
../../../../../kit
../../../../../net
../../../../../wsd

36
android/lib/src/main/cpp/androidapp.cpp
View File

@ -15,7 +15,7 @@
#include <FakeSocket.hpp>
#include <Kit.hpp>
#include <Log.hpp>
#include <LOOLWSD.hpp>
#include <COOLWSD.hpp>
#include <Protocol.hpp>
#include <SetupKitEnvironment.hpp>
#include <Util.hpp>
@ -26,7 +26,7 @@
const int SHOW_JS_MAXLEN = 70;
int loolwsd_server_socket_fd = -1;
int coolwsd_server_socket_fd = -1;
const char* user_name;
@ -97,7 +97,7 @@ public:
static void send2JS(const JNIThreadContext &jctx, const std::vector<char>& buffer)
{
LOG_DBG("Send to JS: " << LOOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
LOG_DBG("Send to JS: " << COOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
std::string js;
@ -183,9 +183,9 @@ void closeDocument()
// Close one end of the socket pair, that will wake up the forwarding thread that was constructed in HULLO
fakeSocketClose(closeNotificationPipeForForwardingThread[0]);
LOG_DBG("Waiting for LOOLWSD to finish...");
std::unique_lock<std::mutex> lock(LOOLWSD::lokit_main_mutex);
LOG_DBG("LOOLWSD has finished.");
LOG_DBG("Waiting for COOLWSD to finish...");
std::unique_lock<std::mutex> lock(COOLWSD::lokit_main_mutex);
LOG_DBG("COOLWSD has finished.");
}
/// Handle a message from JavaScript.
@ -206,11 +206,11 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
{
// Now we know that the JS has started completely
// Contact the permanently (during app lifetime) listening LOOLWSD server
// Contact the permanently (during app lifetime) listening COOLWSD server
// "public" socket
assert(loolwsd_server_socket_fd != -1);
assert(coolwsd_server_socket_fd != -1);
int rc = fakeSocketConnect(currentFakeClientFd, loolwsd_server_socket_fd);
int rc = fakeSocketConnect(currentFakeClientFd, coolwsd_server_socket_fd);
assert(rc != -1);
// Create a socket pair to notify the below thread when the document has been closed
@ -267,7 +267,7 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
// WebSocket.
LOG_DBG("Actually sending to Online:" << fileURL);
// Send the document URL to LOOLWSD to setup the docBroker URL
// Send the document URL to COOLWSD to setup the docBroker URL
struct pollfd pollfd;
pollfd.fd = currentFakeClientFd;
pollfd.events = POLLOUT;
@ -282,7 +282,7 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
}
else
{
// Send the message to LOOLWSD
// Send the message to COOLWSD
char *string_copy = strdup(string_value);
struct pollfd pollfd;
@ -300,9 +300,9 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
extern "C" jboolean libreofficekit_initialize(JNIEnv* env, jstring dataDir, jstring cacheDir, jstring apkFile, jobject assetManager);
/// Create the LOOLWSD instance.
/// Create the COOLWSD instance.
extern "C" JNIEXPORT void JNICALL
Java_org_libreoffice_androidlib_LOActivity_createLOOLWSD(JNIEnv *env, jobject instance, jstring dataDir, jstring cacheDir, jstring apkFile, jobject assetManager, jstring loadFileURL, jstring uiMode, jstring userName)
Java_org_libreoffice_androidlib_LOActivity_createCOOLWSD(JNIEnv *env, jobject instance, jstring dataDir, jstring cacheDir, jstring apkFile, jobject assetManager, jstring loadFileURL, jstring uiMode, jstring userName)
{
fileURL = std::string(env->GetStringUTFChars(loadFileURL, nullptr));
@ -343,14 +343,14 @@ Java_org_libreoffice_androidlib_LOActivity_createLOOLWSD(JNIEnv *env, jobject in
Util::setThreadName("app");
while (true)
{
LOG_DBG("Creating LOOLWSD");
LOG_DBG("Creating COOLWSD");
{
fakeClientFd = fakeSocketSocket();
LOG_DBG("createLOOLWSD created fakeClientFd: " << fakeClientFd);
std::unique_ptr<LOOLWSD> loolwsd(new LOOLWSD());
loolwsd->run(1, argv);
LOG_DBG("createCOOLWSD created fakeClientFd: " << fakeClientFd);
std::unique_ptr<COOLWSD> coolwsd(new COOLWSD());
coolwsd->run(1, argv);
}
LOG_DBG("One run of LOOLWSD completed");
LOG_DBG("One run of COOLWSD completed");
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
}).detach();

2
android/lib/src/main/cpp/androidapp.hpp
View File

@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
extern int loolwsd_server_socket_fd;
extern int coolwsd_server_socket_fd;
extern const char* user_name;

16
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
View File

@ -93,7 +93,7 @@ public class LOActivity extends AppCompatActivity {
private static final String KEY_IS_EDITABLE = "isEditable";
private static final String KEY_INTENT_URI = "intentUri";
private static final String CLIPBOARD_FILE_PATH = "LibreofficeClipboardFile.data";
private static final String CLIPBOARD_LOOL_SIGNATURE = "cool-clip-magic-4a22437e49a8-";
private static final String CLIPBOARD_COOL_SIGNATURE = "cool-clip-magic-4a22437e49a8-";
public static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS_LIST";
private static String USER_NAME_KEY = "USER_NAME";
@ -343,7 +343,7 @@ public class LOActivity extends AppCompatActivity {
WebSettings webSettings = mWebView.getSettings();
webSettings.setJavaScriptEnabled(true);
mWebView.addJavascriptInterface(this, "LOOLMessageHandler");
mWebView.addJavascriptInterface(this, "COOLMessageHandler");
// allow debugging (when building the debug version); see details in
// https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews
@ -812,7 +812,7 @@ public class LOActivity extends AppCompatActivity {
private void loadDocument() {
mProgressDialog.determinate(R.string.loading);
// setup the LOOLWSD
// setup the COOLWSD
ApplicationInfo applicationInfo = getApplicationInfo();
String dataDir = applicationInfo.dataDir;
Log.i(TAG, String.format("Initializing LibreOfficeKit, dataDir=%s\n", dataDir));
@ -822,7 +822,7 @@ public class LOActivity extends AppCompatActivity {
AssetManager assetManager = getResources().getAssets();
String uiMode = (isLargeScreen() && !isChromeOS()) ? "notebookbar" : "classic";
String userName = getPrefs().getString(USER_NAME_KEY, "Guest User");
createLOOLWSD(dataDir, cacheDir, apkFile, assetManager, urlToLoad, uiMode, userName);
createCOOLWSD(dataDir, cacheDir, apkFile, assetManager, urlToLoad, uiMode, userName);
// trigger the load of the document
String finalUrlToLoad = "file:///android_asset/dist/cool.html?file_path=" +
@ -871,9 +871,9 @@ public class LOActivity extends AppCompatActivity {
}
/**
* Initialize the LOOLWSD to load 'loadFileURL'.
* Initialize the COOLWSD to load 'loadFileURL'.
*/
public native void createLOOLWSD(String dataDir, String cacheDir, String apkFile, AssetManager assetManager, String loadFileURL, String uiMode, String userName);
public native void createCOOLWSD(String dataDir, String cacheDir, String apkFile, AssetManager assetManager, String loadFileURL, String uiMode, String userName);
/**
* Passing messages from JS (instead of the websocket communication).
@ -1278,7 +1278,7 @@ public class LOActivity extends AppCompatActivity {
/// Returns a magic that specifies this application - and this document.
private final String getClipboardMagic() {
return CLIPBOARD_LOOL_SIGNATURE + Long.toString(loadDocumentMillis);
return CLIPBOARD_COOL_SIGNATURE + Long.toString(loadDocumentMillis);
}
/// Needs to be executed after the .uno:Copy / Paste has executed
@ -1336,7 +1336,7 @@ public class LOActivity extends AppCompatActivity {
if (clipDesc.getMimeType(i).equals(ClipDescription.MIMETYPE_TEXT_HTML)) {
final String html = clipData.getItemAt(i).getHtmlText();
// Check if the clipboard content was made with the app
if (html.contains(CLIPBOARD_LOOL_SIGNATURE)) {
if (html.contains(CLIPBOARD_COOL_SIGNATURE)) {
// Check if the clipboard content is from the same app instance
if (html.contains(getClipboardMagic())) {
Log.i(TAG, "clipboard comes from us - same instance: short circuit it " + html);

2
browser/Makefile.am
View File

@ -740,7 +740,7 @@ check-local: $(MOCHA_TS_JS_FILES)
@echo "Running mocha tests..."
@$(NODE) node_modules/mocha/bin/mocha "$(srcdir)/mocha_tests/**/*.js"
SSL_FLAG = `xmllint --xpath 'string(/config/ssl/enable)' $(abs_top_builddir)/loolwsd.xml`
SSL_FLAG = `xmllint --xpath 'string(/config/ssl/enable)' $(abs_top_builddir)/coolwsd.xml`
# the delay (in miliseconds) between each emulated key stroke for each view
typing_speed=100

22
browser/README
View File

@ -75,23 +75,23 @@ Running
To see an example:
* run loolwsd, like:
* run coolwsd, like:
./loolwsd --o:sys_template_path=${SYSTEMPLATE} --o:child_root_path=${ROOTFORJAILS}
./coolwsd --o:sys_template_path=${SYSTEMPLATE} --o:child_root_path=${ROOTFORJAILS}
Note that this will, by default, set the loolwsd's file server's root to the parent directory of loolwsd,
Note that this will, by default, set the coolwsd's file server's root to the parent directory of coolwsd,
which means you can access all the files in browser using /browser/ path. It is advised to set
file_server_root_path manually for more control. See wsd/README for more information.
* open dist/cool.html through loolwsd's fileserver
* open dist/cool.html through coolwsd's fileserver
https://localhost:9980/browser/dist/cool.html?file_path=file:///PATH/TO_DOC&host=wss://localhost:9980
and you should see the document in the browser.
Note that accessing local storage is disabled by default for security reasons. You need to explicitly enable it
with the --o:storage.filesystem[@allow]=true option of loolwsd. In case anything goes wrong, check the loolwsd console for
with the --o:storage.filesystem[@allow]=true option of coolwsd. In case anything goes wrong, check the coolwsd console for
the debugging output. You might be asked to confirm the certificate if you are using self-signed certificate
for loolwsd.
for coolwsd.
Development
-----------
@ -105,7 +105,7 @@ Remember to add '--enable-browsersync' argument for './configure' script and del
Run server and start browser-sync:
LOOL_SERVE_FROM_FS=1 make run
COOL_SERVE_FROM_FS=1 make run
and in the second terminal:
@ -119,16 +119,16 @@ browser-sync start --config browsersync-config.js --startPath "browser/96c23f663
Admin Panel
-----------
You can do live monitoring of all the user sessions running on loolwsd instance. To access the admin
console you need to ask for admin.html file from loolwsd which resides in dist/admin/admin.html.
You can do live monitoring of all the user sessions running on coolwsd instance. To access the admin
console you need to ask for admin.html file from coolwsd which resides in dist/admin/admin.html.
For example:
https://localhost:9980/browser/dist/admin/admin.html
It will ask for username and password which is set by the admin_console options of loolwsd. For example you can
It will ask for username and password which is set by the admin_console options of coolwsd. For example you can
pass --o:admin_console.username=admin --o:admin_console.password=admin in command line, or set these values in
loolwsd.xml. After entering the correct password you should be able to monitor the live documents opened, total
coolwsd.xml. After entering the correct password you should be able to monitor the live documents opened, total
users, memory consumption, document URLs with number of users viewing that document etc. You can also kill the
documents directly from the panel which would result in closing the socket connection to the respective document.

4
browser/admin/adminSettings.html
View File

@ -123,8 +123,8 @@
<div class="section">
<h4><script>document.write(l10nstrings.strVersionInfo)</script></h4>
<p>
<h5><b>LOOLWSD</b></h5>
<div id="loolwsd-version"></div>
<h5><b>COOLWSD</b></h5>
<div id="coolwsd-version"></div>
</p>
<p>
<h5><b>LOKit</b></h5>

8
browser/admin/src/AdminSocketSettings.js
View File

@ -76,14 +76,14 @@ var AdminSocketSettings = AdminSocketBase.extend({
}
else if (textMsg.startsWith('coolserver ')) {
// This must be the first message, unless we reconnect.
var loolwsdVersionObj = JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
var coolwsdVersionObj = JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = coolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) === h.toLowerCase().replace(/^0+/, '')) {
h = '<a target="_blank" href="https://github.com/CollaboraOnline/online/commits/' + h + '">' + h + '</a>';
$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h + ')');
$('#coolwsd-version').html(coolwsdVersionObj.Version + ' (git hash: ' + h + ')');
}
else {
$('#loolwsd-version').text(loolwsdVersionObj.Version);
$('#coolwsd-version').text(coolwsdVersionObj.Version);
}
}
else if (textMsg.startsWith('lokitversion ')) {

BIN
browser/archived-packages/vex-js-4.1.0-9ff760927.tar
View File

Binary file not shown.

4
browser/cool-api.html
View File

@ -103,14 +103,14 @@ unexpected behaviour.</h5>
<td><code><b>server</b></code></td>
<td><code>String</code></td>
<td><code><span class="literal">undefined</span></code></td>
<td>The websocket server hosting loolwsd using the <code>ws:</code> protocol.
<td>The websocket server hosting coolwsd using the <code>ws:</code> protocol.
Example: wss://localhost:9980</td>
</tr>
<tr>
<td><code><b>webserver</b></code></td>
<td><code>String</code></td>
<td><code><span class="literal">undefined</span></code></td>
<td>The webserver access to hosting loolwsd. Normally it is
<td>The webserver access to hosting coolwsd. Normally it is
derived from 'server', but can be overridden with an own
value in case of proxying. Example: http://localhost:9980</td>
</tr>

12
browser/html/cool.html.m4
View File

@ -66,9 +66,9 @@ m4_ifelse(GTKAPP,[true],
)
m4_ifelse(ANDROIDAPP,[true],
[ window.ThisIsTheAndroidApp = true;
window.postMobileMessage = function(msg) { window.LOOLMessageHandler.postMobileMessage(msg); };
window.postMobileError = function(msg) { window.LOOLMessageHandler.postMobileError(msg); };
window.postMobileDebug = function(msg) { window.LOOLMessageHandler.postMobileDebug(msg); };],
window.postMobileMessage = function(msg) { window.COOLMessageHandler.postMobileMessage(msg); };
window.postMobileError = function(msg) { window.COOLMessageHandler.postMobileError(msg); };
window.postMobileDebug = function(msg) { window.COOLMessageHandler.postMobileDebug(msg); };],
[ window.ThisIsTheAndroidApp = false;]
)
@ -252,9 +252,9 @@ m4_ifelse(MOBILEAPP,[true],
</div>
<div id="about-dialog-info-container">
<div id="about-dialog-info">
<div> LOOLWSD version:</div>
<div id="loolwsd-version"></div>
<div id="loolwsd-id" style="visibility: hidden;"></div>
<div> COOLWSD version:</div>
<div id="coolwsd-version"></div>
<div id="coolwsd-id" style="visibility: hidden;"></div>
<div>LOKit version:</div>
<div id="lokit-version"></div>
m4_ifelse(MOBILEAPP,[],[<div id="os-info"></div>],[<p></p>])

2
browser/html/framed.doc.html
View File

@ -193,7 +193,7 @@
<h3>Document frame</h3>
<h4>If the frame fails to load click <a id="link">here and accept security bits</a></h4>
<h4>If the frame still fails to load ensure you have <code>localhost:*</code> included in your <code>net.frame_ancestors</code> in loolwsd.xml</h4>
<h4>If the frame still fails to load ensure you have <code>localhost:*</code> included in your <code>net.frame_ancestors</code> in coolwsd.xml</h4>
<iframe id="frame" height="1000" width="1000"></iframe>
<script>

2
browser/js/global.js
View File

@ -128,7 +128,7 @@ window.app = { // Shouldn't have any functions defined.
gecko3d = 'MozPerspective' in doc.style,
opera12 = 'OTransition' in doc.style;
var chromebook = window.ThisIsTheAndroidApp && window.LOOLMessageHandler.isChromeOS();
var chromebook = window.ThisIsTheAndroidApp && window.COOLMessageHandler.isChromeOS();
var touch = !window.L_NO_TOUCH && (pointer || 'ontouchstart' in window ||
(window.DocumentTouch && document instanceof window.DocumentTouch)) && !chromebook;

14
browser/src/control/Toolbar.js
View File

@ -725,9 +725,9 @@ L.Map.include({
map._docLayer.toggleTileDebugMode();
} else if (event.key === 'l') {
// L toggges the Online logging level between the default (whatever
// is set in loolwsd.xml or on the loolwsd command line) and the
// is set in coolwsd.xml or on the coolwsd command line) and the
// most verbose a client is allowed to set (which also can be set in
// loolwsd.xml or on the loolwsd command line).
// coolwsd.xml or on the coolwsd command line).
//
// In a typical developer "make run" setup, the default is "trace"
// so there is nothing more verbose. But presumably it is different
@ -741,18 +741,18 @@ L.Map.include({
var logLevelInformation = newLogLevel;
if (newLogLevel === 'default')
logLevelInformation = 'default (from loolwsd.xml)';
logLevelInformation = 'default (from coolwsd.xml)';
else if (newLogLevel === 'verbose')
logLevelInformation = 'most verbose (from loolwsd.xml)';
logLevelInformation = 'most verbose (from coolwsd.xml)';
else if (newLogLevel === 'terse')
logLevelInformation = 'least verbose (from loolwsd.xml)';
logLevelInformation = 'least verbose (from coolwsd.xml)';
else
logLevelInformation = newLogLevel;
$(app.ExpertlyTrickForLOAbout.contentEl).find('#log-level-state').html('Log level: ' + logLevelInformation);
} else if (event.key === 't') {
// T turns Trace Event recording on in the Kit process
// for this document, as long as loolwsd is running with the
// for this document, as long as coolwsd is running with the
// trace_event[@enable] config option as true. T again
// turns it off.
@ -768,7 +768,7 @@ L.Map.include({
// as directed by the SAL_LOG environment variable, and
// 2) all warnings on plus SAL_INFO for sc.
//
// (Note that loolwsd sets the SAL_LOG environment variable
// (Note that coolwsd sets the SAL_LOG environment variable
// to "-WARN-INFO", i.e. the default is that nothing is
// logged from core.)

6
browser/src/core/Socket.js
View File

@ -504,15 +504,15 @@ app.definitions.Socket = L.Class.extend({
var h = this.WSDServer.Hash;
if (parseInt(h,16).toString(16) === h.toLowerCase().replace(/^0+/, '')) {
h = '<a href="javascript:void(window.open(\'https://github.com/CollaboraOnline/online/commits/' + h + '\'));">' + h + '</a>';
$('#loolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
$('#coolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
}
else {
$('#loolwsd-version').text(this.WSDServer.Version);
$('#coolwsd-version').text(this.WSDServer.Version);
}
if (!window.ThisIsAMobileApp) {
var idUri = window.makeHttpUrl('/hosting/discovery');
$('#loolwsd-id').html(_('Served by:') + ' <a target="_blank" href="' + idUri + '">' + this.WSDServer.Id + '</a>');
$('#coolwsd-id').html(_('Served by:') + ' <a target="_blank" href="' + idUri + '">' + this.WSDServer.Id + '</a>');
}
// TODO: For now we expect perfect match in protocol versions

2
browser/src/layer/BackgroundColor.js
View File

@ -43,7 +43,7 @@ L.BackgroundColor = L.Layer.extend({
/*
* A L.BackgroundColor that automatically resets its color
* based on 'statechange' messages from loolwsd.
* based on 'statechange' messages from coolwsd.
*/
L.CalcBackground = L.BackgroundColor.extend({
onAdd: function(map) {

6
browser/src/layer/marker/TextInput.js
View File

@ -676,7 +676,7 @@ L.TextInput = L.Layer.extend({
this._emptyArea();
},
// Sends the given (UTF-8) string of text to loolwsd, as IME (text composition)
// Sends the given (UTF-8) string of text to coolwsd, as IME (text composition)
// messages
_sendText: function(text) {
if (false) {
@ -689,7 +689,7 @@ L.TextInput = L.Layer.extend({
s = s + ']';
console.log('L.TextInput._sendText: ' + s);
}
this._fancyLog('send-text-to-loolwsd', text);
this._fancyLog('send-text-to-coolwsd', text);
// MSIE/Edge cannot compare a string to "\n" for whatever reason,
// so compare charcode as well
@ -825,7 +825,7 @@ L.TextInput = L.Layer.extend({
_removeTextContent: function(before, after) {
console.log('Remove ' + before + ' before, and ' + after + ' after');
/// TODO: rename the event to 'removetextcontent' as soon as loolwsd supports it
/// TODO: rename the event to 'removetextcontent' as soon as coolwsd supports it
/// TODO: Ask Marco about it
app.socket.sendMessage(
'removetextcontext id=' +

10
browser/src/layer/tile/CanvasTileLayer.js
View File

@ -1720,7 +1720,7 @@ L.CanvasTileLayer = L.Layer.extend({
_onCellAddressMsg: function (textMsg) {
// When the user moves the focus to a different cell, a 'cellformula'
// message is received from loolwsd, *then* a 'celladdress' message.
// message is received from coolwsd, *then* a 'celladdress' message.
var address = textMsg.substring(13);
if (this._map._clip && !this._map['wopi'].DisableCopy) {
this._map._clip.setTextSelectionText(this._lastFormula);
@ -1729,10 +1729,10 @@ L.CanvasTileLayer = L.Layer.extend({
},
_onCellFormulaMsg: function (textMsg) {
// When a 'cellformula' message from loolwsd is received,
// When a 'cellformula' message from coolwsd is received,
// store the text contents of the cell, but don't push
// them to the clipboard container (yet).
// This is done because loolwsd will send several 'cellformula'
// This is done because coolwsd will send several 'cellformula'
// messages during text composition, and resetting the contents
// of the clipboard container mid-composition will easily break it.
var formula = textMsg.substring(13);
@ -3244,14 +3244,14 @@ L.CanvasTileLayer = L.Layer.extend({
}
},
// Given a character code and a UNO keycode, send a "key" message to loolwsd.
// Given a character code and a UNO keycode, send a "key" message to coolwsd.
//
// "type" is either "input" for key presses (akin to the DOM "keypress"
// / "beforeinput" events) and "up" for key releases (akin to the DOM
// "keyup" event).
//
// PageUp/PageDown and select column & row are handled as special cases for spreadsheets - in
// addition of sending messages to loolwsd, they move the cell cursor around.
// addition of sending messages to coolwsd, they move the cell cursor around.
postKeyboardEvent: function(type, charCode, unoKeyCode) {
if (!this._map._docLoaded)
return;

4
browser/src/map/handler/Map.Keyboard.js
View File

@ -269,7 +269,7 @@ L.Map.Keyboard = L.Handler.extend({
},
// _handleKeyEvent - checks if the given keyboard event shall trigger
// a message to loolwsd, and calls the given keyEventFn(type, charcode, keycode)
// a message to coolwsd, and calls the given keyEventFn(type, charcode, keycode)
// callback if so.
// Called from _onKeyDown
_handleKeyEvent: function (ev, keyEventFn) {
@ -449,7 +449,7 @@ L.Map.Keyboard = L.Handler.extend({
},
// Given a DOM keyboard event that happened while the Control key was depressed,
// triggers the appropriate action or loolwsd message.
// triggers the appropriate action or coolwsd message.
_handleCtrlCommand: function (e) {
if (this._map.uiManager.isUIBlocked())
return;

12
browser/test/bootstrap.js
View File

@ -33,18 +33,18 @@ let ssl_args = [
if (ssl_flag === 'true')
args = [...args, ...ssl_args];
const loolwsd = spawn(`${top_builddir}/loolwsd`, args);
const coolwsd = spawn(`${top_builddir}/coolwsd`, args);
/*
loolwsd.stdout.on('data', (data) => {
coolwsd.stdout.on('data', (data) => {
//console.log(`stdout: ${data}`);
});
loolwsd.stderr.on('data', (data) => {
coolwsd.stderr.on('data', (data) => {
//console.error(`stderr: ${data}`);
});
*/
loolwsd.on('exit', (code) => {
console.log(`loolwsd process exited with code ${code}`);
coolwsd.on('exit', (code) => {
console.log(`coolwsd process exited with code ${code}`);
});
let childNodes = [];
@ -66,7 +66,7 @@ if(single_view !== "true") {
function vacuumCleaner(kill, message, code) {
console.log(message);
childNodes.forEach(n => n.kill(kill));
loolwsd.kill(kill);
coolwsd.kill(kill);
console.log(`Process exited with code ${code}`);
}

14
common/Common.hpp
View File

@ -42,10 +42,10 @@ constexpr long READ_BUFFER_SIZE = 64 * 1024;
constexpr int MAX_MESSAGE_SIZE = 2 * 1024 * READ_BUFFER_SIZE;
constexpr const char JAILED_DOCUMENT_ROOT[] = "/tmp/user/docs/";
constexpr const char CHILD_URI[] = "/loolws/child?";
constexpr const char NEW_CHILD_URI[] = "/loolws/newchild";
constexpr const char CHILD_URI[] = "/coolws/child?";
constexpr const char NEW_CHILD_URI[] = "/coolws/newchild";
constexpr const char LO_JAIL_SUBPATH[] = "lo";
constexpr const char FORKIT_URI[] = "/loolws/forkit";
constexpr const char FORKIT_URI[] = "/coolws/forkit";
constexpr const char CAPABILITIES_END_POINT[] = "/hosting/capabilities";
@ -56,7 +56,7 @@ constexpr const char UPLOADING_SUFFIX[] = "ing";
/// A shared threadname suffix in both the WSD and Kit processes
/// is highly helpful for filtering the logs for the same document
/// by simply grepping for this shared suffix+ID. e.g. 'grep "broker_123" loolwsd.log'
/// by simply grepping for this shared suffix+ID. e.g. 'grep "broker_123" coolwsd.log'
/// Unfortunately grepping for only "_123" would include more noise than desirable.
/// This also makes the threadname symmetric and the entries aligned.
/// The choice of "broker" as the suffix is historic: it implies the controller
@ -69,15 +69,15 @@ constexpr const char UPLOADING_SUFFIX[] = "ing";
#define SHARED_DOC_THREADNAME_SUFFIX "broker_"
/// The HTTP request User-Agent. Used only in Requests.
#define HTTP_AGENT_STRING "LOOLWSD HTTP Agent " LOOLWSD_VERSION
#define HTTP_AGENT_STRING "COOLWSD HTTP Agent " COOLWSD_VERSION
/// The WOPI User-Agent. Depricated: use HTTP_AGENT_STRING.
#define WOPI_AGENT_STRING HTTP_AGENT_STRING
/// The HTTP response Server. Used only in Responses.
#define HTTP_SERVER_STRING "LOOLWSD HTTP Server " LOOLWSD_VERSION
#define HTTP_SERVER_STRING "COOLWSD HTTP Server " COOLWSD_VERSION
// The client port number, both loolwsd and the kits have this.
// The client port number, both coolwsd and the kits have this.
extern int ClientPortNumber;
extern std::string MasterLocation;

12
common/JailUtil.cpp
View File

@ -73,7 +73,7 @@ bool unmount(const std::string& target)
// This file signifies that we copied instead of mounted.
// NOTE: jail cleanup helpers are called from forkit and
// loolwsd, and they may have bind-mounting enabled, but the
// coolwsd, and they may have bind-mounting enabled, but the
// kit could have had it removed when falling back to copying.
// In such cases, we cannot safely know whether the jail was
// copied or not, since the bind envar will be present and
@ -196,21 +196,21 @@ void setupJails(bool bindMount, const std::string& jailRoot, const std::string&
{
// Test mounting to verify it actually works,
// as it might not function in some systems.
const std::string target = Poco::Path(jailRoot, "lool_test_mount").toString();
const std::string target = Poco::Path(jailRoot, "cool_test_mount").toString();
if (bind(sysTemplate, target))
{
enableBindMounting();
safeRemoveDir(target);
LOG_INF("Enabling Bind-Mounting of jail contents for better performance per "
"mount_jail_tree config in loolwsd.xml.");
"mount_jail_tree config in coolwsd.xml.");
}
else
LOG_ERR("Bind-Mounting fails and will be disabled for this run. To disable permanently "
"set mount_jail_tree config entry in loolwsd.xml to false.");
"set mount_jail_tree config entry in coolwsd.xml to false.");
}
else
LOG_INF("Disabling Bind-Mounting of jail contents per "
"mount_jail_tree config in loolwsd.xml.");
"mount_jail_tree config in coolwsd.xml.");
}
// This is the second stage of setting up /dev/[u]random
@ -264,7 +264,7 @@ void setupJailDevNodes(const std::string& root)
}
/// The envar name used to control bind-mounting of systemplate/jails.
constexpr const char* BIND_MOUNTING_ENVAR_NAME = "LOOL_BIND_MOUNT";
constexpr const char* BIND_MOUNTING_ENVAR_NAME = "COOL_BIND_MOUNT";
void enableBindMounting()
{

2
common/Log.cpp
View File

@ -328,7 +328,7 @@ namespace Log
if (logToFile)
{
channel = static_cast<Poco::Channel*>(new FileChannel("loolwsd.log"));
channel = static_cast<Poco::Channel*>(new FileChannel("coolwsd.log"));
for (const auto& pair : config)
{
channel->setProperty(pair.first, pair.second);

2
common/Log.hpp
View File

@ -282,7 +282,7 @@ namespace Log
std::ostringstream oss_(Log::prefix<sizeof(b_) - 1>(b_, LVL), std::ostringstream::ate); \
oss_ << std::boolalpha << X; \
LOG_END(oss_, FILEP); \
((void)__android_log_print(ANDROID_LOG_DEBUG, "loolwsd", "%s %s", LVL, oss_.str().c_str()))
((void)__android_log_print(ANDROID_LOG_DEBUG, "coolwsd", "%s %s", LVL, oss_.str().c_str()))
#else

10
common/Message.hpp
View File

@ -84,12 +84,12 @@ public:
bool getTokenInteger(const std::string& name, int& value)
{
return LOOLProtocol::getTokenInteger(_tokens, name, value);
return COOLProtocol::getTokenInteger(_tokens, name, value);
}
/// Return the abbreviated message for logging purposes.
std::string abbr() const {
return _id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size());
return _id + ' ' + COOLProtocol::getAbbreviatedMessage(_data.data(), _data.size());
}
const std::string& id() const { return _id; }
@ -124,7 +124,7 @@ public:
if (func(_data))
{
// Check - just the body.
assert(_firstLine == LOOLProtocol::getFirstLine(_data.data(), _data.size()));
assert(_firstLine == COOLProtocol::getFirstLine(_data.data(), _data.size()));
assert(_type == detectType());
}
}
@ -142,7 +142,7 @@ private:
{
if(_firstLine.empty())
{
_firstLine = LOOLProtocol::getFirstLine(_data.data(), _data.size());
_firstLine = COOLProtocol::getFirstLine(_data.data(), _data.size());
}
}
@ -167,7 +167,7 @@ private:
std::string getForwardToken(const char* buffer, int length)
{
std::string forward = LOOLProtocol::getFirstToken(buffer, length);
std::string forward = COOLProtocol::getFirstToken(buffer, length);
return (forward.find('-') != std::string::npos ? forward : std::string());
}

44
common/MessageQueue.cpp
View File

@ -22,12 +22,12 @@
void TileQueue::put_impl(const Payload& value)
{
const std::string firstToken = LOOLProtocol::getFirstToken(value);
const std::string firstToken = COOLProtocol::getFirstToken(value);
if (firstToken == "canceltiles")
{
const std::string msg = std::string(value.data(), value.size());
LOG_TRC("Processing [" << LOOLProtocol::getAbbreviatedMessage(msg)
LOG_TRC("Processing [" << COOLProtocol::getAbbreviatedMessage(msg)
<< "]. Before canceltiles have " << getQueue().size()
<< " in queue.");
const std::string seqs = msg.substr(12);
@ -100,7 +100,7 @@ void TileQueue::put_impl(const Payload& value)
void TileQueue::removeTileDuplicate(const std::string& tileMsg)
{
assert(LOOLProtocol::matchPrefix("tile", tileMsg, /*ignoreWhitespace*/ true));
assert(COOLProtocol::matchPrefix("tile", tileMsg, /*ignoreWhitespace*/ true));
// Ver is always provided at this point and it is necessary to
// return back to clients the last rendered version of a tile
@ -118,7 +118,7 @@ void TileQueue::removeTileDuplicate(const std::string& tileMsg)
if (it.size() > newMsgPos &&
strncmp(tileMsg.data(), it.data(), newMsgPos) == 0)
{
LOG_TRC("Remove duplicate tile request: " << std::string(it.data(), it.size()) << " -> " << LOOLProtocol::getAbbreviatedMessage(tileMsg));
LOG_TRC("Remove duplicate tile request: " << std::string(it.data(), it.size()) << " -> " << COOLProtocol::getAbbreviatedMessage(tileMsg));
getQueue().erase(getQueue().begin() + i);
break;
}
@ -142,7 +142,7 @@ std::string extractViewId(const std::string& origMsg, const StringVector& tokens
/// Extract the .uno: command ID from the potential command.
std::string extractUnoCommand(const std::string& command)
{
if (!LOOLProtocol::matchPrefix(".uno:", command))
if (!COOLProtocol::matchPrefix(".uno:", command))
return std::string();
size_t equalPos = command.find('=');
@ -186,7 +186,7 @@ bool extractRectangle(const StringVector& tokens, int& x, int& y, int& w, int& h
std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
{
assert(LOOLProtocol::matchPrefix("callback", callbackMsg, /*ignoreWhitespace*/ true));
assert(COOLProtocol::matchPrefix("callback", callbackMsg, /*ignoreWhitespace*/ true));
StringVector tokens = Util::tokenize(callbackMsg);
@ -354,7 +354,7 @@ std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
{
LOG_TRC("Remove obsolete uno command: "
<< std::string(it.data(), it.size()) << " -> "
<< LOOLProtocol::getAbbreviatedMessage(callbackMsg));
<< COOLProtocol::getAbbreviatedMessage(callbackMsg));
getQueue().erase(getQueue().begin() + i);
break;
}
@ -383,7 +383,7 @@ std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
const auto& it = getQueue()[i];
// skip non-callbacks quickly
if (!LOOLProtocol::matchPrefix("callback", it))
if (!COOLProtocol::matchPrefix("callback", it))
continue;
StringVector queuedTokens = Util::tokenize(it.data(), it.size());
@ -395,7 +395,7 @@ std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
{
LOG_TRC("Remove obsolete callback: "
<< std::string(it.data(), it.size()) << " -> "
<< LOOLProtocol::getAbbreviatedMessage(callbackMsg));
<< COOLProtocol::getAbbreviatedMessage(callbackMsg));
getQueue().erase(getQueue().begin() + i);
break;
}
@ -413,7 +413,7 @@ std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
{
LOG_TRC("Remove obsolete view callback: "
<< std::string(it.data(), it.size()) << " -> "
<< LOOLProtocol::getAbbreviatedMessage(callbackMsg));
<< COOLProtocol::getAbbreviatedMessage(callbackMsg));
getQueue().erase(getQueue().begin() + i);
break;
}
@ -454,8 +454,8 @@ void TileQueue::deprioritizePreviews()
// stop at the first non-tile or non-'id' (preview) message
std::string id;
if (!LOOLProtocol::matchPrefix("tile", message) ||
!LOOLProtocol::getTokenStringFromMessage(message, "id", id))
if (!COOLProtocol::matchPrefix("tile", message) ||
!COOLProtocol::getTokenStringFromMessage(message, "id", id))
{
break;
}
@ -474,12 +474,12 @@ TileQueue::Payload TileQueue::get_impl()
std::string msg(front.data(), front.size());
std::string id;
bool isTile = LOOLProtocol::matchPrefix("tile", msg);
bool isPreview = isTile && LOOLProtocol::getTokenStringFromMessage(msg, "id", id);
bool isTile = COOLProtocol::matchPrefix("tile", msg);
bool isPreview = isTile && COOLProtocol::getTokenStringFromMessage(msg, "id", id);
if (!isTile || isPreview)
{
// Don't combine non-tiles or tiles with id.
LOG_TRC("MessageQueue res: " << LOOLProtocol::getAbbreviatedMessage(msg));
LOG_TRC("MessageQueue res: " << COOLProtocol::getAbbreviatedMessage(msg));
getQueue().erase(getQueue().begin());
// de-prioritize the other tiles with id - usually the previews in
@ -502,8 +502,8 @@ TileQueue::Payload TileQueue::get_impl()
// avoid starving - stop the search when we reach a non-tile,
// otherwise we may keep growing the queue of unhandled stuff (both
// tiles and non-tiles)
if (!LOOLProtocol::matchPrefix("tile", prio) ||
LOOLProtocol::getTokenStringFromMessage(prio, "id", id))
if (!COOLProtocol::matchPrefix("tile", prio) ||
COOLProtocol::getTokenStringFromMessage(prio, "id", id))
{
break;
}
@ -533,8 +533,8 @@ TileQueue::Payload TileQueue::get_impl()
{
auto& it = getQueue()[i];
msg = std::string(it.data(), it.size());
if (!LOOLProtocol::matchPrefix("tile", msg) ||
LOOLProtocol::getTokenStringFromMessage(msg, "id", id))
if (!COOLProtocol::matchPrefix("tile", msg) ||
COOLProtocol::getTokenStringFromMessage(msg, "id", id))
{
// Don't combine non-tiles or tiles with id.
++i;
@ -542,7 +542,7 @@ TileQueue::Payload TileQueue::get_impl()
}
TileDesc tile2 = TileDesc::parse(msg);
LOG_TRC("Combining candidate: " << LOOLProtocol::getAbbreviatedMessage(msg));
LOG_TRC("Combining candidate: " << COOLProtocol::getAbbreviatedMessage(msg));
// Check if it's on the same row.
if (tiles[0].canCombine(tile2))
@ -561,12 +561,12 @@ TileQueue::Payload TileQueue::get_impl()
if (tiles.size() == 1)
{
msg = tiles[0].serialize("tile");
LOG_TRC("MessageQueue res: " << LOOLProtocol::getAbbreviatedMessage(msg));
LOG_TRC("MessageQueue res: " << COOLProtocol::getAbbreviatedMessage(msg));
return Payload(msg.data(), msg.data() + msg.size());
}
std::string tileCombined = TileCombined::create(tiles).serialize("tilecombine");
LOG_TRC("MessageQueue res: " << LOOLProtocol::getAbbreviatedMessage(tileCombined));
LOG_TRC("MessageQueue res: " << COOLProtocol::getAbbreviatedMessage(tileCombined));
return Payload(tileCombined.data(), tileCombined.data() + tileCombined.size());
}

20
common/MessageQueue.hpp
View File

@ -134,8 +134,8 @@ protected:
{
std::string id;
std::string text;
if (!LOOLProtocol::getTokenString(tokens, "id", id) ||
!LOOLProtocol::getTokenString(tokens, "text", text))
if (!COOLProtocol::getTokenString(tokens, "id", id) ||
!COOLProtocol::getTokenString(tokens, "text", text))
return std::string();
int i = getQueue().size() - 1;
@ -160,9 +160,9 @@ protected:
std::string queuedText;
if (queuedTokens.equals(0, tokens, 0) &&
queuedTokens.equals(1, "textinput") &&
LOOLProtocol::getTokenString(queuedTokens, "id", queuedId) &&
COOLProtocol::getTokenString(queuedTokens, "id", queuedId) &&
queuedId == id &&
LOOLProtocol::getTokenString(queuedTokens, "text", queuedText))
COOLProtocol::getTokenString(queuedTokens, "text", queuedText))
{
// Remove the queued textinput message and combine it with the current one
getQueue().erase(getQueue().begin() + i);
@ -192,9 +192,9 @@ protected:
std::string id;
int before;
int after;
if (!LOOLProtocol::getTokenString(tokens, "id", id) ||
!LOOLProtocol::getTokenInteger(tokens, "before", before) ||
!LOOLProtocol::getTokenInteger(tokens, "after", after))
if (!COOLProtocol::getTokenString(tokens, "id", id) ||
!COOLProtocol::getTokenInteger(tokens, "before", before) ||
!COOLProtocol::getTokenInteger(tokens, "after", after))
return std::string();
int i = getQueue().size() - 1;
@ -220,10 +220,10 @@ protected:
int queuedAfter;
if (queuedTokens.equals(0, tokens, 0) &&
queuedTokens.equals(1, "removetextcontext") &&
LOOLProtocol::getTokenStringFromMessage(queuedMessage, "id", queuedId) &&
COOLProtocol::getTokenStringFromMessage(queuedMessage, "id", queuedId) &&
queuedId == id &&
LOOLProtocol::getTokenIntegerFromMessage(queuedMessage, "before", queuedBefore) &&
LOOLProtocol::getTokenIntegerFromMessage(queuedMessage, "after", queuedAfter))
COOLProtocol::getTokenIntegerFromMessage(queuedMessage, "before", queuedBefore) &&
COOLProtocol::getTokenIntegerFromMessage(queuedMessage, "after", queuedAfter))
{
// Remove the queued removetextcontext message and combine it with the current one
getQueue().erase(getQueue().begin() + i);

2
common/Protocol.cpp
View File

@ -17,7 +17,7 @@
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
namespace LOOLProtocol
namespace COOLProtocol
{
std::tuple<int, int, std::string> ParseVersion(const std::string& version)
{

2
common/Protocol.hpp
View File

@ -22,7 +22,7 @@
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
namespace LOOLProtocol
namespace COOLProtocol
{
// Protocol Version Number.
// See protocol.txt.

4
common/Session.cpp
View File

@ -35,7 +35,7 @@
#include "Util.hpp"
#include "Unit.hpp"
using namespace LOOLProtocol;
using namespace COOLProtocol;
using Poco::Exception;
@ -98,7 +98,7 @@ void Session::parseDocOptions(const StringVector& tokens, int& part, std::string
{
std::string name;
std::string value;
if (!LOOLProtocol::parseNameValuePair(tokens[i], name, value))
if (!COOLProtocol::parseNameValuePair(tokens[i], name, value))
{
LOG_WRN("Unexpected doc options token [" << tokens[i] << "]. Skipping.");
continue;

2
common/SigUtil.cpp
View File

@ -299,7 +299,7 @@ namespace SigUtil
#endif
#if !ENABLE_DEBUG
if (std::getenv("LOOL_DEBUG"))
if (std::getenv("COOL_DEBUG"))
#endif
{
Log::signalLog(FatalGdbString);

2
common/Unit.cpp
View File

@ -81,7 +81,7 @@ bool UnitBase::init(UnitType type, const std::string &unitLibPath)
#if !MOBILEAPP
assert(!get(type));
#else
// The LOOLWSD initialization is called in a loop on mobile, allow reuse
// The COOLWSD initialization is called in a loop on mobile, allow reuse
if (get(type))
return true;
#endif

2
common/Unit.hpp
View File

@ -304,7 +304,7 @@ public:
virtual void configure(Poco::Util::LayeredConfiguration& /* config */);
/// Main-loop reached, time for testing.
/// Invoked from loolwsd's main thread.
/// Invoked from coolwsd's main thread.
void invokeTest()
{
try

6
common/Util.cpp
View File

@ -612,8 +612,8 @@ namespace Util
void getVersionInfo(std::string& version, std::string& hash)
{
version = std::string(LOOLWSD_VERSION);
hash = std::string(LOOLWSD_VERSION_HASH);
version = std::string(COOLWSD_VERSION);
hash = std::string(COOLWSD_VERSION_HASH);
hash.resize(std::min(8, (int)hash.length()));
}
@ -631,7 +631,7 @@ namespace Util
return
"{ \"Version\": \"" + version + "\", "
"\"Hash\": \"" + hash + "\", "
"\"Protocol\": \"" + LOOLProtocol::GetProtocolVersion() + "\", "
"\"Protocol\": \"" + COOLProtocol::GetProtocolVersion() + "\", "
"\"Id\": \"" + Util::getProcessIdentifier() + "\" }";
}

6
common/Util.hpp
View File

@ -132,9 +132,9 @@ namespace Util
void alertAllUsers(const std::string& msg);
/// Send a 'error:' message with the specified cmd and kind parameters to all connected
/// clients. This function can be called either in loolwsd or loolkit processes, even if only
/// loolwsd obviously has contact with the actual clients; in loolkit it will be forwarded to
/// loolwsd for redistribution. (This function must be implemented separately in each program
/// clients. This function can be called either in coolwsd or coolkit processes, even if only
/// coolwsd obviously has contact with the actual clients; in coolkit it will be forwarded to
/// coolwsd for redistribution. (This function must be implemented separately in each program
/// that uses it, it is not in Util.cpp.)
void alertAllUsers(const std::string& cmd, const std::string& kind);
#else

110
configure.ac
View File

@ -3,7 +3,7 @@
AC_PREREQ([2.63])
AC_INIT([loolwsd], [21.11.0.1], [https://github.com/CollaboraOnline/online/issues], [loolwsd], [https://collaboraonline.github.io/])
AC_INIT([coolwsd], [21.11.0.1], [https://github.com/CollaboraOnline/online/issues], [coolwsd], [https://collaboraonline.github.io/])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 foreign subdir-objects tar-pax -Wno-portability])
@ -13,10 +13,10 @@ AC_CONFIG_MACRO_DIR([m4])
# We don't want to require pkg-config and PKG_CHECK_MODULES on macOS
m4_if(m4_esyscmd_s([uname -s]),Darwin,[m4_define([PKG_CHECK_MODULES],[])],[])
LOOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
LOOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
LOOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
LOOLWSD_VERSION_NANO=`echo $VERSION | awk -F. '{print $4}'`
COOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
COOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
COOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
COOLWSD_VERSION_NANO=`echo $VERSION | awk -F. '{print $4}'`
ANDROID_PACKAGE_VERSIONCODE=
if test "$enable_androidapp" = "yes"; then
@ -25,10 +25,10 @@ if test "$enable_androidapp" = "yes"; then
ANDROID_PACKAGE_VERSIONCODE="1"
AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_VERSIONCODE])
else
LOOLWSD_VERSION_MAJOR=`echo $with_android_package_versioncode | awk -F. '{print $1}'`
LOOLWSD_VERSION_MINOR=`echo $with_android_package_versioncode | awk -F. '{print $2}'`
LOOLWSD_VERSION_MICRO=`echo $with_android_package_versioncode | awk -F. '{print $3}'`
LOOLWSD_VERSION_NANO=`echo $with_android_package_versioncode | awk -F. '{print $4}' | awk -F- '{print $1}'`
COOLWSD_VERSION_MAJOR=`echo $with_android_package_versioncode | awk -F. '{print $1}'`
COOLWSD_VERSION_MINOR=`echo $with_android_package_versioncode | awk -F. '{print $2}'`
COOLWSD_VERSION_MICRO=`echo $with_android_package_versioncode | awk -F. '{print $3}'`
COOLWSD_VERSION_NANO=`echo $with_android_package_versioncode | awk -F. '{print $4}' | awk -F- '{print $1}'`
ANDROID_PACKAGE_VERSIONCODE=`echo $with_android_package_versioncode | awk -F- '{print $2}'`
AC_MSG_RESULT([$ANDROID_PACKAGE_VERSIONCODE])
@ -36,27 +36,27 @@ if test "$enable_androidapp" = "yes"; then
fi
AC_SUBST(ANDROID_PACKAGE_VERSIONCODE)
LOOLWSD_VERSION="$LOOLWSD_VERSION_MAJOR.$LOOLWSD_VERSION_MINOR.$LOOLWSD_VERSION_MICRO.$LOOLWSD_VERSION_NANO"
COOLWSD_VERSION="$COOLWSD_VERSION_MAJOR.$COOLWSD_VERSION_MINOR.$COOLWSD_VERSION_MICRO.$COOLWSD_VERSION_NANO"
AC_SUBST([LOOLWSD_VERSION_MAJOR])
AC_SUBST([LOOLWSD_VERSION_MINOR])
AC_SUBST([LOOLWSD_VERSION_MICRO])
AC_SUBST([LOOLWSD_VERSION_NANO])
AC_SUBST([LOOLWSD_VERSION])
AC_SUBST([COOLWSD_VERSION_MAJOR])
AC_SUBST([COOLWSD_VERSION_MINOR])
AC_SUBST([COOLWSD_VERSION_MICRO])
AC_SUBST([COOLWSD_VERSION_NANO])
AC_SUBST([COOLWSD_VERSION])
AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[Collabora Online WebSocket server version])
AC_DEFINE_UNQUOTED([COOLWSD_VERSION],[["$COOLWSD_VERSION"]],[Collabora Online WebSocket server version])
# try to add a git hash for a version if we're developing
LOOLWSD_VERSION_HASH="$LOOLWSD_VERSION"
COOLWSD_VERSION_HASH="$COOLWSD_VERSION"
git_hash=`cd ${srcdir} && ( cat dist_git_hash 2> /dev/null || git log -1 --format=%h 2> /dev/null )`
if test "z$git_hash" != "z"; then
LOOLWSD_VERSION_HASH=$git_hash
COOLWSD_VERSION_HASH=$git_hash
fi
AC_SUBST([LOOLWSD_VERSION_HASH])
AC_SUBST([COOLWSD_VERSION_HASH])
AC_DEFINE_UNQUOTED([LOOLWSD_VERSION_HASH],[["$LOOLWSD_VERSION_HASH"]],[Collabora Online git hash if present])
AC_DEFINE_UNQUOTED([COOLWSD_VERSION_HASH],[["$COOLWSD_VERSION_HASH"]],[Collabora Online git hash if present])
AC_CONFIG_SRCDIR([wsd/LOOLWSD.cpp])
AC_CONFIG_SRCDIR([wsd/COOLWSD.cpp])
AC_CONFIG_HEADERS([config.h])
@ -150,7 +150,7 @@ AC_ARG_ENABLE([gtkapp],
AC_ARG_ENABLE(fuzzers,
AS_HELP_STRING([--enable-fuzzers],
[Enables building libfuzzer targets for fuzz testing. It is useful to enable this switch
only in a separate build tree, since the switch disables the creation of a loolwsd
only in a separate build tree, since the switch disables the creation of a coolwsd
binary.])
)
@ -292,7 +292,7 @@ AC_ARG_WITH([feedback-location],
AC_ARG_ENABLE(welcome-message,
AS_HELP_STRING([--enable-welcome-message],
[Enables welcome message on version update. Can be changed later in loolwsd.xml.])
[Enables welcome message on version update. Can be changed later in coolwsd.xml.])
)
AC_ARG_ENABLE(feedback,
@ -357,11 +357,11 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
ENABLE_DEBUG=false
ENABLE_DEBUG_PROTOCOL=false
ENABLE_BUNDLE=true
LOOLWSD_LOGLEVEL="warning"
LOOLWSD_LOG_TO_FILE="false"
LOOLWSD_LOGFILE="/var/log/loolwsd.log"
LOOLWSD_TRACEEVENTFILE="/var/log/loolwsd.trace.json"
LOOLWSD_ANONYMIZE_USER_DATA=false
COOLWSD_LOGLEVEL="warning"
COOLWSD_LOG_TO_FILE="false"
COOLWSD_LOGFILE="/var/log/coolwsd.log"
COOLWSD_TRACEEVENTFILE="/var/log/coolwsd.trace.json"
COOLWSD_ANONYMIZE_USER_DATA=false
BROWSER_LOGGING="false"
debug_msg="secure mode: product build"
anonym_msg=""
@ -370,11 +370,11 @@ if test "$enable_debug" = "yes"; then
AC_DEFINE([ENABLE_DEBUG],1,[Whether to compile in some extra debugging support code and disable some security pieces])
ENABLE_DEBUG=true
ENABLE_DEBUG_PROTOCOL=true
LOOLWSD_LOGLEVEL="trace"
LOOLWSD_LOG_TO_FILE="true"
LOOLWSD_LOGFILE="/tmp/loolwsd.log"
LOOLWSD_TRACEEVENTFILE="/tmp/loolwsd.trace.json"
LOOLWSD_ANONYMIZE_USER_DATA=false
COOLWSD_LOGLEVEL="trace"
COOLWSD_LOG_TO_FILE="true"
COOLWSD_LOGFILE="/tmp/coolwsd.log"
COOLWSD_TRACEEVENTFILE="/tmp/coolwsd.trace.json"
COOLWSD_ANONYMIZE_USER_DATA=false
BROWSER_LOGGING="true"
debug_msg="low security debugging mode"
if test "$enable_bundle" != "yes"; then
@ -386,8 +386,8 @@ else
fi
AC_SUBST(ENABLE_DEBUG)
AC_SUBST(ENABLE_BUNDLE)
AC_SUBST(LOOLWSD_LOGLEVEL)
AC_SUBST(LOOLWSD_LOG_TO_FILE)
AC_SUBST(COOLWSD_LOGLEVEL)
AC_SUBST(COOLWSD_LOG_TO_FILE)
AC_SUBST(BROWSER_LOGGING)
if test "$enable_debug_protocol" = no; then
@ -404,22 +404,22 @@ fi
AC_SUBST(ENABLE_BROWSERSYNC)
if test -n "$with_logfile" ; then
LOOLWSD_LOGFILE="$with_logfile"
COOLWSD_LOGFILE="$with_logfile"
fi
AC_SUBST(LOOLWSD_LOGFILE)
AC_SUBST(COOLWSD_LOGFILE)
if test -n "$with_trace_event_file" ; then
LOOLWSD_TRACEEVENTFILE="$with_trace_event_file"
COOLWSD_TRACEEVENTFILE="$with_trace_event_file"
fi
AC_SUBST(LOOLWSD_TRACEEVENTFILE)
AC_DEFINE_UNQUOTED([LOOLWSD_TRACEEVENTFILE], [["]$LOOLWSD_TRACEEVENTFILE["]], [Destination for Trace Event output])
AC_SUBST(COOLWSD_TRACEEVENTFILE)
AC_DEFINE_UNQUOTED([COOLWSD_TRACEEVENTFILE], [["]$COOLWSD_TRACEEVENTFILE["]], [Destination for Trace Event output])
if test "$enable_anonymization" = "yes" ; then
LOOLWSD_ANONYMIZE_USER_DATA=true
COOLWSD_ANONYMIZE_USER_DATA=true
anonym_msg="anonymization of user-data is enabled"
fi
AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_USER_DATA],[$LOOLWSD_ANONYMIZE_USER_DATA],[Enable permanent anonymization in logs])
AC_SUBST(LOOLWSD_ANONYMIZE_USER_DATA)
AC_DEFINE_UNQUOTED([COOLWSD_ANONYMIZE_USER_DATA],[$COOLWSD_ANONYMIZE_USER_DATA],[Enable permanent anonymization in logs])
AC_SUBST(COOLWSD_ANONYMIZE_USER_DATA)
if test -z "$anonym_msg"; then
anonym_msg="anonymization of user-data is disabled"
@ -1162,19 +1162,19 @@ AS_IF([test `uname -s` = "FreeBSD"],
# need this after the other stuff that uses the compiler because we don't want to run configure-tests with the plugins enabled
AS_IF([test -n "$with_compiler_plugins"],
[CPPFLAGS="$CPPFLAGS -Xclang -load -Xclang ${with_compiler_plugins}/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang --lool-base-path=\${abs_top_srcdir}"])
[CPPFLAGS="$CPPFLAGS -Xclang -load -Xclang ${with_compiler_plugins}/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang --cool-base-path=\${abs_top_srcdir}"])
LOOLWSD_CONFIGDIR=${sysconfdir}/${PACKAGE}
AC_SUBST(LOOLWSD_CONFIGDIR)
COOLWSD_CONFIGDIR=${sysconfdir}/${PACKAGE}
AC_SUBST(COOLWSD_CONFIGDIR)
LOOLWSD_DATADIR=${datadir}/${PACKAGE}
AC_SUBST(LOOLWSD_DATADIR)
COOLWSD_DATADIR=${datadir}/${PACKAGE}
AC_SUBST(COOLWSD_DATADIR)
COOL_USER_ID="cool"
if test -n "$with_user_id"; then
COOL_USER_ID="$with_user_id"
fi
AC_DEFINE_UNQUOTED([COOL_USER_ID],["$COOL_USER_ID"],[The user-name which is allowed to run loolwsd and its tools])
AC_DEFINE_UNQUOTED([COOL_USER_ID],["$COOL_USER_ID"],[The user-name which is allowed to run coolwsd and its tools])
AM_CONDITIONAL([ENABLE_SETCAP], [test "$enable_setcap" != "no" -a `uname -s` = "Linux"])
@ -1256,7 +1256,7 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
# iOS app.
touch ios/Mobile/Branding/branding.css
fi
cp loolkitconfig-mobile.xcu ios/Mobile/loolkitconfig.xcu
cp coolkitconfig-mobile.xcu ios/Mobile/coolkitconfig.xcu
fi
])
AC_SUBST(IOSAPP_FONTS)
@ -1407,10 +1407,10 @@ AC_CONFIG_FILES([Makefile
test/Makefile
browser/Makefile
browser/npm-shrinkwrap.json
loolkitconfig.xcu
loolwsd.spec
loolwsd.xml
debian/loolwsd.postinst])
coolkitconfig.xcu
coolwsd.spec
coolwsd.xml
debian/coolwsd.postinst])
if test "$enable_iosapp" = "yes"; then
AC_CONFIG_FILES([ios/config.h
@ -1501,7 +1501,7 @@ Configuration:
\$ make # to compile"
if test -n "$with_lo_path"; then
echo " \$ make run # to start loolwsd
echo " \$ make run # to start coolwsd
\$ make sync-writer|calc|impress # to start browsersync with specified app
"
fi

0
loolkitconfig-mobile.xcu → coolkitconfig-mobile.xcu
View File

0
loolkitconfig.xcu.in → coolkitconfig.xcu.in
View File

12
coolwsd-generate-proof-key
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
SUDO=''
if [ ! -w "/etc/loolwsd" ]; then
if [ ! -w "/etc/coolwsd" ]; then
if (( $EUID != 0 )); then
if hash sudo 2>/dev/null; then
SUDO='sudo'
@ -12,20 +12,20 @@ if [ ! -w "/etc/loolwsd" ]; then
fi
fi
if [ -f /etc/loolwsd/proof_key ]; then
echo "/etc/loolwsd/proof_key exists already."
if [ -f /etc/coolwsd/proof_key ]; then
echo "/etc/coolwsd/proof_key exists already."
exit 0
fi
if hash ssh-keygen 2>/dev/null; then
$SUDO ssh-keygen -t rsa -N "" -m PEM -f /etc/loolwsd/proof_key
$SUDO ssh-keygen -t rsa -N "" -m PEM -f /etc/coolwsd/proof_key
if [ $? -ne 0 ] ; then
exit $?
fi
if id -u cool >/dev/null 2>&1; then
$SUDO chown cool: /etc/loolwsd/proof_key
$SUDO chown cool: /etc/coolwsd/proof_key
else
echo "User cool does not exist. Please reinstall loolwsd package, or in case of manual installation from source, create the cool user manually."
echo "User cool does not exist. Please reinstall coolwsd package, or in case of manual installation from source, create the cool user manually."
fi
else
echo "ssh-keygen command not found. Please install openssh client tools."

22
loolwsd.init.rhel6 → coolwsd.init.rhel6
View File

@ -1,28 +1,28 @@
#!/bin/bash
#
# chkconfig: 35 90 12
# description: loolwsd server
# description: coolwsd server
#
# Get function from functions library
. /etc/init.d/functions
# Start the service loolwsd
# Start the service coolwsd
start() {
echo -n $"Starting loolwsd server: "
su cool -c "/usr/bin/loolwsd --version --o:logging.file[@enable]=true" &
echo -n $"Starting coolwsd server: "
su cool -c "/usr/bin/coolwsd --version --o:logging.file[@enable]=true" &
### Create the lock file ###
touch /var/lock/subsys/loolwsd
success $"loolwsd server startup"
touch /var/lock/subsys/coolwsd
success $"coolwsd server startup"
echo
}
# Stop the service loolwsd
# Stop the service coolwsd
stop() {
echo -n $"Stopping loolwsd server: "
killproc loolwsd
echo -n $"Stopping coolwsd server: "
killproc coolwsd
### Now, delete the lock file ###
rm -f /var/lock/subsys/loolwsd
rm -f /var/lock/subsys/coolwsd
echo
}
@ -35,7 +35,7 @@ case "$1" in
stop
;;
status)
status loolwsd
status coolwsd
;;
restart|reload|condrestart)
stop

4
debian/loolwsd.service → coolwsd.service
View File

@ -3,8 +3,8 @@ Description=Collabora Online WebSocket Daemon
After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/cool/systemplate --o:child_root_path=/opt/cool/child-roots --o:file_server_root_path=/usr/share/loolwsd
EnvironmentFile=-/etc/sysconfig/coolwsd
ExecStart=/usr/bin/coolwsd --version --o:sys_template_path=/opt/cool/systemplate --o:child_root_path=/opt/cool/child-roots --o:file_server_root_path=/usr/share/coolwsd
KillSignal=SIGINT
TimeoutStopSec=120
User=cool

107
loolwsd.spec.in → coolwsd.spec.in
View File

@ -1,4 +1,4 @@
# spec file for package loolwsd
# spec file for package coolwsd
#
# Copyright (c) 2015 Collabora
#
@ -16,7 +16,7 @@ Release: 1%{?dist}
Vendor: %{vendor}
Summary: Collabora Online WebSocket Daemon
License: EULA
Source0: loolwsd-@PACKAGE_VERSION@.tar.gz
Source0: coolwsd-@PACKAGE_VERSION@.tar.gz
BuildRequires: libcap-devel libpng-devel pam-devel gcc-c++ cppunit-devel pam-devel fontconfig make
# Red Hat and CentOS
@ -36,14 +36,14 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib
Requires: collaboraoffice collaboraoffice-ure collaboraofficebasis-core collaboraofficebasis-writer collaboraofficebasis-impress collaboraofficebasis-graphicfilter collaboraofficebasis-en-US collaboraofficebasis-calc collaboraofficebasis-ooofonts collaboraofficebasis-images collaboraofficebasis-draw collaboraofficebasis-extension-pdf-import collaboraofficebasis-ooolinguistic collaboraofficebasis-math
Requires(post): coreutils grep sed cpio
%if 0%{?rhel}
# loolwsd dependencies
# coolwsd dependencies
Requires: systemd expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssh-clients openssl-libs pcre xz-libs zlib
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
Requires: expat fontconfig freetype libuuid bzip2-libs
%endif
%if 0%{?suse_version}
# loolwsd dependencies
# coolwsd dependencies
Requires(post): libcap-progs
Requires: systemd libopenssl1_0_0 libpcre1 libz1 libcap2 libpng12-0 %{fillup_prereq}
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
@ -51,13 +51,16 @@ Requires: systemd libopenssl1_0_0 libpcre1 libz1 libcap2 libpng12-0 %{fill
Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16 libuuid1 openssh
%endif
Provides: loolwsd
Obsoletes: loolwsd
%description
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -n loolwsd-@PACKAGE_VERSION@
%setup -n coolwsd-@PACKAGE_VERSION@
%build
%configure \
@ -78,23 +81,23 @@ env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
install -d -m 755 %{buildroot}/var/adm/fillup-templates
%if 0%{?rhel}
install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service
# systemd in RHEL 7 does not understand these options
%if 0%{?rhel} <= 7
sed -i "/^ReadWritePaths/d;/^ProtectControlGroups/d;/^ProtectSystem/d" %{buildroot}%{_unitdir}/loolwsd.service
sed -i "/^ReadWritePaths/d;/^ProtectControlGroups/d;/^ProtectSystem/d" %{buildroot}%{_unitdir}/coolwsd.service
%endif
install -D -m 644 sysconfig.loolwsd %{buildroot}/etc/sysconfig/loolwsd
install -D -m 644 sysconfig.coolwsd %{buildroot}/etc/sysconfig/coolwsd
install -d -m 755 %{buildroot}/etc/httpd/conf
install -D -m 755 etc/apache2/loolwsd.conf %{buildroot}/etc/httpd/conf
rm %{buildroot}/etc/apache2/conf-available/loolwsd.conf
install -D -m 755 etc/apache2/coolwsd.conf %{buildroot}/etc/httpd/conf
rm %{buildroot}/etc/apache2/conf-available/coolwsd.conf
%endif
%if 0%{?suse_version}
install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates
install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service
install -D -m 644 sysconfig.coolwsd %{buildroot}/var/adm/fillup-templates
%endif
mkdir -p %{buildroot}/etc/pam.d
echo "auth required pam_unix.so" > %{buildroot}/etc/pam.d/loolwsd
echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
echo "auth required pam_unix.so" > %{buildroot}/etc/pam.d/coolwsd
echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/coolwsd
%files
%defattr(-,root,root,-)
@ -104,47 +107,47 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
/usr/bin/coolforkit
/usr/bin/coolconvert
/usr/bin/coolconfig
/usr/bin/loolconfig
/usr/bin/coolconfig
/usr/bin/coolmount
/usr/share/loolwsd/discovery.xml
/usr/share/loolwsd/favicon.ico
/usr/share/loolwsd/browser
/usr/share/doc/loolwsd/README
/usr/share/doc/loolwsd/README.vars
/usr/share/doc/loolwsd/metrics.txt
/usr/share/doc/loolwsd/protocol.txt
/usr/share/doc/loolwsd/reference.md
/usr/share/man/man1/loolwsd.1.gz
/usr/share/coolwsd/discovery.xml
/usr/share/coolwsd/favicon.ico
/usr/share/coolwsd/browser
/usr/share/doc/coolwsd/README
/usr/share/doc/coolwsd/README.vars
/usr/share/doc/coolwsd/metrics.txt
/usr/share/doc/coolwsd/protocol.txt
/usr/share/doc/coolwsd/reference.md
/usr/share/man/man1/coolwsd.1.gz
/usr/share/man/man1/coolforkit.1.gz
/usr/share/man/man1/coolconvert.1.gz
/usr/share/man/man1/coolconfig.1.gz
/usr/share/man/man1/coolwsd-systemplate-setup.1.gz
/usr/share/man/man1/coolwsd-generate-proof-key.1.gz
/usr/share/man/man1/coolmount.1.gz
%{_unitdir}/loolwsd.service
%{_unitdir}/coolwsd.service
%if 0%{?rhel}
%config(noreplace) /etc/sysconfig/loolwsd
%config(noreplace) /etc/sysconfig/coolwsd
%endif
%if 0%{?suse_version}
/var/adm/fillup-templates/sysconfig.loolwsd
/var/adm/fillup-templates/sysconfig.coolwsd
%endif
%config(noreplace) /etc/pam.d/loolwsd
%config(noreplace) %attr(640, cool, root) /etc/loolwsd/loolwsd.xml
%config /etc/loolwsd/loolkitconfig.xcu
%config(noreplace) /etc/nginx/snippets/loolwsd.conf
%config(noreplace) /etc/pam.d/coolwsd
%config(noreplace) %attr(640, cool, root) /etc/coolwsd/coolwsd.xml
%config /etc/coolwsd/coolkitconfig.xcu
%config(noreplace) /etc/nginx/snippets/coolwsd.conf
%if 0%{?suse_version} > 0
%config(noreplace) /etc/apache2/conf-available/loolwsd.conf
%config(noreplace) /etc/apache2/conf-available/coolwsd.conf
%endif
%if 0%{?rhel} > 0
%config(noreplace) /etc/httpd/conf/loolwsd.conf
%config(noreplace) /etc/httpd/conf/coolwsd.conf
%endif
%doc README.md
%pre
%if 0%{?suse_version}
%service_add_pre loolwsd.service
%service_add_pre coolwsd.service
%endif
getent group cool >/dev/null || groupadd -r cool
@ -153,29 +156,29 @@ getent passwd cool >/dev/null || useradd -g cool -r cool -d /opt/cool -s /bin/ba
# for filename in `find /opt/cool/systemplate -type f`;do stripped=$(echo -ne $filename | sed -e "s|/opt/cool/systemplate||");rpm -qf --qf="%{NAME}\n" $stripped;done | grep -v devel | grep -v 32bit | grep -v -- -fonts | sort | uniq
%triggerin -- expat fontconfig freetype freetype2 glibc glibc-locale kernel keyutils-libs krb5 krb5-libs libbz2-1 libcap libcap-ng libcap2 libexpat1 libfreetype6 libgcc libgcc_s1 libgcrypt libiscsi libpng libpng12 libpng12-0 libpng15-15 libpng16-16 libstdc++ libstdc++6 libuuid libuuid1 libz1 lsb nss-mdns nss-softokn-freebl pcre sssd sssd-client systemd-libs timezone tzdata zlib
echo -ne "Triggered update of loolwsd systemplate..."
echo -ne "Triggered update of coolwsd systemplate..."
%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
systemctl is-active -q loolwsd && LOOLWSD_IS_ACTIVE=1 || LOOLWSD_IS_ACTIVE=0
if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl stop loolwsd; fi
systemctl is-active -q coolwsd && COOLWSD_IS_ACTIVE=1 || COOLWSD_IS_ACTIVE=0
if [ $COOLWSD_IS_ACTIVE == "1" ]; then systemctl stop coolwsd; fi
%endif
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for loolwsd on the same file system
# Create a directory for coolwsd on the same file system
loroot=/opt/collaboraoffice
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
coolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/cool
mkdir -p ${loolparent}/cool/child-roots
chown cool:cool ${loolparent}/cool
chown cool:cool ${loolparent}/cool/child-roots
rm -rf ${coolparent}/cool
mkdir -p ${coolparent}/cool/child-roots
chown cool:cool ${coolparent}/cool
chown cool:cool ${coolparent}/cool/child-roots
fc-cache ${loroot}/share/fonts/truetype
coolwsd-systemplate-setup ${loolparent}/cool/systemplate ${loroot} >/dev/null 2>&1
coolwsd-systemplate-setup ${coolparent}/cool/systemplate ${loroot} >/dev/null 2>&1
coolwsd-generate-proof-key >/dev/null 2>&1
%if 0%{?rhel} || 0%{?suse_version}
if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl start loolwsd; fi
if [ $COOLWSD_IS_ACTIVE == "1" ]; then systemctl start coolwsd; fi
%endif
echo " Done."
@ -185,30 +188,30 @@ setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
setcap cap_sys_admin=ep /usr/bin/coolmount
%if 0%{?rhel} >= 7
%systemd_post loolwsd.service
%systemd_post coolwsd.service
%else
%if 0%{?suse_version}
%service_add_post loolwsd.service
%{fillup_only -n loolwsd}
%service_add_post coolwsd.service
%{fillup_only -n coolwsd}
%endif
%endif
%preun
%if 0%{?rhel} >= 7
%systemd_preun loolwsd.service
%systemd_preun coolwsd.service
%else
%if 0%{?suse_version}
%service_del_preun loolwsd.service
%service_del_preun coolwsd.service
%endif
%endif
%postun
%if 0%{?rhel} >= 7
%systemd_postun loolwsd.service
%systemd_postun coolwsd.service
%else
%if 0%{?suse_version}
%service_del_postun loolwsd.service
%service_del_postun coolwsd.service
%endif
%endif

1
coolwsd.xml
View File

@ -1 +0,0 @@
loolwsd.xml

42
loolwsd.xml.in → coolwsd.xml.in
View File

@ -13,7 +13,7 @@
<child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
<mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
<server_name desc="External hostname:port of the server running loolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default=""></server_name>
<server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default=""></server_name>
<file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing cool." type="path" relative="true" default="browser/../"></file_server_root_path>
<hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"></hexify_embedded_urls>
@ -43,7 +43,7 @@
<idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
<limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
<limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
<lost_kit_grace_period_secs desc="The minimum grace period for a lost kit process (not referenced by loolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0" default="120">120</lost_kit_grace_period_secs>
<lost_kit_grace_period_secs desc="The minimum grace period for a lost kit process (not referenced by coolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0" default="120">120</lost_kit_grace_period_secs>
</cleanup>
</per_document>
@ -58,19 +58,19 @@
<color type="bool">true</color>
<!--
Note to developers: When you do "make run", the logging.level will be set on the
loolwsd command line, so if you want to change it for your testing, do it in
coolwsd command line, so if you want to change it for your testing, do it in
Makefile.am, not here.
-->
<level type="string" desc="Can be 0-8 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="@LOOLWSD_LOGLEVEL@">@LOOLWSD_LOGLEVEL@</level>
<level type="string" desc="Can be 0-8 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="@COOLWSD_LOGLEVEL@">@COOLWSD_LOGLEVEL@</level>
<most_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from the client can not set a more verbose log level than this" default="notice">notice</most_verbose_level_settable_from_client>
<least_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from a client can not set a less verbose log level than this" default="fatal">fatal</least_verbose_level_settable_from_client>
<protocol type="bool" desc="Enable minimal client-site JS protocol logging from the start">@ENABLE_DEBUG_PROTOCOL@</protocol>
<!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
<lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
<file enable="@LOOLWSD_LOG_TO_FILE@">
<!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
<property name="path" desc="Log file path.">@LOOLWSD_LOGFILE@</property>
<file enable="@COOLWSD_LOG_TO_FILE@">
<!-- If you use other path than /var/log and you run coolwsd from systemd, make sure that you enable that path in coolwsd.service (ReadWritePaths). -->
<property name="path" desc="Log file path.">@COOLWSD_LOGFILE@</property>
<property name="rotation" desc="Log file rotation strategy. See Poco FileChannel.">never</property>
<property name="archive" desc="Append either timestamp or number to the archived log filename.">timestamp</property>
<property name="compress" desc="Enable/disable log file compression.">true</property>
@ -80,24 +80,24 @@
<property name="flush" desc="Enable/disable flushing after logging each line. May harm performance. Note that without flushing after each line, the log lines from the different processes will not appear in chronological order.">false</property>
</file>
<anonymize>
<anonymize_user_data type="bool" desc="Enable to anonymize/obfuscate of user-data in logs. If default is true, it was forced at compile-time and cannot be disabled." default="@LOOLWSD_ANONYMIZE_USER_DATA@">@LOOLWSD_ANONYMIZE_USER_DATA@</anonymize_user_data>
<anonymize_user_data type="bool" desc="Enable to anonymize/obfuscate of user-data in logs. If default is true, it was forced at compile-time and cannot be disabled." default="@COOLWSD_ANONYMIZE_USER_DATA@">@COOLWSD_ANONYMIZE_USER_DATA@</anonymize_user_data>
<anonymization_salt type="uint" desc="The salt used to anonymize/obfuscate user-data in logs. Use a secret 64-bit random number." default="82589933">82589933</anonymization_salt>
</anonymize>
</logging>
<!--
Note to developers: When you do "make run", the trace_event[@enable] will be set on the
loolwsd command line, so if you want to change it for your testing, do it in Makefile.am,
coolwsd command line, so if you want to change it for your testing, do it in Makefile.am,
not here.
-->
<trace_event desc="The possibility to turn on generation of a Chrome Trace Event file" enable="false">
<path desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string" default="@LOOLWSD_TRACEEVENTFILE@">@LOOLWSD_TRACEEVENTFILE@</path>
<path desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string" default="@COOLWSD_TRACEEVENTFILE@">@COOLWSD_TRACEEVENTFILE@</path>
</trace_event>
<browser_logging desc="Logging in the browser console" default="@BROWSER_LOGGING@">@BROWSER_LOGGING@</browser_logging>
<trace desc="Dump commands and notifications for replay. When 'snapshot' is true, the source file is copied to the path first." enable="false">
<path desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/looltrace-%.gz" compress="true" snapshot="false"></path>
<path desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/cooltrace-%.gz" compress="true" snapshot="false"></path>
<filter>
<message desc="Regex pattern of messages to exclude"></message>
</filter>
@ -107,10 +107,10 @@
</trace>
<net desc="Network settings">
<!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, loolwsd unexpectedly listens on [::1] only.
<!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, coolwsd unexpectedly listens on [::1] only.
You need to change net.proto to IPv4, if you want to use 127.0.0.1. -->
<proto type="string" default="all" desc="Protocol to use IPv4, IPv6 or all for both">all</proto>
<listen type="string" default="any" desc="Listen address that loolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
<listen type="string" default="any" desc="Listen address that coolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
<!-- this allows you to shift all of our URLs into a sub-path from
https://my.com/browser/a123... to https://my.com/my/sub/path/browser/a123... -->
<service_root type="path" default="" desc="Prefix all the pages, websockets, etc. with this path."></service_root>
@ -125,8 +125,8 @@
<host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
</post_allow>
<frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (loolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
<connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
<frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
<connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
<!-- this setting radically changes how online works, it should not be used in a production environment -->
<proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
@ -134,12 +134,12 @@
<ssl desc="SSL settings">
<!-- switches from https:// + wss:// to http:// + ws:// -->
<enable type="bool" desc="Controls whether SSL encryption between loolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">@ENABLE_SSL@</enable>
<enable type="bool" desc="Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">@ENABLE_SSL@</enable>
<!-- SSL off-load can be done in a proxy, if so disable SSL, and enable termination below in production -->
<termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
<cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
<key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
<ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
<termination desc="Connection via proxy where coolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
<cert_file_path desc="Path to the cert file" relative="false">/etc/coolwsd/cert.pem</cert_file_path>
<key_file_path desc="Path to the key file" relative="false">/etc/coolwsd/key.pem</key_file_path>
<ca_file_path desc="Path to the ca file" relative="false">/etc/coolwsd/ca-chain.cert.pem</ca_file_path>
<cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"></cipher_list>
<hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
<max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
@ -191,7 +191,7 @@
</wopi>
<ssl desc="SSL settings">
<as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
<enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults to following the ssl.enable setting"></enable>
<enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and coolwsd. When empty this defaults to following the ssl.enable setting"></enable>
<cert_file_path desc="Path to the cert file" relative="false"></cert_file_path>
<key_file_path desc="Path to the key file" relative="false"></key_file_path>
<ca_file_path desc="Path to the ca file. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." relative="false"></ca_file_path>

52
cypress_test/Makefile.am
View File

@ -12,10 +12,10 @@ CAPABILITIES = $(if @ENABLE_SETCAP@,true,false)
PARALLEL_SCRIPT = $(abs_srcdir)/run_parallel.sh
PID_FILE=$(abs_builddir)/workdir/loolwsd.pid
PID_FILE=$(abs_builddir)/workdir/coolwsd.pid
ERROR_LOG=$(abs_builddir)/workdir/error.log
LOOLWSD_LOG=$(abs_builddir)/cypress/wsd_logs/loolwsd.log
LOOLWSD_OUTPUT=$(abs_builddir)/cypress/wsd_logs/loolwsd_output.log
COOLWSD_LOG=$(abs_builddir)/cypress/wsd_logs/coolwsd.log
COOLWSD_OUTPUT=$(abs_builddir)/cypress/wsd_logs/coolwsd_output.log
SUPPORT_FILE_ABS = $(abs_srcdir)/support/index.js
SUPPORT_FILE = $(if $(findstring $(abs_srcdir),$(abs_builddir)),support/index.js,$(SUPPORT_FILE_ABS))
@ -101,7 +101,7 @@ $(PID_FILE): @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(if $(HEADLESS_BUILD),$(call start_Xvfb),)
$(call start_loolwsd)
$(call start_coolwsd)
$(MOBILE_TEST_FILES_DONE): $(PID_FILE) $(DESKTOP_TEST_FILES_DONE)
$(if $(PARALLEL_BUILD),\
@ -149,7 +149,7 @@ define run_JS_error_check
@echo
endef
define start_loolwsd
define start_coolwsd
$(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS)))
$(if $(findstring php-proxy, $(CYPRESS_INTEGRATION)),\
$(if $(findstring $(PHP_PROXY_PORT),$(FREE_PORT)),,$(error CypressError: $(PHP_PROXY_PORT) port is unavailable!)))
@ -160,7 +160,7 @@ define start_loolwsd
@echo "Launching coolwsd..."
@fc-cache "@LO_PATH@"/share/fonts/truetype
@echo
@mkdir -p $(dir $(LOOLWSD_OUTPUT))
@mkdir -p $(dir $(COOLWSD_OUTPUT))
../coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
--o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
--o:security.capabilities="$(CAPABILITIES)" \
@ -175,9 +175,9 @@ define start_loolwsd
--o:security.enable_macros_execution=true \
--port=$(FREE_PORT) \
--pidfile=$(PID_FILE) \
--o:logging.file.property[0]=$(LOOLWSD_LOG) \
--o:logging.file.property[0]=$(COOLWSD_LOG) \
$(if $(findstring php-proxy, $(CYPRESS_INTEGRATION)),--o:net.proxy_prefix=true) \
> $(LOOLWSD_OUTPUT) 2>&1 &
> $(COOLWSD_OUTPUT) 2>&1 &
@$(WAIT_ON_BINARY) http://localhost:$(FREE_PORT) --timeout 60000
@echo
endef
@ -224,14 +224,14 @@ clean-local:
check-mobile: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(call run_mobile_tests,$(spec))
@$(KILL_COMMAND) || true
run-mobile: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(call run_interactive_mobile,$(spec)) || true
@$(KILL_COMMAND) || true
@ -239,7 +239,7 @@ MOBILE_CONFIG = \
integrationFolder=$(MOBILE_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(MOBILE_USER_AGENT)
MOBILE_ENV = \
DATA_FOLDER=$(MOBILE_DATA_FOLDER),DATA_WORKDIR=$(MOBILE_DATA_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
DATA_FOLDER=$(MOBILE_DATA_FOLDER),DATA_WORKDIR=$(MOBILE_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
# Run one mobile test / all mobile tests in interactive test runner.
# Parameters:
@ -283,14 +283,14 @@ endef
check-desktop: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(call run_desktop_tests,$(spec))
@$(KILL_COMMAND) || true
run-desktop: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(call run_interactive_desktop,$(spec)) || true
@$(KILL_COMMAND) || true
@ -298,7 +298,7 @@ DESKTOP_CONFIG = \
integrationFolder=$(DESKTOP_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT)
DESKTOP_ENV = \
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(DESKTOP_DATA_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(DESKTOP_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
# Run one desktop test / all desktop tests in interactive test runner.
# Parameters:
@ -341,7 +341,7 @@ endef
check-multi: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(if $(spec), \
$(call run_multiuser_test,$(spec)), \
$(call run_all_multiuser_tests))
@ -350,7 +350,7 @@ check-multi: @JAILS_PATH@ $(NODE_BINS)
run-multi: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(call run_interactive_multiuser,$(spec)) || true
@$(KILL_COMMAND) || true
@ -358,7 +358,7 @@ MULTIUSER_CONFIG = \
integrationFolder=$(MULTIUSER_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT),defaultCommandTimeout=30000,retries=0
MULTIUSER_ENV = \
DATA_FOLDER=$(MULTIUSER_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
DATA_FOLDER=$(MULTIUSER_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
# Run all multi-user tests in headless mode.
# Parameters:
@ -409,7 +409,7 @@ do-interfer-mobile-check-log: do-interfer-mobile-check
do-interfer-mobile-check: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(if $(spec), \
$(call run_mobile_interference_test,$(spec)), \
$(call run_mobile_interference_tests))
@ -418,7 +418,7 @@ do-interfer-mobile-check: @JAILS_PATH@ $(NODE_BINS)
run-interfer-mobile: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
@echo
@echo "Running interfer mobile test in interactive test runner..."
@echo
@ -437,13 +437,13 @@ INTERFER_MOBILE_CONFIG1 = \
integrationFolder=$(MOBILE_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(MOBILE_USER_AGENT),defaultCommandTimeout=30000
INTERFER_MOBILE_ENV1 = \
DATA_FOLDER=$(MOBILE_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),INTERFERENCE_TEST=true
DATA_FOLDER=$(MOBILE_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),INTERFERENCE_TEST=true
INTERFER_MOBILE_CONFIG2 = \
supportFile=$(SUPPORT_FILE),userAgent=$(MOBILE_USER_AGENT),defaultCommandTimeout=30000,retries=0
INTERFER_MOBILE_ENV2 = \
DATA_FOLDER=$(MOBILE_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
DATA_FOLDER=$(MOBILE_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
# Run all mobile interference tests in headless mode.
define run_mobile_interference_tests
@ -482,7 +482,7 @@ do-interfer-desktop-check-log: do-interfer-desktop-check
do-interfer-desktop-check: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
$(if $(spec), \
$(call run_desktop_interference_test,$(spec)), \
$(call run_desktop_interference_tests))
@ -491,7 +491,7 @@ do-interfer-desktop-check: @JAILS_PATH@ $(NODE_BINS)
run-interfer-desktop: @JAILS_PATH@ $(NODE_BINS)
$(call cleanup_before_run)
$(call run_JS_error_check)
$(call start_loolwsd)
$(call start_coolwsd)
@echo
@echo "Running interfer desktop test in interactive test runner..."
@echo
@ -510,13 +510,13 @@ INTERFER_DESKTOP_CONFIG1 = \
integrationFolder=$(DESKTOP_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT),defaultCommandTimeout=30000
INTERFER_DESKTOP_ENV1 = \
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),INTERFERENCE_TEST=true
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),INTERFERENCE_TEST=true
INTERFER_DESKTOP_CONFIG2 = \
supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT),defaultCommandTimeout=30000,retries=0
INTERFER_DESKTOP_ENV2 = \
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(MULTIUSER_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION)
# Run all desktop interference test in headless mode.
define run_desktop_interference_tests
@ -563,7 +563,7 @@ do-run-cov: @JAILS_PATH@ $(NODE_BINS)
@echo "Run all tests..."
@echo
$(call cleanup_before_run)
$(call start_loolwsd)
$(call start_coolwsd)
$(call run_desktop_tests,,,COVERAGE_RUN="1")
$(call run_mobile_tests,,,COVERAGE_RUN="1")
$(call run_all_multiuser_tests,COVERAGE_RUN="1")

4
cypress_test/README
View File

@ -324,9 +324,9 @@ Used Packages
test code.
- get-port-cli:
Used by the build system to find an available port to use as loolwsd's
Used by the build system to find an available port to use as coolwsd's
communication port.
- wait-on:
Used by the build system to wait on loolwsd server to start before
Used by the build system to wait on coolwsd server to start before
tests are started.

6
debian/changelog vendored
View File

@ -1,16 +1,16 @@
loolwsd (21.11.0.1-1) unstable; urgency=medium
coolwsd (21.11.0.1-1) unstable; urgency=medium
* https://github.com/CollaboraOnline/online/releases/tag/cp-21.11.0-1
-- Andras Timar <andras.timar@collabora.com> Thu, 11 Nov 2021 15:40:00 +0100
loolwsd (21.11.0.0-1) unstable; urgency=medium
coolwsd (21.11.0.0-1) unstable; urgency=medium
* https://github.com/CollaboraOnline/online/releases/tag/cp-21.11.0-0
-- Andras Timar <andras.timar@collabora.com> Tue, 26 Oct 2021 13:40:00 +0100
loolwsd (21.06.2.0-1) unstable; urgency=medium
coolwsd (21.06.2.0-1) unstable; urgency=medium
* https://github.com/CollaboraOnline/online/releases/tag/cp-21.06.2-0

8
debian/control vendored
View File

@ -1,11 +1,11 @@
Source: loolwsd
Source: coolwsd
Section: web
Priority: optional
Maintainer: Andras Timar <andras.timar@collabora.com>
Build-Depends: debhelper (>= 9.20160709) | dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, linux-libc-dev, nodejs, python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts, m4
Standards-Version: 3.9.7
Package: loolwsd
Package: coolwsd
Section: web
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
@ -24,6 +24,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
collaboraofficebasis-extension-pdf-import,
collaboraofficebasis-ooolinguistic,
collaboraofficebasis-math
Conflicts: loolwsd
Replaces: loolwsd
Description: Collabora Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
COOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.

8
debian/loolwsd.postinst.in → debian/coolwsd.postinst.in vendored
View File

@ -8,8 +8,8 @@ case "$1" in
setcap cap_sys_admin=ep /usr/bin/coolmount || true
adduser --quiet --system --group --home /opt/cool cool
chown cool: /etc/loolwsd/loolwsd.xml
chmod 640 /etc/loolwsd/loolwsd.xml
chown cool: /etc/coolwsd/coolwsd.xml
chmod 640 /etc/coolwsd/coolwsd.xml
# We assume that the LibreOffice to be used is built TDF-style
# and installs in @LO_PATH@, and that /opt/cool is
@ -24,9 +24,9 @@ case "$1" in
coolwsd-systemplate-setup /opt/cool/systemplate @LO_PATH@ >/dev/null 2>&1
coolwsd-generate-proof-key >/dev/null 2>&1
cat << EOF > /etc/apt/apt.conf.d/25loolwsd
cat << EOF > /etc/apt/apt.conf.d/25coolwsd
// Rebuild systemplate of @APP_NAME@
DPkg::Post-Invoke { "echo Updating loolwsd systemplate;coolwsd-systemplate-setup /opt/cool/systemplate @LO_PATH@ >/dev/null 2>&1 || true"; };
DPkg::Post-Invoke { "echo Updating coolwsd systemplate;coolwsd-systemplate-setup /opt/cool/systemplate @LO_PATH@ >/dev/null 2>&1 || true"; };
EOF
;;

5
debian/coolwsd.postrm vendored 100644
View File

@ -0,0 +1,5 @@
#!/bin/sh
set -e
rm -f /etc/apt/apt.conf.d/25coolwsd

10
debian/coolwsd.preinst vendored 100644
View File

@ -0,0 +1,10 @@
#!/bin/sh
set -e
# Stop any running coolwsd process
if [ -d /run/systemd/system ]; then
deb-systemd-invoke stop coolwsd.service >/dev/null || true
fi
#DEBHELPER#

4
loolwsd.service → debian/coolwsd.service vendored
View File

@ -3,8 +3,8 @@ Description=Collabora Online WebSocket Daemon
After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/cool/systemplate --o:child_root_path=/opt/cool/child-roots --o:file_server_root_path=/usr/share/loolwsd
EnvironmentFile=-/etc/sysconfig/coolwsd
ExecStart=/usr/bin/coolwsd --version --o:sys_template_path=/opt/cool/systemplate --o:child_root_path=/opt/cool/child-roots --o:file_server_root_path=/usr/share/coolwsd
KillSignal=SIGINT
TimeoutStopSec=120
User=cool

2
debian/copyright vendored
View File

@ -1,5 +1,5 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
Name: loolwsd
Name: coolwsd
Maintainer: Andras Timar <andras.timar@collabora.com>
Source: https://github.com/CollaboraOnline/online.git

5
debian/loolwsd.postrm vendored
View File

@ -1,5 +0,0 @@
#!/bin/sh
set -e
rm -f /etc/apt/apt.conf.d/25loolwsd

10
debian/loolwsd.preinst vendored
View File

@ -1,10 +0,0 @@
#!/bin/sh
set -e
# Stop any running loolwsd process
if [ -d /run/systemd/system ]; then
deb-systemd-invoke stop loolwsd.service >/dev/null || true
fi
#DEBHELPER#

10
docker/from-packages/scripts/install-collabora-online-rhel8.sh
View File

@ -44,7 +44,7 @@ else
corever=6.4
fi
dnf install -y loolwsd collaboraoffice$corever-dict* collaboraofficebasis$corever-ar collaboraofficebasis$corever-as collaboraofficebasis$corever-ast collaboraofficebasis$corever-bg collaboraofficebasis$corever-bn-IN collaboraofficebasis$corever-br collaboraofficebasis$corever-ca collaboraofficebasis$corever-calc collaboraofficebasis$corever-ca-valencia collaboraofficebasis$corever-core collaboraofficebasis$corever-cs collaboraofficebasis$corever-cy collaboraofficebasis$corever-da collaboraofficebasis$corever-de collaboraofficebasis$corever-draw collaboraofficebasis$corever-el collaboraofficebasis$corever-en-GB collaboraofficebasis$corever-en-US collaboraofficebasis$corever-es collaboraofficebasis$corever-et collaboraofficebasis$corever-eu collaboraofficebasis$corever-extension-pdf-import collaboraofficebasis$corever-fi collaboraofficebasis$corever-fr collaboraofficebasis$corever-ga collaboraofficebasis$corever-gd collaboraofficebasis$corever-gl collaboraofficebasis$corever-graphicfilter collaboraofficebasis$corever-gu collaboraofficebasis$corever-he collaboraofficebasis$corever-hi collaboraofficebasis$corever-hr collaboraofficebasis$corever-hu collaboraofficebasis$corever-id collaboraofficebasis$corever-images collaboraofficebasis$corever-impress collaboraofficebasis$corever-is collaboraofficebasis$corever-it collaboraofficebasis$corever-ja collaboraofficebasis$corever-km collaboraofficebasis$corever-kn collaboraofficebasis$corever-ko collaboraofficebasis$corever-lt collaboraofficebasis$corever-lv collaboraofficebasis$corever-ml collaboraofficebasis$corever-mr collaboraofficebasis$corever-nb collaboraofficebasis$corever-nl collaboraofficebasis$corever-nn collaboraofficebasis$corever-oc collaboraofficebasis$corever-ooofonts collaboraofficebasis$corever-ooolinguistic collaboraofficebasis$corever-or collaboraofficebasis$corever-pa-IN collaboraofficebasis$corever-pl collaboraofficebasis$corever-pt collaboraofficebasis$corever-pt-BR collaboraofficebasis$corever-ro collaboraofficebasis$corever-ru collaboraofficebasis$corever-sk collaboraofficebasis$corever-sl collaboraofficebasis$corever-sr collaboraofficebasis$corever-sr-Latn collaboraofficebasis$corever-sv collaboraofficebasis$corever-ta collaboraofficebasis$corever-te collaboraofficebasis$corever-tr collaboraofficebasis$corever-uk collaboraofficebasis$corever-vi collaboraofficebasis$corever-writer collaboraofficebasis$corever-zh-CN collaboraofficebasis$corever-zh-TW
dnf install -y coolwsd collaboraoffice$corever-dict* collaboraofficebasis$corever-ar collaboraofficebasis$corever-as collaboraofficebasis$corever-ast collaboraofficebasis$corever-bg collaboraofficebasis$corever-bn-IN collaboraofficebasis$corever-br collaboraofficebasis$corever-ca collaboraofficebasis$corever-calc collaboraofficebasis$corever-ca-valencia collaboraofficebasis$corever-core collaboraofficebasis$corever-cs collaboraofficebasis$corever-cy collaboraofficebasis$corever-da collaboraofficebasis$corever-de collaboraofficebasis$corever-draw collaboraofficebasis$corever-el collaboraofficebasis$corever-en-GB collaboraofficebasis$corever-en-US collaboraofficebasis$corever-es collaboraofficebasis$corever-et collaboraofficebasis$corever-eu collaboraofficebasis$corever-extension-pdf-import collaboraofficebasis$corever-fi collaboraofficebasis$corever-fr collaboraofficebasis$corever-ga collaboraofficebasis$corever-gd collaboraofficebasis$corever-gl collaboraofficebasis$corever-graphicfilter collaboraofficebasis$corever-gu collaboraofficebasis$corever-he collaboraofficebasis$corever-hi collaboraofficebasis$corever-hr collaboraofficebasis$corever-hu collaboraofficebasis$corever-id collaboraofficebasis$corever-images collaboraofficebasis$corever-impress collaboraofficebasis$corever-is collaboraofficebasis$corever-it collaboraofficebasis$corever-ja collaboraofficebasis$corever-km collaboraofficebasis$corever-kn collaboraofficebasis$corever-ko collaboraofficebasis$corever-lt collaboraofficebasis$corever-lv collaboraofficebasis$corever-ml collaboraofficebasis$corever-mr collaboraofficebasis$corever-nb collaboraofficebasis$corever-nl collaboraofficebasis$corever-nn collaboraofficebasis$corever-oc collaboraofficebasis$corever-ooofonts collaboraofficebasis$corever-ooolinguistic collaboraofficebasis$corever-or collaboraofficebasis$corever-pa-IN collaboraofficebasis$corever-pl collaboraofficebasis$corever-pt collaboraofficebasis$corever-pt-BR collaboraofficebasis$corever-ro collaboraofficebasis$corever-ru collaboraofficebasis$corever-sk collaboraofficebasis$corever-sl collaboraofficebasis$corever-sr collaboraofficebasis$corever-sr-Latn collaboraofficebasis$corever-sv collaboraofficebasis$corever-ta collaboraofficebasis$corever-te collaboraofficebasis$corever-tr collaboraofficebasis$corever-uk collaboraofficebasis$corever-vi collaboraofficebasis$corever-writer collaboraofficebasis$corever-zh-CN collaboraofficebasis$corever-zh-TW
if [ "$type" == "cool" ] || [ "$type" == "key" ]; then
dnf -y install collabora-online-brand
@ -52,7 +52,7 @@ else
dnf -y install CODE-brand
fi
# Install inotifywait and killall to automatic restart loolwsd, if loolwsd.xml changes
# Install inotifywait and killall to automatic restart coolwsd, if coolwsd.xml changes
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
dnf install -y inotify-tools psmisc perl
@ -60,12 +60,12 @@ dnf install -y inotify-tools psmisc perl
dnf clean all
# Remove WOPI Proof key generated by the package, we need unique key for each container
rm -rf /etc/loolwsd/proof_key*
rm -rf /etc/coolwsd/proof_key*
# Fix permissions
# cf. start-collabora-online.sh that is run by cool user
# # Fix domain name resolution from jails
# cp /etc/resolv.conf /etc/hosts /opt/cool/systemplate/etc/
chown cool:cool /opt/cool/systemplate/etc/hosts /opt/cool/systemplate/etc/resolv.conf
# generated ssl cert/key and WOPI proof key go into /etc/loolwsd
chown cool:cool /etc/loolwsd
# generated ssl cert/key and WOPI proof key go into /etc/coolwsd
chown cool:cool /etc/coolwsd

10
docker/from-packages/scripts/install-collabora-online-ubuntu.sh
View File

@ -60,7 +60,7 @@ else
corever=6.4
fi
apt-get -y install loolwsd collaboraoffice$corever-dict* collaboraofficebasis$corever-ar collaboraofficebasis$corever-as collaboraofficebasis$corever-ast collaboraofficebasis$corever-bg collaboraofficebasis$corever-bn-in collaboraofficebasis$corever-br collaboraofficebasis$corever-ca collaboraofficebasis$corever-calc collaboraofficebasis$corever-ca-valencia collaboraofficebasis$corever-core collaboraofficebasis$corever-cs collaboraofficebasis$corever-cy collaboraofficebasis$corever-da collaboraofficebasis$corever-de collaboraofficebasis$corever-draw collaboraofficebasis$corever-el collaboraofficebasis$corever-en-gb collaboraofficebasis$corever-en-us collaboraofficebasis$corever-es collaboraofficebasis$corever-et collaboraofficebasis$corever-eu collaboraofficebasis$corever-extension-pdf-import collaboraofficebasis$corever-fi collaboraofficebasis$corever-fr collaboraofficebasis$corever-ga collaboraofficebasis$corever-gd collaboraofficebasis$corever-gl collaboraofficebasis$corever-graphicfilter collaboraofficebasis$corever-gu collaboraofficebasis$corever-he collaboraofficebasis$corever-hi collaboraofficebasis$corever-hr collaboraofficebasis$corever-hu collaboraofficebasis$corever-id collaboraofficebasis$corever-images collaboraofficebasis$corever-impress collaboraofficebasis$corever-is collaboraofficebasis$corever-it collaboraofficebasis$corever-ja collaboraofficebasis$corever-km collaboraofficebasis$corever-kn collaboraofficebasis$corever-ko collaboraofficebasis$corever-lt collaboraofficebasis$corever-lv collaboraofficebasis$corever-ml collaboraofficebasis$corever-mr collaboraofficebasis$corever-nb collaboraofficebasis$corever-nl collaboraofficebasis$corever-nn collaboraofficebasis$corever-oc collaboraofficebasis$corever-ooofonts collaboraofficebasis$corever-ooolinguistic collaboraofficebasis$corever-or collaboraofficebasis$corever-pa-in collaboraofficebasis$corever-pl collaboraofficebasis$corever-pt collaboraofficebasis$corever-pt-br collaboraofficebasis$corever-ro collaboraofficebasis$corever-ru collaboraofficebasis$corever-sk collaboraofficebasis$corever-sl collaboraofficebasis$corever-sr collaboraofficebasis$corever-sr-latn collaboraofficebasis$corever-sv collaboraofficebasis$corever-ta collaboraofficebasis$corever-te collaboraofficebasis$corever-tr collaboraofficebasis$corever-uk collaboraofficebasis$corever-vi collaboraofficebasis$corever-writer collaboraofficebasis$corever-zh-cn collaboraofficebasis$corever-zh-tw
apt-get -y install coolwsd collaboraoffice$corever-dict* collaboraofficebasis$corever-ar collaboraofficebasis$corever-as collaboraofficebasis$corever-ast collaboraofficebasis$corever-bg collaboraofficebasis$corever-bn-in collaboraofficebasis$corever-br collaboraofficebasis$corever-ca collaboraofficebasis$corever-calc collaboraofficebasis$corever-ca-valencia collaboraofficebasis$corever-core collaboraofficebasis$corever-cs collaboraofficebasis$corever-cy collaboraofficebasis$corever-da collaboraofficebasis$corever-de collaboraofficebasis$corever-draw collaboraofficebasis$corever-el collaboraofficebasis$corever-en-gb collaboraofficebasis$corever-en-us collaboraofficebasis$corever-es collaboraofficebasis$corever-et collaboraofficebasis$corever-eu collaboraofficebasis$corever-extension-pdf-import collaboraofficebasis$corever-fi collaboraofficebasis$corever-fr collaboraofficebasis$corever-ga collaboraofficebasis$corever-gd collaboraofficebasis$corever-gl collaboraofficebasis$corever-graphicfilter collaboraofficebasis$corever-gu collaboraofficebasis$corever-he collaboraofficebasis$corever-hi collaboraofficebasis$corever-hr collaboraofficebasis$corever-hu collaboraofficebasis$corever-id collaboraofficebasis$corever-images collaboraofficebasis$corever-impress collaboraofficebasis$corever-is collaboraofficebasis$corever-it collaboraofficebasis$corever-ja collaboraofficebasis$corever-km collaboraofficebasis$corever-kn collaboraofficebasis$corever-ko collaboraofficebasis$corever-lt collaboraofficebasis$corever-lv collaboraofficebasis$corever-ml collaboraofficebasis$corever-mr collaboraofficebasis$corever-nb collaboraofficebasis$corever-nl collaboraofficebasis$corever-nn collaboraofficebasis$corever-oc collaboraofficebasis$corever-ooofonts collaboraofficebasis$corever-ooolinguistic collaboraofficebasis$corever-or collaboraofficebasis$corever-pa-in collaboraofficebasis$corever-pl collaboraofficebasis$corever-pt collaboraofficebasis$corever-pt-br collaboraofficebasis$corever-ro collaboraofficebasis$corever-ru collaboraofficebasis$corever-sk collaboraofficebasis$corever-sl collaboraofficebasis$corever-sr collaboraofficebasis$corever-sr-latn collaboraofficebasis$corever-sv collaboraofficebasis$corever-ta collaboraofficebasis$corever-te collaboraofficebasis$corever-tr collaboraofficebasis$corever-uk collaboraofficebasis$corever-vi collaboraofficebasis$corever-writer collaboraofficebasis$corever-zh-cn collaboraofficebasis$corever-zh-tw
if [ "$type" == "cool" ] || [ "$type" == "key" ]; then
apt-get -y install collabora-online-brand
@ -68,19 +68,19 @@ else
apt-get -y install code-brand
fi
# Install inotifywait and killall to automatic restart loolwsd, if loolwsd.xml changes
# Install inotifywait and killall to automatic restart coolwsd, if coolwsd.xml changes
apt-get -y install inotify-tools psmisc
# Cleanup
rm -rf /var/lib/apt/lists/*
# Remove WOPI Proof key generated by the package, we need unique key for each container
rm -rf /etc/loolwsd/proof_key*
rm -rf /etc/coolwsd/proof_key*
# Fix permissions
# cf. start-collabora-online.sh that is run by cool user
# # Fix domain name resolution from jails
# cp /etc/resolv.conf /etc/hosts /opt/cool/systemplate/etc/
chown cool:cool /opt/cool/systemplate/etc/hosts /opt/cool/systemplate/etc/resolv.conf
# generated ssl cert/key and WOPI proof key go into /etc/loolwsd
chown cool:cool /etc/loolwsd
# generated ssl cert/key and WOPI proof key go into /etc/coolwsd
chown cool:cool /etc/coolwsd

28
docker/from-packages/scripts/start-collabora-online.sh
View File

@ -24,9 +24,9 @@ else
openssl req -key certs/servers/localhost/privkey.pem -new -sha256 -out certs/tmp/localhost.csr.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=${cert_domain}"
fi
openssl x509 -req -in certs/tmp/localhost.csr.pem -CA certs/ca/root.crt.pem -CAkey certs/ca/root.key.pem -CAcreateserial -out certs/servers/localhost/cert.pem -days 9131
mv certs/servers/localhost/privkey.pem /etc/loolwsd/key.pem
mv certs/servers/localhost/cert.pem /etc/loolwsd/cert.pem
mv certs/ca/root.crt.pem /etc/loolwsd/ca-chain.cert.pem
mv certs/servers/localhost/privkey.pem /etc/coolwsd/key.pem
mv certs/servers/localhost/cert.pem /etc/coolwsd/cert.pem
mv certs/ca/root.crt.pem /etc/coolwsd/ca-chain.cert.pem
fi
# Disable warning/info messages of LOKit by default
@ -36,19 +36,19 @@ fi
# Replace trusted host and set admin username and password - only if they are set
if test -n "${domain}"; then
perl -pi -e "s/localhost<\/host>/${domain}<\/host>/g" /etc/loolwsd/loolwsd.xml
perl -pi -e "s/localhost<\/host>/${domain}<\/host>/g" /etc/coolwsd/coolwsd.xml
fi
if test -n "${username}"; then
perl -pi -e "s/<username (.*)>.*<\/username>/<username \1>${username}<\/username>/" /etc/loolwsd/loolwsd.xml
perl -pi -e "s/<username (.*)>.*<\/username>/<username \1>${username}<\/username>/" /etc/coolwsd/coolwsd.xml
fi
if test -n "${password}"; then
perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password>/" /etc/loolwsd/loolwsd.xml
perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password>/" /etc/coolwsd/coolwsd.xml
fi
if test -n "${server_name}"; then
perl -pi -e "s/<server_name (.*)>.*<\/server_name>/<server_name \1>${server_name}<\/server_name>/" /etc/loolwsd/loolwsd.xml
perl -pi -e "s/<server_name (.*)>.*<\/server_name>/<server_name \1>${server_name}<\/server_name>/" /etc/coolwsd/coolwsd.xml
fi
if test -n "${dictionaries}"; then
perl -pi -e "s/<allowed_languages (.*)>.*<\/allowed_languages>/<allowed_languages \1>${dictionaries:-de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru}<\/allowed_languages>/" /etc/loolwsd/loolwsd.xml
perl -pi -e "s/<allowed_languages (.*)>.*<\/allowed_languages>/<allowed_languages \1>${dictionaries:-de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru}<\/allowed_languages>/" /etc/coolwsd/coolwsd.xml
fi
if test -n "${user_interface_mode}"; then
extra_params="${extra_params} --o:user_interface.mode=${user_interface_mode}"
@ -56,15 +56,15 @@ else
extra_params="${extra_params} --o:user_interface.mode=notebookbar"
fi
# Restart when /etc/loolwsd/loolwsd.xml changes
# Restart when /etc/coolwsd/coolwsd.xml changes
[ -x /usr/bin/inotifywait -a /usr/bin/killall ] && (
/usr/bin/inotifywait -e modify /etc/loolwsd/loolwsd.xml
echo "$(ls -l /etc/loolwsd/loolwsd.xml) modified --> restarting"
/usr/bin/killall -1 loolwsd
/usr/bin/inotifywait -e modify /etc/coolwsd/coolwsd.xml
echo "$(ls -l /etc/coolwsd/coolwsd.xml) modified --> restarting"
/usr/bin/killall -1 coolwsd
) &
# Generate WOPI proof key
coolwsd-generate-proof-key
# Start loolwsd
exec /usr/bin/loolwsd --version --o:sys_template_path=/opt/cool/systemplate --o:child_root_path=/opt/cool/child-roots --o:file_server_root_path=/usr/share/loolwsd --o:logging.color=false ${extra_params}
# Start coolwsd
exec /usr/bin/coolwsd --version --o:sys_template_path=/opt/cool/systemplate --o:child_root_path=/opt/cool/child-roots --o:file_server_root_path=/usr/share/coolwsd --o:logging.color=false ${extra_params}

8
docker/from-source/Debian
View File

@ -19,7 +19,7 @@ RUN apt-get update && \
# copy freshly built LOKit and Collabora Online
COPY /instdir /
# copy the shell script which can start Collabora Online (loolwsd)
# copy the shell script which can start Collabora Online (coolwsd)
COPY /start-collabora-online.sh /
# set up Collabora Online (normally done by postinstall script of package)
@ -30,10 +30,10 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
rm -rf /opt/cool && \
mkdir -p /opt/cool/child-roots && \
coolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown cool:cool /var/log/loolwsd.log && \
touch /var/log/coolwsd.log && \
chown cool:cool /var/log/coolwsd.log && \
chown -R cool:cool /opt/ && \
chown -R cool:cool /etc/loolwsd
chown -R cool:cool /etc/coolwsd
EXPOSE 9980

8
docker/from-source/Ubuntu
View File

@ -20,7 +20,7 @@ RUN apt-get update && \
# copy freshly built LOKit and Collabora Online
COPY /instdir /
# copy the shell script which can start Collabora Online (loolwsd)
# copy the shell script which can start Collabora Online (coolwsd)
COPY /start-collabora-online.sh /
# set up Collabora Online (normally done by postinstall script of package)
@ -31,10 +31,10 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
rm -rf /opt/cool && \
mkdir -p /opt/cool/child-roots && \
coolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown cool:cool /var/log/loolwsd.log && \
touch /var/log/coolwsd.log && \
chown cool:cool /var/log/coolwsd.log && \
chown -R cool:cool /opt/ && \
chown -R cool:cool /etc/loolwsd
chown -R cool:cool /etc/coolwsd
EXPOSE 9980

2
docker/from-source/build.sh
View File

@ -117,7 +117,7 @@ fi
mkdir -p "$INSTDIR"/opt/
cp -a core/instdir "$INSTDIR"/opt/lokit
##### loolwsd & cool #####
##### coolwsd & cool #####
# build
( cd online && ./autogen.sh ) || exit 1

8
docker/from-source/openSUSE
View File

@ -14,7 +14,7 @@ RUN zypper ref && \
# copy freshly built LOKit and Collabora Online
COPY /instdir /
# copy the shell script which can start Collabora Online (loolwsd)
# copy the shell script which can start Collabora Online (coolwsd)
COPY /start-collabora-online.sh /
# set up Collabora Online (normally done by postinstall script of package)
@ -26,10 +26,10 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
rm -rf /opt/cool && \
mkdir -p /opt/cool/child-roots && \
coolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown cool:cool /var/log/loolwsd.log && \
touch /var/log/coolwsd.log && \
chown cool:cool /var/log/coolwsd.log && \
chown -R cool:cool /opt/ && \
chown -R cool:cool /etc/loolwsd
chown -R cool:cool /etc/coolwsd
EXPOSE 9980

4
etc/apache2/loolwsd.conf → etc/apache2/coolwsd.conf
View File

@ -1,5 +1,5 @@
# Apache2 reverse proxy configuration for Collabora Online
# Internet <-- SSL --> Reverse Proxy <-- No SSL --> loolwsd
# Internet <-- SSL --> Reverse Proxy <-- No SSL --> coolwsd
# Make sure that you enable the following Apache2 modules: proxy, proxy_wstunnel, and proxy_http.
# Create a virtual host for Collabora Online and include this configuration file.
@ -11,7 +11,7 @@
# keep the host
ProxyPreserveHost On
# static html, js, images, etc. served from loolwsd
# static html, js, images, etc. served from coolwsd
# browser is the client part of Collabora Online
ProxyPass /browser http://127.0.0.1:9980/browser retry=0
ProxyPassReverse /browser http://127.0.0.1:9980/browser

0
etc/nginx/loolwsd.conf → etc/nginx/coolwsd.conf
View File

2
fuzzer/ClientSession.cpp
View File

@ -6,7 +6,7 @@
bool DoInitialization()
{
LOOLWSD::ChildRoot = "/fuzz/child-root";
COOLWSD::ChildRoot = "/fuzz/child-root";
return true;
}

2
fuzzer/README
View File

@ -3,7 +3,7 @@ environment (currently enables both asan and ubsan).
online.git can be built the usual way, just the additional `--enable-fuzzers`
flag is needed to build the fuzzers. It is useful to do this in a separate
build tree, since the fuzzers config doesn't produce a `loolwsd` binary.
build tree, since the fuzzers config doesn't produce a `coolwsd` binary.
Run the fuzzers like this:

0
fuzzer/data/loolclient → fuzzer/data/coolclient
View File

BIN
fuzzer/data/crash-70dbba08f3353e34ddf3b12d78f8204e104b20bd
View File

Binary file not shown.

BIN
fuzzer/data/crash-ee6440c94cb4f4f7f902d3b28d607870639d910f
View File

Binary file not shown.

6
gtk/Makefile.am
View File

@ -6,8 +6,8 @@ warning_flags = -Wall -Werror -Wno-parentheses -Wno-sign-compare -Wno-unused-var
define_flags = -DMOBILEAPP=1
AM_CPPFLAGS = -pthread \
-DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' \
-DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' \
-DCOOLWSD_DATADIR='"@COOLWSD_DATADIR@"' \
-DCOOLWSD_CONFIGDIR='"@COOLWSD_CONFIGDIR@"' \
-DTOPSRCDIR='"'$(realpath ${top_srcdir})'"' \
-DGTKAPP \
${define_flags} \
@ -38,7 +38,7 @@ net_sources = ../net/FakeSocket.cpp \
wsd_sources = ../wsd/ClientSession.cpp \
../wsd/DocumentBroker.cpp \
../wsd/LOOLWSD.cpp \
../wsd/COOLWSD.cpp \
../wsd/RequestDetails.cpp \
../wsd/Storage.cpp \
../wsd/TileCache.cpp

2
gtk/gtk.hpp
View File

@ -5,6 +5,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
extern int loolwsd_server_socket_fd;
extern int coolwsd_server_socket_fd;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

28
gtk/mobile.cpp
View File

@ -21,16 +21,16 @@
#include "FakeSocket.hpp"
#include "Log.hpp"
#include "LOOLWSD.hpp"
#include "COOLWSD.hpp"
#include "Protocol.hpp"
#include "Util.hpp"
const int SHOW_JS_MAXLEN = 70;
int loolwsd_server_socket_fd = -1;
int coolwsd_server_socket_fd = -1;
static std::string fileURL;
static LOOLWSD *loolwsd = nullptr;
static COOLWSD *coolwsd = nullptr;
static int fakeClientFd;
static int closeNotificationPipeForForwardingThread[2];
static WebKitWebView *webView;
@ -44,7 +44,7 @@ static void send2JS_ready_callback(GObject *source_object,
static void send2JS(const std::vector<char>& buffer)
{
LOG_TRC_NOFILE("Send to JS: " << LOOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
LOG_TRC_NOFILE("Send to JS: " << COOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
std::string js;
@ -145,7 +145,7 @@ static void handle_message(const char * type, WebKitJavascriptResult *js_result)
g_free(string_value);
}
static void handle_lool_message(WebKitUserContentManager *manager,
static void handle_cool_message(WebKitUserContentManager *manager,
WebKitJavascriptResult *js_result,
gpointer user_data)
{
@ -159,10 +159,10 @@ static void handle_lool_message(WebKitUserContentManager *manager,
{
// Now we know that the JS has started completely
// Contact the permanently (during app lifetime) listening LOOLWSD server
// Contact the permanently (during app lifetime) listening COOLWSD server
// "public" socket
assert(loolwsd_server_socket_fd != -1);
int rc = fakeSocketConnect(fakeClientFd, loolwsd_server_socket_fd);
assert(coolwsd_server_socket_fd != -1);
int rc = fakeSocketConnect(fakeClientFd, coolwsd_server_socket_fd);
assert(rc != -1);
// Create a socket pair to notify the below thread when the document has been closed
@ -288,17 +288,17 @@ int main(int argc, char* argv[])
std::thread([]
{
assert(loolwsd == nullptr);
assert(coolwsd == nullptr);
char *argv[2];
argv[0] = strdup("mobile");
argv[1] = nullptr;
Util::setThreadName("app");
while (true)
{
loolwsd = new LOOLWSD();
loolwsd->run(1, argv);
delete loolwsd;
LOG_TRC("One run of LOOLWSD completed");
coolwsd = new COOLWSD();
coolwsd->run(1, argv);
delete coolwsd;
LOG_TRC("One run of COOLWSD completed");
}
}).detach();
@ -313,7 +313,7 @@ int main(int argc, char* argv[])
WebKitUserContentManager *userContentManager = WEBKIT_USER_CONTENT_MANAGER(webkit_user_content_manager_new());
g_signal_connect(userContentManager, "script-message-received::debug", G_CALLBACK(handle_debug_message), nullptr);
g_signal_connect(userContentManager, "script-message-received::cool", G_CALLBACK(handle_lool_message), nullptr);
g_signal_connect(userContentManager, "script-message-received::cool", G_CALLBACK(handle_cool_message), nullptr);
g_signal_connect(userContentManager, "script-message-received::error", G_CALLBACK(handle_error_message), nullptr);
webkit_user_content_manager_register_script_message_handler(userContentManager, "debug");

20
ios/Mobile.xcodeproj/project.pbxproj
View File

@ -27,14 +27,14 @@
BE5EB5C8213FE29900E0826C /* FileUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5C0213FE29900E0826C /* FileUtil.cpp */; };
BE5EB5CF213FE2D000E0826C /* ClientSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5CC213FE2D000E0826C /* ClientSession.cpp */; };
BE5EB5D0213FE2D000E0826C /* TileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5CD213FE2D000E0826C /* TileCache.cpp */; };
BE5EB5D22140039100E0826C /* LOOLWSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5D12140039100E0826C /* LOOLWSD.cpp */; };
BE5EB5D22140039100E0826C /* COOLWSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5D12140039100E0826C /* COOLWSD.cpp */; };
BE5EB5D421400DC100E0826C /* DocumentBroker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5D321400DC100E0826C /* DocumentBroker.cpp */; };
BE5EB5D621401E0F00E0826C /* Storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5D521401E0F00E0826C /* Storage.cpp */; };
BE5EB5DA2140363100E0826C /* ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = BE5EB5D92140363100E0826C /* ios.mm */; };
BE5EB5DC2140480B00E0826C /* ICU.dat in Resources */ = {isa = PBXBuildFile; fileRef = BE5EB5DB2140480B00E0826C /* ICU.dat */; };
BE6362C22153B5B500F4237E /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE6362C12153B5B500F4237E /* CoreServices.framework */; };
BE7228E22417BC9F000ADABD /* StringVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE7228E02417BC9F000ADABD /* StringVector.cpp */; };
BE7D6A6B23FAA8B500C2E605 /* loolkitconfig.xcu in Resources */ = {isa = PBXBuildFile; fileRef = BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */; };
BE7D6A6B23FAA8B500C2E605 /* coolkitconfig.xcu in Resources */ = {isa = PBXBuildFile; fileRef = BE7D6A6A23FAA8B500C2E605 /* coolkitconfig.xcu */; };
BE80E43221AD92F700859C97 /* Fonts in Resources */ = {isa = PBXBuildFile; fileRef = BE80E43121AD92F600859C97 /* Fonts */; };
BE80E45821B68F5700859C97 /* TemplateCollectionViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = BE80E45721B68F5700859C97 /* TemplateCollectionViewController.mm */; };
BE80E45E21B6CEF200859C97 /* TemplateSectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE80E45D21B6CEF200859C97 /* TemplateSectionHeaderView.m */; };
@ -560,7 +560,7 @@
BE5EB5C0213FE29900E0826C /* FileUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUtil.cpp; sourceTree = "<group>"; };
BE5EB5CC213FE2D000E0826C /* ClientSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClientSession.cpp; sourceTree = "<group>"; };
BE5EB5CD213FE2D000E0826C /* TileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileCache.cpp; sourceTree = "<group>"; };
BE5EB5D12140039100E0826C /* LOOLWSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LOOLWSD.cpp; sourceTree = "<group>"; };
BE5EB5D12140039100E0826C /* COOLWSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COOLWSD.cpp; sourceTree = "<group>"; };
BE5EB5D321400DC100E0826C /* DocumentBroker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentBroker.cpp; sourceTree = "<group>"; };
BE5EB5D521401E0F00E0826C /* Storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Storage.cpp; sourceTree = "<group>"; };
BE5EB5D92140363100E0826C /* ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ios.mm; path = ../../ios/ios.mm; sourceTree = "<group>"; };
@ -675,7 +675,7 @@
BE7D6A6523FA9C2700C2E605 /* defaultprovider.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = defaultprovider.hxx; path = "../../ios-device/configmgr/source/defaultprovider.hxx"; sourceTree = "<group>"; };
BE7D6A6623FA9C2700C2E605 /* parser.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = parser.hxx; path = "../../ios-device/configmgr/source/parser.hxx"; sourceTree = "<group>"; };
BE7D6A6723FA9C2700C2E605 /* rootnode.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rootnode.cxx; path = "../../ios-device/configmgr/source/rootnode.cxx"; sourceTree = "<group>"; };
BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = loolkitconfig.xcu; path = ../loolkitconfig.xcu; sourceTree = "<group>"; };
BE7D6A6A23FAA8B500C2E605 /* coolkitconfig.xcu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = coolkitconfig.xcu; path = ../coolkitconfig.xcu; sourceTree = "<group>"; };
BE7E5B7623AD07BE00F9462A /* SvxPresetListBox.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SvxPresetListBox.cxx; path = "../../ios-device/svx/source/tbxctrls/SvxPresetListBox.cxx"; sourceTree = "<group>"; };
BE7E5B7723AD07BE00F9462A /* tbxcolor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcolor.cxx; path = "../../ios-device/svx/source/tbxctrls/tbxcolor.cxx"; sourceTree = "<group>"; };
BE7E5B7823AD07BE00F9462A /* tbxdrctl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxdrctl.cxx; path = "../../ios-device/svx/source/tbxctrls/tbxdrctl.cxx"; sourceTree = "<group>"; };
@ -1503,7 +1503,7 @@
BE00F8922139494E001CE2D4 /* Resources */ = {
isa = PBXGroup;
children = (
BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */,
BE7D6A6A23FAA8B500C2E605 /* coolkitconfig.xcu */,
BE18C7DD226DE09A001AD27E /* Branding */,
BEB0E5D821C7CA800085A0CF /* Settings.bundle */,
BE80E46721B7066C00859C97 /* Templates */,
@ -2222,7 +2222,7 @@
BE5EB5CC213FE2D000E0826C /* ClientSession.cpp */,
BE5EB5D321400DC100E0826C /* DocumentBroker.cpp */,
BE484B71228D8622001EE76C /* DocumentBroker.hpp */,
BE5EB5D12140039100E0826C /* LOOLWSD.cpp */,
BE5EB5D12140039100E0826C /* COOLWSD.cpp */,
BE5EB5D521401E0F00E0826C /* Storage.cpp */,
BE5EB5CD213FE2D000E0826C /* TileCache.cpp */,
);
@ -3631,7 +3631,7 @@
BE00F8A721396585001CE2D4 /* cool-help.html in Resources */,
BE8D773D2136762600AC58EA /* LaunchScreen.storyboard in Resources */,
BE00F8A121396585001CE2D4 /* bundle.css in Resources */,
BE7D6A6B23FAA8B500C2E605 /* loolkitconfig.xcu in Resources */,
BE7D6A6B23FAA8B500C2E605 /* coolkitconfig.xcu in Resources */,
BE8D85CF214055F3009F1860 /* udkapi.rdb in Resources */,
BE18C7DE226DE09A001AD27E /* Branding in Resources */,
BE8D85D5214055F3009F1860 /* unorc in Resources */,
@ -3661,7 +3661,7 @@
BEA283582146945500848631 /* ChildSession.cpp in Sources */,
BE80E45E21B6CEF200859C97 /* TemplateSectionHeaderView.m in Sources */,
BE5EB5C3213FE29900E0826C /* Session.cpp in Sources */,
BE5EB5D22140039100E0826C /* LOOLWSD.cpp in Sources */,
BE5EB5D22140039100E0826C /* COOLWSD.cpp in Sources */,
BEFB1EE121C29CC70081D757 /* L10n.mm in Sources */,
BEDCC8992456FFAD00FB02BD /* SceneDelegate.m in Sources */,
BE5EB5C6213FE29900E0826C /* SigUtil.cpp in Sources */,
@ -3842,7 +3842,7 @@
"IOS=IOS",
"DISABLE_DYNLOADING=1",
"DEBUG=1",
"LOOLWSD_CONFIGDIR='\".\"'",
"COOLWSD_CONFIGDIR='\".\"'",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = (
@ -3901,7 +3901,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"IOS=IOS",
"DISABLE_DYNLOADING=1",
"LOOLWSD_CONFIGDIR='\".\"'",
"COOLWSD_CONFIGDIR='\".\"'",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = (

22
ios/Mobile/AppDelegate.mm
View File

@ -25,7 +25,7 @@
#import "FakeSocket.hpp"
#import "Kit.hpp"
#import "Log.hpp"
#import "LOOLWSD.hpp"
#import "COOLWSD.hpp"
#import "SetupKitEnvironment.hpp"
#import "Util.hpp"
@ -180,7 +180,7 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
@implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
auto trace = std::getenv("LOOL_LOGLEVEL");
auto trace = std::getenv("COOL_LOGLEVEL");
if (!trace)
trace = strdup("warning");
@ -198,18 +198,18 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
NSString *cacheDirectory = [userDirectory stringByAppendingPathComponent:@"cache"];
NSString *coreVersionHashFile = [cacheDirectory stringByAppendingPathComponent:@"core_version_hash"];
NSString *loolwsdVersionHashFile = [cacheDirectory stringByAppendingPathComponent:@"loolwsd_version_hash"];
NSString *coolwsdVersionHashFile = [cacheDirectory stringByAppendingPathComponent:@"coolwsd_version_hash"];
NSData *oldCoreVersionHash = [NSData dataWithContentsOfFile:coreVersionHashFile];
NSData *oldLoolwsdVersionHash = [NSData dataWithContentsOfFile:loolwsdVersionHashFile];
NSData *oldCoolwsdVersionHash = [NSData dataWithContentsOfFile:coolwsdVersionHashFile];
NSData *coreVersionHash = [NSData dataWithBytes:CORE_VERSION_HASH length:strlen(CORE_VERSION_HASH)];
NSData *loolwsdVersionHash = [NSData dataWithBytes:LOOLWSD_VERSION_HASH length:strlen(LOOLWSD_VERSION_HASH)];
NSData *coolwsdVersionHash = [NSData dataWithBytes:COOLWSD_VERSION_HASH length:strlen(COOLWSD_VERSION_HASH)];
if (oldCoreVersionHash == nil
|| ![oldCoreVersionHash isEqualToData:coreVersionHash]
|| oldLoolwsdVersionHash == nil
|| ![oldLoolwsdVersionHash isEqualToData:loolwsdVersionHash]) {
|| oldCoolwsdVersionHash == nil
|| ![oldCoolwsdVersionHash isEqualToData:coolwsdVersionHash]) {
[[NSFileManager defaultManager] removeItemAtPath:cacheDirectory error:nil];
@ -219,8 +219,8 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
if (![[NSFileManager defaultManager] createFileAtPath:coreVersionHashFile contents:coreVersionHash attributes:nil])
NSLog(@"Could not create %@", coreVersionHashFile);
if (![[NSFileManager defaultManager] createFileAtPath:loolwsdVersionHashFile contents:loolwsdVersionHash attributes:nil])
NSLog(@"Could not create %@", loolwsdVersionHashFile);
if (![[NSFileManager defaultManager] createFileAtPath:coolwsdVersionHashFile contents:coolwsdVersionHash attributes:nil])
NSLog(@"Could not create %@", coolwsdVersionHashFile);
}
// Having LANG in the environment is expected to happen only when debugging from Xcode. When
@ -313,8 +313,8 @@ static void updateTemplates(NSData *data, NSURLResponse *response)
argv[0] = strdup([[NSBundle mainBundle].executablePath UTF8String]);
argv[1] = nullptr;
Util::setThreadName("app");
auto loolwsd = new LOOLWSD();
loolwsd->run(1, argv);
auto coolwsd = new COOLWSD();
coolwsd->run(1, argv);
// Should never return
assert(false);

4
ios/Mobile/CODocument.mm
View File

@ -29,7 +29,7 @@
#import "Kit.hpp"
#import "KitHelper.hpp"
#import "Log.hpp"
#import "LOOLWSD.hpp"
#import "COOLWSD.hpp"
#import "MobileApp.hpp"
#import "Protocol.hpp"
@ -87,7 +87,7 @@ static std::atomic<unsigned> appDocIdCounter(1);
}
- (void)send2JS:(const char *)buffer length:(int)length {
LOG_TRC("To JS: " << LOOLProtocol::getAbbreviatedMessage(buffer, length).c_str());
LOG_TRC("To JS: " << COOLProtocol::getAbbreviatedMessage(buffer, length).c_str());
NSString *js;

8
ios/Mobile/DocumentViewController.mm
View File

@ -18,7 +18,7 @@
#import "ios.h"
#import "FakeSocket.hpp"
#import "LOOLWSD.hpp"
#import "COOLWSD.hpp"
#import "Log.hpp"
#import "MobileApp.hpp"
#import "SigUtil.hpp"
@ -302,10 +302,10 @@ static IMP standardImpOfInputAccessoryView = nil;
if ([message.body isEqualToString:@"HULLO"]) {
// Now we know that the JS has started completely
// Contact the permanently (during app lifetime) listening LOOLWSD server
// Contact the permanently (during app lifetime) listening COOLWSD server
// "public" socket
assert(loolwsd_server_socket_fd != -1);
rc = fakeSocketConnect(self.document->fakeClientFd, loolwsd_server_socket_fd);
assert(coolwsd_server_socket_fd != -1);
rc = fakeSocketConnect(self.document->fakeClientFd, coolwsd_server_socket_fd);
assert(rc != -1);
// Create a socket pair to notify the below thread when the document has been closed

2
ios/Mobile/Info.plist.in
View File

@ -229,7 +229,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<!--
Why not use LOOLWSD_VERSION (surrounded by atsigns) here, you ask? Because in case one
Why not use COOLWSD_VERSION (surrounded by atsigns) here, you ask? Because in case one
build has been approved for release on the App Store, when you want to release a
following version, it has to have a different version number here in Info.plist. And we
don't necessarily want to bump the version number in configure.ac for something that

2
ios/Mobile/Resources/Settings.bundle/Root.plist.in
View File

@ -20,7 +20,7 @@
<key>Key</key>
<string>onlineVersion</string>
<key>DefaultValue</key>
<string>@LOOLWSD_VERSION_HASH@</string>
<string>@COOLWSD_VERSION_HASH@</string>
</dict>
<dict>
<key>Type</key>

4
ios/config.h.in
View File

@ -77,10 +77,10 @@
#define HAVE_UNISTD_H 1
/* Collabora Online WebSocket server version */
#define LOOLWSD_VERSION "@LOOLWSD_VERSION@"
#define COOLWSD_VERSION "@COOLWSD_VERSION@"
/* Collabora Online git hash if present */
#define LOOLWSD_VERSION_HASH "@LOOLWSD_VERSION_HASH@"
#define COOLWSD_VERSION_HASH "@COOLWSD_VERSION_HASH@"
/* Path to LibreOffice installation */
#define LO_PATH "."

2
ios/ios.h
View File

@ -9,7 +9,7 @@
extern const char *user_name;
extern int loolwsd_server_socket_fd;
extern int coolwsd_server_socket_fd;
extern LibreOfficeKit *lo_kit;

2
ios/ios.mm
View File

@ -15,7 +15,7 @@ extern "C" {
const char *user_name = nullptr;
int loolwsd_server_socket_fd = -1;
int coolwsd_server_socket_fd = -1;
LibreOfficeKit *lo_kit;

8
kit/ChildSession.cpp
View File

@ -53,7 +53,7 @@ using Poco::JSON::Object;
using Poco::JSON::Parser;
using Poco::URI;
using namespace LOOLProtocol;
using namespace COOLProtocol;
bool ChildSession::NoCapsForKit = false;
UnoCommandsRecorder ChildSession::unoCommandsRecorder;
@ -147,7 +147,7 @@ bool ChildSession::_handleInput(const char *buffer, int length)
const std::string firstLine = getFirstLine(buffer, length);
const StringVector tokens = Util::tokenize(firstLine.data(), firstLine.size());
if (LOOLProtocol::tokenIndicatesUserInteraction(tokens[0]))
if (COOLProtocol::tokenIndicatesUserInteraction(tokens[0]))
{
// Keep track of timestamps of incoming client messages that indicate user activity.
updateLastActivityTime();
@ -1979,7 +1979,7 @@ bool ChildSession::resizeWindow(const char* /*buffer*/, int /*length*/, const St
std::string size;
if (tokens.size() > 2 && getTokenString(tokens[2], "size", size))
{
const std::vector<int> sizeParts = LOOLProtocol::tokenizeInts(size, ',');
const std::vector<int> sizeParts = COOLProtocol::tokenizeInts(size, ',');
if (sizeParts.size() == 2)
{
getLOKitDocument()->resizeWindow(winId, sizeParts[0], sizeParts[1]);
@ -2637,7 +2637,7 @@ void ChildSession::rememberEventsForInactiveUser(const int type, const std::stri
{
std::string name;
std::string value;
if (LOOLProtocol::parseNameValuePair(payload, name, value, '='))
if (COOLProtocol::parseNameValuePair(payload, name, value, '='))
{
_stateRecorder.recordState(name, payload);
}

38
kit/ForKit.cpp
View File

@ -159,7 +159,7 @@ protected:
else if (tokens.size() == 2 && tokens.equals(0, "setloglevel"))
{
// Set environment variable so that new children will also set their log levels accordingly.
setenv("LOOL_LOGLEVEL", tokens[1].c_str(), 1);
setenv("COOL_LOGLEVEL", tokens[1].c_str(), 1);
Log::logger().setLevel(tokens[1]);
}
else if (tokens.size() == 3 && tokens.equals(0, "setconfig"))
@ -357,7 +357,7 @@ static int createLibreOfficeKit(const std::string& childRoot,
// Used to label the spare kit instances
static size_t spareKitId = 0;
++spareKitId;
LOG_DBG("Forking a loolkit process with jailId: " << jailId << " as spare loolkit #"
LOG_DBG("Forking a coolkit process with jailId: " << jailId << " as spare coolkit #"
<< spareKitId << '.');
const pid_t pid = fork();
@ -365,7 +365,7 @@ static int createLibreOfficeKit(const std::string& childRoot,
{
// Child
// Close the pipe from loolwsd
// Close the pipe from coolwsd
close(0);
#ifndef KIT_IN_PROCESS
@ -447,7 +447,7 @@ static void printArgumentHelp()
{
std::cout << "Usage: coolforkit [OPTION]..." << std::endl;
std::cout << " Single-threaded process that spawns lok instances" << std::endl;
std::cout << " Note: Running this standalone is not possible. It is spawned by loolwsd" << std::endl;
std::cout << " Note: Running this standalone is not possible. It is spawned by coolwsd" << std::endl;
std::cout << " and is controlled via a pipe." << std::endl;
std::cout << "" << std::endl;
}
@ -458,12 +458,12 @@ int main(int argc, char** argv)
/*WARNING*/ // early check for avoiding the security check for username 'cool'
/*WARNING*/ // (deliberately only this, not moving the entire parameter parsing here)
/*WARNING*/ bool checkLoolUser = true;
/*WARNING*/ std::string disableLoolUserChecking("--disable-cool-user-checking");
/*WARNING*/ for (int i = 1; checkLoolUser && (i < argc); ++i)
/*WARNING*/ bool checkCoolUser = true;
/*WARNING*/ std::string disableCoolUserChecking("--disable-cool-user-checking");
/*WARNING*/ for (int i = 1; checkCoolUser && (i < argc); ++i)
/*WARNING*/ {
/*WARNING*/ if (disableLoolUserChecking == argv[i])
/*WARNING*/ checkLoolUser = false;
/*WARNING*/ if (disableCoolUserChecking == argv[i])
/*WARNING*/ checkCoolUser = false;
/*WARNING*/ }
/*WARNING*/ if (!hasCorrectUID("coolforkit"))
@ -481,7 +481,7 @@ int main(int argc, char** argv)
/*WARNING*/ }
/*WARNING*/ else if (hasAnyCapability())
/*WARNING*/ {
/*WARNING*/ if (!checkLoolUser)
/*WARNING*/ if (!checkCoolUser)
/*WARNING*/ LOG_FTL("Security: --disable-cool-user-checking failed, coolforkit has some capabilities set.");
/*WARNING*/ LOG_FTL("Aborting.");
@ -490,7 +490,7 @@ int main(int argc, char** argv)
/*WARNING*/ // even without the capabilities, don't run unless the user really knows
/*WARNING*/ // what they are doing, and provided a --disable-cool-user-checking
/*WARNING*/ if (checkLoolUser)
/*WARNING*/ if (checkCoolUser)
/*WARNING*/ {
/*WARNING*/ LOG_FTL("Aborting.");
/*WARNING*/ return EX_SOFTWARE;
@ -521,17 +521,17 @@ int main(int argc, char** argv)
}
#ifndef FUZZER
SigUtil::setFatalSignals("forkit startup of " LOOLWSD_VERSION " " LOOLWSD_VERSION_HASH);
SigUtil::setFatalSignals("forkit startup of " COOLWSD_VERSION " " COOLWSD_VERSION_HASH);
SigUtil::setTerminationSignals();
#endif
Util::setApplicationPath(Poco::Path(argv[0]).parent().toString());
// Initialization
const bool logToFile = std::getenv("LOOL_LOGFILE");
const char* logFilename = std::getenv("LOOL_LOGFILENAME");
const char* logLevel = std::getenv("LOOL_LOGLEVEL");
const char* logColor = std::getenv("LOOL_LOGCOLOR");
const bool logToFile = std::getenv("COOL_LOGFILE");
const char* logFilename = std::getenv("COOL_LOGFILENAME");
const char* logLevel = std::getenv("COOL_LOGLEVEL");
const char* logColor = std::getenv("COOL_LOGCOLOR");
std::map<std::string, std::string> logProperties;
if (logToFile && logFilename)
{
@ -689,7 +689,7 @@ int main(int argc, char** argv)
#if !MOBILEAPP
// Parse the configuration.
const auto conf = std::getenv("LOOL_CONFIG");
const auto conf = std::getenv("COOL_CONFIG");
config::initialize(std::string(conf ? conf : std::string()));
#endif
@ -699,7 +699,7 @@ int main(int argc, char** argv)
// We must have at least one child, more are created dynamically.
// Ask this first child to send version information to master process and trace startup.
::setenv("LOOL_TRACE_STARTUP", "1", 1);
::setenv("COOL_TRACE_STARTUP", "1", 1);
const pid_t forKitPid
= createLibreOfficeKit(childRoot, sysTemplate, loTemplate, loSubPath, true);
if (forKitPid < 0)
@ -710,7 +710,7 @@ int main(int argc, char** argv)
}
// No need to trace subsequent children.
::unsetenv("LOOL_TRACE_STARTUP");
::unsetenv("COOL_TRACE_STARTUP");
if (LogLevel != "trace")
{
LOG_INF("Forkit initialization complete: setting log-level to [" << LogLevel << "] as configured.");

42
kit/Kit.cpp
View File

@ -86,11 +86,11 @@
#ifdef FUZZER
#include <kit/DummyLibreOfficeKit.hpp>
#include <wsd/LOOLWSD.hpp>
#include <wsd/COOLWSD.hpp>
#endif
#if MOBILEAPP
#include "LOOLWSD.hpp"
#include "COOLWSD.hpp"
#endif
#ifdef IOS
@ -111,7 +111,7 @@ using Poco::URI;
using Poco::Path;
#endif
using namespace LOOLProtocol;
using namespace COOLProtocol;
extern "C" { void dump_kit_state(void); /* easy for gdb */ }
@ -554,7 +554,7 @@ namespace
/// Manages the lifetime of a document.
/// Technically, we can host multiple documents
/// per process. But for security reasons don't.
/// However, we could have a loolkit instance
/// However, we could have a coolkit instance
/// per user or group of users (a trusted circle).
class Document final : public DocumentManagerInterface
{
@ -1437,7 +1437,7 @@ private:
std::string name;
std::string sessionId;
if (LOOLProtocol::parseNameValuePair(prefix, name, sessionId, '-') && name == "child")
if (COOLProtocol::parseNameValuePair(prefix, name, sessionId, '-') && name == "child")
{
const auto it = _sessions.find(sessionId);
if (it != _sessions.end())
@ -1573,7 +1573,7 @@ public:
const TileQueue::Payload input = _tileQueue->pop();
LOG_TRC("Kit handling queue message: " << LOOLProtocol::getAbbreviatedMessage(input));
LOG_TRC("Kit handling queue message: " << COOLProtocol::getAbbreviatedMessage(input));
const StringVector tokens = Util::tokenize(input.data(), input.size());
@ -1615,7 +1615,7 @@ public:
{
broadcast = true;
}
else if (LOOLProtocol::matchPrefix("except-", target))
else if (COOLProtocol::matchPrefix("except-", target))
{
exceptViewId = std::stoi(target.substr(7));
broadcast = true;
@ -1673,12 +1673,12 @@ public:
}
else
{
LOG_ERR("Invalid callback message: [" << LOOLProtocol::getAbbreviatedMessage(input) << "].");
LOG_ERR("Invalid callback message: [" << COOLProtocol::getAbbreviatedMessage(input) << "].");
}
}
else
{
LOG_ERR("Unexpected request: [" << LOOLProtocol::getAbbreviatedMessage(input) << "].");
LOG_ERR("Unexpected request: [" << COOLProtocol::getAbbreviatedMessage(input) << "].");
}
}
@ -1854,7 +1854,7 @@ private:
#if !defined FUZZER && !defined BUILDING_TESTS && !MOBILEAPP
// When building the fuzzer we link LOOLWSD.cpp into the same executable so the
// When building the fuzzer we link COOLWSD.cpp into the same executable so the
// Protected::emitOneRecording() there gets used. When building the unit tests the one in
// TraceEvent.cpp gets used.
@ -2264,7 +2264,7 @@ protected:
}
else if (tokens.equals(0, "tile") || tokens.equals(0, "tilecombine") || tokens.equals(0, "canceltiles") ||
tokens.equals(0, "paintwindow") || tokens.equals(0, "resizewindow") ||
LOOLProtocol::getFirstToken(tokens[0], '-') == "child")
COOLProtocol::getFirstToken(tokens[0], '-') == "child")
{
if (_document)
{
@ -2412,16 +2412,16 @@ void lokit_main(
#if !MOBILEAPP
#ifndef FUZZER
SigUtil::setFatalSignals("kit startup of " LOOLWSD_VERSION " " LOOLWSD_VERSION_HASH);
SigUtil::setFatalSignals("kit startup of " COOLWSD_VERSION " " COOLWSD_VERSION_HASH);
SigUtil::setTerminationSignals();
#endif
Util::setThreadName("kit_spare_" + Util::encodeId(numericIdentifier, 3));
// Reinitialize logging when forked.
const bool logToFile = std::getenv("LOOL_LOGFILE");
const char* logFilename = std::getenv("LOOL_LOGFILENAME");
const char* logLevel = std::getenv("LOOL_LOGLEVEL");
const bool logToFile = std::getenv("COOL_LOGFILE");
const char* logFilename = std::getenv("COOL_LOGFILENAME");
const char* logLevel = std::getenv("COOL_LOGLEVEL");
const bool logColor = config::getBool("logging.color", true) && isatty(fileno(stderr));
std::map<std::string, std::string> logProperties;
if (logToFile && logFilename)
@ -2432,14 +2432,14 @@ void lokit_main(
Util::rng::reseed();
const std::string LogLevel = logLevel ? logLevel : "trace";
const bool bTraceStartup = (std::getenv("LOOL_TRACE_STARTUP") != nullptr);
const bool bTraceStartup = (std::getenv("COOL_TRACE_STARTUP") != nullptr);
Log::initialize("kit", bTraceStartup ? "trace" : logLevel, logColor, logToFile, logProperties);
if (bTraceStartup && LogLevel != "trace")
{
LOG_INF("Setting log-level to [trace] and delaying setting to configured [" << LogLevel << "] until after Kit initialization.");
}
const char* pAnonymizationSalt = std::getenv("LOOL_ANONYMIZATION_SALT");
const char* pAnonymizationSalt = std::getenv("COOL_ANONYMIZATION_SALT");
if (pAnonymizationSalt)
{
AnonymizationSalt = std::stoull(std::string(pAnonymizationSalt));
@ -2631,7 +2631,7 @@ void lokit_main(
#else
kit = nullptr;
#ifdef FUZZER
if (LOOLWSD::DummyLOK)
if (COOLWSD::DummyLOK)
kit = dummy_lok_init_2(instdir, userdir);
#endif
#endif
@ -2700,7 +2700,7 @@ void lokit_main(
SigUtil::setVersionInfo(versionString);
// Add some parameters we want to pass to the client. Could not figure out how to get
// the configuration parameters from LOOLWSD.cpp's initialize() or loolwsd.xml here, so
// the configuration parameters from COOLWSD.cpp's initialize() or coolwsd.xml here, so
// oh well, just have the value hardcoded in KitHelper.hpp. It isn't really useful to
// "tune" it at end-user installations anyway, I think.
auto versionJSON = Poco::JSON::Parser().parse(versionString).extract<Poco::JSON::Object::Ptr>();
@ -2742,7 +2742,7 @@ void lokit_main(
static std::shared_ptr<lok::Office> loKit = std::make_shared<lok::Office>(kit);
assert(loKit);
LOOLWSD::LOKitVersion = loKit->getVersionInfo();
COOLWSD::LOKitVersion = loKit->getVersionInfo();
// Dummies
const std::string jailId = "jailid";
@ -2866,7 +2866,7 @@ std::string anonymizeUrl(const std::string& url)
bool globalPreinit(const std::string &loTemplate)
{
#ifdef FUZZER
if (LOOLWSD::DummyLOK)
if (COOLWSD::DummyLOK)
return true;
#endif
const std::string libSofficeapp = loTemplate + "/program/" LIB_SOFFICEAPP;

10
kit/SetupKitEnvironment.hpp
View File

@ -23,14 +23,14 @@ inline void setupKitEnvironment(const std::string& userInterface)
"userext:${${BRAND_BASE_DIR}/program/lounorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini "
);
#ifdef IOS
layers += "user:*${BRAND_BASE_DIR}/loolkitconfig.xcu ";
layers += "user:*${BRAND_BASE_DIR}/coolkitconfig.xcu ";
#elif ENABLE_DEBUG && !defined(ANDROID) // '*' denotes non-writable.
layers += "user:*file://" DEBUG_ABSSRCDIR "/loolkitconfig.xcu ";
layers += "user:*file://" DEBUG_ABSSRCDIR "/coolkitconfig.xcu ";
#else
if(::getenv("LOOLKITCONFIG_XCU"))
layers += "user:*file://" + std::string(::getenv("LOOLKITCONFIG_XCU")) + " ";
if(::getenv("COOLKITCONFIG_XCU"))
layers += "user:*file://" + std::string(::getenv("COOLKITCONFIG_XCU")) + " ";
else
layers += "user:*file://" LOOLWSD_CONFIGDIR "/loolkitconfig.xcu ";
layers += "user:*file://" COOLWSD_CONFIGDIR "/coolkitconfig.xcu ";
#endif
::setenv("CONFIGURATION_LAYERS", layers.c_str(),
1 /* override */);

10
kubernetes/helm/README.md
View File

@ -46,18 +46,18 @@ helm install collabora-online ./kubernetes/helm/collabora-online/
C. Now in this case to make our hostname available we have to add following line into /etc/hosts:
```
192.168.0.106 loolwsd.public.example.com
192.168.0.106 coolwsd.public.example.com
```
To check if everything is setup correctly you can run:
```
curl -I -H 'Host: loolwsd.public.example.com' 'http://192.168.0.106:30536/'
curl -I -H 'Host: coolwsd.public.example.com' 'http://192.168.0.106:30536/'
```
It should return a similar output as below:
```
HTTP/1.1 200 OK
last-modified: Tue, 18 May 2021 10:46:29
user-agent: LOOLWSD WOPI Agent 6.4.8
user-agent: COOLWSD WOPI Agent 6.4.8
content-length: 2
content-type: text/plain
```
@ -75,7 +75,7 @@ collabora-online-5fb4869564-dnzmk 1/1 Running 0 28h
collabora-online-5fb4869564-fb4cf 1/1 Running 0 28h
collabora-online-5fb4869564-wbrv2 1/1 Running 0 28h
```
* What is the outside host that multiple loolwsd servers actually answering ?
* What is the outside host that multiple coolwsd servers actually answering ?
```
kubectl get ingress -n collabora
```
@ -84,7 +84,7 @@ example output :
|-----------|------------------|--------------------------|------------------------|-------|
| NAMESPACE | NAME | HOSTS | ADDRESS | PORTS |
|-----------|------------------|--------------------------|------------------------|-------|
| collabora | collabora-online |loolwsd.public.example.com| | 80 |
| collabora | collabora-online |coolwsd.public.example.com| | 80 |
|-----------|------------------|--------------------------|------------------------|-------|
```

4
kubernetes/helm/collabora-online/templates/deployment.yaml
View File

@ -67,9 +67,9 @@ spec:
successThreshold: {{ .Values.probes.readiness.successThreshold }}
failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
{{- end }}
{{- if .Values.environmentVariablesLool }}
{{- if .Values.environmentVariablesCool }}
env:
{{ toYaml .Values.environmentVariablesLool | indent 12 }}
{{ toYaml .Values.environmentVariablesCool | indent 12 }}
{{- end }}
volumeMounts:
- name: tmp

6
kubernetes/helm/collabora-online/values.yaml
View File

@ -24,7 +24,7 @@ global:
ingress:
name: collabora-online
replicaCount: 3 # This is the amount of how many instances of loolwsd will run
replicaCount: 3 # This is the amount of how many instances of coolwsd will run
image:
pullPolicy: Always
@ -58,7 +58,7 @@ deployment:
maxUnavailable: 0
maxSurge: 1
environmentVariablesLool:
environmentVariablesCool:
- name: extra_params
value: --o:ssl.enable=false
- name: username
@ -75,7 +75,7 @@ hpa:
name: collabora-online
hosts:
host: loolwsd.public.example.com
host: coolwsd.public.example.com
namespace:
collabora: collabora

2
man/coolconfig.1
View File

@ -31,4 +31,4 @@ update\-system\-template
The \fBanonymize\fR command helps to read anonymized logs. If you know a document and/or a user had an issue, you can find their session in the logs by running this command with the username and/or document name and get the anonymized hash, which you use to search the logs with.
.PP
.SH "SEE ALSO"
coolforkit(1), coolconvert(1), loolwsd(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)
coolforkit(1), coolconvert(1), coolwsd(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)

4
man/coolforkit.1
View File

@ -6,6 +6,6 @@ coolforkit OPTIONS
.SH DESCRIPTION
Single-threaded process that spawns LibreOfficeKit (LOK) instances.
.PP
\fBNote\fR: Running this standalone is not possible. It is spawned by loolwsd and is controlled via a pipe.
\fBNote\fR: Running this standalone is not possible. It is spawned by coolwsd and is controlled via a pipe.
.SH "SEE ALSO"
loolwsd(1), coolconvert(1), coolconfig(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)
coolwsd(1), coolconvert(1), coolconfig(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)

4
man/coolmount.1
View File

@ -6,6 +6,6 @@ coolmount OPTIONS
.SH DESCRIPTION
This is a very tiny helper to allow overlay mounting.
.PP
\fBNote\fR: Running this standalone is not possible. It is used internally by loolwsd when it creates the jail for the document.
\fBNote\fR: Running this standalone is not possible. It is used internally by coolwsd when it creates the jail for the document.
.SH "SEE ALSO"
loolwsd(1), coolconvert(1), coolconfig(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolforkit(1)
coolwsd(1), coolconvert(1), coolconfig(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolforkit(1)

Some files were not shown because too many files have changed in this diff Show More