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

Enable easy ssh key revocation #694

Merged
merged 2 commits into from Jun 14, 2017

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Jun 7, 2017

Fully manage the .ssh/authorized_keys file for root,
so that keys removed from Salt are also removed from the file.

Note that the AWS (Linux) machines are configured to have two
additional keys in the root authorized_keys file,
namely servo-aws and servo-aws-reserved-instances,
but when used these keys will tell the user to log in as ubuntu,
so they don't provide real access.
Remove these keys as they are not useful.

Add documentation about gaining SSH access and revoking/rotating keys.

Fixes #693.


This change is Reviewable

@aneeshusa
Copy link
Member Author

aneeshusa commented Jun 7, 2017

r? @edunham

cc @larsbergstrom @Manishearth @metajack

Obviously, whoever deploys this should be careful and make sure to have an open SSH session (preferably with tmux or screen running) to avoid locking ourselves out.

make sure to su - servo to simulate the space,
and check the Buildbot config for any required environment variables.

### SSH key revocation and rotation

This comment has been minimized.

@aneeshusa

aneeshusa Jun 7, 2017

Author Member

Please take a look at these instructions in particular and let me know if they seem reasonable!

@Manishearth
Copy link
Member

Manishearth commented Jun 7, 2017

LGTM.

I'm not entirely clear on how to use the the salt testing dir though, got links to more docs (or expand on it inline)?

Fully manage the `.ssh/authorized_keys` file for root,
so that keys removed from Salt are also removed from the file.

Note that the AWS (Linux) machines are configured to have two
additional keys in the root `authorized_keys` file,
namely `servo-aws` and `servo-aws-reserved-instances`,
but when used these keys will tell the user to log in as ubuntu,
so they don't provide real access.
Remove these keys as they are not useful.

Add documentation about gaining SSH access and revoking/rotating keys.
@aneeshusa aneeshusa force-pushed the aneeshusa:enable-easy-ssh-key-revocation branch from a58ab8e to 4519591 Jun 7, 2017
@aneeshusa
Copy link
Member Author

aneeshusa commented Jun 7, 2017

It's explained in the salt.md docs, I added a link inline.

@edunham
Copy link
Contributor

edunham commented Jun 14, 2017

@bors-servo r+

Thanks for the fix and the excellent docs! They look clear, accurate, and reasonable to me.

@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

📌 Commit 4519591 has been approved by edunham

@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

Testing commit 4519591 with merge 18dd9b1...

bors-servo added a commit that referenced this pull request Jun 14, 2017
Enable easy ssh key revocation

Fully manage the `.ssh/authorized_keys` file for root,
so that keys removed from Salt are also removed from the file.

Note that the AWS (Linux) machines are configured to have two
additional keys in the root `authorized_keys` file,
namely `servo-aws` and `servo-aws-reserved-instances`,
but when used these keys will tell the user to log in as ubuntu,
so they don't provide real access.
Remove these keys as they are not useful.

Add documentation about gaining SSH access and revoking/rotating keys.

Fixes #693.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/694)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

☀️ Test successful - status-travis
Approved by: edunham
Pushing 18dd9b1 to master...

@bors-servo bors-servo merged commit 4519591 into servo:master Jun 14, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@jdm jdm removed the S-needs-deploy label Jun 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.