API client Profile credential loader #5993
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
Joerger
force-pushed
the
joerger/api-profile-credentials
branch
4 times, most recently
from
cc5f20c to
edc8a4b
Compare
Joerger
requested review from
alex-kovoy,
klizhentas,
r0mant and
russjones
as code owners
|
@awly @andrejtokarcik Can you review? |
Joerger
force-pushed
the
joerger/api-profile-credentials
branch
from
edc8a4b to
6212a10
Compare
awly
reviewed
Mar 19, 2021
Comment on lines
+165
to
+166
| sshCertPath := filepath.Join(userKeyDir, p.Username+constants.FileExtSSHCert) | ||
| err = ioutil.WriteFile(sshCertPath, []byte(sshCert), 0600) | ||
| require.NoError(t, err) |
There was a problem hiding this comment.
FYI this will need to be updated after #5938
andrejtokarcik
approved these changes
Mar 22, 2021
Comment on lines
+129
to
145
| const ( | ||
| // SessionKeyDir is the sub-directory where session keys are stored (.tsh/keys). | ||
| SessionKeyDir = "keys" | ||
| // FileNameKnownHosts is a file that stores known hosts. | ||
| FileNameKnownHosts = "known_hosts" | ||
| // FileExtTLSCert is the filename extension/suffix of TLS certs | ||
| // stored in a profile (./tsh/keys/profilename/username-x509.pem). | ||
| FileExtTLSCert = "-x509.pem" | ||
| // FileNameTLSCerts is the filename of Cert Authorities stored in a | ||
| // profile (./tsh/keys/profilename/certs.pem). | ||
| FileNameTLSCerts = "certs.pem" | ||
| // FileExtCert is a file extension used for SSH Certificate files. | ||
| FileExtSSHCert = "-cert.pub" | ||
| // FileExtPub is a file extension used for SSH Certificate Authorities | ||
| // stored in a profile (./tsh/keys/profilename/username.pub). | ||
| FileExtPub = ".pub" | ||
| ) |
There was a problem hiding this comment.
These constants aren't really used in the api module except for tests. Is the idea to gradually move everything from under lib/client to api/client?
There was a problem hiding this comment.
These are also used in profile.go in profile.TLSConfig() and profile.SSHClientConfig(). We only want to move things that are essential to the API, but the majority of lib/client seems to be internal logic. I don't expect much more to be moved into api/client.
Joerger
force-pushed
the
joerger/api-profile-credentials
branch
from
4341deb to
a0376ee
Compare
Joerger
force-pushed
the
joerger/api-profile-credentials
branch
from
a0376ee to
1d773b3
Compare
awly
approved these changes
Mar 23, 2021
Joerger
force-pushed
the
joerger/api-profile-credentials
branch
from
1d773b3 to
35d4766
Compare
Joerger
force-pushed
the
joerger/api-profile-credentials
branch
from
35d4766 to
40d31f2
Compare
Joerger
added a commit
that referenced
this pull request
Mar 26, 2021
Joerger
added a commit
that referenced
this pull request
Mar 29, 2021
Joerger
added a commit
that referenced
this pull request
Mar 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes:
api/client/profile.go.Merge after #5625, which this is based upon.