Skip to content

exportfs: check fsid #878

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −0
Open

exportfs: check fsid #878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions heartbeat/exportfs
View file
Original file line number Diff line number Diff line change
@@ -417,6 +417,10 @@ testdir() {
}
exportfs_validate_all ()
{
if ! echo "$OCF_RESKEY_fsid" | grep -q -E "^(root|[[:xdigit:][:punct:]]*)$"; then
ocf_exit_reason "$OCF_RESKEY_fsid is not a valid fsid"
return $OCF_ERR_CONFIGURED
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I see now that there's a check for this below (ocf_is_decimal). Anything wrong with it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed that there's a check only for multiple directories. Anyway, exports(5) says here:
Other filesystems can be identified with a small integer, or a
UUID which should contain 32 hex digits and arbitrary punctua‐
tion.
That doesn't match the regexp in grep above.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The regexp matching that description would be: '^(root|[[:xdigit:][:punct:]]*)$'. And then we'd need to hope that the description is precise. Somehow, I'd rather let this be as is, lest we introduce a regression.

if [ $NUMDIRS -gt 1 ] &&
! ocf_is_decimal "$OCF_RESKEY_fsid"; then
ocf_exit_reason "use integer fsid when exporting multiple directories"