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

Commit 54d6f72

Browse files
author
Janos Pasztor
committed
0.9.1: SSHServer update
This release adds support for the keyboard-interactive authentication and bumps [sshserver](https://github.com/containerssh/sshserver) to 0.9.16.
1 parent e2781b7 commit 54d6f72

File tree

5 files changed

+185
-30
lines changed

5 files changed

+185
-30
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 0.9.1: SSHServer update
4+
5+
This release adds support for the keyboard-interactive authentication and bumps [sshserver](https://github.com/containerssh/sshserver) to 0.9.16.
6+
37
## 0.9.0: Initial port
48

59
This release is the initial port for metrics from ContainerSSH version 0.3.

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ go 1.14
55
require (
66
github.com/containerssh/geoip v0.9.4
77
github.com/containerssh/metrics v0.9.6
8-
github.com/containerssh/sshserver v0.9.14
8+
github.com/containerssh/sshserver v0.9.16
99
github.com/stretchr/testify v1.6.1
1010
)

‎go.sum‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
github.com/containerssh/geoip v0.9.3 h1:RDj46uxB3Ew7qoTHCUClBDkqULRZJOLxYf/VqPgEuK8=
2+
github.com/containerssh/geoip v0.9.3/go.mod h1:8fyg4eUrKKY0FDyS7GofI6OO7UXDoG1icRtVAHb510k=
3+
github.com/containerssh/geoip v0.9.4 h1:ugkbESJpitdObbSHdYNQfpoFJOlvxwNCX2ZHHnlVJzA=
4+
github.com/containerssh/geoip v0.9.4/go.mod h1:JxyH+hKj7LfoXWmOMR5lQVrNJCpy42N3GNWSPEguq24=
5+
github.com/containerssh/http v0.9.2 h1:ZvGaQy/xxNE+UGavsyp2bYwagz9/s+c11wVQoCQXRY4=
6+
github.com/containerssh/http v0.9.2/go.mod h1:ZuPYt0qDhZ4FRWRf/gUyG/VChNRIMd4N7gSA3Qs3SCI=
7+
github.com/containerssh/http v0.9.4 h1:jgzT8T8hT/gE3PEpdeQl1fC1cm+cAuT7raP8UxEpNPQ=
8+
github.com/containerssh/http v0.9.4/go.mod h1:KTBEbXRSdllIGOb+O6AURBCG+9vCEyo6AI+JCrI94Cw=
9+
github.com/containerssh/http v0.9.5 h1:rkC47g5TShbIls2rSZbFT5SCLNDWeWziAcRb9FLw1YU=
10+
github.com/containerssh/http v0.9.5/go.mod h1:EHEDmrTsA7S0JUnCHVAj1kN0JsQFcbwiTgz9S/uO3tc=
11+
github.com/containerssh/log v0.9.2/go.mod h1:05pgNm7IgFKt+qbZiUhtuJw2B4j3ynn2vSv5j2JA7hA=
12+
github.com/containerssh/log v0.9.6 h1:K3/RjrKnTfT1jBe+9PxMdFrZkLSmXQapZD4wcSFGe5w=
13+
github.com/containerssh/log v0.9.6/go.mod h1:P/tea/If6kzzfqlZdmqNp5SOpD6CD/OvmvcOK+vbweI=
14+
github.com/containerssh/log v0.9.7 h1:T1FxnEtGMbyJJ7C66dDr6k2RwTnSpVGE5U5apr5pB78=
15+
github.com/containerssh/log v0.9.7/go.mod h1:NBMzkhOLZ4z45ShSBKQ/Ij6Hqqg15DgOKy6HlSITx0s=
16+
github.com/containerssh/log v0.9.8 h1:DJfM/um/kXvs2acCWAvSotuwSuiGEsnheFJp6n7wKAI=
17+
github.com/containerssh/log v0.9.8/go.mod h1:NBMzkhOLZ4z45ShSBKQ/Ij6Hqqg15DgOKy6HlSITx0s=
18+
github.com/containerssh/log v0.9.9 h1:JNgeUs5PxCy1qT80RgNSjGBHsS6ukwsKRsZphVJ4yLY=
19+
github.com/containerssh/log v0.9.9/go.mod h1:NBMzkhOLZ4z45ShSBKQ/Ij6Hqqg15DgOKy6HlSITx0s=
20+
github.com/containerssh/metrics v0.9.3 h1:OIXMw4eFi6xbFKtiuwamz2FCa2gFOXOtTHXqGYZzsX0=
21+
github.com/containerssh/metrics v0.9.3/go.mod h1:n5Itoucb/uFRAUevBfnyKFw+il52uYVbDFmV/smgias=
22+
github.com/containerssh/metrics v0.9.6 h1:m4Q6IM8zZsghYCV978ZMqh9TQ6dkLWHDyYA5nHU2kpk=
23+
github.com/containerssh/metrics v0.9.6/go.mod h1:yClAiBuFrIrmxQLyU/AjR1XNbqPIHg+m/Hb2EZrVtRE=
24+
github.com/containerssh/service v0.9.0 h1:JUHqiK12tclq7EWQYGRTfgKKw6fhHs0gxlKWTvVwFlQ=
25+
github.com/containerssh/service v0.9.0/go.mod h1:otAKYF1MWy2eB0K7Sk7YQIECQMTHR3yikbyS1UstGpY=
26+
github.com/containerssh/sshserver v0.9.14 h1:cIc11NbzF2QfnO5SVSgYH6YTBeIORUd9x0chzvaEfrQ=
27+
github.com/containerssh/sshserver v0.9.14/go.mod h1:GOr/SHQvoJpt/yoztX0a9QfKMbixd42GrLZk6YASSvw=
28+
github.com/containerssh/sshserver v0.9.16 h1:vnvYbu2m1Hdzq5mHF883fAz3h6KzD0gYlxyyWIS+vfs=
29+
github.com/containerssh/sshserver v0.9.16/go.mod h1:cMdDoIt0l24KsoaSQezS0aA/891j/gf4QiPjRyDYvyY=
30+
github.com/containerssh/structutils v0.9.0 h1:pz4xl5ZrPnpdSx7B/ru8Fj3oU3vOtx1jprIuSkm5s7o=
31+
github.com/containerssh/structutils v0.9.0/go.mod h1:zirdwNXan3kuTpsJp9Gl3W6VQz0fexqMySqxmfviSjw=
32+
github.com/containerssh/unixutils v0.9.0 h1:9Bh2UiQW6DIuVW6upc1uUU38tKK1IUn2hxZqi9w3cQc=
33+
github.com/containerssh/unixutils v0.9.0/go.mod h1:k1Z/lsIUK95UzrlqRw2JWDDi6LGeL7wG+V+N+TWkCbU=
34+
github.com/creasty/defaults v1.5.1 h1:j8WexcS3d/t4ZmllX4GEkl4wIB/trOr035ajcLHCISM=
35+
github.com/creasty/defaults v1.5.1/go.mod h1:FPZ+Y0WNrbqOVw+c6av63eyHUAl6pMHZwqLPvXUZGfY=
36+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
37+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
38+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
39+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
40+
github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E=
41+
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
42+
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
43+
github.com/google/uuid v1.1.3 h1:twObb+9XcuH5B9V1TBCvvvZoO6iEdILi2a76PYn5rJI=
44+
github.com/google/uuid v1.1.3/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
45+
github.com/google/uuid v1.1.4 h1:0ecGp3skIrHWPNGPJDaBIghfA6Sp7Ruo2Io8eLKzWm0=
46+
github.com/google/uuid v1.1.4/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
47+
github.com/gordonklaus/ineffassign v0.0.0-20200809085317-e36bfde3bb78/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU=
48+
github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
49+
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
50+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
51+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
52+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
53+
github.com/mattn/go-shellwords v1.0.10 h1:Y7Xqm8piKOO3v10Thp7Z36h4FYFjt5xB//6XvOrs2Gw=
54+
github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
55+
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
56+
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
57+
github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug=
58+
github.com/oschwald/geoip2-golang v1.4.0/go.mod h1:8QwxJvRImBH+Zl6Aa6MaIcs5YdlZSTKtzmPGzQqi9ng=
59+
github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls=
60+
github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w=
61+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
62+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
63+
github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494 h1:wSmWgpuccqS2IOfmYrbRiUgv+g37W5suLLLxwwniTSc=
64+
github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494/go.mod h1:yipyliwI08eQ6XwDm1fEwKPdF/xdbkiHtrU+1Hg+vc4=
65+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
66+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
67+
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
68+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
69+
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
70+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
71+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
72+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
73+
golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604=
74+
golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
75+
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
76+
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
77+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
78+
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
79+
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
80+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
81+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
82+
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
83+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
84+
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
85+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
86+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
87+
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
88+
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
89+
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
90+
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
91+
golang.org/x/sys v0.0.0-20201231184435-2d18734c6014 h1:joucsQqXmyBVxViHCPFjG3hx8JzIFSaym3l3MM/Jsdg=
92+
golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
93+
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 h1:nVuTkr9L6Bq62qpUqKo/RnZCFfzDBL0bYo6w9OJUqZY=
94+
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
95+
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
96+
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
97+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
98+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
99+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
100+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
101+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
102+
golang.org/x/tools v0.0.0-20201105001634-bc3cf281b174/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
103+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
104+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
105+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
106+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
107+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
108+
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
109+
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
110+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
111+
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
112+
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
113+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
114+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎handler.go‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ type metricsNetworkHandler struct {
5656
disconnected bool
5757
}
5858

59+
func (m *metricsNetworkHandler) OnShutdown(shutdownContext context.Context) {
60+
m.backend.OnShutdown(shutdownContext)
61+
}
62+
5963
func (m *metricsNetworkHandler) OnAuthPassword(username string, password []byte) (
6064
response sshserver.AuthResponse,
6165
reason error,
@@ -90,6 +94,26 @@ func (m *metricsNetworkHandler) OnAuthPubKey(username string, pubKey string) (
9094
return response, reason
9195
}
9296

97+
func (m *metricsNetworkHandler) OnAuthKeyboardInteractive(
98+
user string,
99+
challenge func(
100+
instruction string,
101+
questions sshserver.KeyboardInteractiveQuestions,
102+
) (answers sshserver.KeyboardInteractiveAnswers, err error),
103+
) (response sshserver.AuthResponse, reason error) {
104+
label := metrics.Label("authtype", "keyboard-interactive")
105+
response, reason = m.backend.OnAuthKeyboardInteractive(user, challenge)
106+
switch response {
107+
case sshserver.AuthResponseSuccess:
108+
m.handler.authSuccessMetric.Increment(m.client.IP, label)
109+
case sshserver.AuthResponseFailure:
110+
m.handler.authFailureMetric.Increment(m.client.IP, label)
111+
case sshserver.AuthResponseUnavailable:
112+
m.handler.authBackendFailureMetric.Increment(label)
113+
}
114+
return response, reason
115+
}
116+
93117
func (m *metricsNetworkHandler) OnHandshakeFailed(reason error) {
94118
m.handler.handshakeFailedMetric.Increment(m.client.IP)
95119
m.backend.OnHandshakeFailed(reason)

‎integration_test.go‎

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package metricsintegration_test
33
import (
44
"context"
55
"fmt"
6-
"io"
76
"net"
87
"testing"
98

@@ -162,6 +161,9 @@ type dummyBackendHandler struct {
162161
authResponse sshserver.AuthResponse
163162
}
164163

164+
func (d *dummyBackendHandler) OnClose() {
165+
}
166+
165167
func (d *dummyBackendHandler) OnReady() error {
166168
return nil
167169
}
@@ -194,6 +196,16 @@ func (d *dummyBackendHandler) OnAuthPubKey(_ string, _ string) (
194196
return d.authResponse, nil
195197
}
196198

199+
func (d *dummyBackendHandler) OnAuthKeyboardInteractive(
200+
_ string,
201+
_ func(
202+
instruction string,
203+
questions sshserver.KeyboardInteractiveQuestions,
204+
) (answers sshserver.KeyboardInteractiveAnswers, err error),
205+
) (response sshserver.AuthResponse, reason error) {
206+
return d.authResponse, nil
207+
}
208+
197209
func (d *dummyBackendHandler) OnHandshakeFailed(_ error) {
198210

199211
}
@@ -216,15 +228,28 @@ func (d *dummyBackendHandler) OnUnsupportedChannel(_ uint64, _ string, _ []byte)
216228
func (d *dummyBackendHandler) OnSessionChannel(
217229
_ uint64,
218230
_ []byte,
231+
session sshserver.SessionChannel,
219232
) (channel sshserver.SessionChannelHandler, failureReason sshserver.ChannelRejection) {
220-
return d, nil
233+
return &dummySession{
234+
session: session,
235+
}, nil
236+
}
237+
238+
type dummySession struct {
239+
session sshserver.SessionChannel
240+
}
241+
242+
func (d *dummySession) OnClose() {
243+
}
244+
245+
func (d *dummySession) OnShutdown(_ context.Context) {
221246
}
222247

223-
func (d *dummyBackendHandler) OnUnsupportedChannelRequest(_ uint64, _ string, _ []byte) {
248+
func (d *dummySession) OnUnsupportedChannelRequest(_ uint64, _ string, _ []byte) {
224249

225250
}
226251

227-
func (d *dummyBackendHandler) OnFailedDecodeChannelRequest(
252+
func (d *dummySession) OnFailedDecodeChannelRequest(
228253
_ uint64,
229254
_ string,
230255
_ []byte,
@@ -233,11 +258,11 @@ func (d *dummyBackendHandler) OnFailedDecodeChannelRequest(
233258

234259
}
235260

236-
func (d *dummyBackendHandler) OnEnvRequest(_ uint64, _ string, _ string) error {
261+
func (d *dummySession) OnEnvRequest(_ uint64, _ string, _ string) error {
237262
return fmt.Errorf("env not supported")
238263
}
239264

240-
func (d *dummyBackendHandler) OnPtyRequest(
265+
func (d *dummySession) OnPtyRequest(
241266
_ uint64,
242267
_ string,
243268
_ uint32,
@@ -249,62 +274,50 @@ func (d *dummyBackendHandler) OnPtyRequest(
249274
return fmt.Errorf("PTY not supported")
250275
}
251276

252-
func (d *dummyBackendHandler) OnExecRequest(
277+
func (d *dummySession) OnExecRequest(
253278
_ uint64,
254279
exec string,
255-
_ io.Reader,
256-
stdout io.Writer,
257-
_ io.Writer,
258-
exit func(exitStatus sshserver.ExitStatus),
259280
) error {
260281
go func() {
261-
_, err := stdout.Write([]byte(fmt.Sprintf("Exec request received: %s", exec)))
282+
_, err := d.session.Stdout().Write([]byte(fmt.Sprintf("Exec request received: %s", exec)))
262283
if err != nil {
263-
exit(2)
284+
d.session.ExitStatus(2)
264285
} else {
265-
exit(0)
286+
d.session.ExitStatus(0)
266287
}
267288
}()
268289
return nil
269290
}
270291

271-
func (d *dummyBackendHandler) OnShell(
292+
func (d *dummySession) OnShell(
272293
_ uint64,
273-
_ io.Reader,
274-
_ io.Writer,
275-
_ io.Writer,
276-
_ func(exitStatus sshserver.ExitStatus),
277294
) error {
278295
return fmt.Errorf("shell not supported")
279296
}
280297

281-
func (d *dummyBackendHandler) OnSubsystem(
298+
func (d *dummySession) OnSubsystem(
282299
_ uint64,
283300
subsystem string,
284-
_ io.Reader,
285-
stdout io.Writer,
286-
_ io.Writer,
287-
exit func(exitStatus sshserver.ExitStatus),
288301
) error {
289302
if subsystem != "sftp" {
290303
return fmt.Errorf("subsystem not supported")
291304
}
292305
go func() {
293-
_, err := stdout.Write([]byte(fmt.Sprintf("Subsystem request received: %s", subsystem)))
306+
_, err := d.session.Stdout().Write([]byte(fmt.Sprintf("Subsystem request received: %s", subsystem)))
294307
if err != nil {
295-
exit(2)
308+
d.session.ExitStatus(2)
296309
} else {
297-
exit(0)
310+
d.session.ExitStatus(0)
298311
}
299312
}()
300313
return nil
301314
}
302315

303-
func (d *dummyBackendHandler) OnSignal(_ uint64, _ string) error {
316+
func (d *dummySession) OnSignal(_ uint64, _ string) error {
304317
return fmt.Errorf("signal not supported")
305318
}
306319

307-
func (d *dummyBackendHandler) OnWindow(
320+
func (d *dummySession) OnWindow(
308321
_ uint64,
309322
_ uint32,
310323
_ uint32,

0 commit comments

Comments
 (0)