Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Sshutil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mirrored_repos
smallstep
Sshutil
Commits
2de209d4
Commit
2de209d4
authored
4 years ago
by
David Cowden
Browse files
Options
Downloads
Patches
Plain Diff
server: polish log messages
Lowercase `server`.
parent
5a5fb95d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server.go
+11
-11
11 additions, 11 deletions
server.go
with
11 additions
and
11 deletions
server.go
+
11
−
11
View file @
2de209d4
...
...
@@ -121,7 +121,7 @@ func (srv *Server) init() error {
return
}
f
:=
ssh
.
FingerprintSHA256
(
signer
.
PublicKey
())
srv
.
L
.
Printf
(
"
S
erver ephermeral key '%s'"
,
f
)
srv
.
L
.
Printf
(
"
s
erver ephermeral key '%s'"
,
f
)
config
.
AddHostKey
(
signer
)
srv
.
Config
=
config
}
...
...
@@ -156,7 +156,7 @@ func (srv *Server) init() error {
// ErrServerClosed is returned from ListenAndServe and Serve when either
// method returnd due to a call to Close or Shutdown.
var
ErrServerClosed
=
errors
.
New
(
"sshutil:
S
erver closed"
)
var
ErrServerClosed
=
errors
.
New
(
"sshutil:
s
erver closed"
)
// ListenAndServe blocks listening on Server.Addr. If Addr is empty, the
// server listens on localhost:22, the ssh port. The returned error is never
...
...
@@ -191,7 +191,7 @@ func (srv *Server) Serve(listener net.Listener) error {
}
defer
srv
.
forgetListener
(
listener
)
srv
.
L
.
Printf
(
"listening on %s"
,
listener
.
Addr
())
srv
.
L
.
Printf
(
"
server
listening on %s"
,
listener
.
Addr
())
// Delay inspired by net/http:
var
delay
time
.
Duration
...
...
@@ -204,7 +204,7 @@ func (srv *Server) Serve(listener net.Listener) error {
if
max
:=
1
*
time
.
Second
;
delay
>
max
{
delay
=
max
}
srv
.
L
.
Printf
(
"
S
erver accept error '%v'; retrying in %v ns"
,
err
,
delay
)
srv
.
L
.
Printf
(
"
s
erver accept error '%v'; retrying in %v ns"
,
err
,
delay
)
time
.
Sleep
(
delay
)
}
...
...
@@ -218,7 +218,7 @@ func (srv *Server) Serve(listener net.Listener) error {
continue
}
addr
:=
listener
.
Addr
()
.
String
()
srv
.
L
.
Printf
(
"
S
erver finished listening on %s"
,
addr
)
srv
.
L
.
Printf
(
"
s
erver finished listening on %s"
,
addr
)
if
srv
.
ShutdownCalled
()
{
return
ErrServerClosed
}
...
...
@@ -272,7 +272,7 @@ func (srv *Server) ShutdownAndWait(ctx context.Context) error {
return
err
}
srv
.
L
.
Println
(
"
S
erver waiting for peer connections to drain..."
)
srv
.
L
.
Println
(
"
s
erver waiting for peer connections to drain..."
)
idle
:=
make
(
chan
struct
{},
1
)
go
func
()
{
srv
.
Idle
.
Wait
()
...
...
@@ -365,7 +365,7 @@ func (srv *Server) handshake(c net.Conn) {
// Before use, a handshake must be performed on the incoming net.Conn.
ssh
,
channels
,
global
,
err
:=
ssh
.
NewServerConn
(
c
,
srv
.
Config
)
if
err
!=
nil
{
srv
.
L
.
Printf
(
"
S
erver handshake failure '%v'"
,
err
)
srv
.
L
.
Printf
(
"
s
erver handshake failure '%v'"
,
err
)
c
.
Close
()
srv
.
Idle
.
Done
()
return
...
...
@@ -397,13 +397,13 @@ func (srv *Server) handshake(c net.Conn) {
func
defaultHandshakeHook
(
conn
*
ServerConn
)
error
{
pk
:=
conn
.
Permissions
.
Extensions
[
"pubkey-fp"
]
conn
.
Server
.
L
.
Printf
(
"
S
erver peer accession '%s'"
,
pk
)
conn
.
Server
.
L
.
Printf
(
"
s
erver peer accession '%s'"
,
pk
)
return
nil
}
func
defaultDepartureHook
(
conn
*
ServerConn
)
{
pk
:=
conn
.
Permissions
.
Extensions
[
"pubkey-fp"
]
conn
.
Server
.
L
.
Printf
(
"
S
erver peer egression '%s'"
,
pk
)
conn
.
Server
.
L
.
Printf
(
"
s
erver peer egression '%s'"
,
pk
)
}
// RequestHandler is called for incoming global requests.
...
...
@@ -452,13 +452,13 @@ func (srv *Server) ssh(conn *ServerConn, channels <-chan ssh.NewChannel) {
unknown
:=
ssh
.
UnknownChannelType
err
:=
candidate
.
Reject
(
unknown
,
"unknown channel type"
)
if
err
!=
nil
{
log
.
Printf
(
"
S
erver error rejecting channel '%s': %v"
,
t
,
err
)
log
.
Printf
(
"
s
erver error rejecting channel '%s': %v"
,
t
,
err
)
}
continue
}
channel
,
requests
,
err
:=
candidate
.
Accept
()
if
err
!=
nil
{
srv
.
L
.
Printf
(
"
S
erver error accepting channel '%s': %v"
,
t
,
err
)
srv
.
L
.
Printf
(
"
s
erver error accepting channel '%s': %v"
,
t
,
err
)
continue
}
ctx
,
cancel
:=
context
.
WithCancel
(
conn
.
Context
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment