Skip to content
This repository has been archived by the owner on Oct 2, 2022. It is now read-only.

Commit

Permalink
0.9.18: Moving to new logger
Browse files Browse the repository at this point in the history
This releaser cleans up logging and moves to the new logger 0.9.11.
  • Loading branch information
Janos Pasztor committed Feb 26, 2021
1 parent 48b379f commit ac844a6
Show file tree
Hide file tree
Showing 11 changed files with 327 additions and 169 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 0.9.18: Moving to new logger

This releaser cleans up logging and moves to the new logger 0.9.11.

## 0.9.17: Fixing shutdown double-call

This release fixes a bug where the OnShutdown function on the handler was called twice.

## 0.9.16: Keyboard-interactive authentication

This release adds support for keyboard-interactive authentication.
Expand Down
11 changes: 11 additions & 0 deletions CODES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Error/message codes

| Code | Explanation |
|------|-------------|
| `SSH_ALREADY_RUNNING` | The SSH service is already running. This is a bug. |
| `SSH_START_FAILED` | Failed to start the SSH service. See the error message for details. |
| `SSH_LISTEN_CLOSE_FAILED` | ContainerSSH could not close the listen socket on shutdown. |
| `SSH_AVAILABLE` | This message informs you that the SSH service is now available at the specified location. |
| `SSH_AUTH_UNAVAILABLE` | The attempted authentication method was not available. |
| `SSH_AUTH_FAILED` | Authentication failed. Multiple of these messages may be issued for a single connection. |
| `SSH_AUTH_SUCCESSFUL` | Authentication attempt successful. |
27 changes: 27 additions & 0 deletions codes.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package sshserver

const (
MConnected = "SSH_CONNECTED"
MDisconnected = "SSH_DISCONNECTED"
EHandshakeFailed = "SSH_HANDSHAKE_FAILED"
MHandshakeSuccessful = "SSH_HANDSHAKE_SUCCESSFUL"
EUnsupportedGlobalRequest = "SSH_UNSUPPORTED_GLOBAL_REQUEST"
EReplyFailed = "SSH_REPLY_SEND_FAILED"
EUnsupportedChannelType = "SSH_UNSUPPORTED_CHANNEL_TYPE"
EAlreadyRunning = "SSH_ALREADY_RUNNING"
EStartFailed = "SSH_START_FAILED"
EListenCloseFailed = "SSH_LISTEN_CLOSE_FAILED"
MNewChannel = "SSH_NEW_CHANNEL"
MNewChannelRejected = "SSH_NEW_CHANNEL_REJECTED"
MServiceAvailable = "SSH_AVAILABLE"
EAuthUnavailable = "SSH_AUTH_UNAVAILABLE"
EAuthFailed = "SSH_AUTH_FAILED"
EAuthSuccessful = "SSH_AUTH_SUCCESSFUL"
EExitCodeFailed = "SSH_EXIT_CODE_FAILED"
EDecodeFailed = "SSH_DECODE_FAILED"
MExit = "SSH_EXIT"
MExitSignal = "SSH_EXIT_SIGNAL"
MChannelRequest = "SSH_CHANNEL_REQUEST"
MChannelRequestFailed = "SSH_CHANNEL_REQUEST_FAILED"
MChannelRequestSuccessful = "SSH_CHANNEL_REQUEST_SUCCESSFUL"
)
2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type Config struct {
// KexAlgorithms are the key exchange algorithms offered to the client.
KexAlgorithms []Kex `json:"kex" yaml:"kex" default:"[\"curve25519-sha256@libssh.org\",\"ecdh-sha2-nistp521\",\"ecdh-sha2-nistp384\",\"ecdh-sha2-nistp256\"]" comment:"Key exchange algorithms to use"`
// MACs are the MAC algorithms offered to the client.
MACs []MAC `json:"macs" yaml:"macs" default:"[\"hmac-sha2-256-etm@openssh.com\",\"hmac-sha2-256\",\"hmac-sha1\",\"hmac-sha1-96\"]" comment:"MAC algorithms to use"`
MACs []MAC `json:"macs" yaml:"macs" default:"[\"hmac-sha2-256-etm@openssh.com\",\"hmac-sha2-256\"]" comment:"MAC algorithms to use"`
// Banner is the banner sent to the client on connecting.
Banner string `json:"banner" yaml:"banner" comment:"Host banner to show after the username" default:""`
// HostKeys are the host keys either in PEM format, or filenames to load.
Expand Down
10 changes: 4 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@ module github.com/containerssh/sshserver
go 1.14

require (
github.com/containerssh/log v0.9.9
github.com/containerssh/service v0.9.0
github.com/containerssh/log v0.9.11
github.com/containerssh/service v0.9.2
github.com/containerssh/structutils v0.9.0
github.com/containerssh/unixutils v0.9.0
github.com/google/uuid v1.1.4
github.com/stretchr/testify v1.6.1
github.com/google/uuid v1.2.0
github.com/stretchr/testify v1.7.0
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 // indirect
)

replace (
github.com/containerssh/log v0.9.2 => github.com/containerssh/log v0.9.9
github.com/stretchr/testify v1.4.0 => github.com/stretchr/testify v1.6.1
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 => golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 => golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 => golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
Expand Down
18 changes: 11 additions & 7 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
github.com/containerssh/log v0.9.9 h1:JNgeUs5PxCy1qT80RgNSjGBHsS6ukwsKRsZphVJ4yLY=
github.com/containerssh/log v0.9.9/go.mod h1:NBMzkhOLZ4z45ShSBKQ/Ij6Hqqg15DgOKy6HlSITx0s=
github.com/containerssh/service v0.9.0 h1:JUHqiK12tclq7EWQYGRTfgKKw6fhHs0gxlKWTvVwFlQ=
github.com/containerssh/service v0.9.0/go.mod h1:otAKYF1MWy2eB0K7Sk7YQIECQMTHR3yikbyS1UstGpY=
github.com/containerssh/log v0.9.10/go.mod h1:NBMzkhOLZ4z45ShSBKQ/Ij6Hqqg15DgOKy6HlSITx0s=
github.com/containerssh/log v0.9.11 h1:CLpl9mhxBg4giLZjcZB+FjddYypm2f2x1bCY3iissdA=
github.com/containerssh/log v0.9.11/go.mod h1:uVuUPoZsJYi2KoV9+lgPeB/gWuXeUTD3AoVxc4y+tKY=
github.com/containerssh/service v0.9.2 h1:+EZ7s7sxSme+IosYBR24oNhVlPTz3GJTXBZ0HaSD9rU=
github.com/containerssh/service v0.9.2/go.mod h1:nbA2I+GL0vU7ls0JEQKI+QOJfbUjlIDmmUSQqx/G7ro=
github.com/containerssh/structutils v0.9.0 h1:pz4xl5ZrPnpdSx7B/ru8Fj3oU3vOtx1jprIuSkm5s7o=
github.com/containerssh/structutils v0.9.0/go.mod h1:zirdwNXan3kuTpsJp9Gl3W6VQz0fexqMySqxmfviSjw=
github.com/containerssh/unixutils v0.9.0 h1:9Bh2UiQW6DIuVW6upc1uUU38tKK1IUn2hxZqi9w3cQc=
Expand All @@ -11,8 +12,8 @@ github.com/creasty/defaults v1.5.1/go.mod h1:FPZ+Y0WNrbqOVw+c6av63eyHUAl6pMHZwqL
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/google/uuid v1.1.4 h1:0ecGp3skIrHWPNGPJDaBIghfA6Sp7Ruo2Io8eLKzWm0=
github.com/google/uuid v1.1.4/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
Expand All @@ -27,8 +28,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494 h1:wSmWgpuccqS2IOfmYrbRiUgv+g37W5suLLLxwwniTSc=
github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494/go.mod h1:yipyliwI08eQ6XwDm1fEwKPdF/xdbkiHtrU+1Hg+vc4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
Expand All @@ -41,6 +44,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
Expand Down
Loading

0 comments on commit ac844a6

Please sign in to comment.