This repository was archived by the owner on Aug 14, 2020. It is now read-only.
ace/validator: fix mountpoint checks #467
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iaguis
force-pushed
the
iaguis/check-mount
branch
2 times, most recently
from
b1c22f1 to
c1a1116
Compare
iaguis
force-pushed
the
iaguis/check-mount
branch
from
c1a1116 to
69e5009
Compare
|
After adding the missing |
|
Ooops, thanks for catching that! |
iaguis
force-pushed
the
iaguis/check-mount
branch
from
69e5009 to
afaa6ae
Compare
mpasternacki
added a commit
to 3ofcoins/jetpack
that referenced
this pull request
Aug 6, 2015
| root string | ||
| mountPoint string | ||
| mountOptions string | ||
| optionalFields string |
There was a problem hiding this comment.
according to proc(5):
(7) optional fields: zero or more fields of the form "tag[:value]".
Does the Scanf work if there are several fields? It would be good to add some unit tests about that.
There was a problem hiding this comment.
It's probably fine because we only care about (5) and (6) but for that same reason we can only parse the first 6 fields (which are fixed) and avoid possible problems. I'll update the PR with that and some unit tests. Thanks!
|
Except the issue with parsing |
This includes: - A proper check for Linux. The previous one was just checking if the devices were the same, this is not true for bind-mounts within the same device - A check for FreeBSD courtesy of Maciej Pasternacki <[email protected]>. Jails seem to have f_fsid set to zero so the original check didn't work. Now we check f_fstypename, f_mntfromname and f_mntonname too. - As a fallback (for other systems) we do the same as the original code: just check the f_fsid.
iaguis
force-pushed
the
iaguis/check-mount
branch
from
afaa6ae to
8962271
Compare
|
Updated with only parsing the first 6 fields and added a test |
|
👍 thanks |
jonboulle
added a commit
that referenced
this pull request
Aug 8, 2015
ace/validator: fix mountpoint checks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This includes:
devices were the same, this is not true for bind-mounts within the
same device
[email protected]. Jails seem to have f_fsid set to zero so the
original check didn't work. Now we check r_fstypename, f_mntfromname
and f_mntonname too.
just check the f_fsid.
Fixes #464
cc @mpasternacki