Skip to content

Commit

Permalink
Cherry pick Gravitational -> GoTeleport (gravitational#4932)
Browse files Browse the repository at this point in the history
  • Loading branch information
benarent authored Nov 25, 2020
1 parent 0f38826 commit 09928a7
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@gravitational.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@goteleport.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
2 changes: 1 addition & 1 deletion lib/auth/saml.go
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ func (a *Server) validateSAMLResponse(samlResponse string) (*samlAuthResponse, e
}
assertionInfo, err := provider.RetrieveAssertionInfo(samlResponse)
if err != nil {
log.Warnf("Received response with incorrect or no claims/attribute statements. Please check the identity provider configuration to make sure that mappings for claims/attribute statements are set up correctly. <See: https://gravitational.com/teleport/docs/enterprise/ssh_sso/>. Failed to retrieve SAML AssertionInfo from response: %v.", err)
log.Warnf("Received response with incorrect or no claims/attribute statements. Please check the identity provider configuration to make sure that mappings for claims/attribute statements are set up correctly. <See: https://goteleport.com/teleport/docs/enterprise/sso/ssh-sso/>. Failed to retrieve SAML AssertionInfo from response: %v.", err)
return nil, trace.AccessDenied("bad SAML response")
}

Expand Down
2 changes: 1 addition & 1 deletion lib/config/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ func applySSHConfig(fc *FileConfig, cfg *service.Config) error {
if !pam.BuildHasPAM() {
errorMessage := "Unable to start Teleport: PAM was enabled in file configuration but this \n" +
"Teleport binary was built without PAM support. To continue either download a \n" +
"Teleport binary build with PAM support from https://gravitational.com/teleport \n" +
"Teleport binary build with PAM support from https://goteleport.com/teleport \n" +
"or disable PAM in file configuration."
return trace.BadParameter(errorMessage)
}
Expand Down
2 changes: 1 addition & 1 deletion lib/events/gcssessions/gcsstream_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestStreams(t *testing.T) {
uri := os.Getenv(teleport.GCSTestURI)
if uri == "" {
t.Skip(
fmt.Sprintf("Skipping GCS tests, set env var %q, details here: https://gravitational.com/teleport/docs/gcp_guide/",
fmt.Sprintf("Skipping GCS tests, set env var %q, details here: https://goteleport.com/teleport/docs/gcp-guide/",
teleport.GCSTestURI))
}
u, err := url.Parse(uri)
Expand Down
4 changes: 2 additions & 2 deletions lib/kube/proxy/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ func checkImpersonationPermissions(ctx context.Context, sarClient authztypes.Sel
},
}, metav1.CreateOptions{})
if err != nil {
return trace.Wrap(err, "failed to verify impersonation permissions for kubernetes: %v; this may be due to missing the SelfSubjectAccessReview permission on the ClusterRole used by the proxy; please make sure that proxy has all the necessary permissions: https://gravitational.com/teleport/docs/kubernetes_ssh/#impersonation", err)
return trace.Wrap(err, "failed to verify impersonation permissions for kubernetes: %v; this may be due to missing the SelfSubjectAccessReview permission on the ClusterRole used by the proxy; please make sure that proxy has all the necessary permissions: https://goteleport.com/teleport/docs/kubernetes-ssh/#impersonation", err)
}
if !resp.Status.Allowed {
return trace.AccessDenied("proxy can't impersonate kubernetes %s at the cluster level; please make sure that proxy has all the necessary permissions: https://gravitational.com/teleport/docs/kubernetes_ssh/#impersonation", resource)
return trace.AccessDenied("proxy can't impersonate kubernetes %s at the cluster level; please make sure that proxy has all the necessary permissions: https://goteleport.com/teleport/docs/kubernetes-ssh/#impersonation", resource)
}
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion lib/service/cfg.go
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ func (a App) Check() error {
// are invalid subdomains because for trusted clusters the name is used to
// construct the domain that the application will be available at.
if errs := validation.IsDNS1035Label(a.Name); len(errs) > 0 {
return trace.BadParameter("application name %q must be a valid DNS subdomain: https://gravitational.com/teleport/docs/application-access/#application-name", a.Name)
return trace.BadParameter("application name %q must be a valid DNS subdomain: https://goteleport.com/teleport/docs/application-access/#application-name", a.Name)
}
// Parse and validate URL.
if _, err := url.Parse(a.URI); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/parse/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ type Matcher interface {
func NewMatcher(value string) (m Matcher, err error) {
defer func() {
if err != nil {
err = trace.WrapWithMessage(err, "see supported syntax at https://gravitational.com/teleport/docs/enterprise/ssh-rbac/#rbac-for-hosts")
err = trace.WrapWithMessage(err, "see supported syntax at https://goteleport.com/teleport/docs/enterprise/ssh-rbac/#rbac-for-hosts")
}
}()
match := reVariable.FindStringSubmatch(value)
Expand Down
2 changes: 1 addition & 1 deletion tool/teleport/common/teleport.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func Run(options Options) (executedCommand string, conf *service.Config) {
// configure logger for a typical CLI scenario until configuration file is
// parsed
utils.InitLogger(utils.LoggingForDaemon, log.ErrorLevel)
app := utils.InitCLIParser("teleport", "Clustered SSH service. Learn more at https://gravitational.com/teleport")
app := utils.InitCLIParser("teleport", "Clustered SSH service. Learn more at https://goteleport.com/teleport")

// define global flags:
var ccf config.CommandLineFlags
Expand Down
2 changes: 1 addition & 1 deletion tool/tsh/tsh.go
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ func printProfiles(debug bool, profile *client.ProfileStatus, profiles []*client
// here, they are only available in Enterprise.
if profile != nil || len(profiles) > 0 {
fmt.Printf("\n* RBAC is only available in Teleport Enterprise\n")
fmt.Printf(" https://gravitational.com/teleport/docs/enterprise\n")
fmt.Printf(" https://goteleport.com/teleport/docs/enterprise\n")
}
}

Expand Down

0 comments on commit 09928a7

Please sign in to comment.