5c9988f2e3
loolmount now works and supports mounting and unmounting, plus numerous improvements, refactoring, logging, etc.. When enabled, binding improves the jail setup time by anywhere from 2x to orders of magnitude (in docker, f.e.). A new config entry mount_jail_tree controls whether mounting is used or the old method of linking/copying of jail contents. It is set to true by default and falls back to linking/copying. A test mount is done when the setting is enabled, and if mounting fails, it's disabled to avoid noise. Temporarily disabled for unit-tests until we can cleanup lingering mounts after Jenkins aborts our build job. In a future patch we will have mount/jail cleanup as part of make. The network/system files in /etc that need frequent refreshing are now updated in systemplate to make their most recent version available in the jails. These files can change during the course of loolwsd lifetime, and are unlikely to be updated in systemplate after installation at all. We link to them in the systemplate/etc directory, and if that fails, we copy them before forking each kit instance to have the latest. This reworks the approach used to bind-mount the jails and the templates such that the total is now down to only three mounts: systemplate, lo, tmp. As now systemplate and lotemplate are shared, they must be mounted as readonly, this means that user/ must now be moved into tmp/user/ which is writable. The mount-points must be recursive, because we mount lo/ within the mount-point of systemplate (which is the root of the jail). But because we (re)bind recursively, and because both systemplate and lotemplate are mounted for each jails, we need to make them unbindable, so they wouldn't multiply the mount-points for each jails (an explosive growth!) Contrarywise, we don't want the mount-points to be shared, because we don't expect to add/remove mounts after a jail is created. The random temp directory is now created and set correctly, plus many logging and other improvements. Change-Id: Iae3fda5e876cf47d2cae6669a87b5b826a8748df Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92829 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
145 lines
4.5 KiB
C++
145 lines
4.5 KiB
C++
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
/*
|
|
* This is a very tiny helper to allow overlay mounting.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include <sys/mount.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
|
|
#include <security.h>
|
|
|
|
void usage(const char* program)
|
|
{
|
|
fprintf(stderr, "Usage: %s <-s|-r> <source path> <target path>\n", program);
|
|
fprintf(stderr, " %s -u <target>.\n", program);
|
|
fprintf(stderr, " -b bind and mount the source to target.\n");
|
|
fprintf(stderr, " -r bind and mount the source to target as readonly.\n");
|
|
fprintf(stderr, " -u to unmount the target.\n");
|
|
}
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
const char* program = argv[0];
|
|
|
|
if (!hasCorrectUID("loolmount"))
|
|
{
|
|
fprintf(stderr, "%s: incorrect UID.", program);
|
|
return 1;
|
|
}
|
|
|
|
if (argc < 3)
|
|
{
|
|
usage(program);
|
|
return 1;
|
|
}
|
|
|
|
const char* option = argv[1];
|
|
if (argc == 3 && strcmp(option, "-u") == 0) // Unmount
|
|
{
|
|
const char* target = argv[2];
|
|
|
|
struct stat sb;
|
|
const bool target_exists = (stat(target, &sb) == 0 && S_ISDIR(sb.st_mode));
|
|
|
|
// Do nothing if target doesn't exist.
|
|
if (target_exists)
|
|
{
|
|
// Unmount the target, first by detaching. This should succeed.
|
|
int retval = umount2(target, MNT_DETACH);
|
|
if (retval != 0)
|
|
{
|
|
if (errno != EINVAL)
|
|
fprintf(stderr, "%s: unmount failed to detach [%s]: %s.\n", program, target,
|
|
strerror(errno));
|
|
}
|
|
|
|
// Now try to force the unmounting, which isn't supported on all filesystems.
|
|
retval = umount2(target, MNT_FORCE);
|
|
if (retval && errno != EINVAL)
|
|
{
|
|
fprintf(stderr, "%s: forced unmount of [%s] failed: %s.\n", program, target,
|
|
strerror(errno));
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
else if (argc == 4) // Mount
|
|
{
|
|
const char* source = argv[2];
|
|
struct stat sb;
|
|
if (stat(source, &sb) != 0 || !S_ISDIR(sb.st_mode))
|
|
{
|
|
fprintf(stderr, "%s: cannot mount from invalid source directory [%s].\n", program,
|
|
source);
|
|
return 1;
|
|
}
|
|
|
|
const char* target = argv[3];
|
|
const bool target_exists = (stat(target, &sb) == 0 && S_ISDIR(sb.st_mode));
|
|
if (!target_exists)
|
|
{
|
|
fprintf(stderr, "%s: cannot mount on invalid target directory [%s].\n", program,
|
|
target);
|
|
return 1;
|
|
}
|
|
|
|
// Mount the source path as the target path.
|
|
// First bind to mount an existing directory node into the chroot.
|
|
// MS_BIND ignores other flags.
|
|
if (strcmp(option, "-b") == 0) // Shared or Bind Mount.
|
|
{
|
|
const int retval
|
|
= mount(source, target, nullptr, (MS_MGC_VAL | MS_BIND | MS_REC), nullptr);
|
|
if (retval)
|
|
{
|
|
fprintf(stderr, "%s: mount failed to bind [%s] to [%s]: %s.\n", program, source,
|
|
target, strerror(errno));
|
|
return 1;
|
|
}
|
|
}
|
|
else if (strcmp(option, "-r") == 0) // Readonly Mount.
|
|
{
|
|
// Now we need to set read-only and other flags with a remount.
|
|
int retval = mount(source, target, nullptr,
|
|
(MS_BIND | MS_REC | MS_REMOUNT | MS_NOATIME | MS_NODEV | MS_NOSUID
|
|
| MS_RDONLY | MS_SILENT),
|
|
nullptr);
|
|
if (retval)
|
|
{
|
|
fprintf(stderr, "%s: mount failed remount [%s] readonly: %s.\n", program, target,
|
|
strerror(errno));
|
|
return 1;
|
|
}
|
|
|
|
retval = mount(source, target, nullptr, (MS_UNBINDABLE | MS_REC), nullptr);
|
|
if (retval)
|
|
{
|
|
fprintf(stderr, "%s: mount failed make [%s] private: %s.\n", program, target,
|
|
strerror(errno));
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
usage(program);
|
|
return 1;
|
|
}
|
|
|
|
fflush(stderr);
|
|
return 0;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|