-
-
Notifications
You must be signed in to change notification settings - Fork 57
init: optionally load the system SELinux policy #400
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
5952f94
to
35df218
Compare
Current TODO (just to note I am aware of it) is to link against libselinux in the Makefile. |
I've added an --enable--selinux option to the configure script, however I am not really sure how best to go about linking against libselinux as it is an optional dependency. Any advice in this regard? |
Think I've got that sorted by passing a linker flag. |
I will review properly when I get a chance. I don't know a heap about SELinux so bare with me. A couple of things I will point out now though:
|
Hey! Appreciate the fast response.
A lot of the other init systems mentioned /dev/console not being available at that point in time (which is a reasonable assumption as if the policy fails to load there is a good chance SELinux would block access to /dev/console). I had a quite glance through dinit-log.cc and it appears like it just uses stdout - would this be correct?
I'll make sure to change that to use
Generally the command-line option is provided to the kernel cmdline (which the
I'll make sure to do that |
Also, would you like me to commit any changes as separate commits until you are happy with it so you can see the diffs between changes a bit easier, or would rebasing be preferred? |
Alright took a look at this a bit more thoroughly and I have a few design questions to raise quickly, notably regarding
static int initialize_security(
bool *loaded_policy,
dual_timestamp *security_start_timestamp,
dual_timestamp *security_finish_timestamp,
const char **ret_error_message); Then we could just call our implementation of a similar function once in dinit_main (ideally as early as possible, being security frameworks it makes sense to attempt to load them as early as possible). Now given that we have C++ to hand here, I was wondering how to go about propagating errors back. Being C++11, we don't have anything like
I think that'd be a reasonable way of structuring things, but being my first PR to dinit and my first real work on a C++ project below 14, your input would be greatly appreciated. Thanks! |
Log any relevant message (via
If we're just talking about adding a single method, I don't see any advantage in doing that now, as it can easily be done if and when support for other security frameworks are added. Let's just keep it simple.
Ok, that sounds fine. |
Actually, thinking about this more, there may still be cases where SELinux is enabled but the loading of the policy should not be performed. One example is given by the Systemd code here. Also, can you clarify what this might mean? I want to know what file descriptors SELinux would keep open and in what circumstances. Are you doing this work for a distribution or is it a more personal endeavour? |
(Finally: make sure you have read CONTRIBUTING and CODE-STYLE documents, if you haven't already. Thanks!). |
Got it, thanks :)
Yup, makes sense, should be fairly easy with to deal in the future. Will do!
That's a good example. For that specific initrd case, I had a look at systemd's /* If /etc/initrd-release exists, we're in an initrd.
* This can be overridden by setting SYSTEMD_IN_INITRD=0|1.
*/ Would you like to do the same with an override here? (maybe something more like DINIT_IN_INITRD) If you'd still like to add a flag override of some sorts to tell dinit to not load the selinux policy, I feel like that should be an opt in sort of thing, because while not loading the selinux policy won't load any of the user's policy, it doesn't mean selinux won't be loaded. In that case, everything runs in the
Afaik this is generally in the case of when it needs to audit something related to that fd so it keeps it open for a bit? I remember seeing something similar in the past, but I'm not exactly too happy with that answer as I can't answer it with 100% confidence, so if that's okay I'll do a bit of digging in the libselinux docs and get back to you on that.
I'm currently using Gentoo and dinit on basically all of my systems (which doesn't have upstream Gentoo support currently), however I am hoping to try improving the support (and maybe possibly getting official support) for dinit for both Adelie and Gentoo (nothing offical, just me on my own there, though I have spoken to some developers of the respective distros about that, but absoloutly nothing really offical yet). This specific piece of work was started when I hit a few weird bugs with my SELinux policy while dealing with a few ebuilds for dinit related to SELinux (policy for it), so in the future as Gentoo has offical SELinux support it might be useful, but for now really just take it as a personal endeavour, I'm not affiliated with any distro officially :)
Had a read over them already, but I'll make sure to reread CODE-STYLE |
Did a bit of digging and found this commit systemd/systemd@a3dff21 which seems to explain it quite nicely. |
Hmm reading the
Still seems fine to transition with |
I think it'll be best to consider how SELinux aware we want dinit to be at this stage. After reading some more man pages and systemd code, it seems like systemd transitioning itself to the new context is an okay option as they already make heavy use of selinux throughout (i.e. in transient units which have an SELinuxContext= option). However, if our only goal (at least in the short-term) is to load the policy, then I think it makes sense to stick with the If we want to be a little bit more SELinux aware, (i.e. if it is not unforeseeable to make use of libselinux more throughout dinit), then I would probably start off by creating an selinux utils header of some point as there is quite a bit of setup, etc that'll need to be done. My personal opinion would be (for the sake of simplicity) to stick with the However, if you'd still like to continue with setting our own context, I can go down that route. It'd require a bit more design though, so it might be worth working on getting some helper functions stubbed out firstly. |
That's fine but it will need a commitment from you that you will support it going forward, or otherwise make it clear that it's experimental/unsupported in relevant documentation. (Incidentally I think you missed updating the build instructions - that's something that would need to be added). To be honest I'm not sure I'm following your reasoning in a few ways:
I don't really understand why that makes a difference. What is the reason why this would not be a good option for dinit as well? (I get that Dinit doesn't provide specific support for SELinux features when executing service processes, but why does that make a difference as to the mechanics of how the policy is loaded?) I'm fine with the policy loading happening very early in dinit's execution. But:
If we are going to call I know you had a few other questions for me and I can go back to those, but I really need some clarification on these points. I don't want to be discouraging but it seems like there are a few details you're not really sure of yourself, and that gives me some pause. I'm hesitant to incorporate something where I really don't understand why things have been done the way they have. If there's open questions that you need to sort out, please feel free to take whatever time you need to do that, but let's get them sorted first and talk details of the code then. |
Hey,
I can commit to that, but would also be happy mentioning it is experimental.
I think I phrased that badly earlier, I'll rephrase it a little here now. Systemd makes use of SELinux a lot inside it being quite SELinux aware so it already has a lot of boilerplate that will be used elsewhere. The reason why transitioning to the new context is a little more complex is because it requires a bit more setup, we are in a privileged domain at that point and we are sort of entrusting ourselves to do it right, so it'd require a fair amount more code I would think.
An initramfs can work fine for this (and often is!) or some simpler pid 1 that's only job is to launch dinit properly with the right context, but (at least to me) that feels a little unnecessary.
That's fair, I did phrase it quite badly above. My main reasoning was based off the
That makes sense. For now I'll just presume we're going down the route of transitioning ourselves to a new context and I'll push in a bit with an example of that and let you compare.
|
This, I guess, is what I don't understand. I can see that opening file descriptors before loading the policy might give access to things that the policy will then disallow but, if we are loading the policy quite early and we have opened file descriptors then in fact we do need those file descriptors. If the policy disallowed that access then that would be a broken policy anyway. Dinit doesn't go around just casually opening files. Likewise any other resource it has accessed, it probably needs. And anyway, as far as I can tell, applying the security label will enforce access against file descriptors that were opened previously anyway. Eg from https://www.systutorials.com/docs/linux/man/3-setcon_raw/ -
Given those are taken care of (and ptrace shouldn't be an issue anyway), and given that we'd be loading the policy early (before doing just about anything anyway), what would be the concerns in regards to "entrusting ourselves to do it right?" I'm after concrete examples.
To me it feels unnecessary to me add specific support (including a library dependency) for something in Dinit which can be handled just as well from outside, and re-executing our own process right after we start honestly just feels like a hack. At the moment my position on that is a "no", I would need to be given a good, concrete reason for why that should change. Applying the security context within the already-running process without re-
A little bit more code isn't an issue, if we have already gone as far as adding a dependency and providing support for SELinux then we may as well do it properly. My bad for the "keep it simple" comment which caused confusion - I meant, keep it restricted to the specific functionality that you are wanting to implement; we don't need abstraction layers for handling other security frameworks, etc. But before you said:
Is it a bit, or is it a fair amount? (or am I conflating two different things?) |
As for A good example is this. Imagine we start out with kernel context (what dinit starts out with on my system before the policy is loaded). We have some fd's opened, and the kernel context has permission to use them. Now we load the policy, transition ourselves, and the loaded policy executes us as init_t. In the Gentoo refpolicy, then that kernel context becomes kernel_t. Now SELinux will prevent us from using those open file descriptors.
Oh I see what you meant by keeping it simple now :) I was a bit confused with what you were after, but it shouldn't really require any sweeping changes for the codebase, it should all be confined to that function we'll make to load the policy, which will be the thing that's a bit longer. That's all good then, I can make the transition work. I'll get to work on that, and if there are any concerns please let me know. Thanks for all the time you've given this so far, appreciated a lot. |
5ddfc4d
to
d5295d9
Compare
Alright I think I've got this working as desired now. I've just made a function If anything is unclear/you feel any comments are needed, please let me know, and I'll make sure to add them. |
(just updated an error message as i'm not longer using |
Just fixed another silly mistake, forgot to chance |
Could you remove the "Draft:" status if it's ready? I'll get to it when I can. A couple of things I noticed when looking quickly now:
Can I ask you to please go through our discussion and double-check you've addressed the things we did discuss. One other thing I noticed now:
Answers to some of your earlier questions:
You can squash commits but don't rebase onto any changes in master (if there are any), thanks.
No, just a command line option. |
Hmm, I see you've re-based onto current master. Please don't do that until ready for final merge (i.e. once the PR has basically been approved). Now I can't compare the changes between the previous incarnation of the PR and the current incarnation. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some more comments.
Please take care to address the specific comments, but also re-review your own PR to make sure there aren't other changes that should apply in more than one place. Also check correctness of documentation and check terminology used in new documentation for consistency with existing documentation.
doc/manpages/dinit.8.m4
Outdated
@@ -298,6 +302,16 @@ There are several ways to work around this. | |||
Service names following the \fB\-\-container\fR (\fB\-o\fR) or \fB\-\-system\-mgr\fR (\fB\-m\fR) options are not ignored. | |||
Also, the \fB\-\-service\fR (\fB\-t\fR) option can be used to force a service name to be recognised regardless of operating mode. | |||
.\" | |||
.SH SELINUX SUPPORT | |||
.LP | |||
When running as PID 1 on a SELinux enabled machine, \fBdinit\fR will by default load the system's SELinux policy. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I look at the code, it looks to me like the SELinux policy will be loaded if dinit is running as system manager and system init, but this says "when running as PID 1"? (I already pointed out a similar issue in the previous review; you should address all cases).
Isn't it the case that this happens only if Dinit has been built with SELinux support enabled?
What happens in case of various failures? Eg failure to load the policy.
doc/manpages/dinit.8.m4
Outdated
.SH SELINUX SUPPORT | ||
.LP | ||
When running as PID 1 on a SELinux enabled machine, \fBdinit\fR will by default load the system's SELinux policy. | ||
This behaviour can be disabled by passing the \fB\-\-disable\-selinux\-policy\fR option to dinit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't really need to mention this, that option is already documented (also "dinit" lacks formatting).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Referring to line 308)
doc/manpages/dinit.8.m4
Outdated
When loading the SELinux policy, dinit will automatically mount a few special filesystems needed to successfully load the policy. | ||
\fBsysfs\fR will be mounted at \fB/sys\fR, and \fBselinuxfs\fR will be mounted at \fB/sys/fs/selinux\fR. | ||
\fBdinit\fR will not unmount either. | ||
\fBprocfs\fR will also be mounted at \fB/proc\fR, but \fBdinit\fR will unmount it after loading the SELinux policy. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I find this whole section problematic. First, other than /proc
, it's not really dinit that mounts the filesystems; that happens inside the SELinux library and is prone to change if the library does, so I would prefer that the documentation doesn't claim that dinit does this itself but instead makes it clear that the SELinux framework may mount filesystems (and specify /sys/
etc as examples).
If you're going to mention /proc
being temporarily mounted (and I guess that it's probably a good idea to mention it) then at least be clear on the significance of this. Rather than talk about when it's mounted and unmounted just say that it is temporarily mounted in order to load the policy, that's much more concise and less confusing. But also, point out that the /proc
directory must exist for this to be successful, and that the temporary mount will overmount any previously-mounted /proc
until the temporary mount is removed (I guess you perhaps didn't realise this), and what the likely outcome of being unable to mount /proc
will be.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Davin, I've just pushed a change for this, does the new wording seem okay? Just to clarify on my choices on a few things:
First, other than /proc, it's not really dinit that mounts the filesystems; that happens inside the SELinux library and is prone to change if the library does, so I would prefer that the documentation doesn't claim that dinit does this itself but instead makes it clear that the SELinux framework may mount filesystems (and specify /sys/ etc as examples).
I think I've managed to achieve this, but as the dinit
library is linked with libselinux
and hence technically the binary is mounting /sys
, etc, when later specifying that Dinit mounts /proc
, I opted to not use dinit
but use Dinit (to refer to the project) as I think that gets across that it is not Dinit-written code mounting that - is that expressing things okay?
If you're going to mention /proc being temporarily mounted (and I guess that it's probably a good idea to mention it) then at least be clear on the significance of this. Rather than talk about when it's mounted and unmounted just say that it is temporarily mounted in order to load the policy
With regard to this, we mount /proc
to transition ourselves so the later calls to getcon_raw(3)
, etc work, but I suppose we also do it for selinux_init_load_policy(3)
, but that's a weird one because that function will attempt to mount it in some codepaths, so for now I've just mentioned it mounts it in order to transition - would you like me to include loading the policy in that?
Thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I've managed to achieve this, but as the dinit library is linked with libselinux and hence technically the binary is mounting /sys, etc, when later specifying that Dinit mounts /proc, I opted to not use dinit but use Dinit
That's a bit of a non-sequitur isn't it? But yes, it is fine (and perhaps preferable) to refer to actions by Dinit as opposed to dinit. "dinit" is just the executable (file/command).
(However, I think the paragraph is currently worded somewhat confusing. It starts by saying that a few filesystems will be mounted "If they are not mounted already", but concludes with a sentence saying that any previously-mounted proc will be mounted over.)
As I said earlier:
I don't really want to be pulled in to make a judgement on every thing that comes up. Please get the PR to the state where you are satisfied with it and ask for review only at that stage (remember to self-review first).
I will repeat that now because it seems the message didn't get through: please hold off on asking questions one-at-a-time, complete the PR and ask for feedback at that stage. (Only ask a question in the meantime if it raises a concern about something that's going to be a lot of work to change afterwards). I'm sorry, but this is your personal itch you are scratching, you need to place more value on my time and less on your own.
Also, if you are pushing commits which do not represent the final state of the PR (ready for review), then please convert the PR to draft status (until it is actually ready). Otherwise each push triggers a request for review in my notifications, and it is not clear if the PR is ready for review or not.
src/dinit.cc
Outdated
@@ -6,6 +6,7 @@ | |||
#include <cstddef> | |||
#include <cstdlib> | |||
|
|||
#include <sys/mount.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't a header specified by POSIX, we cannot rely on it being unconditionally available.
doc/linux/SELINUX.md
Outdated
mentioned in this document. | ||
|
||
## Loading the system SELinux policy | ||
When booted as the system init system, dinit by default will attempt to load the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"system init system" sounds weird. Say "system init" just as we do elsewhere.
doc/linux/SELINUX.md
Outdated
When booted as the system init system, dinit by default will attempt to load the | ||
system's SELinux policy and transition itself to a context specified by that policy | ||
if not already done so in earlier boot (e.g. by an initramfs). This behaviour may be | ||
disabled by passing dinit the `--disable-selinux-policy` flag. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"flag" -> command-line argument.
doc/linux/SELINUX.md
Outdated
If not already mounted in earlier boot (e.g. by an initramfs), dinit will mount `/sys`, | ||
and selinuxfs (typically `/sys/fs/selinux`). This occurs before any services are started, | ||
as loading the SELinux policy is the first thing dinit does. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See comments elsewhere about assigning responsibility for these actions.
It seems odd to mention this here but not also mention the temporary mounting of /proc
, especially as it appears in the chart below.
src/dinit.cc
Outdated
// This function will attempt to mount /sys and /proc unconditionally, but will not bail if it | ||
// fail to do so. /sys will remain mounted after returning, and it is possible for /sys to still | ||
// remain mounted despite returning false. This function will attempt to unmount /proc if it was | ||
// responsible for mounting it, but lazily unmounts it using MNT_DETACH so while /proc will be | ||
// unavailable for new accesses, it is not guarenteed to be unmounted. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make clear where the responsibility for mounting /sys
lies (and why does this mention only /sys
and not /sys/fs/selinux
?)
What is the point of the lazy unmount using MNT_DETACH? (either explain why it's necessary to do it that way, or don't do it that way).
My apologies - would you like me to keep making commits like before and then to squash them? |
Yes, just as I said earlier:
Note that I requested even then that you don't rebase onto master. It is trivial to see diffs between successive versions of the PR changes even if you squash the commits. It becomes difficult when you also rebase onto master. |
Hi Davin, should be all ready for review. I think I've addressed everything mentioned in the last two reviews in all places I can find instances of them, as well as cleaned up some general formatting and a few other things (should be mentioned in commits). I've tested on a system:
Thanks a lot |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You didn't address this comment from the previous review: #400 (comment)
I'd really appreciate if you could thoroughly check that everything has been addressed before you request another review.
Regarding the documentation/comments about mounting directories, let me lay out my concerns:
- I don't want users to be surprised that some directories get mounted automatically (seemingly by dinit)
- However, I don't really want to suggest that Dinit is doing the mounts (other than the single case which it temporarily does): it is really SELinux that does
- I also don't want to be in a position where Dinit documentation is actually documenting SELinux more completely/precisely than SELinux documentation itself does (especially but not solely because details of what SELinux does may change without any change in Dinit).
Some more general concerns:
- I don't want user documentation to be developer centric (don't user developer terminology, and don't provide details about implementation that are irrelevant to users).
- Nevertheless, the documentation needs to be clear and unambiguous, and consistent.
- It also needs to be correct.
So for instance, where you have got:
If not already mounted in earlier boot (e.g. by an initramfs), libselinux will mount
/sys
, and selinuxfs (typically/sys/fs/selinux
) in order to load the policy. Should the mounting of either fail, the policy load will fail.dinit
will also attempt to temporarily mount/proc
, and the newly mounted procfs will be mounted over an existing procfs. In order for this, and as such the initial setup of SELinux, to succeed, the/proc
directory will need to exist. This occurs before any services are started, as loading the SELinux policy is the first thingdinit
does.
The problems I have are:
- it talks about an action by libselinux - that's the SELinux library, it's a developer-centric concept. Say "SELinux" or "SELinux framework" (even "SELinux library", but I would prefer one of the former two).
- it's implying that libselinux loads the policy, but the previous paragraph says that dinit loads the policy (
dinit by default will attempt to load the system's SELinux policy
) - i.e. it's inconsistent. You could clear up the confusion somewhat by specifically stating that Dinit instructs the SELinux framework to load the policy, rather than saying that Dinit loads the policy itself, or by clarifying that Dinit makes use of the SELinux framework to load the policy. - In "
dinit
will also attempt to temporarily mount/proc
", there's a similar confusion. Saying that dinit "will also mount" something implies that dinit already mounted something else. But it was SELinux that mounted/sys
etc, as per the previous sentence - I know that's arguably an action of dinit, but there's no reason for the inconsistency at this point in the documentation. (So for example you could say "In addition, dinit itself will mount ..."). - It says that SELinux will do things but that's not documented by SELinux documentation (is it?) and so can't necessarily be 100% relied on to always be the case. So, say "may" instead ("is known to" would've been ok, but I prefer "may"). It's SELinux's job to specify the details, not ours; if they don't, we shouldn't be any more precise than we need to be (we are not documenting SELinux, beyond what is really necessary).
- "This occurs before any services are started, as loading the SELinux policy is the first thing
dinit
does." -- No, the first thing dinit does is parse its arguments. Even if loading the SELinux policy was the first thing, why say that here? It's just an unnecessary detail (that may later become incorrect). Just leave it as "This occurs before any services are started".
Some lesser issues (that I might have let go if it weren't for the other things I've highlighted above):
- It says "If not already mounted in earlier boot" that libselinux will mount
/sys
, and selinuxfs (typically/sys/fs/selinux
). Specifying one filesystem only by its mountpoint but the other by both type and typical mountpoint is inconsistent. Be consistent. - "earlier boot" isn't a thing (at least not in the way it's used here). "Earlier in the boot process" makes sense here.
- It says
dinit
a lot when talking about Dinit. As we discussed recently, it's preferable to say Dinit unless there's a specific reason to saydinit
.
I'm not going to go through all the other documentation/comments - please go through them yourself and apply the above concerns. There really is a high bar for the documentation quality.
(I understand that's a lot to absorb. But please give it a go, and I will give more detailed feedback/suggestions in the next iteration, if necessary).
Hi Davin, Thanks for the review. Could you elaborate on what's missing for #400 (comment) please? I thought 3d04808 covered it, but I'm guessing not, just a bit unclear on what else you'd like added for that. As for everything else, I'll try to get to that shortly - I've got a few things to work on for the next couple days so might take a little while before anything is done (and given it's a lot to digest I want to spend a bit of time on it). Also, to avoid email spam, would you like me to not push any commits until I'm ready for review or would changing the title of the PR to include draft suffice? Thanks a lot |
Ok, I see you added a comment which says:
... just above the call to But what has the procfs that was mounted before we mounted (over) it got to do with the one that we mounted and that we are now unmounting? If the original proc is busy, we can still mount over the top of it and then unmount that new mount without doing anything special - why is |
I should add:
The other problem with this (other than it not making sense) is the "may be in use" part. That doesn't explain the problem. What may be using it? What is the real problem you are trying to solve here? What do you believe MNT_DETACH is doing and why is that better (than not using it)? |
And finally! I see that you've acknowledge the prior comments, but still not actually answered the question. I'm concerned that you are going to try to answer by updating the comment in the code. What I'm wanting is to get answers to the questions so that we can establish that the code as written is correct and desirable (or not), I'm not just wanting an attempt at justification in a comment - go that route and I may still find it unsatisfactory at next review. I forgot to answer this:
Changing the PR status to draft is fine. |
So my logic for the
Given |
Thanks for answering.
What existing things? Is this even a real problem currently? Anyway, suppose that this scenario was valid - that something before Dinit started both mounted Now there is a problem: we don't know what options If Dinit goes ahead and mounts Currently the So, if it's a real concern that other processes are already running in parallel with Dinit, and that's something that we want to support, then we have a problem. And On the other hand, if other processes running in parallel with Dinit are a purely theoretical concern and not something we need to support, it's ok to mount and unmount proc as is currently done (I guess, though it makes me distinctly uncomfortable regardless), but only without the use of In neither case, as I see it, should |
Hi Davin, Apologies for the long response time.
Yea, it was a theoretical concern; the actual loading the policy is out of scope outside of being the system init or manager in this PR imo.
Reading your logic above, and testing on a few systems, I agree with this conclusion. I'll push a commit to mount with MNT_DETACH shortly, and I'll try and address the rest of the documentation concerns you mentioned as well and request review when I'm done/happy with the state of the PR again. Thanks! |
Hi Davin, Apologies for the long break. I've reworked some of the documentation, and it reads clearer to me. I've left I'm ready for review again, please let me know if there are any concerns. Thanks |
Please:
Thanks. |
This commit adds support for loading the system SELinux policy when dinit is running as the system manager. A new option has been added to not load the SELinux policy, --disable-selinux-policy. SELinux support is only available on Linux platforms, and is gatekept behind an SELinux enabled build configuration. Signed-off-by: Rahul Sandhu <[email protected]>
Hi Davin, I've completed a self-review, and I think I've addressed everything mentioned from the previous review. I've squashed all commits into a single commit. Thanks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I mentioned in the previous review (point 1):
I don't really want to suggest that Dinit is doing the mounts (other than the single case which it temporarily does): it is really SELinux that does
and I suggested (point 2):
You could clear up the confusion somewhat by specifically stating that Dinit instructs the SELinux framework to load the policy
and (point 3):
It says that SELinux will do things but that's not documented by SELinux documentation (is it?) and so can't necessarily be 100% relied on to always be the case. So, say "may" instead ("is known to" would've been ok, but I prefer "may")
Now with that in mind, look at this paragraph in SELINUX.md
:
If not already mounted earlier in the boot process (e.g. by an initramfs), Dinit will instruct the
SELinux framework to mount sysfs (typically/sys
), and selinuxfs (typically/sys/fs/selinux
) in
order to load the policy
So you've sort of taken on point 2, but extended it to say that Dinit will "instruct [SELinux] to mount" sysfs and selinuxfs. That's ignoring point 3 - what SELinux mounts is up to SELinux, but isn't documented there (and shouldn't be specified by Dinit documentation as if it was set in stone). It's also not honouring the spirit of point 1 - because it makes it sound like Dinit intends for SELinux to mount those filesystems even though it definitely does not.
In summary, so far:
- Dinit doesn't instruct SELinux to mount filesystems. It's not correct to say that it does.
- Dinit does however instruct SELinux to load the policy.
- It would be correct to say that SELinux may mount those filesystems when requested to load the policy, (and may fail to load the policy if it cannot mount them).
Also these changes are still needed:
- fix the man page documentation (eg it still talks about the SELInux "library", that's developer-centric)
- fix the comment at the header of the
selinux_transition
function (still doesn't properly attribute the mounting of/sys
and/sys/fs/selinux
filesystems to the SELinux library - which I bought up in the review prior to last - and still claims that unmountingproc
is done withMNT_DETACH
even though that's now changed).
I will add a few other notes inline but really, I'm not keen on continuing reviews for this if you're not really taking the comments onboard and properly checking your own work. If you're going to submit again then please check it all over thoroughly this time (and it would be appreciated if you could complete it in a tighter time frame).
Additionally to what's specifically noted, you should:
- Check each and every bit of documentation to make sure it's correct. I found some cases where the documentation you wrote doesn't match your own code. You should be checking this yourself.
- Proof read everything. Make sure it makes sense.
- Use established terminology, don't make up your own. Make sure you are using terms correctly.
And finally: my review comments are not exhaustive. If I point out that you need to change use of some term, for example, then you need to change it everywhere, not just the one case I point out. Similarly for any change that could apply in multiple places/files.
Anyway with all that said, this is starting to look ok and the main problem is still the documentation - as per above and the individual inline comments.
doc/linux/SELINUX.md
Outdated
# Dinit SELinux Awareness | ||
|
||
Dinit has support for basic SELinux awareness. This document is intended to outline the extent and | ||
inner workings of Dinit's SELinux awareness. The reader is assumed to be knowledgeable about the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The title and phrasing are odd. Why not "support" instead of "awareness"? Eg:
"Dinit support for SELinux - Dinit has support for loading the SELinux security policy at boot time, which must be enabled at build time (see BUILD). ...(etc)"
No need to waffle, just say things straight.
"This document is intended to outline the extent and inner workings of Dinit's SELinux awareness support" -- is it, though?
How about:
"This document outlines how to use this support, including the requirements and potential system effects."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The title and phrasing are odd. Why not "support" instead of "awareness"? Eg:
My logic for awareness was that the phrase "SELinux awareness", and referring to "SELinux aware" applications are common within existing documentation about SELinux (e.g. https://fedoraproject.org/wiki/SELinux/SELinuxApplications), and is generally what is used by the community (e.g. forums, irc, mailing lists, talks, etc) to refer to programs that are "aware" that SELinux exists. I'm more than happy to use "support" instead if you'd like me to, just thought I'd provide the context.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, but yes, I prefer "support".
doc/linux/SELINUX.md
Outdated
inner workings of Dinit's SELinux awareness. The reader is assumed to be knowledgeable about the | ||
basics of [SELinux](https://github.com/SELinuxProject/selinux-notebook) and Dinit. | ||
|
||
Dinit needs to be built with SELinux support (see [BUILD](/BUILD)) to enable the features that are |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dinit needs to be built with SELinux support (see BUILD) to enable the features that are mentioned in this document.
Just incorporate this into the first paragraph as suggested above.
doc/linux/SELINUX.md
Outdated
mentioned in this document. | ||
|
||
## Loading the system SELinux policy | ||
When running as the system init or manager, Dinit by default will attempt to load the system's |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"system init or manager" - what?
I guess you mean "system init or system manager". Are you trying to abbreviate? (Don't!).
But also: this doesn't match what your code actually does:
if (am_system_mgr && am_system_init && opts.load_selinux_policy && !selinux_transition(argv[0])) return 1;
That's an "AND" not "OR".
doc/linux/SELINUX.md
Outdated
an existing procfs. In order for this, and as such the initial setup of SELinux, to succeed, the | ||
`/proc` directory will need to exist. This occurs before any services are started. | ||
|
||
Dependent on the requested loading state of SELinux, Dinit has different behaviour should policy |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Dependent on the requested loading state of SELinux" -
Do you mean "Dependent on the SELinux mode of operation"? I can't find anything about "requested loading state" in SELinux documentation. (Don't make up terminology!)
You could say "Dependent on the SELinux mode of operation (as specified for example on the kernel command line) ..." if you want to provide a little more detail.
doc/linux/SELINUX.md
Outdated
|
||
Dependent on the requested loading state of SELinux, Dinit has different behaviour should policy | ||
load fail. If SELinux was requested to be loaded in Enforcing mode and the policy load failed, | ||
Dinit will bail early after printing an error to stderr. If SELinux was requested to be loaded in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dinit will bail early after printing an error to stderr
Dinit will exit early with an error.
"bail" is informal and unclear (does it mean it will exit, or just bail on trying to load the policy, or...?). "print a message to stderr" is developer-centric (what is "stderr"?) and anyway an unneccesary level of detail.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In fact, "Dinit will exit with an error". The "early" is pretty meaningless.
init_log(log_is_syslog); | ||
|
||
#if SUPPORT_SELINUX | ||
// Error exit if we are the system manager and fail to load the selinux policy. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Error exit"?
Do you mean exit with an error? Then say that! Anyway, it's clear that we exit with an error if it fails (line 622). The comment should focus on the main purpose of the code (i.e. to load the policy) not on what to do in case that happens to fail.
doc/linux/SELINUX.md
Outdated
J --> K{Did the SELinux policy load succeed?} | ||
K -->|Yes| L[Attempt to calculate our new context and transition] | ||
K -->|No| M{Was enforcing mode requested?} | ||
M -->|Yes| I[Error exit early] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Error exit"?
// This should be done directly after argument parsing. It's best to do this as early as | ||
// possible to get init in the context specified in the policy, and hence confine it, quickly. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"This should be done directly after argument parsing"
It is done directly after argument parsing, and the following sentence explains that it should be done early, so this sentence is redundant.
if (current_context) freecon(current_context); | ||
if (file_context) freecon(file_context); | ||
if (new_context) freecon(new_context); | ||
if (proc_mount_rc == 0) umount("/proc"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The return from umount
should be checked and a warning logged if it fails (not because we really expect it to be happen, but in the crazy situation that there is something running parallel to init and poking at /proc
, we certainly want to flag an error).
doc/linux/SELINUX.md
Outdated
If not already mounted earlier in the boot process (e.g. by an initramfs), Dinit will instruct the | ||
SELinux framework to mount sysfs (typically `/sys`), and selinuxfs (typically `/sys/fs/selinux`) in | ||
order to load the policy. Should the mounting of either fail, the policy load may fail. In addition, | ||
Dinit itself will also temporarily mount `/proc`, and the newly mounted procfs will be mounted over |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See overall review comments on this section.
Hi Davin, Thanks for the review. Apologies for the long gap between the last review and my updates, won't happen again. I'll be working on this again later in the evening and continuing to do so over the following days, and hopefully should be ready for a review again in 2 weeks. I'll make sure to reread all the documentation after a small gap so I'm not lost in my own understanding of my words. Thanks! |
Hi Davin, I had a hardware failure recently and am getting my processor RMA'd, so I might take a few more days to get the PR ready for review again. Sincere apologies. |
Hi Davin, I've been working on the documentation, but I'm a bit stumped with regards to mountpoints and how to honour the previous requests correctly; I'm a bit confused about how you'd like me to document things mounted (if at all); earlier you said:
But I'm struggling to also reconcile that with
Could you clarify what I should document here? I'm a bit lost here on what to write. I've pushed the changes made so far should they be useful; I haven't touched the "If not already mounted earlier in the boot process" paragraph at all yet. Thanks! |
Signed-off-by: Rahul Sandhu <[email protected]>
One of those comments was about what should be in the function comment and man page, and the other is about what should be in the
As I've said earlier, if you are going to push changes leaving the PR in a "not ready" state, then change the status to draft, please, and remove draft status again once it is actually ready for review. I will not review half-done changes. |
@WavyEbuilder I am sorry, but I have thought about it and I am going to close this PR now. It's been 9 months spent on what amounts to a fairly small code change, and despite a lot of elaboration from myself about what is required for the documentation you seem to be having trouble completing it. It's been over a month even since the last review, where I gave detailed feedback about what needed to change, and only now are questions being raised that should have been sorted out at the time (and that really, were already answered). Through the life of this PR, I feel like my feedback has been ignored on several occasions, as have instructions about process, and that thorough self-review hasn't been happening. This has slowed the whole process down and led to me spending way more time on it than I would like. Even if you were able to get this PR into shape eventually, I don't believe - based on how long iterations of this PR are taking - that you'd be able to provide any reasonable level of support for any related issues that came up. Providing support was one of the conditions of this being accepted in the first place. I regret not making this decision earlier and I'm sorry that you (as well as me) have spent as much time on this as you have - I had hoped with some guidance that this PR would get there - but I doubt at this stage that you will really be able to satisfy the requirements with a single further review, and after all this time and back-and-forth that is all I would be willing to give. This project is special to me, and my requirements on contributions are high. I hope that you understand. |
Implements #399 . Currently a draft PR for some of the reasons noted in that issue. Another thing to add:
fprintf
if the SELinux policy fails to load (as/dev/console
is likely unable to be accessed at that point). Would you preferstd::cout
to be used for now in this case?