engineering/sshpiper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adopt official non auth callback

Browse source
This commit is contained in:
Boshi Lian 2022-10-22 11:18:47 +00:00
parent 9f53ef51d6
commit 006fcb31da
6 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libplugin/pluginbase.go
View file

@ -41,7 +41,7 @@ type SshPiperPluginConfig struct {
NextAuthMethodsCallback func(conn ConnMetadata) ([]string, error)
NoneAuthCallback func(conn ConnMetadata) (*Upstream, error)
NoClientAuthCallback func(conn ConnMetadata) (*Upstream, error)
PasswordCallback func(conn ConnMetadata, password []byte) (*Upstream, error)
@ -152,7 +152,7 @@ func (s *server) ListCallbacks(ctx context.Context, req *ListCallbackRequest) (*
cb = append(cb, "NextAuthMethods")
}
if s.config.NoneAuthCallback != nil {
if s.config.NoClientAuthCallback != nil {
cb = append(cb, "NoneAuth")
}
@ -221,11 +221,11 @@ func (s *server) NextAuthMethods(ctx context.Context, req *NextAuthMethodsReques
}
func (s *server) NoneAuth(ctx context.Context, req *NoneAuthRequest) (*NoneAuthResponse, error) {
if s.config.NoneAuthCallback == nil {
if s.config.NoClientAuthCallback == nil {
return nil, status.Errorf(codes.Unimplemented, "method NoneAuth not implemented")
}
upstream, err := s.config.NoneAuthCallback(req.Meta)
upstream, err := s.config.NoClientAuthCallback(req.Meta)
if err != nil {
return nil, err
}