mirror of
https://github.com/gravitational/teleport
synced 2024-10-21 01:34:01 +00:00
Fix formatting issues.
This commit is contained in:
parent
1d7b00859a
commit
ec7e53370d
|
@ -354,7 +354,7 @@ func (s *IntSuite) TestAuditOn(c *check.C) {
|
|||
time.Sleep(time.Millisecond * 250)
|
||||
if i >= 5 {
|
||||
// session stream keeps coming back short
|
||||
c.Fatal("stream is not getting data: %q", string(sessionStream))
|
||||
c.Fatalf("Stream is not getting data: %q.", string(sessionStream))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -185,7 +185,7 @@ set kubeconfig_path if auth server is running outside of the cluster`, teleport.
|
|||
clt, cfg, err := kubeutils.GetKubeClient(os.Getenv(teleport.EnvKubeConfig))
|
||||
if err != nil {
|
||||
return nil, trace.BadParameter(`auth server assumed that it is
|
||||
running in a kubernetes cluster, but could not init in-cluster kubernetes client`, err)
|
||||
running in a kubernetes cluster, but could not init in-cluster kubernetes client: %v`, err)
|
||||
}
|
||||
|
||||
targetAddr, err := parseKubeHost(cfg.Host)
|
||||
|
|
|
@ -197,7 +197,7 @@ func (a *AuthMiddleware) GetUser(r *http.Request) (interface{}, error) {
|
|||
clientCert := peers[0]
|
||||
certClusterName, err := tlsca.ClusterName(clientCert.Issuer)
|
||||
if err != nil {
|
||||
log.Warning("Failed to parse client certificate %v.", err)
|
||||
log.Warnf("Failed to parse client certificate %v.", err)
|
||||
return nil, trace.AccessDenied("access denied: invalid client certificate")
|
||||
}
|
||||
|
||||
|
|
|
@ -133,7 +133,7 @@ func New(params backend.Params) (backend.Backend, error) {
|
|||
err := utils.ObjectToStruct(params, &cfg)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
return nil, trace.BadParameter("DynamoDB configuration is invalid", err)
|
||||
return nil, trace.BadParameter("invalid DynamoDB configuration: %v", err)
|
||||
}
|
||||
|
||||
defer l.Debug("AWS session is created.")
|
||||
|
|
|
@ -153,7 +153,7 @@ func New(params backend.Params) (backend.Backend, error) {
|
|||
// convert generic backend parameters structure to etcd config:
|
||||
var cfg *Config
|
||||
if err = utils.ObjectToStruct(params, &cfg); err != nil {
|
||||
return nil, trace.BadParameter("invalid etcd configuration", err)
|
||||
return nil, trace.BadParameter("invalid etcd configuration: %v", err)
|
||||
}
|
||||
if err = cfg.Validate(); err != nil {
|
||||
return nil, trace.Wrap(err)
|
||||
|
|
|
@ -350,7 +350,7 @@ func (ns *NodeSession) updateTerminalSize(s *ssh.Session) {
|
|||
}
|
||||
|
||||
lastSize = terminalParams.Winsize()
|
||||
log.Debugf("Recevied window size %v from node in session.\n", lastSize, event.GetString(events.SessionEventID))
|
||||
log.Debugf("Recevied window size %v from node in session %v.", lastSize, event.GetString(events.SessionEventID))
|
||||
|
||||
// Update size of local terminal with the last size received from remote server.
|
||||
case <-tickerCh.C:
|
||||
|
@ -371,14 +371,14 @@ func (ns *NodeSession) updateTerminalSize(s *ssh.Session) {
|
|||
// the window.
|
||||
err = term.SetWinsize(0, lastSize)
|
||||
if err != nil {
|
||||
log.Warnf("Unable to update terminal size: %v.\n", err)
|
||||
log.Warnf("Unable to update terminal size: %v.", err)
|
||||
continue
|
||||
}
|
||||
|
||||
// This is what we use to resize the physical terminal window itself.
|
||||
os.Stdout.Write([]byte(fmt.Sprintf("\x1b[8;%d;%dt", lastSize.Height, lastSize.Width)))
|
||||
|
||||
log.Debugf("Updated window size from to %v due to remote window change.", currSize, lastSize)
|
||||
log.Debugf("Updated window size from %v to %v due to remote window change.", currSize, lastSize)
|
||||
case <-ns.closer.C:
|
||||
return
|
||||
}
|
||||
|
|
|
@ -134,11 +134,11 @@ func (l *FileLog) SearchEvents(fromUTC, toUTC time.Time, query string, limit int
|
|||
// how many days of logs to search?
|
||||
days := int(toUTC.Sub(fromUTC).Hours() / 24)
|
||||
if days < 0 {
|
||||
return nil, trace.BadParameter("query", query)
|
||||
return nil, trace.BadParameter("invalid days")
|
||||
}
|
||||
queryVals, err := url.ParseQuery(query)
|
||||
if err != nil {
|
||||
return nil, trace.BadParameter("missing parameter query", query)
|
||||
return nil, trace.BadParameter("invalid query")
|
||||
}
|
||||
filtered, err := l.matchingFiles(fromUTC, toUTC)
|
||||
if err != nil {
|
||||
|
|
|
@ -188,7 +188,7 @@ func (h *portForwardProxy) forwardStreamPair(p *httpStreamPair, remotePort int64
|
|||
headers.Set(StreamType, StreamTypeData)
|
||||
dataStream, err := h.targetConn.CreateStream(headers)
|
||||
if err != nil {
|
||||
return trace.ConnectionProblem(err, "error creating forwarding stream for port -> %d: %v", remotePort)
|
||||
return trace.ConnectionProblem(err, "error creating forwarding stream for port -> %d: %v", remotePort, err)
|
||||
}
|
||||
defer dataStream.Close()
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ func (p *clusterPeers) pickPeer() (*clusterPeer, error) {
|
|||
}
|
||||
}
|
||||
if currentPeer == nil {
|
||||
return nil, trace.NotFound("no active peers found for %v")
|
||||
return nil, trace.NotFound("no active peers found for %v", p.clusterName)
|
||||
}
|
||||
return currentPeer, nil
|
||||
}
|
||||
|
@ -159,7 +159,7 @@ type clusterPeer struct {
|
|||
}
|
||||
|
||||
func (s *clusterPeer) CachingAccessPoint() (auth.AccessPoint, error) {
|
||||
return nil, trace.ConnectionProblem(nil, "unable to fetch access point, this proxy %v has not been discovered yet, try again later")
|
||||
return nil, trace.ConnectionProblem(nil, "unable to fetch access point, this proxy %v has not been discovered yet, try again later", s)
|
||||
}
|
||||
|
||||
func (s *clusterPeer) GetClient() (auth.ClientI, error) {
|
||||
|
|
|
@ -637,7 +637,7 @@ func (s *Server) serveAgent(ctx *srv.ServerContext) error {
|
|||
socketPath := filepath.Join(socketDir, fmt.Sprintf("teleport-%v.socket", pid))
|
||||
if err := os.Chown(socketDir, uid, gid); err != nil {
|
||||
if err := dirCloser.Close(); err != nil {
|
||||
log.Warn("failed to remove directory: %v", err)
|
||||
log.Warnf("failed to remove directory: %v", err)
|
||||
}
|
||||
return trace.ConvertSystemError(err)
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ func ParseSigningKeyStorePEM(keyPEM, certPEM string) (*SigningKeyStore, error) {
|
|||
}
|
||||
rsaKey, ok := key.(*rsa.PrivateKey)
|
||||
if !ok {
|
||||
return nil, trace.BadParameter("key of type %T is not supported, only RSA keys are supported for signatures")
|
||||
return nil, trace.BadParameter("key of type %T is not supported, only RSA keys are supported for signatures", key)
|
||||
}
|
||||
certASN, _ := pem.Decode([]byte(certPEM))
|
||||
if certASN == nil {
|
||||
|
|
|
@ -654,7 +654,7 @@ func (h *Handler) oidcLoginWeb(w http.ResponseWriter, r *http.Request, p httprou
|
|||
|
||||
csrfToken, err := csrf.ExtractTokenFromCookie(r)
|
||||
if err != nil {
|
||||
log.Warningf("unable to extract CSRF token from cookie", err)
|
||||
log.Warningf("unable to extract CSRF token from cookie: %v", err)
|
||||
return nil, trace.AccessDenied("access denied")
|
||||
}
|
||||
|
||||
|
@ -826,7 +826,7 @@ func (h *Handler) oidcCallback(w http.ResponseWriter, r *http.Request, p httprou
|
|||
if response.Req.CreateWebSession {
|
||||
err = csrf.VerifyToken(response.Req.CSRFToken, r)
|
||||
if err != nil {
|
||||
log.Warningf("[OIDC] unable to verify CSRF token", err)
|
||||
log.Warningf("[OIDC] unable to verify CSRF token: %v", err)
|
||||
return nil, trace.AccessDenied("access denied")
|
||||
}
|
||||
|
||||
|
|
|
@ -117,7 +117,7 @@ func (m *Handler) samlACS(w http.ResponseWriter, r *http.Request, p httprouter.P
|
|||
log.Debugf("redirecting to web browser")
|
||||
err = csrf.VerifyToken(response.Req.CSRFToken, r)
|
||||
if err != nil {
|
||||
l.Warningf("unable to verify CSRF token", err)
|
||||
l.Warningf("unable to verify CSRF token: %v", err)
|
||||
return nil, trace.AccessDenied("access denied")
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue