From 8596fb52c07df56fab781a8c698bace366b4d557 Mon Sep 17 00:00:00 2001 From: Janos Pasztor Date: Thu, 1 Apr 2021 17:02:10 +0200 Subject: [PATCH] 1.0.0: First stable release This is the first stable release for ContainerSSH 0.4.0. --- CHANGELOG.md | 4 ++++ go.mod | 17 ++++++++--------- go.sum | 26 ++++++++++++++++++++++++++ integration_test.go | 17 +---------------- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1df9dff..4832290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.0: First stable release + +This is the first stable release for ContainerSSH 0.4.0. + ## 0.9.4: Metrics support for auth This version adds metrics support for auth. diff --git a/go.mod b/go.mod index 8f6c394..dbbfc81 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,18 @@ module github.com/containerssh/authintegration go 1.14 require ( - github.com/containerssh/auth v0.9.6 - github.com/containerssh/geoip v0.9.4 - github.com/containerssh/http v0.9.9 - github.com/containerssh/log v0.9.13 - github.com/containerssh/metrics v0.9.8 - github.com/containerssh/service v0.9.3 - github.com/containerssh/sshserver v0.9.20 - github.com/containerssh/structutils v0.9.0 + github.com/containerssh/auth v1.0.0 + github.com/containerssh/geoip v1.0.0 + github.com/containerssh/http v1.0.0 + github.com/containerssh/log v1.0.0 + github.com/containerssh/metrics v1.0.0 + github.com/containerssh/service v1.0.0 + github.com/containerssh/sshserver v1.0.0 + github.com/containerssh/structutils v1.0.0 github.com/imdario/mergo v0.3.12 // indirect github.com/mattn/go-shellwords v1.0.11 // indirect github.com/stretchr/testify v1.7.0 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 - golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect ) // Fixes CVE-2020-9283 diff --git a/go.sum b/go.sum index 00bf864..2731ccb 100644 --- a/go.sum +++ b/go.sum @@ -1,25 +1,43 @@ github.com/containerssh/auth v0.9.6 h1:vHF59sawna5ELsHHaZl5BLHvbjjwcsbd908Tw24l1yQ= github.com/containerssh/auth v0.9.6/go.mod h1:CULF3udHpQo6zp99poF6i7dq5BEguRiqL+BYLaFT91c= +github.com/containerssh/auth v1.0.0 h1:6ZlLfj7+WsNIc5xJpdwoWvxgyVA19BQqzEtXYCfdkRA= +github.com/containerssh/auth v1.0.0/go.mod h1:EHYcedk9tDAK+5YvB6thc8WDmAaqNmki+E9VQYfI7MU= github.com/containerssh/geoip v0.9.4 h1:ugkbESJpitdObbSHdYNQfpoFJOlvxwNCX2ZHHnlVJzA= github.com/containerssh/geoip v0.9.4/go.mod h1:JxyH+hKj7LfoXWmOMR5lQVrNJCpy42N3GNWSPEguq24= +github.com/containerssh/geoip v1.0.0 h1:7igZyJW9g6jwBhoYqCOVQ9hRXbW1p0DNyiz0/bXL0qY= +github.com/containerssh/geoip v1.0.0/go.mod h1:W6gNUH6EXmYb5Tk0EG5Qp57YsySLxmQGCMlYufinYuo= github.com/containerssh/http v0.9.9 h1:28F8tw0pcwVUS3ClpvsaTVyCKvARLP8R4zqdbVQMrjo= github.com/containerssh/http v0.9.9/go.mod h1:138EGp1m2eSk+MIPD837NAVMNzExedP5VvEnWl5B2gk= +github.com/containerssh/http v1.0.0 h1:tHkqLI5gAD3l4uxcJLYub/SMhExglXHJPpfnNnXFxQk= +github.com/containerssh/http v1.0.0/go.mod h1:tHVp3sGCX1J7NITtgn67aVQhj7QJv8s+KNrWeey/CSc= github.com/containerssh/log v0.9.10/go.mod h1:NBMzkhOLZ4z45ShSBKQ/Ij6Hqqg15DgOKy6HlSITx0s= github.com/containerssh/log v0.9.13 h1:jBSrFaxZNGwkjHU6y/efYI8lyG8KIFR5aOIeOnNzquE= github.com/containerssh/log v0.9.13/go.mod h1:uVuUPoZsJYi2KoV9+lgPeB/gWuXeUTD3AoVxc4y+tKY= +github.com/containerssh/log v1.0.0 h1:nOSqNqh7cXIa+Iy+Lx2CA+wpkrqDqcQh4EVoEvSaxU8= +github.com/containerssh/log v1.0.0/go.mod h1:7Gy+sx0H1UDtjYBySvK0CnXRRHPHZPXMsa9MYmLBI0I= github.com/containerssh/metrics v0.9.8 h1:dJNb21Nd0IJxE1bEOevOrnwSinaMLuiZATwix0v4GxI= github.com/containerssh/metrics v0.9.8/go.mod h1:+CIKiJ+XxdVUcnNwe2noB15YM4VR/hp3zQ4/vE1dHuI= +github.com/containerssh/metrics v1.0.0 h1:F7VLIzqZLrTJ6ayxoVtBZQ4kyHiE1AIYOOwZ3+8yNko= +github.com/containerssh/metrics v1.0.0/go.mod h1:4k7i71jHFJVpeBL+6uU6h5p/E0suHK+YF0KFZs5rCqs= github.com/containerssh/service v0.9.2/go.mod h1:nbA2I+GL0vU7ls0JEQKI+QOJfbUjlIDmmUSQqx/G7ro= github.com/containerssh/service v0.9.3 h1:mYpvZ9zxUrKL8OpBen86heXfGtdUGdtfZ3Y7P605zvQ= github.com/containerssh/service v0.9.3/go.mod h1:Yeq3hwfM6js9TfpkrQAQhv5IRfurrGEkM+AbFEC9KCE= +github.com/containerssh/service v1.0.0 h1:+AcBsmeaR0iMDnemXJ6OgeTEYB3C0YJF3h03MNIo1Ak= +github.com/containerssh/service v1.0.0/go.mod h1:FmYg3jc56WBvxyx5rvXCkJbIsmweNTeYSr/9z2n2qsI= github.com/containerssh/sshserver v0.9.19 h1:QSpREx9owneSvJPpKe/MDy4DP7zoYfKFemHYD6qaQgY= github.com/containerssh/sshserver v0.9.19/go.mod h1:NA4hs/2nZB9RX5TS4jniYdO08lfXxBFHvRxV/Pf4bW4= github.com/containerssh/sshserver v0.9.20 h1:30ggFd7UiHaoBP7m/6FF0EZk6a8CuBqROdE6DQZ6QMk= github.com/containerssh/sshserver v0.9.20/go.mod h1:yQRp6CLwz3pX/bDDv/bKSF+3SkwTae4+8OaAPVZABRI= +github.com/containerssh/sshserver v1.0.0 h1:BWVngzeQH+gFHVcuJ4tb3iCQg1X8CKnOhF7mLt0V70c= +github.com/containerssh/sshserver v1.0.0/go.mod h1:/gIyl45eM171tg8psNAxSjYsyvW9hclAeG/buO7I40g= github.com/containerssh/structutils v0.9.0 h1:pz4xl5ZrPnpdSx7B/ru8Fj3oU3vOtx1jprIuSkm5s7o= github.com/containerssh/structutils v0.9.0/go.mod h1:zirdwNXan3kuTpsJp9Gl3W6VQz0fexqMySqxmfviSjw= +github.com/containerssh/structutils v1.0.0 h1:XwNSnjmoJpMP8hxX5YbDJRGcU66znRWP5jKUYI2Kh4s= +github.com/containerssh/structutils v1.0.0/go.mod h1:Dp5tCtnkT19A9BFNP4+flL5R+THvBgp95eO640fR+ow= github.com/containerssh/unixutils v0.9.0 h1:9Bh2UiQW6DIuVW6upc1uUU38tKK1IUn2hxZqi9w3cQc= github.com/containerssh/unixutils v0.9.0/go.mod h1:k1Z/lsIUK95UzrlqRw2JWDDi6LGeL7wG+V+N+TWkCbU= +github.com/containerssh/unixutils v1.0.0 h1:V6zwRxOycwpXY3hjjzFVfgV/4vOsqPVJ63rR2V7EYM8= +github.com/containerssh/unixutils v1.0.0/go.mod h1:UK2dMXp9Iy2ILHrcrzOU5jWZDgPkuChyg75wrdcIZjU= github.com/creasty/defaults v1.5.1 h1:j8WexcS3d/t4ZmllX4GEkl4wIB/trOr035ajcLHCISM= github.com/creasty/defaults v1.5.1/go.mod h1:FPZ+Y0WNrbqOVw+c6av63eyHUAl6pMHZwqLPvXUZGfY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -40,8 +58,12 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug= github.com/oschwald/geoip2-golang v1.4.0/go.mod h1:8QwxJvRImBH+Zl6Aa6MaIcs5YdlZSTKtzmPGzQqi9ng= +github.com/oschwald/geoip2-golang v1.5.0 h1:igg2yQIrrcRccB1ytFXqBfOHCjXWIoMv85lVJ1ONZzw= +github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s= github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls= github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w= +github.com/oschwald/maxminddb-golang v1.8.0 h1:Uh/DSnGoxsyp/KYbY1AuP0tYEwfs0sCph9p/UMXK/Hk= +github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494 h1:wSmWgpuccqS2IOfmYrbRiUgv+g37W5suLLLxwwniTSc= @@ -64,6 +86,8 @@ golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa h1:ZYxPR6aca/uhfRJyaOAtflSHj golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 h1:EZ2mChiOa8udjfp6rRmswTbtZN/QzUQp4ptM4rnjHvc= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54 h1:rF3Ohx8DRyl8h2zw9qojyLHLhrJpEMgyPOImREEryf0= +golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -76,3 +100,5 @@ 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= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/integration_test.go b/integration_test.go index fc255e5..60cda54 100644 --- a/integration_test.go +++ b/integration_test.go @@ -141,7 +141,7 @@ func (t *testBackend) OnSessionChannel(_ uint64, _ []byte, _ sshserver.SessionCh _ sshserver.SessionChannelHandler, _ sshserver.ChannelRejection, ) { - return nil, &rejection{} + return nil, sshserver.NewChannelRejection(ssh.UnknownChannelType, log.MTest, "not supported", "not supported") } func (t *testBackend) OnHandshakeFailed(_ error) {} @@ -172,21 +172,6 @@ func (t *testBackend) OnNetworkConnection(_ net.TCPAddr, _ string) ( return t, nil } -type rejection struct { -} - -func (r *rejection) Error() string { - return "not implemented" -} - -func (r *rejection) Message() string { - return "not implemented" -} - -func (r *rejection) Reason() ssh.RejectionReason { - return ssh.UnknownChannelType -} - // endregion // region AuthHandler