mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-11-07 04:36:52 -10:00
Ed Maste
644b4646c7
Full release notes are available at https://www.openssh.com/txt/release-10.1 Selected highlights from the release notes: Potentially-incompatible changes * ssh(1): add a warning when the connection negotiates a non-post quantum key agreement algorithm. * ssh(1), sshd(8): major changes to handling of DSCP marking/IPQoS * ssh(1), sshd(8): deprecate support for IPv4 type-of-service (ToS) keywords in the IPQoS configuration directive. * ssh-add(1): when adding certificates to an agent, set the expiry to the certificate expiry time plus a short (5 min) grace period. * ssh-agent(1), sshd(8): move agent listener sockets from /tmp to under ~/.ssh/agent for both ssh-agent(1) and forwarded sockets in sshd(8). Security * ssh(1): disallow control characters in usernames passed via the commandline or expanded using %-sequences from the configuration file, and disallow \0 characters in ssh:// URIs. New features * ssh(1), sshd(8): add SIGINFO handlers to log active channel and session information. Sponsored by: The FreeBSD Foundation
111 lines
3.0 KiB
C
111 lines
3.0 KiB
C
/*
|
|
* Copyright (c) 2011 Dag-Erling Smorgrav
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
#ifdef SANDBOX_CAPSICUM
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/time.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/capsicum.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#ifdef HAVE_CAPSICUM_HELPERS_H
|
|
#include <capsicum_helpers.h>
|
|
#endif
|
|
|
|
#include "log.h"
|
|
#include "monitor.h"
|
|
#include "ssh-sandbox.h"
|
|
#include "xmalloc.h"
|
|
|
|
/*
|
|
* Capsicum sandbox that sets zero nfiles, nprocs and filesize rlimits,
|
|
* limits rights on stdout, stdin, stderr, monitor and switches to
|
|
* capability mode.
|
|
*/
|
|
|
|
struct ssh_sandbox {
|
|
int m_recvfd;
|
|
int m_log_sendfd;
|
|
};
|
|
|
|
struct ssh_sandbox *
|
|
ssh_sandbox_init(struct monitor *monitor)
|
|
{
|
|
struct ssh_sandbox *box;
|
|
|
|
debug3_f("preparing capsicum sandbox");
|
|
box = xcalloc(1, sizeof(*box));
|
|
box->m_recvfd = monitor->m_recvfd;
|
|
box->m_log_sendfd = monitor->m_log_sendfd;
|
|
return box;
|
|
}
|
|
|
|
void
|
|
ssh_sandbox_child(struct ssh_sandbox *box)
|
|
{
|
|
struct rlimit rl_zero;
|
|
cap_rights_t rights;
|
|
|
|
#ifdef HAVE_CAPH_CACHE_TZDATA
|
|
caph_cache_tzdata();
|
|
#endif
|
|
|
|
rl_zero.rlim_cur = rl_zero.rlim_max = 0;
|
|
|
|
if (setrlimit(RLIMIT_FSIZE, &rl_zero) == -1)
|
|
fatal("%s: setrlimit(RLIMIT_FSIZE, { 0, 0 }): %s",
|
|
__func__, strerror(errno));
|
|
#ifndef SANDBOX_SKIP_RLIMIT_NOFILE
|
|
if (setrlimit(RLIMIT_NOFILE, &rl_zero) == -1)
|
|
fatal("%s: setrlimit(RLIMIT_NOFILE, { 0, 0 }): %s",
|
|
__func__, strerror(errno));
|
|
#endif
|
|
if (setrlimit(RLIMIT_NPROC, &rl_zero) == -1)
|
|
fatal("%s: setrlimit(RLIMIT_NPROC, { 0, 0 }): %s",
|
|
__func__, strerror(errno));
|
|
|
|
cap_rights_init(&rights);
|
|
|
|
if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS)
|
|
fatal("can't limit stdin: %m");
|
|
if (cap_rights_limit(STDOUT_FILENO, &rights) < 0 && errno != ENOSYS)
|
|
fatal("can't limit stdout: %m");
|
|
if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS)
|
|
fatal("can't limit stderr: %m");
|
|
|
|
cap_rights_init(&rights, CAP_READ, CAP_WRITE);
|
|
if (cap_rights_limit(box->m_recvfd, &rights) < 0 &&
|
|
errno != ENOSYS)
|
|
fatal_f("failed to limit the network socket");
|
|
cap_rights_init(&rights, CAP_WRITE);
|
|
if (cap_rights_limit(box->m_log_sendfd, &rights) < 0 &&
|
|
errno != ENOSYS)
|
|
fatal_f("failed to limit the logging socket");
|
|
if (cap_enter() < 0 && errno != ENOSYS)
|
|
fatal_f("failed to enter capability mode");
|
|
|
|
}
|
|
|
|
#endif /* SANDBOX_CAPSICUM */
|