mirror of https://github.com/containers/podman.git
fix(deps): update github.com/godbus/dbus/v5 digest to c266b19
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
parent
2385257d08
commit
f3d250cf27
2
go.mod
2
go.mod
|
@ -33,7 +33,7 @@ require (
|
||||||
github.com/docker/go-connections v0.5.0
|
github.com/docker/go-connections v0.5.0
|
||||||
github.com/docker/go-plugins-helpers v0.0.0-20240701071450-45e2431495c8
|
github.com/docker/go-plugins-helpers v0.0.0-20240701071450-45e2431495c8
|
||||||
github.com/docker/go-units v0.5.0
|
github.com/docker/go-units v0.5.0
|
||||||
github.com/godbus/dbus/v5 v5.1.1-0.20240921181615-a817f3cc4a9e
|
github.com/godbus/dbus/v5 v5.1.1-0.20241109141217-c266b19b28e9
|
||||||
github.com/google/gofuzz v1.2.0
|
github.com/google/gofuzz v1.2.0
|
||||||
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
|
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
|
|
4
go.sum
4
go.sum
|
@ -217,8 +217,8 @@ github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncV
|
||||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||||
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
github.com/godbus/dbus/v5 v5.1.1-0.20240921181615-a817f3cc4a9e h1:znsZ+BW06LsAtZwQvY/rgWQ3o1q0mnR4SG4q8HCP+3Q=
|
github.com/godbus/dbus/v5 v5.1.1-0.20241109141217-c266b19b28e9 h1:Kzr9J0S0V2PRxiX6B6xw1kWjzsIyjLO2Ibi4fNTaYBM=
|
||||||
github.com/godbus/dbus/v5 v5.1.1-0.20240921181615-a817f3cc4a9e/go.mod h1:nRJ+j259aT/CW6otoGCHPa1K/lNHLO+UGmW133FNj9s=
|
github.com/godbus/dbus/v5 v5.1.1-0.20241109141217-c266b19b28e9/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
|
||||||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||||
|
|
|
@ -3,6 +3,7 @@ package dbus
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -500,15 +501,26 @@ func (conn *Conn) sendMessageAndIfClosed(msg *Message, ifClosed func()) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isEncodingError(err error) bool {
|
||||||
|
switch err.(type) {
|
||||||
|
case FormatError:
|
||||||
|
return true
|
||||||
|
case InvalidMessageError:
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func (conn *Conn) handleSendError(msg *Message, err error) {
|
func (conn *Conn) handleSendError(msg *Message, err error) {
|
||||||
if msg.Type == TypeMethodCall {
|
if msg.Type == TypeMethodCall {
|
||||||
conn.calls.handleSendError(msg, err)
|
conn.calls.handleSendError(msg, err)
|
||||||
} else if msg.Type == TypeMethodReply {
|
} else if msg.Type == TypeMethodReply {
|
||||||
if _, ok := err.(FormatError); ok {
|
if isEncodingError(err) {
|
||||||
// Make sure that the caller gets some kind of error response if
|
// Make sure that the caller gets some kind of error response if
|
||||||
// the application code tried to respond, but the resulting message
|
// the application code tried to respond, but the resulting message
|
||||||
// was malformed in the end
|
// was malformed in the end
|
||||||
conn.sendError(err, msg.Headers[FieldDestination].value.(string), msg.Headers[FieldReplySerial].value.(uint32))
|
returnedErr := fmt.Errorf("destination tried to respond with invalid message (%w)", err)
|
||||||
|
conn.sendError(returnedErr, msg.Headers[FieldDestination].value.(string), msg.Headers[FieldReplySerial].value.(uint32))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
conn.serialGen.RetireSerial(msg.serial)
|
conn.serialGen.RetireSerial(msg.serial)
|
||||||
|
|
|
@ -644,7 +644,7 @@ github.com/goccy/go-json/internal/encoder/vm_color_indent
|
||||||
github.com/goccy/go-json/internal/encoder/vm_indent
|
github.com/goccy/go-json/internal/encoder/vm_indent
|
||||||
github.com/goccy/go-json/internal/errors
|
github.com/goccy/go-json/internal/errors
|
||||||
github.com/goccy/go-json/internal/runtime
|
github.com/goccy/go-json/internal/runtime
|
||||||
# github.com/godbus/dbus/v5 v5.1.1-0.20240921181615-a817f3cc4a9e
|
# github.com/godbus/dbus/v5 v5.1.1-0.20241109141217-c266b19b28e9
|
||||||
## explicit; go 1.20
|
## explicit; go 1.20
|
||||||
github.com/godbus/dbus/v5
|
github.com/godbus/dbus/v5
|
||||||
# github.com/gogo/protobuf v1.3.2
|
# github.com/gogo/protobuf v1.3.2
|
||||||
|
|
Loading…
Reference in New Issue