Refactor plugin.proto and pluginbase.go to add support for metadata i…

…n connection context
tg123 · Oct 27, 2024 · 9b24dfd · 9b24dfd
1 parent c8ca0c4
commit 9b24dfd
Show file tree

Hide file tree

Showing 5 changed files with 408 additions and 371 deletions.
diff --git a/cmd/sshpiperd/internal/plugin/chain.go b/cmd/sshpiperd/internal/plugin/chain.go
@@ -31,6 +31,16 @@ func (cp *ChainPlugins) Append(p *GrpcPlugin) error {
 func (cp *ChainPlugins) onNextPlugin(challengeCtx ssh.ChallengeContext, upstream *libplugin.UpstreamNextPluginAuth) error {
 	chain := challengeCtx.(*chainConnMeta)
 
+	if upstream.Meta != nil {
+		if chain.Metadata == nil {
+			chain.Metadata = make(map[string]string)
+		}
+
+		for k, v := range upstream.Meta {
+			chain.Metadata[k] = v
+		}
+	}
+
 	if chain.current+1 >= len(cp.pluginsCallback) {
 		return fmt.Errorf("no more plugins")
 	}

diff --git a/cmd/sshpiperd/internal/plugin/grpc.go b/cmd/sshpiperd/internal/plugin/grpc.go
@@ -168,6 +168,7 @@ func (g *GrpcPlugin) CreateChallengeContext(conn ssh.ConnMetadata) (ssh.Challeng
 		UserName: conn.User(),
 		FromAddr: conn.RemoteAddr().String(),
 		UniqId:   uiq.String(),
+		Metadata: make(map[string]string),
 	}
 
 	return &meta, g.NewConnection(&meta)
@@ -180,6 +181,7 @@ func (g *GrpcPlugin) NewConnection(meta *connMeta) error {
 				UserName: meta.UserName,
 				FromAddr: meta.FromAddr,
 				UniqId:   meta.UniqId,
+				Metadata: meta.Metadata,
 			},
 		})