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

misc: more renames 'lool' -> 'cool' 

Change-Id: I2d392eef3dff23f2f8737e57bb977fa060ab8ea5
Signed-off-by: Henry Castro <hcastro@collabora.com>
pull/3649/head
Henry Castro 2021-11-15 12:12:06 -04:00 committed by Andras Timar
parent 85ba63ddce
commit c07928bf40
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/src/map/Map.js
View File

@ -51,7 +51,7 @@ L.Map = L.Evented.extend({
// 256x256 pixels tile).Unless you know what you are doing, this should not be modified;
// this means twips value for 256 pixels at 96dpi.
tileHeightTwips: window.tileSize * 15,
urlPrefix: 'lool',
urlPrefix: 'cool',
wopiSrc: '',
cursorURL: L.LOUtil.getURL('cursors'),
// cursorURL

2
configure.ac
View File

@ -1170,7 +1170,7 @@ AC_SUBST(LOOLWSD_CONFIGDIR)
LOOLWSD_DATADIR=${datadir}/${PACKAGE}
AC_SUBST(LOOLWSD_DATADIR)
COOL_USER_ID="lool"
COOL_USER_ID="cool"
if test -n "$with_user_id"; then
COOL_USER_ID="$with_user_id"
fi

6
kit/ForKit.cpp
View File

@ -456,7 +456,7 @@ int main(int argc, char** argv)
{
/*WARNING: PRIVILEGED CODE CHECKING START */
/*WARNING*/ // early check for avoiding the security check for username 'lool'
/*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-lool-user-checking");
@ -496,13 +496,13 @@ int main(int argc, char** argv)
/*WARNING*/ return EX_SOFTWARE;
/*WARNING*/ }
/*WARNING*/ LOG_ERR("Security: Check for the 'lool' username overridden on the command line.");
/*WARNING*/ LOG_ERR("Security: Check for the 'cool' username overridden on the command line.");
/*WARNING*/ }
/*WARNING: PRIVILEGED CODE CHECKING END */
// Continue in privileged mode, but only if:
// * the user is 'lool' (privileged user)
// * the user is 'cool' (privileged user)
// * the user is 'root', and --disable-lool-user-checking was provided
// Alternatively allow running in non-privileged mode (with --nocaps), if:
// * the user is a non-priviled user, the binary is not privileged

4
wsd/LOOLWSD.cpp
View File

@ -1790,7 +1790,7 @@ void LOOLWSD::defineOptions(OptionSet& optionSet)
.required(false)
.repeatable(false));
optionSet.addOption(Option("disable-lool-user-checking", "", "Don't check whether loolwsd is running under the user 'lool'. NOTE: This is insecure, use only when you know what you are doing!")
optionSet.addOption(Option("disable-lool-user-checking", "", "Don't check whether loolwsd is running under the user 'cool'. NOTE: This is insecure, use only when you know what you are doing!")
.required(false)
.repeatable(false));
@ -2805,7 +2805,7 @@ private:
else if (!requestDetails.isWebSocket() && requestDetails.equals(RequestDetails::Field::Type, "lool"))
{
// All post requests have url prefix 'lool'.
// All post requests have url prefix 'cool'.
handlePostRequest(requestDetails, request, message, disposition, socket);
}
else