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>
70 lines
2.2 KiB
C++
70 lines
2.2 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/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <string>
|
|
|
|
#include <Poco/File.h>
|
|
#include <Poco/Path.h>
|
|
|
|
namespace JailUtil
|
|
{
|
|
/// Bind mount a jail directory.
|
|
bool bind(const std::string& source, const std::string& target);
|
|
|
|
/// Remount a bound mount point as readonly.
|
|
bool remountReadonly(const std::string& source, const std::string& target);
|
|
|
|
/// Unmount a bind-mounted jail directory.
|
|
bool unmount(const std::string& target);
|
|
|
|
/// Remove the jail directory and all its contents.
|
|
void removeJail(const std::string& path);
|
|
|
|
/// Remove all the jails given their paths.
|
|
inline void removeJails(const std::vector<std::string>& jails)
|
|
{
|
|
for (const auto& path : jails)
|
|
{
|
|
removeJail(path);
|
|
}
|
|
}
|
|
|
|
/// Remove all jails.
|
|
void cleanupJails(const std::string& jailRoot);
|
|
|
|
/// Setup the jails.
|
|
void setupJails(bool bindMount, const std::string& jailRoot, const std::string& sysTemplate);
|
|
|
|
/// Setup /dev/random and /dev/urandom in the given jail path.
|
|
void setupJailDevNodes(const std::string& root);
|
|
|
|
namespace SysTemplate
|
|
{
|
|
/// Create a symlink inside the jailPath so that the absolute pathname loTemplate, when
|
|
/// interpreted inside a chroot at jailPath, points to loSubPath (relative to the chroot).
|
|
void setupLoSymlink(const std::string& sysTemplate, const std::string& loTemplate,
|
|
const std::string& loSubPath);
|
|
|
|
/// Setup links for /dev/random and /dev/urandom in systemplate.
|
|
void setupRandomDeviceLinks(const std::string& root);
|
|
|
|
/// Setup of the dynamic files within the sysTemplate by either
|
|
/// copying or linking. See updateJail_DynamicFilesInSysTemplate.
|
|
void setupDynamicFiles(const std::string& sysTemplate);
|
|
|
|
/// Update the dynamic files within the sysTemplate before each child fork.
|
|
void updateDynamicFiles(const std::string& sysTemplate);
|
|
|
|
} // namespace SysTemplate
|
|
|
|
} // end namespace JailUtil
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|