mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 09:10:28 +00:00
![Ed Maste](/assets/img/avatar_default.png)
Release notes are available at https://www.openssh.com/txt/release-9.1 9.1 contains fixes for three minor memory safety problems; these have lready been merged to the copy of OpenSSH 9.0 that is in the FreeBSD base system. Some highlights copied from the release notes: Potentially-incompatible changes -------------------------------- * ssh(1), sshd(8): SetEnv directives in ssh_config and sshd_config are now first-match-wins to match other directives. Previously if an environment variable was multiply specified the last set value would have been used. bz3438 * ssh-keygen(8): ssh-keygen -A (generate all default host key types) will no longer generate DSA keys, as these are insecure and have not been used by default for some years. New features ------------ * ssh(1), sshd(8): add a RequiredRSASize directive to set a minimum RSA key length. Keys below this length will be ignored for user authentication and for host authentication in sshd(8). * sftp-server(8): add a "users-groups-by-id@openssh.com" extension request that allows the client to obtain user/group names that correspond to a set of uids/gids. * sftp(1): use "users-groups-by-id@openssh.com" sftp-server extension (when available) to fill in user/group names for directory listings. * sftp-server(8): support the "home-directory" extension request defined in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the existing "expand-path@openssh.com", but some other clients support it. * ssh-keygen(1), sshd(8): allow certificate validity intervals, sshsig verification times and authorized_keys expiry-time options to accept dates in the UTC time zone in addition to the default of interpreting them in the system time zone. YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if suffixed with a 'Z' character. Also allow certificate validity intervals to be specified in raw seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This is intended for use by regress tests and other tools that call ssh-keygen as part of a CA workflow. bz3468 * sftp(1): allow arguments to the sftp -D option, e.g. sftp -D "/usr/libexec/sftp-server -el debug3" * ssh-keygen(1): allow the existing -U (use agent) flag to work with "-Y sign" operations, where it will be interpreted to require that the private keys is hosted in an agent; bz3429 MFC after: 2 weeks Relnotes: Yes Sponsored by: The FreeBSD Foundation
129 lines
3.4 KiB
C
129 lines
3.4 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 {
|
|
struct monitor *monitor;
|
|
pid_t child_pid;
|
|
};
|
|
|
|
struct ssh_sandbox *
|
|
ssh_sandbox_init(struct monitor *monitor)
|
|
{
|
|
struct ssh_sandbox *box;
|
|
|
|
/*
|
|
* Strictly, we don't need to maintain any state here but we need
|
|
* to return non-NULL to satisfy the API.
|
|
*/
|
|
debug3("%s: preparing capsicum sandbox", __func__);
|
|
box = xcalloc(1, sizeof(*box));
|
|
box->monitor = monitor;
|
|
box->child_pid = 0;
|
|
|
|
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->monitor->m_recvfd, &rights) < 0 &&
|
|
errno != ENOSYS)
|
|
fatal("%s: failed to limit the network socket", __func__);
|
|
cap_rights_init(&rights, CAP_WRITE);
|
|
if (cap_rights_limit(box->monitor->m_log_sendfd, &rights) < 0 &&
|
|
errno != ENOSYS)
|
|
fatal("%s: failed to limit the logging socket", __func__);
|
|
if (cap_enter() < 0 && errno != ENOSYS)
|
|
fatal("%s: failed to enter capability mode", __func__);
|
|
|
|
}
|
|
|
|
void
|
|
ssh_sandbox_parent_finish(struct ssh_sandbox *box)
|
|
{
|
|
free(box);
|
|
debug3("%s: finished", __func__);
|
|
}
|
|
|
|
void
|
|
ssh_sandbox_parent_preauth(struct ssh_sandbox *box, pid_t child_pid)
|
|
{
|
|
box->child_pid = child_pid;
|
|
}
|
|
|
|
#endif /* SANDBOX_CAPSICUM */
|