Merge branch 'main' of gitlab.autonubil.net:go/go-wazuh into main

ossec/agent.go

@@ -581,6 +581,10 @@ func (a *Client) pingServer() error {
 }
 
 func (a *Client) writeMessage(msg string) error {
+ if a.conn == nil {
+ return fmt.Errorf("client is not connected")
+ }
+
  encryptedMsg, msgSize := a.cryptMsg(msg)
  a.evtCount++
 
@@ -659,6 +663,10 @@ func (a *Client) sendMessage(msg string, readTimeout time.Duration) error {
 }
 
 func (a *Client) readServerResponse(timeout time.Duration) error {
+ if a.conn == nil {
+ return fmt.Errorf("client is not connected")
+ }
+
  var buf bytes.Buffer
  buffer := make([]byte, maxBufferSize)
  totallyRead := 0

ossec/agent_keys.go

@@ -103,6 +103,21 @@ func LoadAgentKeyMap(filename string) (AgentKeyMap, error) {
 }
 
 func (a *AgentKey) WriteAgentKey(filename string) error {
+ if a == nil {
+ return errors.New("key is null")
+ }
+ if a.AgentID == "" {
+ return errors.New("agent id is empty")
+ }
+ if a.AgentName == "" {
+ return errors.New("agent name is empty")
+ }
+ if a.AgentKey == "" {
+ return errors.New("agent key is empty")
+ }
+ if a.AgentAllowedIPs == "" {
+ return errors.New("agent allowed ips is empty")
+ }
  if filename == "" {
  filename = "/etc/client.keys"
  }

ossec/authd.go

@@ -63,53 +63,50 @@ func InitAgent(cfg *EnrollmentConfig) (*AgentKey, error) {
  } else {
  keyFile = "/var/ossec/etc/client.keys"
  }
+ //ensure path...
+ path := filepath.Dir(keyFile)
+ if _, err := os.Stat(path); os.IsNotExist(err) {
+ err = os.MkdirAll(path, os.ModePerm)
+ if err != nil {
+ if cfg.logger != nil {
+ cfg.logger.Error("register agent - create path", zap.String("authdServer", cfg.ManagerName), zap.String("agentID", cfg.AgentName), zap.String("agentIP", cfg.AgentIP), zap.String("keyfile", keyFile), zap.Error(err))
+ }
+ return nil, err
+ }
+ }
 
  hostname, err := DefaultAgentName()
  if err != nil {
  return nil, err
  }
 
- if cfg.AuthPass != "" {
-
- agentKey, err := GetAgentKeyFromFile(hostname, keyFile)
- keyMapValid := err == nil && agentKey != nil
-
- if !keyMapValid {
- var err2 error
- // Try to register agent
-
- //ensure path...
- path := filepath.Dir(keyFile)
- if _, err2 = os.Stat(path); os.IsNotExist(err2) {
- err2 = os.MkdirAll(path, os.ModePerm)
- if err2 != nil {
- if cfg.logger != nil {
- cfg.logger.Error("register agent - create path", zap.String("authdServer", cfg.ManagerName), zap.String("agentID", cfg.AgentName), zap.String("agentIP", cfg.AgentIP), zap.String("keyfile", keyFile), zap.Error(err2))
- }
- return nil, err
- }
- }
+ agentKey, err := GetAgentKeyFromFile(hostname, keyFile)
+ keyMapValid := err == nil && agentKey != nil
 
+ if !keyMapValid && cfg.AuthPass != "" {
+ var err2 error
+ // Try to register agent
+ agentKey, err2 = RegisterAgent(cfg)
+ if err2 == nil && agentKey != nil {
+ // persist new key
  err2 = agentKey.WriteAgentKey(keyFile)
  if err2 != nil {
  if cfg.logger != nil {
  cfg.logger.Error("register agent - write key file", zap.String("authdServer", cfg.ManagerName), zap.String("agentID", cfg.AgentName), zap.String("agentIP", cfg.AgentIP), zap.String("path", path), zap.String("keyfile", keyFile), zap.Error(err2))
  }
  return nil, err
  }
+ agentKey, err = GetAgentKeyFromFile(hostname, keyFile)
+ if err != nil {
+ return nil, err
+ }
  }
  }
 
- agentInfo, err := GetAgentKeyFromFile(hostname, keyFile)
- if err != nil {
- return nil, err
- }
-
- if agentInfo == nil {
+ if agentKey == nil {
  return nil, errors.New("no agent key configured")
  }
- return agentInfo, nil
-
+ return agentKey, nil
 }
 
 // NewEnrollmentConfig initialize new enrolment config