Robert Swiecki
dfba744bfc
Merge branch 'master' of ssh://github.com/google/nsjail
2018-11-25 23:12:43 +01:00
robertswiecki
7a5cf69883
Merge pull request #99 from rutsky/writeToFd_return_type
...
fix writeToFD() return type in declaration
2018-11-25 23:12:23 +01:00
Vladimir Rutsky
ec0d4174f1
fix writeToFD() return type in declaration
...
In 25a7791d
return type of writeToFD() was changed from `ssize_t` to `bool`, but header wasn't updated.
2018-11-25 18:26:52 +01:00
Robert Swiecki
2bee68f9df
Merge branch 'master' of ssh://github.com/google/nsjail
2018-11-24 17:22:13 +01:00
robertswiecki
069a3e96cc
Merge pull request #98 from disconnect3d/fix-writeToFd-return-type
...
Fix utils::writeToFd return type
2018-11-24 17:21:48 +01:00
disconnect3d
25a7791d34
Fix utils::writeToFd return type
...
The `writeToFd` function in `util.cc` returns `ssize_t` but the only
returned values are either `false` or `true`.
```
ssize_t writeToFd(int fd, const void* buf, size_t len) {
(...) return false;
(...) return true;
```
2018-11-24 16:40:30 +01:00
Robert Swiecki
79a0a7dcab
mnt: better description for mounts
2018-11-22 08:44:43 +01:00
Robert Swiecki
f2a27da11f
Merge branch 'master' of ssh://github.com/google/nsjail
2018-11-22 08:44:36 +01:00
Robert Swiecki
6217d27d61
mnt: better description for mounts
2018-11-22 08:44:25 +01:00
Wiktor Garbacz
ba01ae76f2
Update kafel - fixes build on Ubuntu 14.04
2018-11-21 15:37:19 +01:00
Robert Swiecki
ddd515e890
config.proto: renumber the fields
2018-11-08 07:09:41 +01:00
Robert Swiecki
625e36f912
config.proto: comments
2018-11-06 17:30:04 +01:00
Robert Swiecki
122f251efd
mnt: simplify debug message #2
2018-10-30 01:44:08 +01:00
Robert Swiecki
28c80845ea
mnt: simplify debug message
2018-10-30 01:33:09 +01:00
Robert Swiecki
cfdf71043e
mnt: simplify printing mnt points
2018-10-28 21:07:46 +01:00
Robert Swiecki
c05b47b3b6
cmdline/env: don't set empty envvars
2018-10-28 21:03:10 +01:00
Robert Swiecki
c7dd18c612
cmdline: add ability to passthrough current envvars
2018-10-28 17:15:55 +01:00
Robert Swiecki
25004a5545
Support --iface_vs_ma with libnl3
2018-10-25 14:49:46 +02:00
Robert Swiecki
4d3cf9f56f
Merge branch 'master' of github.com:google/nsjail
2018-10-25 14:10:33 +02:00
Robert Swiecki
71edb5836a
configs/xchat: add LANG
2018-10-25 14:10:23 +02:00
Wiktor Garbacz
7fe87b41c7
code formatting
2018-10-24 10:31:14 +02:00
happyCoder92
eee0cec302
Merge pull request #96 from mickydelfavero/master
...
Added --macvlan_vs_ma switch to be able to set macvlan's mac-address.
2018-10-24 10:27:17 +02:00
Micky Del Favero
303f7ab7f0
Remove duplicate code
...
Signed-off-by: Micky Del Favero <micky@BeeCloudy.net>
2018-10-23 22:24:43 +02:00
Micky Del Favero
233a7296fe
Added --macvlan_vs_ma switch to be able to set macvlan's mac-address.
...
Signed-off-by: Micky Del Favero <micky@BeeCloudy.net>
2018-10-23 15:05:50 +02:00
Robert Swiecki
a288158095
Updated kafel
2018-10-22 14:44:12 +02:00
Wiktor Garbacz
1bb58083c4
use new kafel features in configs and examples
2018-09-06 14:19:01 +02:00
Wiktor Garbacz
758f90a279
update kafel
2018-09-06 14:19:01 +02:00
robertswiecki
977b5ada23
Merge pull request #94 from tomj/master
...
README Docker disambiguations
2018-09-03 07:22:32 +02:00
tomj
4096acee3c
README Docker disambiguations
...
Disambiguate between nsjail _container_ and _command_ in README for easier reading.
- Being a n00b to this project I feel this makes the onboarding of use with Docker somewhat easier by removing duplicated/overloaded terms.
2018-09-03 01:39:41 +10:00
robertswiecki
589b342863
Merge pull request #90 from disconnect3d/patch-1
...
Update config.proto
2018-07-31 23:15:43 +02:00
Disconnect3d
760350d788
Update config.proto
2018-07-31 23:10:05 +02:00
Disconnect3d
755626f543
Update config.proto
2018-07-31 23:09:24 +02:00
Robert Swiecki
ef94c3cc6b
config: correct way of setting pass_fd
2018-07-31 22:52:03 +02:00
Robert Swiecki
6af9565a1d
mnt: function rename
2018-07-29 00:30:08 +02:00
Robert Swiecki
5a8a178290
configs/bash: add noexec/nodev/nosuid to a mount
2018-07-27 22:54:28 +02:00
Wiktor Garbacz
bb4e77686d
subproc: reap processes after killing
...
Always try to release resources if possible.
Fixes #69
2018-07-27 13:33:39 +02:00
Wiktor Garbacz
ba14675185
mnt: added nosuid/nodev/noexec flags to config
...
Closes #70
2018-07-27 11:29:15 +02:00
Wiktor Garbacz
26d086f986
cgroup: refactor cgroup code
...
Extract common functions, use c++ strings.
Fixes #83
2018-07-26 14:46:36 +02:00
Wiktor Garbacz
c23d02e5f3
mnt: remount all filesystems
...
Explicitly specifying RW "/" mount in config did not yield desired
result.
The reason was a default RO "/" tmpfs is prepended to mountpoint
list. All filesystems are initially mounted RW to be able to create
directories for mountpoints. Read only filesystems were remounted
during a 2nd pass, effectively overriding RW flag of fs mounted
over them.
Fixes #88
2018-07-24 16:30:31 +02:00
Wiktor Garbacz
1923d6af04
conifg: parse cgroup_cpu settings
...
Fixes #87
2018-07-24 15:20:44 +02:00
robertswiecki
480af4ef75
Merge pull request #85 from jvvv/master
...
README.md, nsjail.1: add --stderr_to_null option
2018-07-24 00:38:27 +02:00
Robert Swiecki
bfd7f1ec78
nsjail: clearer new_proc/reap_proc loop
2018-07-24 00:23:44 +02:00
Robert Swiecki
d355e1dc08
subproc: better log messages
2018-07-23 23:35:01 +02:00
Robert Swiecki
4c87531bcc
Don't re-run process if previous execution failed
2018-07-23 17:13:17 +02:00
John Vogel
37c0b9b37a
README.md, nsjail.1: add --stderr_to_null option
2018-07-14 10:20:34 -04:00
Robert Swiecki
4ef480546d
subproc: correct casting for nsjconf->tlimit in printf
2018-07-05 14:32:07 +02:00
Robert Swiecki
06c5818abd
configs/bash: add stderr_to_null
2018-06-25 04:12:07 +02:00
Robert Swiecki
5bf23a0e58
cmdline: more stderr_to_null closer to is_silent
2018-06-25 04:10:42 +02:00
Robert Swiecki
272a85477a
config: Implement --stderr_to_null
2018-06-25 03:12:27 +02:00
Robert Swiecki
054e62c026
net: use memset to init stack structs
2018-06-20 15:36:44 +02:00