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

Add more comment warnings around security critical code. 

Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I1ca4a54d076a8f95850f329168c941806bc56b16
pull/8986/head
Michael Meeks 2024-05-03 12:19:11 +01:00 committed by Caolán McNamara
parent 9d67fe24d2
commit 72bbc375be
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/security.h
View File

@ -28,6 +28,8 @@
# error "include config.h for user id"; # error "include config.h for user id";
#endif #endif
/*WARNING: PRIVILEGED CODE CHECKING START */
inline int hasUID(const char *userId) inline int hasUID(const char *userId)
{ {
struct passwd *pw = getpwuid(getuid()); struct passwd *pw = getpwuid(getuid());
@ -107,4 +109,6 @@ inline int hasAnyCapability()
#endif #endif
} }
/*WARNING: PRIVILEGED CODE CHECKING END */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
kit/ForKit.cpp
View File

@ -534,7 +534,7 @@ int forkit_main(int argc, char** argv)
/*WARNING*/ checkCoolUser = false; /*WARNING*/ checkCoolUser = false;
/*WARNING*/ } /*WARNING*/ }
/*WARNING*/ if (!hasCorrectUID("coolforkit")) /*WARNING*/ if (!hasCorrectUID(/* appName = */ "coolforkit"))
/*WARNING*/ { /*WARNING*/ {
/*WARNING*/ // don't allow if any capability is set (unless root; who runs this /*WARNING*/ // don't allow if any capability is set (unless root; who runs this
/*WARNING*/ // as root or runs this in a container and provides --disable-cool-user-checking knows what they /*WARNING*/ // as root or runs this in a container and provides --disable-cool-user-checking knows what they

12
tools/mount.cpp
View File

@ -149,11 +149,13 @@ void usage(const char* program)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (!hasCorrectUID(/* appName = */"coolmount")) /*WARNING: PRIVILEGED CODE CHECKING START */
{ /*WARNING*/ if (!hasCorrectUID(/* appName = */ "coolmount"))
fprintf(stderr, "Aborting.\n"); /*WARNING*/ {
return EX_SOFTWARE; /*WARNING*/ fprintf(stderr, "Aborting.\n");
} /*WARNING*/ return EX_SOFTWARE;
/*WARNING*/ }
/*WARNING: PRIVILEGED CODE CHECKING END */
const char* program = argv[0]; const char* program = argv[0];
if (argc < 3) if (argc < 3)