Skip to content
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

Reduce verbosity of missing kernel support warning for secure symlink #12396

Merged
merged 1 commit into from
May 4, 2022

Conversation

strideynet
Copy link
Contributor

Closes #11755

Follows the same solution as used elsewhere, using a sync.Once to ensure warnings related to the missing syscall are only displayed once. This is a bit of a hacky solution, but matches the solution already in use, and only controls a log message.

@strideynet strideynet force-pushed the strideynet/reduce-secure-symlink-log-verbosity branch from 6620b6e to 26f4bbb Compare May 3, 2022 20:41
@strideynet strideynet changed the title Reduce secure symlink log verbosity when kernel does not support Reduce verbosity of missing kernel support warning for secure symlink May 3, 2022
@strideynet
Copy link
Contributor Author

@timothyb89 - by re-using the same sync.Once here, the message will only be displayed once across creation and writing. I can't see any reason to display it once for creation and once for writing, but wanted to run this past you.

@strideynet strideynet marked this pull request as ready for review May 3, 2022 20:49
@github-actions github-actions bot requested review from ravicious and rosstimothy May 3, 2022 20:50
@strideynet strideynet force-pushed the strideynet/reduce-secure-symlink-log-verbosity branch from 26f4bbb to efff21f Compare May 3, 2022 20:50
@strideynet strideynet requested a review from timothyb89 May 3, 2022 20:50
Copy link
Contributor

@timothyb89 timothyb89 left a comment

Choose a reason for hiding this comment

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

Looks fine to me, thanks!

@strideynet strideynet force-pushed the strideynet/reduce-secure-symlink-log-verbosity branch from efff21f to b749c70 Compare May 3, 2022 22:33
@strideynet strideynet enabled auto-merge (squash) May 3, 2022 22:34
@strideynet strideynet merged commit 9348ef1 into master May 4, 2022
@strideynet strideynet deleted the strideynet/reduce-secure-symlink-log-verbosity branch May 4, 2022 09:08
@timothyb89
Copy link
Contributor

Forgot to mention, we should backport this to branch/v9

@strideynet
Copy link
Contributor Author

Hmm, we could ! I'm not too sure what our process is on backporting though, do we have a bot for this ?

@timothyb89
Copy link
Contributor

I think we've got a bot in the works, but for now I'd just:

git checkout branch/b9
git checkout -b user/v9/branchname
git cherry-pick 9348ef172f86dc4c5f70a8f053f02fc54fb818e5

... and push up a PR for the result, with a base branch of branch/v9.

@rosstimothy
Copy link
Contributor

Hmm, we could ! I'm not too sure what our process is on backporting though, do we have a bot for this ?

If you add labels to your PR before you merge, e.g. backport/branch/v9, the bot will automatically do the backports for you:
See #12373 for an example

@strideynet
Copy link
Contributor Author

Thanks @rosstimothy, I'll keep that in mind next time.

@timothyb89 I'll raise that now :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tbot's symlinks: try-secure mode produces excessive log spam on older Linux kernels
4 participants