feat: NewWorkConn server plugin hook
This commit is contained in:
parent
d47f6eea91
commit
63faf5204d
@ -24,15 +24,18 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Manager struct {
|
type Manager struct {
|
||||||
loginPlugins []Plugin
|
loginPlugins []Plugin
|
||||||
newProxyPlugins []Plugin
|
newProxyPlugins []Plugin
|
||||||
pingPlugins []Plugin
|
pingPlugins []Plugin
|
||||||
|
newWorkConnPlugins []Plugin
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewManager() *Manager {
|
func NewManager() *Manager {
|
||||||
return &Manager{
|
return &Manager{
|
||||||
loginPlugins: make([]Plugin, 0),
|
loginPlugins: make([]Plugin, 0),
|
||||||
newProxyPlugins: make([]Plugin, 0),
|
newProxyPlugins: make([]Plugin, 0),
|
||||||
|
pingPlugins: make([]Plugin, 0),
|
||||||
|
newWorkConnPlugins: make([]Plugin, 0),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,6 +49,9 @@ func (m *Manager) Register(p Plugin) {
|
|||||||
if p.IsSupport(OpPing) {
|
if p.IsSupport(OpPing) {
|
||||||
m.pingPlugins = append(m.pingPlugins, p)
|
m.pingPlugins = append(m.pingPlugins, p)
|
||||||
}
|
}
|
||||||
|
if p.IsSupport(OpNewWorkConn) {
|
||||||
|
m.pingPlugins = append(m.pingPlugins, p)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Manager) Login(content *LoginContent) (*LoginContent, error) {
|
func (m *Manager) Login(content *LoginContent) (*LoginContent, error) {
|
||||||
@ -137,3 +143,33 @@ func (m *Manager) Ping(content *PingContent) (*PingContent, error) {
|
|||||||
}
|
}
|
||||||
return content, nil
|
return content, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *Manager) NewWorkConn(content *NewWorkConnContent) (*NewWorkConnContent, error) {
|
||||||
|
var (
|
||||||
|
res = &Response{
|
||||||
|
Reject: false,
|
||||||
|
Unchange: true,
|
||||||
|
}
|
||||||
|
retContent interface{}
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
reqid, _ := util.RandId()
|
||||||
|
xl := xlog.New().AppendPrefix("reqid: " + reqid)
|
||||||
|
ctx := xlog.NewContext(context.Background(), xl)
|
||||||
|
ctx = NewReqidContext(ctx, reqid)
|
||||||
|
|
||||||
|
for _, p := range m.pingPlugins {
|
||||||
|
res, retContent, err = p.Handle(ctx, OpPing, *content)
|
||||||
|
if err != nil {
|
||||||
|
xl.Warn("send NewWorkConn request to plugin [%s] error: %v", p.Name(), err)
|
||||||
|
return nil, errors.New("send NewWorkConn request to plugin error")
|
||||||
|
}
|
||||||
|
if res.Reject {
|
||||||
|
return nil, fmt.Errorf("%s", res.RejectReason)
|
||||||
|
}
|
||||||
|
if !res.Unchange {
|
||||||
|
content = retContent.(*NewWorkConnContent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return content, nil
|
||||||
|
}
|
||||||
|
@ -21,9 +21,10 @@ import (
|
|||||||
const (
|
const (
|
||||||
APIVersion = "0.1.0"
|
APIVersion = "0.1.0"
|
||||||
|
|
||||||
OpLogin = "Login"
|
OpLogin = "Login"
|
||||||
OpNewProxy = "NewProxy"
|
OpNewProxy = "NewProxy"
|
||||||
OpPing = "Ping"
|
OpPing = "Ping"
|
||||||
|
OpNewWorkConn = "NewWorkConn"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Plugin interface {
|
type Plugin interface {
|
||||||
|
@ -50,3 +50,8 @@ type PingContent struct {
|
|||||||
User UserInfo `json:"user"`
|
User UserInfo `json:"user"`
|
||||||
msg.Ping
|
msg.Ping
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type NewWorkConnContent struct {
|
||||||
|
User UserInfo `json:"user"`
|
||||||
|
msg.NewWorkConn
|
||||||
|
}
|
||||||
|
@ -457,13 +457,27 @@ func (svr *Service) RegisterWorkConn(workConn net.Conn, newMsg *msg.NewWorkConn)
|
|||||||
xl.Warn("No client control found for run id [%s]", newMsg.RunId)
|
xl.Warn("No client control found for run id [%s]", newMsg.RunId)
|
||||||
return fmt.Errorf("no client control found for run id [%s]", newMsg.RunId)
|
return fmt.Errorf("no client control found for run id [%s]", newMsg.RunId)
|
||||||
}
|
}
|
||||||
// Check auth.
|
// server plugin hook
|
||||||
if err := svr.authVerifier.VerifyNewWorkConn(newMsg); err != nil {
|
content := &plugin.NewWorkConnContent{
|
||||||
xl.Warn("Invalid authentication in NewWorkConn message on run id [%s]", newMsg.RunId)
|
User: plugin.UserInfo{
|
||||||
|
User: ctl.loginMsg.User,
|
||||||
|
Metas: ctl.loginMsg.Metas,
|
||||||
|
RunId: ctl.loginMsg.RunId,
|
||||||
|
},
|
||||||
|
NewWorkConn: *newMsg,
|
||||||
|
}
|
||||||
|
retContent, err := svr.pluginManager.NewWorkConn(content)
|
||||||
|
if err == nil {
|
||||||
|
newMsg = &retContent.NewWorkConn
|
||||||
|
// Check auth.
|
||||||
|
err = svr.authVerifier.VerifyNewWorkConn(newMsg)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
xl.Warn("invalid NewWorkConn with run id [%s]", newMsg.RunId)
|
||||||
msg.WriteMsg(workConn, &msg.StartWorkConn{
|
msg.WriteMsg(workConn, &msg.StartWorkConn{
|
||||||
Error: "invalid authentication in NewWorkConn",
|
Error: util.GenerateResponseErrorString("invalid NewWorkConn", err, ctl.serverCfg.DetailedErrorsToClient),
|
||||||
})
|
})
|
||||||
return fmt.Errorf("invalid authentication in NewWorkConn message on run id [%s]", newMsg.RunId)
|
return fmt.Errorf("invalid NewWorkConn with run id [%s]", newMsg.RunId)
|
||||||
}
|
}
|
||||||
return ctl.RegisterWorkConn(workConn)
|
return ctl.RegisterWorkConn(workConn)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user