2009-04-29 16:02:52 +00:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 1999 Poul-Henning Kamp.
|
2012-04-26 17:36:05 +00:00
|
|
|
* Copyright (c) 2009-2012 James Gritton
|
2009-04-29 16:02:52 +00:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
1999-05-04 18:20:53 +00:00
|
|
|
*/
|
|
|
|
|
2003-07-06 12:44:11 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
#include <sys/socket.h>
|
2006-05-11 13:04:23 +00:00
|
|
|
#include <sys/sysctl.h>
|
2001-06-24 20:28:19 +00:00
|
|
|
|
|
|
|
#include <arpa/inet.h>
|
2009-05-27 14:30:26 +00:00
|
|
|
#include <netinet/in.h>
|
2001-06-24 20:28:19 +00:00
|
|
|
|
|
|
|
#include <err.h>
|
2004-05-29 18:39:27 +00:00
|
|
|
#include <errno.h>
|
2010-10-20 20:42:33 +00:00
|
|
|
#include <stdarg.h>
|
2001-06-24 20:28:19 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
This Implements the mumbled about "Jail" feature.
This is a seriously beefed up chroot kind of thing. The process
is jailed along the same lines as a chroot does it, but with
additional tough restrictions imposed on what the superuser can do.
For all I know, it is safe to hand over the root bit inside a
prison to the customer living in that prison, this is what
it was developed for in fact: "real virtual servers".
Each prison has an ip number associated with it, which all IP
communications will be coerced to use and each prison has its own
hostname.
Needless to say, you need more RAM this way, but the advantage is
that each customer can run their own particular version of apache
and not stomp on the toes of their neighbors.
It generally does what one would expect, but setting up a jail
still takes a little knowledge.
A few notes:
I have no scripts for setting up a jail, don't ask me for them.
The IP number should be an alias on one of the interfaces.
mount a /proc in each jail, it will make ps more useable.
/proc/<pid>/status tells the hostname of the prison for
jailed processes.
Quotas are only sensible if you have a mountpoint per prison.
There are no privisions for stopping resource-hogging.
Some "#ifdef INET" and similar may be missing (send patches!)
If somebody wants to take it from here and develop it into
more of a "virtual machine" they should be most welcome!
Tools, comments, patches & documentation most welcome.
Have fun...
Sponsored by: http://www.rndassociates.com/
Run for almost a year by: http://www.servetheweb.com/
1999-04-28 11:38:52 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
#include "jailp.h"
|
2009-05-27 14:30:26 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
#define JP_RDTUN(jp) (((jp)->jp_ctltype & CTLFLAG_RDTUN) == CTLFLAG_RDTUN)
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2010-10-27 16:22:54 +00:00
|
|
|
struct permspec {
|
|
|
|
const char *name;
|
|
|
|
enum intparam ipnum;
|
|
|
|
int rev;
|
|
|
|
};
|
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
const char *cfname;
|
2012-05-28 20:44:11 +00:00
|
|
|
int iflag;
|
2011-06-18 15:23:08 +00:00
|
|
|
int note_remove;
|
2010-10-20 20:42:33 +00:00
|
|
|
int verbose;
|
|
|
|
|
|
|
|
static void clear_persist(struct cfjail *j);
|
|
|
|
static int update_jail(struct cfjail *j);
|
|
|
|
static int rdtun_params(struct cfjail *j, int dofail);
|
|
|
|
static void running_jid(struct cfjail *j, int dflag);
|
2012-02-08 23:51:46 +00:00
|
|
|
static void jail_quoted_warnx(const struct cfjail *j, const char *name_msg,
|
|
|
|
const char *noname_msg);
|
2010-10-20 20:42:33 +00:00
|
|
|
static int jailparam_set_note(const struct cfjail *j, struct jailparam *jp,
|
|
|
|
unsigned njp, int flags);
|
|
|
|
static void print_jail(FILE *fp, struct cfjail *j, int oldcl);
|
|
|
|
static void print_param(FILE *fp, const struct cfparam *p, int sep, int doname);
|
2009-05-27 14:30:26 +00:00
|
|
|
static void quoted_print(FILE *fp, char *str);
|
|
|
|
static void usage(void);
|
|
|
|
|
2010-10-27 16:22:54 +00:00
|
|
|
static struct permspec perm_sysctl[] = {
|
2011-06-17 16:21:03 +00:00
|
|
|
{ "security.jail.set_hostname_allowed", KP_ALLOW_SET_HOSTNAME, 0 },
|
|
|
|
{ "security.jail.sysvipc_allowed", KP_ALLOW_SYSVIPC, 0 },
|
|
|
|
{ "security.jail.allow_raw_sockets", KP_ALLOW_RAW_SOCKETS, 0 },
|
|
|
|
{ "security.jail.chflags_allowed", KP_ALLOW_CHFLAGS, 0 },
|
|
|
|
{ "security.jail.mount_allowed", KP_ALLOW_MOUNT, 0 },
|
|
|
|
{ "security.jail.socket_unixiproute_only", KP_ALLOW_SOCKET_AF, 1 },
|
2009-06-10 15:26:35 +00:00
|
|
|
};
|
|
|
|
|
2011-06-17 16:18:44 +00:00
|
|
|
static const enum intparam startcommands[] = {
|
2012-05-03 21:39:23 +00:00
|
|
|
IP__NULL,
|
2011-06-20 23:04:13 +00:00
|
|
|
#ifdef INET
|
2011-06-17 16:18:44 +00:00
|
|
|
IP__IP4_IFADDR,
|
2011-06-20 23:04:13 +00:00
|
|
|
#endif
|
2011-06-17 16:18:44 +00:00
|
|
|
#ifdef INET6
|
|
|
|
IP__IP6_IFADDR,
|
|
|
|
#endif
|
|
|
|
IP_MOUNT,
|
|
|
|
IP__MOUNT_FROM_FSTAB,
|
|
|
|
IP_MOUNT_DEVFS,
|
2013-10-12 17:27:59 +00:00
|
|
|
IP_MOUNT_FDESCFS,
|
2015-02-06 17:54:53 +00:00
|
|
|
IP_MOUNT_PROCFS,
|
2011-06-17 16:18:44 +00:00
|
|
|
IP_EXEC_PRESTART,
|
|
|
|
IP__OP,
|
|
|
|
IP_VNET_INTERFACE,
|
|
|
|
IP_EXEC_START,
|
|
|
|
IP_COMMAND,
|
|
|
|
IP_EXEC_POSTSTART,
|
2012-05-03 21:39:23 +00:00
|
|
|
IP__NULL
|
2009-06-10 15:26:35 +00:00
|
|
|
};
|
|
|
|
|
2011-06-17 16:18:44 +00:00
|
|
|
static const enum intparam stopcommands[] = {
|
2012-05-03 21:39:23 +00:00
|
|
|
IP__NULL,
|
2011-06-17 16:18:44 +00:00
|
|
|
IP_EXEC_PRESTOP,
|
|
|
|
IP_EXEC_STOP,
|
|
|
|
IP_STOP_TIMEOUT,
|
|
|
|
IP__OP,
|
|
|
|
IP_EXEC_POSTSTOP,
|
2015-02-06 17:54:53 +00:00
|
|
|
IP_MOUNT_PROCFS,
|
2013-10-12 17:27:59 +00:00
|
|
|
IP_MOUNT_FDESCFS,
|
2011-06-17 16:18:44 +00:00
|
|
|
IP_MOUNT_DEVFS,
|
|
|
|
IP__MOUNT_FROM_FSTAB,
|
|
|
|
IP_MOUNT,
|
|
|
|
#ifdef INET6
|
|
|
|
IP__IP6_IFADDR,
|
|
|
|
#endif
|
2011-06-20 23:04:13 +00:00
|
|
|
#ifdef INET
|
2011-06-17 16:18:44 +00:00
|
|
|
IP__IP4_IFADDR,
|
2011-06-20 23:04:13 +00:00
|
|
|
#endif
|
2012-05-03 21:39:23 +00:00
|
|
|
IP__NULL
|
2011-06-17 16:18:44 +00:00
|
|
|
};
|
2004-05-29 18:39:27 +00:00
|
|
|
|
This Implements the mumbled about "Jail" feature.
This is a seriously beefed up chroot kind of thing. The process
is jailed along the same lines as a chroot does it, but with
additional tough restrictions imposed on what the superuser can do.
For all I know, it is safe to hand over the root bit inside a
prison to the customer living in that prison, this is what
it was developed for in fact: "real virtual servers".
Each prison has an ip number associated with it, which all IP
communications will be coerced to use and each prison has its own
hostname.
Needless to say, you need more RAM this way, but the advantage is
that each customer can run their own particular version of apache
and not stomp on the toes of their neighbors.
It generally does what one would expect, but setting up a jail
still takes a little knowledge.
A few notes:
I have no scripts for setting up a jail, don't ask me for them.
The IP number should be an alias on one of the interfaces.
mount a /proc in each jail, it will make ps more useable.
/proc/<pid>/status tells the hostname of the prison for
jailed processes.
Quotas are only sensible if you have a mountpoint per prison.
There are no privisions for stopping resource-hogging.
Some "#ifdef INET" and similar may be missing (send patches!)
If somebody wants to take it from here and develop it into
more of a "virtual machine" they should be most welcome!
Tools, comments, patches & documentation most welcome.
Have fun...
Sponsored by: http://www.rndassociates.com/
Run for almost a year by: http://www.servetheweb.com/
1999-04-28 11:38:52 +00:00
|
|
|
int
|
|
|
|
main(int argc, char **argv)
|
|
|
|
{
|
2010-10-20 20:42:33 +00:00
|
|
|
struct stat st;
|
|
|
|
FILE *jfp;
|
|
|
|
struct cfjail *j;
|
2011-06-20 23:04:13 +00:00
|
|
|
char *JidFile;
|
2009-06-10 15:26:35 +00:00
|
|
|
size_t sysvallen;
|
2010-10-20 20:42:33 +00:00
|
|
|
unsigned op, pi;
|
|
|
|
int ch, docf, error, i, oldcl, sysval;
|
2012-05-28 20:44:11 +00:00
|
|
|
int dflag, Rflag;
|
2009-06-24 18:18:35 +00:00
|
|
|
char enforce_statfs[4];
|
2011-06-20 23:04:13 +00:00
|
|
|
#if defined(INET) || defined(INET6)
|
|
|
|
char *cs, *ncs;
|
|
|
|
#endif
|
|
|
|
#if defined(INET) && defined(INET6)
|
|
|
|
struct in6_addr addr6;
|
|
|
|
#endif
|
2009-06-19 15:58:24 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
op = 0;
|
2012-05-28 20:44:11 +00:00
|
|
|
dflag = Rflag = 0;
|
2010-10-20 20:42:33 +00:00
|
|
|
docf = 1;
|
|
|
|
cfname = CONF_FILE;
|
|
|
|
JidFile = NULL;
|
2009-06-19 15:58:24 +00:00
|
|
|
|
2012-06-28 08:25:19 +00:00
|
|
|
while ((ch = getopt(argc, argv, "cdf:hiJ:lmn:p:qrRs:u:U:v")) != -1) {
|
2003-03-27 12:16:58 +00:00
|
|
|
switch (ch) {
|
2010-10-20 20:42:33 +00:00
|
|
|
case 'c':
|
|
|
|
op |= JF_START;
|
|
|
|
break;
|
2009-05-27 14:30:26 +00:00
|
|
|
case 'd':
|
2010-10-20 20:42:33 +00:00
|
|
|
dflag = 1;
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
cfname = optarg;
|
2009-05-27 14:30:26 +00:00
|
|
|
break;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
case 'h':
|
2011-06-20 23:04:13 +00:00
|
|
|
#if defined(INET) || defined(INET6)
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, IP_IP_HOSTNAME, NULL);
|
2011-06-20 23:04:13 +00:00
|
|
|
#endif
|
2010-10-20 20:42:33 +00:00
|
|
|
docf = 0;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
break;
|
2003-04-09 03:04:12 +00:00
|
|
|
case 'i':
|
|
|
|
iflag = 1;
|
2010-10-20 20:42:33 +00:00
|
|
|
verbose = -1;
|
2003-04-09 03:04:12 +00:00
|
|
|
break;
|
2005-12-03 17:32:39 +00:00
|
|
|
case 'J':
|
|
|
|
JidFile = optarg;
|
2010-10-20 20:42:33 +00:00
|
|
|
break;
|
|
|
|
case 'l':
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, IP_EXEC_CLEAN, NULL);
|
2010-10-20 20:42:33 +00:00
|
|
|
docf = 0;
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
op |= JF_SET;
|
2005-12-03 17:32:39 +00:00
|
|
|
break;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
case 'n':
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, KP_NAME, optarg);
|
2010-10-20 20:42:33 +00:00
|
|
|
docf = 0;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
break;
|
2010-10-20 20:42:33 +00:00
|
|
|
case 'p':
|
2010-12-10 23:57:55 +00:00
|
|
|
paralimit = strtol(optarg, NULL, 10);
|
|
|
|
if (paralimit == 0)
|
|
|
|
paralimit = -1;
|
2006-05-11 13:04:23 +00:00
|
|
|
break;
|
2010-10-20 20:42:33 +00:00
|
|
|
case 'q':
|
|
|
|
verbose = -1;
|
2004-05-29 18:39:27 +00:00
|
|
|
break;
|
2010-10-20 20:42:33 +00:00
|
|
|
case 'r':
|
|
|
|
op |= JF_STOP;
|
2003-03-27 12:16:58 +00:00
|
|
|
break;
|
2010-10-20 20:42:33 +00:00
|
|
|
case 'R':
|
|
|
|
op |= JF_STOP;
|
|
|
|
Rflag = 1;
|
2004-08-15 08:21:50 +00:00
|
|
|
break;
|
2010-10-20 20:42:33 +00:00
|
|
|
case 's':
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, KP_SECURELEVEL, optarg);
|
2010-10-20 20:42:33 +00:00
|
|
|
docf = 0;
|
2009-05-27 14:30:26 +00:00
|
|
|
break;
|
2010-10-20 20:42:33 +00:00
|
|
|
case 'u':
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, IP_EXEC_JAIL_USER, optarg);
|
|
|
|
add_param(NULL, NULL, IP_EXEC_SYSTEM_JAIL_USER, NULL);
|
2010-10-20 20:42:33 +00:00
|
|
|
docf = 0;
|
2009-05-27 14:30:26 +00:00
|
|
|
break;
|
2010-10-20 20:42:33 +00:00
|
|
|
case 'U':
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, IP_EXEC_JAIL_USER, optarg);
|
|
|
|
add_param(NULL, NULL, IP_EXEC_SYSTEM_JAIL_USER,
|
|
|
|
"false");
|
2010-10-20 20:42:33 +00:00
|
|
|
docf = 0;
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
verbose = 1;
|
2009-05-27 14:30:26 +00:00
|
|
|
break;
|
2003-03-27 12:16:58 +00:00
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
2003-04-09 03:04:12 +00:00
|
|
|
}
|
2003-03-27 12:16:58 +00:00
|
|
|
argc -= optind;
|
|
|
|
argv += optind;
|
2011-05-29 21:03:40 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/* Find out which of the four command line styles this is. */
|
|
|
|
oldcl = 0;
|
|
|
|
if (!op) {
|
|
|
|
/* Old-style command line with four fixed parameters */
|
|
|
|
if (argc < 4 || argv[0][0] != '/')
|
2009-05-27 14:30:26 +00:00
|
|
|
usage();
|
2010-10-20 20:42:33 +00:00
|
|
|
op = JF_START;
|
|
|
|
docf = 0;
|
|
|
|
oldcl = 1;
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, KP_PATH, argv[0]);
|
|
|
|
add_param(NULL, NULL, KP_HOST_HOSTNAME, argv[1]);
|
2011-06-20 23:04:13 +00:00
|
|
|
#if defined(INET) || defined(INET6)
|
2010-10-20 20:42:33 +00:00
|
|
|
if (argv[2][0] != '\0') {
|
|
|
|
for (cs = argv[2];; cs = ncs + 1) {
|
|
|
|
ncs = strchr(cs, ',');
|
|
|
|
if (ncs)
|
|
|
|
*ncs = '\0';
|
|
|
|
add_param(NULL, NULL,
|
2011-06-20 23:04:13 +00:00
|
|
|
#if defined(INET) && defined(INET6)
|
2010-10-20 20:42:33 +00:00
|
|
|
inet_pton(AF_INET6, cs, &addr6) == 1
|
2011-06-20 23:04:13 +00:00
|
|
|
? KP_IP6_ADDR : KP_IP4_ADDR,
|
|
|
|
#elif defined(INET)
|
|
|
|
KP_IP4_ADDR,
|
|
|
|
#elif defined(INET6)
|
|
|
|
KP_IP6_ADDR,
|
2011-05-29 21:03:40 +00:00
|
|
|
#endif
|
2011-06-20 23:04:13 +00:00
|
|
|
cs);
|
2010-10-20 20:42:33 +00:00
|
|
|
if (!ncs)
|
2009-05-27 14:30:26 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-05-29 21:03:40 +00:00
|
|
|
#endif
|
2010-10-20 20:42:33 +00:00
|
|
|
for (i = 3; i < argc; i++)
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, IP_COMMAND, argv[i]);
|
2010-10-20 20:42:33 +00:00
|
|
|
/* Emulate the defaults from security.jail.* sysctls. */
|
2009-06-10 15:26:35 +00:00
|
|
|
sysvallen = sizeof(sysval);
|
|
|
|
if (sysctlbyname("security.jail.jailed", &sysval, &sysvallen,
|
|
|
|
NULL, 0) == 0 && sysval == 0) {
|
|
|
|
for (pi = 0; pi < sizeof(perm_sysctl) /
|
|
|
|
sizeof(perm_sysctl[0]); pi++) {
|
|
|
|
sysvallen = sizeof(sysval);
|
2010-10-27 16:22:54 +00:00
|
|
|
if (sysctlbyname(perm_sysctl[pi].name,
|
2009-06-10 15:26:35 +00:00
|
|
|
&sysval, &sysvallen, NULL, 0) == 0)
|
2010-10-20 20:42:33 +00:00
|
|
|
add_param(NULL, NULL,
|
2010-10-27 16:22:54 +00:00
|
|
|
perm_sysctl[pi].ipnum,
|
|
|
|
(sysval ? 1 : 0) ^
|
|
|
|
perm_sysctl[pi].rev
|
|
|
|
? NULL : "false");
|
2009-06-10 15:26:35 +00:00
|
|
|
}
|
|
|
|
sysvallen = sizeof(sysval);
|
|
|
|
if (sysctlbyname("security.jail.enforce_statfs",
|
|
|
|
&sysval, &sysvallen, NULL, 0) == 0) {
|
|
|
|
snprintf(enforce_statfs,
|
|
|
|
sizeof(enforce_statfs), "%d", sysval);
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, KP_ENFORCE_STATFS,
|
2010-10-20 20:42:33 +00:00
|
|
|
enforce_statfs);
|
2009-06-10 15:26:35 +00:00
|
|
|
}
|
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
} else if (op == JF_STOP) {
|
|
|
|
/* Jail remove, perhaps using the config file */
|
|
|
|
if (!docf || argc == 0)
|
|
|
|
usage();
|
|
|
|
if (!Rflag)
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
if (strchr(argv[i], '='))
|
|
|
|
usage();
|
|
|
|
if ((docf = !Rflag &&
|
|
|
|
(!strcmp(cfname, "-") || stat(cfname, &st) == 0)))
|
|
|
|
load_config();
|
2011-06-18 15:23:08 +00:00
|
|
|
note_remove = docf || argc > 1 || wild_jail_name(argv[0]);
|
2010-10-20 20:42:33 +00:00
|
|
|
} else if (argc > 1 || (argc == 1 && strchr(argv[0], '='))) {
|
|
|
|
/* Single jail specified on the command line */
|
|
|
|
if (Rflag)
|
|
|
|
usage();
|
|
|
|
docf = 0;
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
if (!strncmp(argv[i], "command", 7) &&
|
|
|
|
(argv[i][7] == '\0' || argv[i][7] == '=')) {
|
|
|
|
if (argv[i][7] == '=')
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, IP_COMMAND,
|
2010-10-20 20:42:33 +00:00
|
|
|
argv[i] + 8);
|
|
|
|
for (i++; i < argc; i++)
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(NULL, NULL, IP_COMMAND,
|
2010-10-20 20:42:33 +00:00
|
|
|
argv[i]);
|
2009-06-10 15:26:35 +00:00
|
|
|
}
|
2012-08-23 01:43:22 +00:00
|
|
|
#ifdef INET
|
|
|
|
else if (!strncmp(argv[i], "ip4.addr=", 9)) {
|
|
|
|
for (cs = argv[i] + 9;; cs = ncs + 1) {
|
|
|
|
ncs = strchr(cs, ',');
|
|
|
|
if (ncs)
|
|
|
|
*ncs = '\0';
|
|
|
|
add_param(NULL, NULL, KP_IP4_ADDR, cs);
|
|
|
|
if (!ncs)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef INET6
|
|
|
|
else if (!strncmp(argv[i], "ip6.addr=", 9)) {
|
|
|
|
for (cs = argv[i] + 9;; cs = ncs + 1) {
|
|
|
|
ncs = strchr(cs, ',');
|
|
|
|
if (ncs)
|
|
|
|
*ncs = '\0';
|
|
|
|
add_param(NULL, NULL, KP_IP6_ADDR, cs);
|
|
|
|
if (!ncs)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
else
|
|
|
|
add_param(NULL, NULL, 0, argv[i]);
|
2009-06-10 15:26:35 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
} else {
|
|
|
|
/* From the config file, perhaps with a specified jail */
|
|
|
|
if (Rflag || !docf)
|
|
|
|
usage();
|
|
|
|
load_config();
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/* Find out which jails will be run. */
|
|
|
|
dep_setup(docf);
|
|
|
|
error = 0;
|
|
|
|
if (op == JF_STOP) {
|
|
|
|
for (i = 0; i < argc; i++)
|
2012-02-08 23:51:46 +00:00
|
|
|
if (start_state(argv[i], docf, op, Rflag) < 0)
|
2010-10-20 20:42:33 +00:00
|
|
|
error = 1;
|
|
|
|
} else {
|
2012-02-08 23:51:46 +00:00
|
|
|
if (start_state(argv[0], docf, op, 0) < 0)
|
2010-10-20 20:42:33 +00:00
|
|
|
exit(1);
|
2005-12-03 17:32:39 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
|
|
|
|
jfp = NULL;
|
|
|
|
if (JidFile != NULL) {
|
|
|
|
jfp = fopen(JidFile, "w");
|
|
|
|
if (jfp == NULL)
|
|
|
|
err(1, "open %s", JidFile);
|
|
|
|
setlinebuf(jfp);
|
2003-04-21 17:20:48 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
setlinebuf(stdout);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The main loop: Get an available jail and perform the required
|
|
|
|
* operation on it. When that is done, the jail may be finished,
|
|
|
|
* or it may go back for the next step.
|
|
|
|
*/
|
|
|
|
while ((j = next_jail()))
|
|
|
|
{
|
|
|
|
if (j->flags & JF_FAILED) {
|
|
|
|
error = 1;
|
2011-06-17 16:18:44 +00:00
|
|
|
if (j->comparam == NULL) {
|
|
|
|
dep_done(j, 0);
|
|
|
|
continue;
|
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
}
|
2010-11-01 21:37:28 +00:00
|
|
|
if (!(j->flags & JF_PARAMS))
|
2010-10-20 20:42:33 +00:00
|
|
|
{
|
2010-11-01 21:37:28 +00:00
|
|
|
j->flags |= JF_PARAMS;
|
2010-10-20 20:42:33 +00:00
|
|
|
if (dflag)
|
2010-10-27 16:22:54 +00:00
|
|
|
add_param(j, NULL, IP_ALLOW_DYING, NULL);
|
2010-10-20 20:42:33 +00:00
|
|
|
if (check_intparams(j) < 0)
|
|
|
|
continue;
|
2010-11-01 21:37:28 +00:00
|
|
|
if ((j->flags & (JF_START | JF_SET)) &&
|
|
|
|
import_params(j) < 0)
|
2010-10-20 20:42:33 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!j->jid)
|
|
|
|
running_jid(j,
|
|
|
|
(j->flags & (JF_SET | JF_DEPEND)) == JF_SET
|
|
|
|
? dflag || bool_param(j->intparams[IP_ALLOW_DYING])
|
|
|
|
: 0);
|
2011-06-17 16:18:44 +00:00
|
|
|
if (finish_command(j))
|
2010-10-20 20:42:33 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
switch (j->flags & JF_OP_MASK) {
|
|
|
|
/*
|
|
|
|
* These operations just turn into a different op
|
|
|
|
* depending on the jail's current status.
|
|
|
|
*/
|
|
|
|
case JF_START_SET:
|
|
|
|
j->flags = j->jid < 0 ? JF_START : JF_SET;
|
|
|
|
break;
|
|
|
|
case JF_SET_RESTART:
|
|
|
|
if (j->jid < 0) {
|
2012-02-08 23:51:46 +00:00
|
|
|
jail_quoted_warnx(j, "not found",
|
|
|
|
"no jail specified");
|
2010-10-20 20:42:33 +00:00
|
|
|
failed(j);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
j->flags = rdtun_params(j, 0) ? JF_RESTART : JF_SET;
|
|
|
|
if (j->flags == JF_RESTART)
|
|
|
|
dep_reset(j);
|
|
|
|
break;
|
|
|
|
case JF_START_SET_RESTART:
|
|
|
|
j->flags = j->jid < 0 ? JF_START
|
|
|
|
: rdtun_params(j, 0) ? JF_RESTART : JF_SET;
|
|
|
|
if (j->flags == JF_RESTART)
|
|
|
|
dep_reset(j);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (j->flags & JF_OP_MASK) {
|
|
|
|
case JF_START:
|
2011-06-17 16:18:44 +00:00
|
|
|
if (j->comparam == NULL) {
|
2010-10-20 20:42:33 +00:00
|
|
|
if (j->jid > 0 &&
|
|
|
|
!(j->flags & (JF_DEPEND | JF_WILD))) {
|
2012-02-08 23:51:46 +00:00
|
|
|
jail_quoted_warnx(j, "already exists",
|
|
|
|
NULL);
|
2010-10-20 20:42:33 +00:00
|
|
|
failed(j);
|
|
|
|
continue;
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
if (dep_check(j))
|
|
|
|
continue;
|
|
|
|
if (j->jid > 0)
|
|
|
|
goto jail_create_done;
|
2011-06-22 21:18:37 +00:00
|
|
|
j->comparam = startcommands;
|
|
|
|
j->comstring = NULL;
|
2010-10-20 20:42:33 +00:00
|
|
|
}
|
2011-06-17 16:18:44 +00:00
|
|
|
if (next_command(j))
|
|
|
|
continue;
|
|
|
|
jail_create_done:
|
|
|
|
clear_persist(j);
|
|
|
|
if (jfp != NULL)
|
|
|
|
print_jail(jfp, j, oldcl);
|
|
|
|
dep_done(j, 0);
|
2010-10-20 20:42:33 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case JF_SET:
|
|
|
|
if (j->jid < 0 && !(j->flags & JF_DEPEND)) {
|
2012-02-08 23:51:46 +00:00
|
|
|
jail_quoted_warnx(j, "not found",
|
|
|
|
"no jail specified");
|
2010-10-20 20:42:33 +00:00
|
|
|
failed(j);
|
2011-06-17 16:21:03 +00:00
|
|
|
continue;
|
2010-10-20 20:42:33 +00:00
|
|
|
}
|
|
|
|
if (dep_check(j))
|
|
|
|
continue;
|
|
|
|
if (!(j->flags & JF_DEPEND)) {
|
|
|
|
if (rdtun_params(j, 1) < 0 ||
|
|
|
|
update_jail(j) < 0)
|
|
|
|
continue;
|
|
|
|
if (verbose >= 0 && (j->name || verbose > 0))
|
|
|
|
jail_note(j, "updated\n");
|
|
|
|
}
|
|
|
|
dep_done(j, 0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case JF_STOP:
|
|
|
|
case JF_RESTART:
|
2011-06-17 16:18:44 +00:00
|
|
|
if (j->comparam == NULL) {
|
2010-10-20 20:42:33 +00:00
|
|
|
if (dep_check(j))
|
|
|
|
continue;
|
|
|
|
if (j->jid < 0) {
|
2013-10-10 09:32:27 +00:00
|
|
|
if (!(j->flags & (JF_DEPEND|JF_WILD))) {
|
|
|
|
if (verbose >= 0)
|
|
|
|
jail_quoted_warnx(j,
|
|
|
|
"not found", NULL);
|
|
|
|
failed(j);
|
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
goto jail_remove_done;
|
|
|
|
}
|
2011-06-22 21:18:37 +00:00
|
|
|
j->comparam = stopcommands;
|
|
|
|
j->comstring = NULL;
|
2011-06-18 15:23:08 +00:00
|
|
|
} else if ((j->flags & JF_FAILED) && j->jid > 0)
|
2011-06-17 16:18:44 +00:00
|
|
|
goto jail_remove_done;
|
|
|
|
if (next_command(j))
|
|
|
|
continue;
|
|
|
|
jail_remove_done:
|
|
|
|
dep_done(j, 0);
|
|
|
|
if ((j->flags & (JF_START | JF_FAILED)) == JF_START) {
|
|
|
|
j->comparam = NULL;
|
|
|
|
j->flags &= ~JF_STOP;
|
|
|
|
dep_reset(j);
|
|
|
|
requeue(j, j->ndeps ? &depend : &ready);
|
2010-10-20 20:42:33 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (jfp != NULL)
|
|
|
|
fclose(jfp);
|
|
|
|
exit(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Mark a jail's failure for future handling.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
failed(struct cfjail *j)
|
|
|
|
{
|
|
|
|
j->flags |= JF_FAILED;
|
|
|
|
TAILQ_REMOVE(j->queue, j, tq);
|
|
|
|
TAILQ_INSERT_HEAD(&ready, j, tq);
|
|
|
|
j->queue = &ready;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Exit slightly more gracefully when out of memory.
|
|
|
|
*/
|
|
|
|
void *
|
|
|
|
emalloc(size_t size)
|
|
|
|
{
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
p = malloc(size);
|
|
|
|
if (!p)
|
|
|
|
err(1, "malloc");
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
erealloc(void *ptr, size_t size)
|
|
|
|
{
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
p = realloc(ptr, size);
|
|
|
|
if (!p)
|
|
|
|
err(1, "malloc");
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
estrdup(const char *str)
|
|
|
|
{
|
|
|
|
char *ns;
|
|
|
|
|
|
|
|
ns = strdup(str);
|
|
|
|
if (!ns)
|
|
|
|
err(1, "malloc");
|
|
|
|
return ns;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Print a message including an optional jail name.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
jail_note(const struct cfjail *j, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap, tap;
|
|
|
|
char *cs;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
va_copy(tap, ap);
|
|
|
|
len = vsnprintf(NULL, 0, fmt, tap);
|
|
|
|
va_end(tap);
|
|
|
|
cs = alloca(len + 1);
|
|
|
|
(void)vsnprintf(cs, len + 1, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
if (j->name)
|
|
|
|
printf("%s: %s", j->name, cs);
|
|
|
|
else
|
|
|
|
printf("%s", cs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Print a warning message including an optional jail name.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
jail_warnx(const struct cfjail *j, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap, tap;
|
|
|
|
char *cs;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
va_copy(tap, ap);
|
|
|
|
len = vsnprintf(NULL, 0, fmt, tap);
|
|
|
|
va_end(tap);
|
|
|
|
cs = alloca(len + 1);
|
|
|
|
(void)vsnprintf(cs, len + 1, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
if (j->name)
|
|
|
|
warnx("%s: %s", j->name, cs);
|
|
|
|
else
|
|
|
|
warnx("%s", cs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a new jail.
|
|
|
|
*/
|
2011-06-18 15:23:08 +00:00
|
|
|
int
|
2010-10-20 20:42:33 +00:00
|
|
|
create_jail(struct cfjail *j)
|
|
|
|
{
|
|
|
|
struct iovec jiov[4];
|
|
|
|
struct stat st;
|
|
|
|
struct jailparam *jp, *setparams, *setparams2, *sjp;
|
|
|
|
const char *path;
|
|
|
|
int dopersist, ns, jid, dying, didfail;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check the jail's path, with a better error message than jail_set
|
|
|
|
* gives.
|
|
|
|
*/
|
|
|
|
if ((path = string_param(j->intparams[KP_PATH]))) {
|
2012-02-07 22:13:24 +00:00
|
|
|
if (j->name != NULL && path[0] != '/') {
|
2010-11-04 18:40:29 +00:00
|
|
|
jail_warnx(j, "path %s: not an absolute pathname",
|
|
|
|
path);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
if (stat(path, &st) < 0) {
|
|
|
|
jail_warnx(j, "path %s: %s", path, strerror(errno));
|
|
|
|
return -1;
|
2005-12-03 17:32:39 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
if (!S_ISDIR(st.st_mode)) {
|
|
|
|
jail_warnx(j, "path %s: %s", path, strerror(ENOTDIR));
|
|
|
|
return -1;
|
2005-12-03 17:32:39 +00:00
|
|
|
}
|
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy all the parameters, except that "persist" is always set when
|
|
|
|
* there are commands to run later.
|
|
|
|
*/
|
|
|
|
dopersist = !bool_param(j->intparams[KP_PERSIST]) &&
|
|
|
|
(j->intparams[IP_EXEC_START] || j->intparams[IP_COMMAND] ||
|
|
|
|
j->intparams[IP_EXEC_POSTSTART]);
|
|
|
|
sjp = setparams =
|
|
|
|
alloca((j->njp + dopersist) * sizeof(struct jailparam));
|
|
|
|
if (dopersist && jailparam_init(sjp++, "persist") < 0) {
|
|
|
|
jail_warnx(j, "%s", jail_errmsg);
|
|
|
|
return -1;
|
2005-12-03 17:32:39 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
for (jp = j->jp; jp < j->jp + j->njp; jp++)
|
|
|
|
if (!dopersist || !equalopts(jp->jp_name, "persist"))
|
|
|
|
*sjp++ = *jp;
|
|
|
|
ns = sjp - setparams;
|
|
|
|
|
|
|
|
didfail = 0;
|
|
|
|
j->jid = jailparam_set_note(j, setparams, ns, JAIL_CREATE);
|
|
|
|
if (j->jid < 0 && errno == EEXIST &&
|
|
|
|
bool_param(j->intparams[IP_ALLOW_DYING]) &&
|
|
|
|
int_param(j->intparams[KP_JID], &jid) && jid != 0) {
|
|
|
|
/*
|
|
|
|
* The jail already exists, but may be dying.
|
|
|
|
* Make sure it is, in which case an update is appropriate.
|
|
|
|
*/
|
2014-11-25 21:01:08 +00:00
|
|
|
jiov[0].iov_base = __DECONST(char *, "jid");
|
2010-10-20 20:42:33 +00:00
|
|
|
jiov[0].iov_len = sizeof("jid");
|
|
|
|
jiov[1].iov_base = &jid;
|
|
|
|
jiov[1].iov_len = sizeof(jid);
|
2014-11-25 21:01:08 +00:00
|
|
|
jiov[2].iov_base = __DECONST(char *, "dying");
|
2010-10-20 20:42:33 +00:00
|
|
|
jiov[2].iov_len = sizeof("dying");
|
|
|
|
jiov[3].iov_base = &dying;
|
|
|
|
jiov[3].iov_len = sizeof(dying);
|
|
|
|
if (jail_get(jiov, 4, JAIL_DYING) < 0) {
|
|
|
|
/*
|
|
|
|
* It could be that the jail just barely finished
|
|
|
|
* dying, or it could be that the jid never existed
|
|
|
|
* but the name does. In either case, another try
|
|
|
|
* at creating the jail should do the right thing.
|
|
|
|
*/
|
|
|
|
if (errno == ENOENT)
|
|
|
|
j->jid = jailparam_set_note(j, setparams, ns,
|
|
|
|
JAIL_CREATE);
|
|
|
|
} else if (dying) {
|
|
|
|
j->jid = jid;
|
|
|
|
if (rdtun_params(j, 1) < 0) {
|
|
|
|
j->jid = -1;
|
|
|
|
didfail = 1;
|
|
|
|
} else {
|
|
|
|
sjp = setparams2 = alloca((j->njp + dopersist) *
|
|
|
|
sizeof(struct jailparam));
|
|
|
|
for (jp = setparams; jp < setparams + ns; jp++)
|
|
|
|
if (!JP_RDTUN(jp) ||
|
|
|
|
!strcmp(jp->jp_name, "jid"))
|
|
|
|
*sjp++ = *jp;
|
|
|
|
j->jid = jailparam_set_note(j, setparams2,
|
|
|
|
sjp - setparams2, JAIL_UPDATE | JAIL_DYING);
|
|
|
|
/*
|
|
|
|
* Again, perhaps the jail just finished dying.
|
|
|
|
*/
|
|
|
|
if (j->jid < 0 && errno == ENOENT)
|
|
|
|
j->jid = jailparam_set_note(j,
|
|
|
|
setparams, ns, JAIL_CREATE);
|
|
|
|
}
|
2004-08-15 08:21:50 +00:00
|
|
|
}
|
2003-03-27 12:16:58 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
if (j->jid < 0 && !didfail) {
|
|
|
|
jail_warnx(j, "%s", jail_errmsg);
|
|
|
|
failed(j);
|
2004-08-15 08:21:50 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
if (dopersist) {
|
|
|
|
jailparam_free(setparams, 1);
|
|
|
|
if (j->jid > 0)
|
|
|
|
j->flags |= JF_PERSIST;
|
2004-08-15 08:21:50 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
return j->jid;
|
This Implements the mumbled about "Jail" feature.
This is a seriously beefed up chroot kind of thing. The process
is jailed along the same lines as a chroot does it, but with
additional tough restrictions imposed on what the superuser can do.
For all I know, it is safe to hand over the root bit inside a
prison to the customer living in that prison, this is what
it was developed for in fact: "real virtual servers".
Each prison has an ip number associated with it, which all IP
communications will be coerced to use and each prison has its own
hostname.
Needless to say, you need more RAM this way, but the advantage is
that each customer can run their own particular version of apache
and not stomp on the toes of their neighbors.
It generally does what one would expect, but setting up a jail
still takes a little knowledge.
A few notes:
I have no scripts for setting up a jail, don't ask me for them.
The IP number should be an alias on one of the interfaces.
mount a /proc in each jail, it will make ps more useable.
/proc/<pid>/status tells the hostname of the prison for
jailed processes.
Quotas are only sensible if you have a mountpoint per prison.
There are no privisions for stopping resource-hogging.
Some "#ifdef INET" and similar may be missing (send patches!)
If somebody wants to take it from here and develop it into
more of a "virtual machine" they should be most welcome!
Tools, comments, patches & documentation most welcome.
Have fun...
Sponsored by: http://www.rndassociates.com/
Run for almost a year by: http://www.servetheweb.com/
1999-04-28 11:38:52 +00:00
|
|
|
}
|
2003-03-27 12:16:58 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/*
|
|
|
|
* Remove a temporarily set "persist" parameter.
|
|
|
|
*/
|
2003-03-27 12:16:58 +00:00
|
|
|
static void
|
2010-10-20 20:42:33 +00:00
|
|
|
clear_persist(struct cfjail *j)
|
2003-03-27 12:16:58 +00:00
|
|
|
{
|
2010-10-20 20:42:33 +00:00
|
|
|
struct iovec jiov[4];
|
|
|
|
int jid;
|
|
|
|
|
|
|
|
if (!(j->flags & JF_PERSIST))
|
|
|
|
return;
|
|
|
|
j->flags &= ~JF_PERSIST;
|
2014-11-25 21:01:08 +00:00
|
|
|
jiov[0].iov_base = __DECONST(char *, "jid");
|
2010-10-20 20:42:33 +00:00
|
|
|
jiov[0].iov_len = sizeof("jid");
|
|
|
|
jiov[1].iov_base = &j->jid;
|
|
|
|
jiov[1].iov_len = sizeof(j->jid);
|
2014-11-25 21:01:08 +00:00
|
|
|
jiov[2].iov_base = __DECONST(char *, "nopersist");
|
2010-10-20 20:42:33 +00:00
|
|
|
jiov[2].iov_len = sizeof("nopersist");
|
|
|
|
jiov[3].iov_base = NULL;
|
|
|
|
jiov[3].iov_len = 0;
|
|
|
|
jid = jail_set(jiov, 4, JAIL_UPDATE);
|
|
|
|
if (verbose > 0)
|
|
|
|
jail_note(j, "jail_set(JAIL_UPDATE) jid=%d nopersist%s%s\n",
|
|
|
|
j->jid, jid < 0 ? ": " : "",
|
|
|
|
jid < 0 ? strerror(errno) : "");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set a jail's parameters.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
update_jail(struct cfjail *j)
|
|
|
|
{
|
|
|
|
struct jailparam *jp, *setparams, *sjp;
|
|
|
|
int ns, jid;
|
|
|
|
|
|
|
|
ns = 0;
|
|
|
|
for (jp = j->jp; jp < j->jp + j->njp; jp++)
|
|
|
|
if (!JP_RDTUN(jp))
|
|
|
|
ns++;
|
|
|
|
if (ns == 0)
|
|
|
|
return 0;
|
|
|
|
sjp = setparams = alloca(++ns * sizeof(struct jailparam));
|
|
|
|
if (jailparam_init(sjp, "jid") < 0 ||
|
|
|
|
jailparam_import_raw(sjp, &j->jid, sizeof j->jid) < 0) {
|
|
|
|
jail_warnx(j, "%s", jail_errmsg);
|
|
|
|
failed(j);
|
|
|
|
return -1;
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
for (jp = j->jp; jp < j->jp + j->njp; jp++)
|
|
|
|
if (!JP_RDTUN(jp))
|
|
|
|
*++sjp = *jp;
|
|
|
|
|
|
|
|
jid = jailparam_set_note(j, setparams, ns,
|
|
|
|
bool_param(j->intparams[IP_ALLOW_DYING])
|
|
|
|
? JAIL_UPDATE | JAIL_DYING : JAIL_UPDATE);
|
|
|
|
if (jid < 0) {
|
|
|
|
jail_warnx(j, "%s", jail_errmsg);
|
|
|
|
failed(j);
|
|
|
|
}
|
|
|
|
jailparam_free(setparams, 1);
|
|
|
|
return jid;
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2003-03-27 12:16:58 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/*
|
|
|
|
* Return if a jail set would change any create-only parameters.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
rdtun_params(struct cfjail *j, int dofail)
|
2003-03-27 12:16:58 +00:00
|
|
|
{
|
2010-10-20 20:42:33 +00:00
|
|
|
struct jailparam *jp, *rtparams, *rtjp;
|
|
|
|
int nrt, rval;
|
|
|
|
|
|
|
|
if (j->flags & JF_RDTUN)
|
|
|
|
return 0;
|
|
|
|
j->flags |= JF_RDTUN;
|
|
|
|
nrt = 0;
|
|
|
|
for (jp = j->jp; jp < j->jp + j->njp; jp++)
|
|
|
|
if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid"))
|
|
|
|
nrt++;
|
|
|
|
if (nrt == 0)
|
|
|
|
return 0;
|
|
|
|
rtjp = rtparams = alloca(++nrt * sizeof(struct jailparam));
|
|
|
|
if (jailparam_init(rtjp, "jid") < 0 ||
|
|
|
|
jailparam_import_raw(rtjp, &j->jid, sizeof j->jid) < 0) {
|
|
|
|
jail_warnx(j, "%s", jail_errmsg);
|
|
|
|
exit(1);
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
for (jp = j->jp; jp < j->jp + j->njp; jp++)
|
|
|
|
if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid"))
|
|
|
|
*++rtjp = *jp;
|
|
|
|
rval = 0;
|
|
|
|
if (jailparam_get(rtparams, nrt,
|
|
|
|
bool_param(j->intparams[IP_ALLOW_DYING]) ? JAIL_DYING : 0) > 0) {
|
|
|
|
rtjp = rtparams + 1;
|
|
|
|
for (jp = j->jp, rtjp = rtparams + 1; rtjp < rtparams + nrt;
|
|
|
|
jp++) {
|
|
|
|
if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) {
|
|
|
|
if (!((jp->jp_flags & (JP_BOOL | JP_NOBOOL)) &&
|
|
|
|
jp->jp_valuelen == 0 &&
|
|
|
|
*(int *)jp->jp_value) &&
|
|
|
|
!(rtjp->jp_valuelen == jp->jp_valuelen &&
|
|
|
|
!memcmp(rtjp->jp_value, jp->jp_value,
|
|
|
|
jp->jp_valuelen))) {
|
|
|
|
if (dofail) {
|
|
|
|
jail_warnx(j, "%s cannot be "
|
|
|
|
"changed after creation",
|
|
|
|
jp->jp_name);
|
|
|
|
failed(j);
|
|
|
|
rval = -1;
|
|
|
|
} else
|
|
|
|
rval = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rtjp++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (rtjp = rtparams + 1; rtjp < rtparams + nrt; rtjp++)
|
|
|
|
rtjp->jp_name = NULL;
|
|
|
|
jailparam_free(rtparams, nrt);
|
|
|
|
return rval;
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2003-03-27 12:16:58 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/*
|
|
|
|
* Get the jail's jid if it is running.
|
|
|
|
*/
|
2009-05-27 14:30:26 +00:00
|
|
|
static void
|
2010-10-20 20:42:33 +00:00
|
|
|
running_jid(struct cfjail *j, int dflag)
|
2009-05-27 14:30:26 +00:00
|
|
|
{
|
2010-10-20 20:42:33 +00:00
|
|
|
struct iovec jiov[2];
|
|
|
|
const char *pval;
|
|
|
|
char *ep;
|
|
|
|
int jid;
|
2009-05-27 14:30:26 +00:00
|
|
|
|
2010-10-27 16:35:23 +00:00
|
|
|
if ((pval = string_param(j->intparams[KP_JID]))) {
|
2010-10-20 20:42:33 +00:00
|
|
|
if (!(jid = strtol(pval, &ep, 10)) || *ep) {
|
|
|
|
j->jid = -1;
|
|
|
|
return;
|
|
|
|
}
|
2014-11-25 21:01:08 +00:00
|
|
|
jiov[0].iov_base = __DECONST(char *, "jid");
|
2010-10-20 20:42:33 +00:00
|
|
|
jiov[0].iov_len = sizeof("jid");
|
|
|
|
jiov[1].iov_base = &jid;
|
|
|
|
jiov[1].iov_len = sizeof(jid);
|
2010-10-27 16:35:23 +00:00
|
|
|
} else if ((pval = string_param(j->intparams[KP_NAME]))) {
|
2014-11-25 21:01:08 +00:00
|
|
|
jiov[0].iov_base = __DECONST(char *, "name");
|
2010-10-20 20:42:33 +00:00
|
|
|
jiov[0].iov_len = sizeof("name");
|
|
|
|
jiov[1].iov_len = strlen(pval) + 1;
|
|
|
|
jiov[1].iov_base = alloca(jiov[1].iov_len);
|
|
|
|
strcpy(jiov[1].iov_base, pval);
|
2010-10-27 16:35:23 +00:00
|
|
|
} else {
|
|
|
|
j->jid = -1;
|
|
|
|
return;
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
j->jid = jail_get(jiov, 2, dflag ? JAIL_DYING : 0);
|
2003-03-27 12:16:58 +00:00
|
|
|
}
|
2009-05-27 14:30:26 +00:00
|
|
|
|
2012-02-08 23:51:46 +00:00
|
|
|
static void
|
|
|
|
jail_quoted_warnx(const struct cfjail *j, const char *name_msg,
|
|
|
|
const char *noname_msg)
|
|
|
|
{
|
|
|
|
const char *pval;
|
|
|
|
|
|
|
|
if ((pval = j->name) || (pval = string_param(j->intparams[KP_JID])) ||
|
|
|
|
(pval = string_param(j->intparams[KP_NAME])))
|
|
|
|
warnx("\"%s\" %s", pval, name_msg);
|
|
|
|
else
|
|
|
|
warnx("%s", noname_msg);
|
|
|
|
}
|
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/*
|
2014-11-25 21:01:08 +00:00
|
|
|
* Set jail parameters and possibly print them out.
|
2010-10-20 20:42:33 +00:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
jailparam_set_note(const struct cfjail *j, struct jailparam *jp, unsigned njp,
|
|
|
|
int flags)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
int jid;
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
jid = jailparam_set(jp, njp, flags);
|
|
|
|
if (verbose > 0) {
|
|
|
|
jail_note(j, "jail_set(%s%s)",
|
|
|
|
(flags & (JAIL_CREATE | JAIL_UPDATE)) == JAIL_CREATE
|
|
|
|
? "JAIL_CREATE" : "JAIL_UPDATE",
|
|
|
|
(flags & JAIL_DYING) ? " | JAIL_DYING" : "");
|
|
|
|
for (i = 0; i < njp; i++) {
|
|
|
|
printf(" %s", jp[i].jp_name);
|
|
|
|
if (jp[i].jp_value == NULL)
|
|
|
|
continue;
|
|
|
|
putchar('=');
|
|
|
|
value = jailparam_export(jp + i);
|
|
|
|
if (value == NULL)
|
|
|
|
err(1, "jailparam_export");
|
|
|
|
quoted_print(stdout, value);
|
|
|
|
free(value);
|
|
|
|
}
|
|
|
|
if (jid < 0)
|
|
|
|
printf(": %s", strerror(errno));
|
|
|
|
printf("\n");
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2010-10-20 20:42:33 +00:00
|
|
|
return jid;
|
2003-03-27 12:16:58 +00:00
|
|
|
}
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/*
|
|
|
|
* Print a jail record.
|
|
|
|
*/
|
2009-05-27 14:30:26 +00:00
|
|
|
static void
|
2010-10-20 20:42:33 +00:00
|
|
|
print_jail(FILE *fp, struct cfjail *j, int oldcl)
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
{
|
2010-10-20 20:42:33 +00:00
|
|
|
struct cfparam *p;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
if (oldcl) {
|
|
|
|
fprintf(fp, "%d\t", j->jid);
|
|
|
|
print_param(fp, j->intparams[KP_PATH], ',', 0);
|
|
|
|
putc('\t', fp);
|
2010-10-27 16:22:54 +00:00
|
|
|
print_param(fp, j->intparams[KP_HOST_HOSTNAME], ',', 0);
|
2010-10-20 20:42:33 +00:00
|
|
|
putc('\t', fp);
|
2011-05-29 21:03:40 +00:00
|
|
|
#ifdef INET
|
2010-10-20 20:42:33 +00:00
|
|
|
print_param(fp, j->intparams[KP_IP4_ADDR], ',', 0);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
#ifdef INET6
|
2011-06-20 23:04:13 +00:00
|
|
|
if (j->intparams[KP_IP4_ADDR] &&
|
|
|
|
!TAILQ_EMPTY(&j->intparams[KP_IP4_ADDR]->val) &&
|
|
|
|
j->intparams[KP_IP6_ADDR] &&
|
|
|
|
!TAILQ_EMPTY(&j->intparams[KP_IP6_ADDR]->val))
|
|
|
|
putc(',', fp);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
#endif
|
2011-05-29 21:03:40 +00:00
|
|
|
#endif
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
#ifdef INET6
|
2011-06-20 23:04:13 +00:00
|
|
|
print_param(fp, j->intparams[KP_IP6_ADDR], ',', 0);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
#endif
|
2010-10-20 20:42:33 +00:00
|
|
|
putc('\t', fp);
|
|
|
|
print_param(fp, j->intparams[IP_COMMAND], ' ', 0);
|
|
|
|
} else {
|
|
|
|
fprintf(fp, "jid=%d", j->jid);
|
|
|
|
TAILQ_FOREACH(p, &j->params, tq)
|
|
|
|
if (strcmp(p->name, "jid")) {
|
|
|
|
putc(' ', fp);
|
|
|
|
print_param(fp, p, ',', 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
putc('\n', fp);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/*
|
|
|
|
* Print a parameter value, or a name=value pair.
|
|
|
|
*/
|
2009-05-27 14:30:26 +00:00
|
|
|
static void
|
2010-10-20 20:42:33 +00:00
|
|
|
print_param(FILE *fp, const struct cfparam *p, int sep, int doname)
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
{
|
2010-10-20 20:42:33 +00:00
|
|
|
const struct cfstring *s, *ts;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
if (doname)
|
|
|
|
fputs(p->name, fp);
|
2011-06-17 16:06:13 +00:00
|
|
|
if (p == NULL || TAILQ_EMPTY(&p->val))
|
2009-05-27 14:30:26 +00:00
|
|
|
return;
|
2010-10-20 20:42:33 +00:00
|
|
|
if (doname)
|
|
|
|
putc('=', fp);
|
2011-06-17 16:06:13 +00:00
|
|
|
TAILQ_FOREACH_SAFE(s, &p->val, tq, ts) {
|
2010-10-20 20:42:33 +00:00
|
|
|
quoted_print(fp, s->s);
|
|
|
|
if (ts != NULL)
|
|
|
|
putc(sep, fp);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
/*
|
|
|
|
* Print a string with quotes around spaces.
|
|
|
|
*/
|
2009-05-27 14:30:26 +00:00
|
|
|
static void
|
|
|
|
quoted_print(FILE *fp, char *str)
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
{
|
2009-05-27 14:30:26 +00:00
|
|
|
int c, qc;
|
|
|
|
char *p = str;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2010-10-20 20:42:33 +00:00
|
|
|
qc = !*p ? '"'
|
|
|
|
: strchr(p, '\'') ? '"'
|
2009-05-27 14:30:26 +00:00
|
|
|
: strchr(p, '"') ? '\''
|
|
|
|
: strchr(p, ' ') || strchr(p, '\t') ? '"'
|
|
|
|
: 0;
|
|
|
|
if (qc)
|
|
|
|
putc(qc, fp);
|
|
|
|
while ((c = *p++)) {
|
|
|
|
if (c == '\\' || c == qc)
|
|
|
|
putc('\\', fp);
|
|
|
|
putc(c, fp);
|
|
|
|
}
|
|
|
|
if (qc)
|
|
|
|
putc(qc, fp);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
static void
|
|
|
|
usage(void)
|
|
|
|
{
|
|
|
|
|
|
|
|
(void)fprintf(stderr,
|
2010-10-20 20:42:33 +00:00
|
|
|
"usage: jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n"
|
|
|
|
" -[cmr] param=value ... [command=command ...]\n"
|
|
|
|
" jail [-dqv] [-f file] -[cmr] [jail]\n"
|
|
|
|
" jail [-qv] [-f file] -[rR] ['*' | jail ...]\n"
|
|
|
|
" jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n"
|
|
|
|
" [-n jailname] [-s securelevel]\n"
|
|
|
|
" path hostname [ip[,...]] command ...\n");
|
2009-05-27 14:30:26 +00:00
|
|
|
exit(1);
|
|
|
|
}
|