Update IGL for Notifications Changes

Synchronize codebase against latest version of
Icinga/icinga-go-library#145, containing package changes.

Author: oxzi

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6
 	github.com/emersion/go-smtp v0.24.0
 	github.com/google/uuid v1.6.0
-	github.com/icinga/icinga-go-library v0.7.3-0.20250807134650-55c038b220d8
+	github.com/icinga/icinga-go-library v0.7.3-0.20250904130608-5032573a325e
 	github.com/jhillyerd/enmime v1.3.0
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd

go.sum

@@ -35,10 +35,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/icinga/icinga-go-library v0.7.2 h1:6ilUeE9F9OqxxJXNR9URWDf6zOqsdhjjR9w1MUXY9Kg=
-github.com/icinga/icinga-go-library v0.7.2/go.mod h1:HZTiYD+N+9FZIVpPdUEJWJnc6sLvrIRO03jvkdkmUEU=
-github.com/icinga/icinga-go-library v0.7.3-0.20250807134650-55c038b220d8 h1:YStwl7OlLUN87ROcZ8LQRTDKBhEx0V7EX5+5OMRwEnM=
-github.com/icinga/icinga-go-library v0.7.3-0.20250807134650-55c038b220d8/go.mod h1:6xgV9o7JcGVg2I6CzPfefQZF4Ev8QeZnysiu82YaRY4=
+github.com/icinga/icinga-go-library v0.7.3-0.20250904130608-5032573a325e h1:yZPWPPCHKozWRm9VedDHd8igJh9uI4U2CJdgl1On+/4=
+github.com/icinga/icinga-go-library v0.7.3-0.20250904130608-5032573a325e/go.mod h1:exEJdfik2GPYrvZM6Gn4BXIBLIGg6OrCCMnILT+mTUs=
 github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA=
 github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=

internal/config/runtime.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"github.com/icinga/icinga-go-library/database"
 	"github.com/icinga/icinga-go-library/logging"
-	"github.com/icinga/icinga-go-library/notifications"
+	"github.com/icinga/icinga-go-library/notifications/source"
 	"github.com/icinga/icinga-go-library/types"
 	"github.com/icinga/icinga-notifications/internal/channel"
 	"github.com/icinga/icinga-notifications/internal/recipient"
@@ -171,17 +171,17 @@ func (r *RuntimeConfig) GetRuleEscalation(escalationID int64) *rule.Escalation {
 // If the source does not have any rules associated with it, the version will be set to notifications.EmptyRulesVersion.
 //
 // May not be called while holding the write lock on the RuntimeConfig.
-func (r *RuntimeConfig) GetRulesVersionFor(source int64) string {
+func (r *RuntimeConfig) GetRulesVersionFor(srcId int64) string {
 	r.RLock()
 	defer r.RUnlock()
 
 	if r.RulesBySource != nil {
-		if sourceInfo, ok := r.RulesBySource[source]; ok && sourceInfo.Version > 0 {
+		if sourceInfo, ok := r.RulesBySource[srcId]; ok && sourceInfo.Version > 0 {
 			return fmt.Sprintf("%x", sourceInfo.Version)
 		}
 	}
 
-	return notifications.EmptyRulesVersion
+	return source.EmptyRulesVersion
 }
 
 // GetContact returns *recipient.Contact by the given username (case-insensitive).
@@ -215,20 +215,20 @@ func (r *RuntimeConfig) GetSourceFromCredentials(user, pass string, logger *logg
 		return nil
 	}
 
-	source, ok := r.Sources[sourceId]
+	src, ok := r.Sources[sourceId]
 	if !ok {
 		logger.Debugw("Cannot check credentials for unknown source ID", zap.Int64("id", sourceId))
 		return nil
 	}
 
-	if !source.ListenerPasswordHash.Valid {
+	if !src.ListenerPasswordHash.Valid {
 		logger.Debugw("Cannot check credentials for source without a listener_password_hash", zap.Int64("id", sourceId))
 		return nil
 	}
 
 	// If either PHP's PASSWORD_DEFAULT changes or Icinga Web 2 starts using something else, e.g., Argon2id, this will
 	// return a descriptive error as the identifier does no longer match the bcrypt "$2y$".
-	err = bcrypt.CompareHashAndPassword([]byte(source.ListenerPasswordHash.String), []byte(pass))
+	err = bcrypt.CompareHashAndPassword([]byte(src.ListenerPasswordHash.String), []byte(pass))
 	if errors.Is(err, bcrypt.ErrMismatchedHashAndPassword) {
 		logger.Debugw("Invalid password for this source", zap.Int64("id", sourceId))
 		return nil
@@ -237,7 +237,7 @@ func (r *RuntimeConfig) GetSourceFromCredentials(user, pass string, logger *logg
 		return nil
 	}
 
-	return source
+	return src
 }
 
 func (r *RuntimeConfig) fetchFromDatabase(ctx context.Context) error {

internal/listener/listener.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"github.com/icinga/icinga-go-library/database"
 	"github.com/icinga/icinga-go-library/logging"
-	"github.com/icinga/icinga-go-library/notifications"
 	baseEv "github.com/icinga/icinga-go-library/notifications/event"
+	"github.com/icinga/icinga-go-library/notifications/source"
 	"github.com/icinga/icinga-notifications/internal"
 	"github.com/icinga/icinga-notifications/internal/config"
 	"github.com/icinga/icinga-notifications/internal/daemon"
@@ -124,30 +124,30 @@ func (l *Listener) ProcessEvent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	source, validAuth := l.sourceFromAuthOrAbort(w, r)
+	src, validAuth := l.sourceFromAuthOrAbort(w, r)
 	if !validAuth {
 		return
 	}
 
-	ruleIdsStr := r.Header.Get(notifications.XIcingaRulesId)
-	ruleVersion := r.Header.Get(notifications.XIcingaRulesVersion)
+	ruleIdsStr := r.Header.Get(source.XIcingaRulesId)
+	ruleVersion := r.Header.Get(source.XIcingaRulesVersion)
 
 	// If the client uses an outdated rules version, reject the request but send also the current rules version
 	// and rules for this source back to the client, so it can retry the request with the updated rules.
-	if latestRuleVersion := l.runtimeConfig.GetRulesVersionFor(source.ID); ruleVersion != latestRuleVersion {
+	if latestRuleVersion := l.runtimeConfig.GetRulesVersionFor(src.ID); ruleVersion != latestRuleVersion {
 		w.WriteHeader(http.StatusPreconditionFailed)
-		l.writeSourceRulesInfo(w, source)
+		l.writeSourceRulesInfo(w, src)
 
 		l.logger.Debugw("Abort event processing due to outdated rules version",
 			zap.String("current_version", latestRuleVersion),
 			zap.String("provided_version", ruleVersion),
-			zap.String("source", source.Name))
+			zap.String("source", src.Name))
 		return
 	}
 
 	var ev event.Event
 	if err := ev.LoadMatchedRulesFromString(ruleIdsStr); err != nil {
-		abort(http.StatusBadRequest, nil, "cannot parse %s header: %v", notifications.XIcingaRulesId, err)
+		abort(http.StatusBadRequest, nil, "cannot parse %s header: %v", source.XIcingaRulesId, err)
 		return
 	}
 
@@ -157,7 +157,7 @@ func (l *Listener) ProcessEvent(w http.ResponseWriter, r *http.Request) {
 	}
 
 	ev.Time = time.Now()
-	ev.SourceId = source.ID
+	ev.SourceId = src.ID
 	if ev.Type == baseEv.TypeUnknown {
 		ev.Type = baseEv.TypeState
 	} else if !ev.Mute.Valid && ev.Type == baseEv.TypeMute {