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

Adds Message of the Day #7396

Merged
merged 5 commits into from
Jul 20, 2021
Merged

Adds Message of the Day #7396

merged 5 commits into from
Jul 20, 2021

Conversation

tcsc
Copy link
Contributor

@tcsc tcsc commented Jun 23, 2021

Adds a configurable MotD to the auth service. Any attempt to login into a cluster where a MotD is set will display that message and not begin to log the user in until that message is acknowledged.

See-Also: #4988

@tcsc tcsc linked an issue Jun 23, 2021 that may be closed by this pull request
@tcsc tcsc requested review from Joerger and nklaassen June 23, 2021 07:11
@russjones
Copy link
Contributor

@alex-kovoy @kimlisa Can you two review this as well because the Web UI will need to present the MOTD as well?

# which must be acknowledged before the user is allowed to log in. Note that will
# be shown *before* login, so should not contain any confidential information.
# Defaults to the empty string, implying no message or acknowledgment is required.
message_of_the_day: ""
Copy link
Contributor

Choose a reason for hiding this comment

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

This MOTD article for PAM might be worth reviewing/updating here: https://goteleport.com/docs/server-access/guides/ssh-pam/#set-message-of-the-day-motd-with-teleport. Looks like your changes are specific to the API?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The message added by this change is shown as part of tsh login rather than on access to a resource, while it's a similar feature it happens at a different time. Will see if I can add anything useful to the PAM guide to refer this, though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've added a note that you can add a cluster-wide MotD to the PAM documentation. I'm not certain that it's the 100% right place for it (as it doesn't use PAM at all) but at least someone searching for motd will find it :-)

Base automatically changed from trent/timeout-msg to master June 25, 2021 04:12
@tcsc tcsc requested a review from nklaassen July 12, 2021 02:22
@tcsc tcsc added this to the 7.0 "Stockholm" milestone Jul 13, 2021
@tcsc tcsc requested a review from timothyb89 July 15, 2021 07:16
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.

Just a couple small nits on the docs.

docs/pages/server-access/guides/ssh-pam.mdx Outdated Show resolved Hide resolved
docs/pages/server-access/guides/ssh-pam.mdx Outdated Show resolved Hide resolved
tcsc added 3 commits July 19, 2021 10:25
Adds a configurable MotD to the auth service. If a message is set, any
attempt to login into a cluster via `tsh` will display that message and
not begin to log the user in until that message is acknowledged.
Copy link
Contributor

@russjones russjones left a comment

Choose a reason for hiding this comment

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

Bot.

@tcsc tcsc merged commit 5ffa4b4 into master Jul 20, 2021
@tcsc tcsc deleted the tcsc/4988 branch July 20, 2021 00:48
tcsc added a commit that referenced this pull request Jul 20, 2021
Adds a configurable MotD to the auth service. If a message is set, any
attempt to login into a cluster via `tsh` will display that message and
not begin to log the user in until that message is acknowledged.
tcsc added a commit that referenced this pull request Jul 20, 2021
Adds a configurable MotD to the auth service. If a message is set, any
attempt to login into a cluster via `tsh` will display that message and
not begin to log the user in until that message is acknowledged.

Backport of #7396
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.

tsh should have a configurable MOTD
5 participants