Update vendor of containers/common to v0.1.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #2087 Approved by: giuseppe
This commit is contained in:
parent
b09fdc33e8
commit
c46f6e0321
2
go.mod
2
go.mod
|
@ -5,7 +5,7 @@ go 1.12
|
||||||
require (
|
require (
|
||||||
github.com/blang/semver v3.5.0+incompatible // indirect
|
github.com/blang/semver v3.5.0+incompatible // indirect
|
||||||
github.com/containernetworking/cni v0.7.1
|
github.com/containernetworking/cni v0.7.1
|
||||||
github.com/containers/common v0.0.8-0.20200108114752-d87ce6ce296b
|
github.com/containers/common v0.1.0
|
||||||
github.com/containers/image/v5 v5.1.0
|
github.com/containers/image/v5 v5.1.0
|
||||||
github.com/containers/storage v1.15.5
|
github.com/containers/storage v1.15.5
|
||||||
github.com/cyphar/filepath-securejoin v0.2.2
|
github.com/cyphar/filepath-securejoin v0.2.2
|
||||||
|
|
2
go.sum
2
go.sum
|
@ -66,6 +66,8 @@ github.com/containers/common v0.0.8-0.20200106141003-a79791495fd1 h1:udiDqxQSdun
|
||||||
github.com/containers/common v0.0.8-0.20200106141003-a79791495fd1/go.mod h1:lhWV3MLhO1+KGE2x6v9+K38MxpjXGso+edmpkFnCOqI=
|
github.com/containers/common v0.0.8-0.20200106141003-a79791495fd1/go.mod h1:lhWV3MLhO1+KGE2x6v9+K38MxpjXGso+edmpkFnCOqI=
|
||||||
github.com/containers/common v0.0.8-0.20200108114752-d87ce6ce296b h1:G+DKyzrku0fC5Qa3paArNBERTwRleTg45ypY0qjo7YM=
|
github.com/containers/common v0.0.8-0.20200108114752-d87ce6ce296b h1:G+DKyzrku0fC5Qa3paArNBERTwRleTg45ypY0qjo7YM=
|
||||||
github.com/containers/common v0.0.8-0.20200108114752-d87ce6ce296b/go.mod h1:ss8uGpUsaDE4DPmaVFOjzKrlgf5eUnSAWL+d/PYGaoM=
|
github.com/containers/common v0.0.8-0.20200108114752-d87ce6ce296b/go.mod h1:ss8uGpUsaDE4DPmaVFOjzKrlgf5eUnSAWL+d/PYGaoM=
|
||||||
|
github.com/containers/common v0.1.0 h1:RsAxx1yeepYhXXEasNpspi/nPC8KKP1AzzOgEuvfWXk=
|
||||||
|
github.com/containers/common v0.1.0/go.mod h1:ss8uGpUsaDE4DPmaVFOjzKrlgf5eUnSAWL+d/PYGaoM=
|
||||||
github.com/containers/image/v4 v4.0.1 h1:idNGHChj0Pyv3vLrxul2oSVMZLeFqpoq3CjLeVgapSQ=
|
github.com/containers/image/v4 v4.0.1 h1:idNGHChj0Pyv3vLrxul2oSVMZLeFqpoq3CjLeVgapSQ=
|
||||||
github.com/containers/image/v4 v4.0.1/go.mod h1:0ASJH1YgJiX/eqFZObqepgsvIA4XjCgpyfwn9pDGafA=
|
github.com/containers/image/v4 v4.0.1/go.mod h1:0ASJH1YgJiX/eqFZObqepgsvIA4XjCgpyfwn9pDGafA=
|
||||||
github.com/containers/image/v5 v5.0.0 h1:arnXgbt1ucsC/ndtSpiQY87rA0UjhF+/xQnPzqdBDn4=
|
github.com/containers/image/v5 v5.0.0 h1:arnXgbt1ucsC/ndtSpiQY87rA0UjhF+/xQnPzqdBDn4=
|
||||||
|
|
3
info.go
3
info.go
|
@ -12,7 +12,6 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/containers/buildah/util"
|
"github.com/containers/buildah/util"
|
||||||
"github.com/containers/common/pkg/cgroups"
|
|
||||||
"github.com/containers/common/pkg/unshare"
|
"github.com/containers/common/pkg/unshare"
|
||||||
"github.com/containers/storage"
|
"github.com/containers/storage"
|
||||||
"github.com/containers/storage/pkg/system"
|
"github.com/containers/storage/pkg/system"
|
||||||
|
@ -48,7 +47,7 @@ func hostInfo() map[string]interface{} {
|
||||||
info["cpus"] = runtime.NumCPU()
|
info["cpus"] = runtime.NumCPU()
|
||||||
info["rootless"] = unshare.IsRootless()
|
info["rootless"] = unshare.IsRootless()
|
||||||
|
|
||||||
unified, err := cgroups.IsCgroup2UnifiedMode()
|
unified, err := util.IsCgroup2UnifiedMode()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Error(err, "err reading cgroups mode")
|
logrus.Error(err, "err reading cgroups mode")
|
||||||
}
|
}
|
||||||
|
|
10
util/util.go
10
util/util.go
|
@ -7,9 +7,9 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/containers/common/pkg/cgroups"
|
|
||||||
"github.com/containers/image/v5/docker/reference"
|
"github.com/containers/image/v5/docker/reference"
|
||||||
"github.com/containers/image/v5/pkg/sysregistriesv2"
|
"github.com/containers/image/v5/pkg/sysregistriesv2"
|
||||||
"github.com/containers/image/v5/signature"
|
"github.com/containers/image/v5/signature"
|
||||||
|
@ -252,7 +252,7 @@ func Runtime() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Need to switch default until runc supports cgroups v2
|
// Need to switch default until runc supports cgroups v2
|
||||||
if unified, _ := cgroups.IsCgroup2UnifiedMode(); unified {
|
if unified, _ := IsCgroup2UnifiedMode(); unified {
|
||||||
return "crun"
|
return "crun"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -395,3 +395,9 @@ func TruncateString(str string, to int) string {
|
||||||
}
|
}
|
||||||
return newStr
|
return newStr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
isUnifiedOnce sync.Once
|
||||||
|
isUnified bool
|
||||||
|
isUnifiedErr error
|
||||||
|
)
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
package util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"syscall"
|
||||||
|
)
|
||||||
|
|
||||||
|
// IsCgroup2UnifiedMode returns whether we are running in cgroup 2 cgroup2 mode.
|
||||||
|
func IsCgroup2UnifiedMode() (bool, error) {
|
||||||
|
isUnifiedOnce.Do(func() {
|
||||||
|
_cgroup2SuperMagic := int64(0x63677270)
|
||||||
|
var st syscall.Statfs_t
|
||||||
|
if err := syscall.Statfs("/sys/fs/cgroup", &st); err != nil {
|
||||||
|
isUnified, isUnifiedErr = false, err
|
||||||
|
} else {
|
||||||
|
isUnified, isUnifiedErr = st.Type == _cgroup2SuperMagic, nil
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return isUnified, isUnifiedErr
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
// +build !linux
|
||||||
|
|
||||||
|
package util
|
||||||
|
|
||||||
|
// IsCgroup2UnifiedMode returns whether we are running in cgroup 2 cgroup2 mode.
|
||||||
|
func IsCgroup2UnifiedMode() (bool, error) {
|
||||||
|
return false, nil
|
||||||
|
}
|
|
@ -1,149 +0,0 @@
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
type blkioHandler struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func getBlkioHandler() *blkioHandler {
|
|
||||||
return &blkioHandler{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply set the specified constraints
|
|
||||||
func (c *blkioHandler) Apply(ctr *CgroupControl, res *spec.LinuxResources) error {
|
|
||||||
if res.BlockIO == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return fmt.Errorf("blkio apply function not implemented yet")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the cgroup
|
|
||||||
func (c *blkioHandler) Create(ctr *CgroupControl) (bool, error) {
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
return ctr.createCgroupDirectory(Blkio)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Destroy the cgroup
|
|
||||||
func (c *blkioHandler) Destroy(ctr *CgroupControl) error {
|
|
||||||
return rmDirRecursively(ctr.getCgroupv1Path(Blkio))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stat fills a metrics structure with usage stats for the controller
|
|
||||||
func (c *blkioHandler) Stat(ctr *CgroupControl, m *Metrics) error {
|
|
||||||
var ioServiceBytesRecursive []BlkIOEntry
|
|
||||||
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
// more details on the io.stat file format:X https://facebookmicrosites.github.io/cgroup2/docs/io-controller.html
|
|
||||||
values, err := readCgroup2MapFile(ctr, "io.stat")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for k, v := range values {
|
|
||||||
d := strings.Split(k, ":")
|
|
||||||
if len(d) != 2 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
minor, err := strconv.ParseUint(d[0], 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
major, err := strconv.ParseUint(d[1], 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, item := range v {
|
|
||||||
d := strings.Split(item, "=")
|
|
||||||
if len(d) != 2 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
op := d[0]
|
|
||||||
|
|
||||||
// Accommodate the cgroup v1 naming
|
|
||||||
switch op {
|
|
||||||
case "rbytes":
|
|
||||||
op = "read"
|
|
||||||
case "wbytes":
|
|
||||||
op = "write"
|
|
||||||
}
|
|
||||||
|
|
||||||
value, err := strconv.ParseUint(d[1], 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
entry := BlkIOEntry{
|
|
||||||
Op: op,
|
|
||||||
Major: major,
|
|
||||||
Minor: minor,
|
|
||||||
Value: value,
|
|
||||||
}
|
|
||||||
ioServiceBytesRecursive = append(ioServiceBytesRecursive, entry)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
BlkioRoot := ctr.getCgroupv1Path(Blkio)
|
|
||||||
|
|
||||||
p := filepath.Join(BlkioRoot, "blkio.throttle.io_service_bytes_recursive")
|
|
||||||
f, err := os.Open(p)
|
|
||||||
if err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return errors.Wrapf(err, "open %s", p)
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
scanner := bufio.NewScanner(f)
|
|
||||||
for scanner.Scan() {
|
|
||||||
line := scanner.Text()
|
|
||||||
parts := strings.Fields(line)
|
|
||||||
if len(parts) < 3 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
d := strings.Split(parts[0], ":")
|
|
||||||
if len(d) != 2 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
minor, err := strconv.ParseUint(d[0], 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
major, err := strconv.ParseUint(d[1], 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
op := parts[1]
|
|
||||||
|
|
||||||
value, err := strconv.ParseUint(parts[2], 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
entry := BlkIOEntry{
|
|
||||||
Op: op,
|
|
||||||
Major: major,
|
|
||||||
Minor: minor,
|
|
||||||
Value: value,
|
|
||||||
}
|
|
||||||
ioServiceBytesRecursive = append(ioServiceBytesRecursive, entry)
|
|
||||||
}
|
|
||||||
if err := scanner.Err(); err != nil {
|
|
||||||
return errors.Wrapf(err, "parse %s", p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m.Blkio = BlkioMetrics{IoServiceBytesRecursive: ioServiceBytesRecursive}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,564 +0,0 @@
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"math"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/containers/common/pkg/unshare"
|
|
||||||
systemdDbus "github.com/coreos/go-systemd/dbus"
|
|
||||||
"github.com/godbus/dbus"
|
|
||||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrCgroupDeleted means the cgroup was deleted
|
|
||||||
ErrCgroupDeleted = errors.New("cgroup deleted")
|
|
||||||
// ErrCgroupV1Rootless means the cgroup v1 were attempted to be used in rootless environmen
|
|
||||||
ErrCgroupV1Rootless = errors.New("no support for CGroups V1 in rootless environments")
|
|
||||||
)
|
|
||||||
|
|
||||||
// CgroupControl controls a cgroup hierarchy
|
|
||||||
type CgroupControl struct {
|
|
||||||
cgroup2 bool
|
|
||||||
path string
|
|
||||||
systemd bool
|
|
||||||
// List of additional cgroup subsystems joined that
|
|
||||||
// do not have a custom handler.
|
|
||||||
additionalControllers []controller
|
|
||||||
}
|
|
||||||
|
|
||||||
// CPUUsage keeps stats for the CPU usage (unit: nanoseconds)
|
|
||||||
type CPUUsage struct {
|
|
||||||
Kernel uint64
|
|
||||||
Total uint64
|
|
||||||
PerCPU []uint64
|
|
||||||
}
|
|
||||||
|
|
||||||
// MemoryUsage keeps stats for the memory usage
|
|
||||||
type MemoryUsage struct {
|
|
||||||
Usage uint64
|
|
||||||
Limit uint64
|
|
||||||
}
|
|
||||||
|
|
||||||
// CPUMetrics keeps stats for the CPU usage
|
|
||||||
type CPUMetrics struct {
|
|
||||||
Usage CPUUsage
|
|
||||||
}
|
|
||||||
|
|
||||||
// BlkIOEntry describes an entry in the blkio stats
|
|
||||||
type BlkIOEntry struct {
|
|
||||||
Op string
|
|
||||||
Major uint64
|
|
||||||
Minor uint64
|
|
||||||
Value uint64
|
|
||||||
}
|
|
||||||
|
|
||||||
// BlkioMetrics keeps usage stats for the blkio cgroup controller
|
|
||||||
type BlkioMetrics struct {
|
|
||||||
IoServiceBytesRecursive []BlkIOEntry
|
|
||||||
}
|
|
||||||
|
|
||||||
// MemoryMetrics keeps usage stats for the memory cgroup controller
|
|
||||||
type MemoryMetrics struct {
|
|
||||||
Usage MemoryUsage
|
|
||||||
}
|
|
||||||
|
|
||||||
// PidsMetrics keeps usage stats for the pids cgroup controller
|
|
||||||
type PidsMetrics struct {
|
|
||||||
Current uint64
|
|
||||||
}
|
|
||||||
|
|
||||||
// Metrics keeps usage stats for the cgroup controllers
|
|
||||||
type Metrics struct {
|
|
||||||
CPU CPUMetrics
|
|
||||||
Blkio BlkioMetrics
|
|
||||||
Memory MemoryMetrics
|
|
||||||
Pids PidsMetrics
|
|
||||||
}
|
|
||||||
|
|
||||||
type controller struct {
|
|
||||||
name string
|
|
||||||
symlink bool
|
|
||||||
}
|
|
||||||
|
|
||||||
type controllerHandler interface {
|
|
||||||
Create(*CgroupControl) (bool, error)
|
|
||||||
Apply(*CgroupControl, *spec.LinuxResources) error
|
|
||||||
Destroy(*CgroupControl) error
|
|
||||||
Stat(*CgroupControl, *Metrics) error
|
|
||||||
}
|
|
||||||
|
|
||||||
const (
|
|
||||||
cgroupRoot = "/sys/fs/cgroup"
|
|
||||||
_cgroup2SuperMagic = 0x63677270
|
|
||||||
// CPU is the cpu controller
|
|
||||||
CPU = "cpu"
|
|
||||||
// CPUAcct is the cpuacct controller
|
|
||||||
CPUAcct = "cpuacct"
|
|
||||||
// CPUset is the cpuset controller
|
|
||||||
CPUset = "cpuset"
|
|
||||||
// Memory is the memory controller
|
|
||||||
Memory = "memory"
|
|
||||||
// Pids is the pids controller
|
|
||||||
Pids = "pids"
|
|
||||||
// Blkio is the blkio controller
|
|
||||||
Blkio = "blkio"
|
|
||||||
)
|
|
||||||
|
|
||||||
var handlers map[string]controllerHandler
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
handlers = make(map[string]controllerHandler)
|
|
||||||
handlers[CPU] = getCPUHandler()
|
|
||||||
handlers[CPUset] = getCpusetHandler()
|
|
||||||
handlers[Memory] = getMemoryHandler()
|
|
||||||
handlers[Pids] = getPidsHandler()
|
|
||||||
handlers[Blkio] = getBlkioHandler()
|
|
||||||
}
|
|
||||||
|
|
||||||
// getAvailableControllers get the available controllers
|
|
||||||
func getAvailableControllers(exclude map[string]controllerHandler, cgroup2 bool) ([]controller, error) {
|
|
||||||
if cgroup2 {
|
|
||||||
return nil, fmt.Errorf("getAvailableControllers not implemented yet for cgroup v2")
|
|
||||||
}
|
|
||||||
|
|
||||||
infos, err := ioutil.ReadDir(cgroupRoot)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "read directory %s", cgroupRoot)
|
|
||||||
}
|
|
||||||
var controllers []controller
|
|
||||||
for _, i := range infos {
|
|
||||||
name := i.Name()
|
|
||||||
if _, found := exclude[name]; found {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
c := controller{
|
|
||||||
name: name,
|
|
||||||
symlink: !i.IsDir(),
|
|
||||||
}
|
|
||||||
controllers = append(controllers, c)
|
|
||||||
}
|
|
||||||
return controllers, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// getCgroupv1Path is a helper function to get the cgroup v1 path
|
|
||||||
func (c *CgroupControl) getCgroupv1Path(name string) string {
|
|
||||||
return filepath.Join(cgroupRoot, name, c.path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// createCgroupv2Path creates the cgroupv2 path and enables all the available controllers
|
|
||||||
func createCgroupv2Path(path string) (Err error) {
|
|
||||||
content, err := ioutil.ReadFile("/sys/fs/cgroup/cgroup.controllers")
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrapf(err, "read /sys/fs/cgroup/cgroup.controllers")
|
|
||||||
}
|
|
||||||
if !strings.HasPrefix(path, "/sys/fs/cgroup/") {
|
|
||||||
return fmt.Errorf("invalid cgroup path %s", path)
|
|
||||||
}
|
|
||||||
|
|
||||||
res := ""
|
|
||||||
for i, c := range strings.Split(strings.TrimSpace(string(content)), " ") {
|
|
||||||
if i == 0 {
|
|
||||||
res = fmt.Sprintf("+%s", c)
|
|
||||||
} else {
|
|
||||||
res = res + fmt.Sprintf(" +%s", c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
resByte := []byte(res)
|
|
||||||
|
|
||||||
current := "/sys/fs"
|
|
||||||
elements := strings.Split(path, "/")
|
|
||||||
for i, e := range elements[3:] {
|
|
||||||
current = filepath.Join(current, e)
|
|
||||||
if i > 0 {
|
|
||||||
if err := os.Mkdir(current, 0755); err != nil {
|
|
||||||
if !os.IsExist(err) {
|
|
||||||
return errors.Wrapf(err, "mkdir %s", path)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// If the directory was created, be sure it is not left around on errors.
|
|
||||||
defer func() {
|
|
||||||
if Err != nil {
|
|
||||||
os.Remove(current)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// We enable the controllers for all the path components except the last one. It is not allowed to add
|
|
||||||
// PIDs if there are already enabled controllers.
|
|
||||||
if i < len(elements[3:])-1 {
|
|
||||||
if err := ioutil.WriteFile(filepath.Join(current, "cgroup.subtree_control"), resByte, 0755); err != nil {
|
|
||||||
return errors.Wrapf(err, "write %s", filepath.Join(current, "cgroup.subtree_control"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// initialize initializes the specified hierarchy
|
|
||||||
func (c *CgroupControl) initialize() (err error) {
|
|
||||||
createdSoFar := map[string]controllerHandler{}
|
|
||||||
defer func() {
|
|
||||||
if err != nil {
|
|
||||||
for name, ctr := range createdSoFar {
|
|
||||||
if err := ctr.Destroy(c); err != nil {
|
|
||||||
logrus.Warningf("error cleaning up controller %s for %s", name, c.path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
if c.cgroup2 {
|
|
||||||
if err := createCgroupv2Path(filepath.Join(cgroupRoot, c.path)); err != nil {
|
|
||||||
return errors.Wrapf(err, "error creating cgroup path %s", c.path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for name, handler := range handlers {
|
|
||||||
created, err := handler.Create(c)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if created {
|
|
||||||
createdSoFar[name] = handler
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !c.cgroup2 {
|
|
||||||
// We won't need to do this for cgroup v2
|
|
||||||
for _, ctr := range c.additionalControllers {
|
|
||||||
if ctr.symlink {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
path := c.getCgroupv1Path(ctr.name)
|
|
||||||
if err := os.MkdirAll(path, 0755); err != nil {
|
|
||||||
return errors.Wrapf(err, "error creating cgroup path %s for %s", path, ctr.name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *CgroupControl) createCgroupDirectory(controller string) (bool, error) {
|
|
||||||
cPath := c.getCgroupv1Path(controller)
|
|
||||||
_, err := os.Stat(cPath)
|
|
||||||
if err == nil {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if !os.IsNotExist(err) {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := os.MkdirAll(cPath, 0755); err != nil {
|
|
||||||
return false, errors.Wrapf(err, "error creating cgroup for %s", controller)
|
|
||||||
}
|
|
||||||
return true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func readFileAsUint64(path string) (uint64, error) {
|
|
||||||
data, err := ioutil.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return 0, errors.Wrapf(err, "open %s", path)
|
|
||||||
}
|
|
||||||
v := cleanString(string(data))
|
|
||||||
if v == "max" {
|
|
||||||
return math.MaxUint64, nil
|
|
||||||
}
|
|
||||||
ret, err := strconv.ParseUint(v, 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return ret, errors.Wrapf(err, "parse %s from %s", v, path)
|
|
||||||
}
|
|
||||||
return ret, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// New creates a new cgroup control
|
|
||||||
func New(path string, resources *spec.LinuxResources) (*CgroupControl, error) {
|
|
||||||
cgroup2, err := IsCgroup2UnifiedMode()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
control := &CgroupControl{
|
|
||||||
cgroup2: cgroup2,
|
|
||||||
path: path,
|
|
||||||
}
|
|
||||||
|
|
||||||
if !cgroup2 {
|
|
||||||
controllers, err := getAvailableControllers(handlers, false)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
control.additionalControllers = controllers
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := control.initialize(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return control, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewSystemd creates a new cgroup control
|
|
||||||
func NewSystemd(path string) (*CgroupControl, error) {
|
|
||||||
cgroup2, err := IsCgroup2UnifiedMode()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
control := &CgroupControl{
|
|
||||||
cgroup2: cgroup2,
|
|
||||||
path: path,
|
|
||||||
systemd: true,
|
|
||||||
}
|
|
||||||
return control, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load loads an existing cgroup control
|
|
||||||
func Load(path string) (*CgroupControl, error) {
|
|
||||||
cgroup2, err := IsCgroup2UnifiedMode()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
control := &CgroupControl{
|
|
||||||
cgroup2: cgroup2,
|
|
||||||
path: path,
|
|
||||||
systemd: false,
|
|
||||||
}
|
|
||||||
if !cgroup2 {
|
|
||||||
controllers, err := getAvailableControllers(handlers, false)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
control.additionalControllers = controllers
|
|
||||||
}
|
|
||||||
if !cgroup2 {
|
|
||||||
for name := range handlers {
|
|
||||||
p := control.getCgroupv1Path(name)
|
|
||||||
if _, err := os.Stat(p); err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
if unshare.IsRootless() {
|
|
||||||
return nil, ErrCgroupV1Rootless
|
|
||||||
}
|
|
||||||
// compatible with the error code
|
|
||||||
// used by containerd/cgroups
|
|
||||||
return nil, ErrCgroupDeleted
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return control, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// CreateSystemdUnit creates the systemd cgroup
|
|
||||||
func (c *CgroupControl) CreateSystemdUnit(path string) error {
|
|
||||||
if !c.systemd {
|
|
||||||
return fmt.Errorf("the cgroup controller is not using systemd")
|
|
||||||
}
|
|
||||||
|
|
||||||
conn, err := systemdDbus.New()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer conn.Close()
|
|
||||||
|
|
||||||
return systemdCreate(path, conn)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUserConnection returns an user connection to D-BUS
|
|
||||||
func GetUserConnection(uid int) (*systemdDbus.Conn, error) {
|
|
||||||
return systemdDbus.NewConnection(func() (*dbus.Conn, error) {
|
|
||||||
return dbusAuthConnection(uid, dbus.SessionBusPrivate)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// CreateSystemdUserUnit creates the systemd cgroup for the specified user
|
|
||||||
func (c *CgroupControl) CreateSystemdUserUnit(path string, uid int) error {
|
|
||||||
if !c.systemd {
|
|
||||||
return fmt.Errorf("the cgroup controller is not using systemd")
|
|
||||||
}
|
|
||||||
|
|
||||||
conn, err := GetUserConnection(uid)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer conn.Close()
|
|
||||||
|
|
||||||
return systemdCreate(path, conn)
|
|
||||||
}
|
|
||||||
|
|
||||||
func dbusAuthConnection(uid int, createBus func(opts ...dbus.ConnOption) (*dbus.Conn, error)) (*dbus.Conn, error) {
|
|
||||||
conn, err := createBus()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(uid))}
|
|
||||||
|
|
||||||
err = conn.Auth(methods)
|
|
||||||
if err != nil {
|
|
||||||
conn.Close()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := conn.Hello(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return conn, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Delete cleans a cgroup
|
|
||||||
func (c *CgroupControl) Delete() error {
|
|
||||||
return c.DeleteByPath(c.path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// rmDirRecursively delete recursively a cgroup directory.
|
|
||||||
// It differs from os.RemoveAll as it doesn't attempt to unlink files.
|
|
||||||
// On cgroupfs we are allowed only to rmdir empty directories.
|
|
||||||
func rmDirRecursively(path string) error {
|
|
||||||
if err := os.Remove(path); err == nil || os.IsNotExist(err) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
entries, err := ioutil.ReadDir(path)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrapf(err, "read %s", path)
|
|
||||||
}
|
|
||||||
for _, i := range entries {
|
|
||||||
if i.IsDir() {
|
|
||||||
if err := rmDirRecursively(filepath.Join(path, i.Name())); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if err := os.Remove(path); err != nil {
|
|
||||||
if !os.IsNotExist(err) {
|
|
||||||
return errors.Wrapf(err, "remove %s", path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteByPathConn deletes the specified cgroup path using the specified
|
|
||||||
// dbus connection if needed.
|
|
||||||
func (c *CgroupControl) DeleteByPathConn(path string, conn *systemdDbus.Conn) error {
|
|
||||||
if c.systemd {
|
|
||||||
return systemdDestroyConn(path, conn)
|
|
||||||
}
|
|
||||||
if c.cgroup2 {
|
|
||||||
return rmDirRecursively(filepath.Join(cgroupRoot, c.path))
|
|
||||||
}
|
|
||||||
var lastError error
|
|
||||||
for _, h := range handlers {
|
|
||||||
if err := h.Destroy(c); err != nil {
|
|
||||||
lastError = err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, ctr := range c.additionalControllers {
|
|
||||||
if ctr.symlink {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
p := c.getCgroupv1Path(ctr.name)
|
|
||||||
if err := rmDirRecursively(p); err != nil {
|
|
||||||
lastError = errors.Wrapf(err, "remove %s", p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return lastError
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteByPath deletes the specified cgroup path
|
|
||||||
func (c *CgroupControl) DeleteByPath(path string) error {
|
|
||||||
if c.systemd {
|
|
||||||
conn, err := systemdDbus.New()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer conn.Close()
|
|
||||||
return c.DeleteByPathConn(path, conn)
|
|
||||||
}
|
|
||||||
return c.DeleteByPathConn(path, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update updates the cgroups
|
|
||||||
func (c *CgroupControl) Update(resources *spec.LinuxResources) error {
|
|
||||||
for _, h := range handlers {
|
|
||||||
if err := h.Apply(c, resources); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddPid moves the specified pid to the cgroup
|
|
||||||
func (c *CgroupControl) AddPid(pid int) error {
|
|
||||||
pidString := []byte(fmt.Sprintf("%d\n", pid))
|
|
||||||
|
|
||||||
if c.cgroup2 {
|
|
||||||
p := filepath.Join(cgroupRoot, c.path, "cgroup.procs")
|
|
||||||
if err := ioutil.WriteFile(p, pidString, 0644); err != nil {
|
|
||||||
return errors.Wrapf(err, "write %s", p)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var names []string
|
|
||||||
for n := range handlers {
|
|
||||||
names = append(names, n)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, c := range c.additionalControllers {
|
|
||||||
if !c.symlink {
|
|
||||||
names = append(names, c.name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, n := range names {
|
|
||||||
p := filepath.Join(c.getCgroupv1Path(n), "tasks")
|
|
||||||
if err := ioutil.WriteFile(p, pidString, 0644); err != nil {
|
|
||||||
return errors.Wrapf(err, "write %s", p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stat returns usage statistics for the cgroup
|
|
||||||
func (c *CgroupControl) Stat() (*Metrics, error) {
|
|
||||||
m := Metrics{}
|
|
||||||
for _, h := range handlers {
|
|
||||||
if err := h.Stat(c, &m); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return &m, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func readCgroup2MapFile(ctr *CgroupControl, name string) (map[string][]string, error) {
|
|
||||||
ret := map[string][]string{}
|
|
||||||
p := filepath.Join(cgroupRoot, ctr.path, name)
|
|
||||||
f, err := os.Open(p)
|
|
||||||
if err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
return ret, nil
|
|
||||||
}
|
|
||||||
return nil, errors.Wrapf(err, "open file %s", p)
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
scanner := bufio.NewScanner(f)
|
|
||||||
for scanner.Scan() {
|
|
||||||
line := scanner.Text()
|
|
||||||
parts := strings.Fields(line)
|
|
||||||
if len(parts) < 2 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
ret[parts[0]] = parts[1:]
|
|
||||||
}
|
|
||||||
if err := scanner.Err(); err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "parsing file %s", p)
|
|
||||||
}
|
|
||||||
return ret, nil
|
|
||||||
}
|
|
|
@ -1,89 +0,0 @@
|
||||||
// +build linux
|
|
||||||
|
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"syscall"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
isUnifiedOnce sync.Once
|
|
||||||
isUnified bool
|
|
||||||
isUnifiedErr error
|
|
||||||
)
|
|
||||||
|
|
||||||
// IsCgroup2UnifiedMode returns whether we are running in cgroup 2 cgroup2 mode.
|
|
||||||
func IsCgroup2UnifiedMode() (bool, error) {
|
|
||||||
isUnifiedOnce.Do(func() {
|
|
||||||
var st syscall.Statfs_t
|
|
||||||
if err := syscall.Statfs("/sys/fs/cgroup", &st); err != nil {
|
|
||||||
isUnified, isUnifiedErr = false, err
|
|
||||||
} else {
|
|
||||||
isUnified, isUnifiedErr = st.Type == _cgroup2SuperMagic, nil
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return isUnified, isUnifiedErr
|
|
||||||
}
|
|
||||||
|
|
||||||
// UserOwnsCurrentSystemdCgroup checks whether the current EUID owns the
|
|
||||||
// current cgroup.
|
|
||||||
func UserOwnsCurrentSystemdCgroup() (bool, error) {
|
|
||||||
uid := os.Geteuid()
|
|
||||||
|
|
||||||
cgroup2, err := IsCgroup2UnifiedMode()
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
f, err := os.Open("/proc/self/cgroup")
|
|
||||||
if err != nil {
|
|
||||||
return false, errors.Wrapf(err, "open file /proc/self/cgroup")
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
scanner := bufio.NewScanner(f)
|
|
||||||
for scanner.Scan() {
|
|
||||||
line := scanner.Text()
|
|
||||||
parts := strings.SplitN(line, ":", 3)
|
|
||||||
|
|
||||||
if len(parts) < 3 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
var cgroupPath string
|
|
||||||
|
|
||||||
if cgroup2 {
|
|
||||||
cgroupPath = filepath.Join(cgroupRoot, parts[2])
|
|
||||||
} else {
|
|
||||||
if parts[1] != "name=systemd" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
cgroupPath = filepath.Join(cgroupRoot, "systemd", parts[2])
|
|
||||||
}
|
|
||||||
|
|
||||||
st, err := os.Stat(cgroupPath)
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
s := st.Sys()
|
|
||||||
if s == nil {
|
|
||||||
return false, fmt.Errorf("error stat cgroup path %s", cgroupPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
if int(s.(*syscall.Stat_t).Uid) != uid {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if err := scanner.Err(); err != nil {
|
|
||||||
return false, errors.Wrapf(err, "parsing file /proc/self/cgroup")
|
|
||||||
}
|
|
||||||
return true, nil
|
|
||||||
}
|
|
|
@ -1,14 +0,0 @@
|
||||||
// +build !linux
|
|
||||||
|
|
||||||
package cgroups
|
|
||||||
|
|
||||||
// IsCgroup2UnifiedMode returns whether we are running in cgroup 2 cgroup2 mode.
|
|
||||||
func IsCgroup2UnifiedMode() (bool, error) {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// UserOwnsCurrentSystemdCgroup checks whether the current EUID owns the
|
|
||||||
// current cgroup.
|
|
||||||
func UserOwnsCurrentSystemdCgroup() (bool, error) {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
|
@ -1,123 +0,0 @@
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
type cpuHandler struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func getCPUHandler() *cpuHandler {
|
|
||||||
return &cpuHandler{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func cleanString(s string) string {
|
|
||||||
return strings.Trim(s, "\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
func readAcct(ctr *CgroupControl, name string) (uint64, error) {
|
|
||||||
p := filepath.Join(ctr.getCgroupv1Path(CPUAcct), name)
|
|
||||||
return readFileAsUint64(p)
|
|
||||||
}
|
|
||||||
|
|
||||||
func readAcctList(ctr *CgroupControl, name string) ([]uint64, error) {
|
|
||||||
var r []uint64
|
|
||||||
|
|
||||||
p := filepath.Join(ctr.getCgroupv1Path(CPUAcct), name)
|
|
||||||
data, err := ioutil.ReadFile(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "reading %s", p)
|
|
||||||
}
|
|
||||||
for _, s := range strings.Split(string(data), " ") {
|
|
||||||
s = cleanString(s)
|
|
||||||
if s == "" {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
v, err := strconv.ParseUint(s, 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "parsing %s", s)
|
|
||||||
}
|
|
||||||
r = append(r, v)
|
|
||||||
}
|
|
||||||
return r, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply set the specified constraints
|
|
||||||
func (c *cpuHandler) Apply(ctr *CgroupControl, res *spec.LinuxResources) error {
|
|
||||||
if res.CPU == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return fmt.Errorf("cpu apply not implemented yet")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the cgroup
|
|
||||||
func (c *cpuHandler) Create(ctr *CgroupControl) (bool, error) {
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
return ctr.createCgroupDirectory(CPU)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Destroy the cgroup
|
|
||||||
func (c *cpuHandler) Destroy(ctr *CgroupControl) error {
|
|
||||||
return rmDirRecursively(ctr.getCgroupv1Path(CPU))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stat fills a metrics structure with usage stats for the controller
|
|
||||||
func (c *cpuHandler) Stat(ctr *CgroupControl, m *Metrics) error {
|
|
||||||
var err error
|
|
||||||
usage := CPUUsage{}
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
values, err := readCgroup2MapFile(ctr, "cpu.stat")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if val, found := values["usage_usec"]; found {
|
|
||||||
usage.Total, err = strconv.ParseUint(cleanString(val[0]), 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
usage.Kernel *= 1000
|
|
||||||
}
|
|
||||||
if val, found := values["system_usec"]; found {
|
|
||||||
usage.Kernel, err = strconv.ParseUint(cleanString(val[0]), 10, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
usage.Total *= 1000
|
|
||||||
}
|
|
||||||
// FIXME: How to read usage.PerCPU?
|
|
||||||
} else {
|
|
||||||
usage.Total, err = readAcct(ctr, "cpuacct.usage")
|
|
||||||
if err != nil {
|
|
||||||
if !os.IsNotExist(errors.Cause(err)) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
usage.Total = 0
|
|
||||||
}
|
|
||||||
usage.Kernel, err = readAcct(ctr, "cpuacct.usage_sys")
|
|
||||||
if err != nil {
|
|
||||||
if !os.IsNotExist(errors.Cause(err)) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
usage.Kernel = 0
|
|
||||||
}
|
|
||||||
usage.PerCPU, err = readAcctList(ctr, "cpuacct.usage_percpu")
|
|
||||||
if err != nil {
|
|
||||||
if !os.IsNotExist(errors.Cause(err)) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
usage.PerCPU = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m.CPU = CPUMetrics{Usage: usage}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,85 +0,0 @@
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
type cpusetHandler struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func cpusetCopyFileFromParent(dir, file string, cgroupv2 bool) ([]byte, error) {
|
|
||||||
if dir == cgroupRoot {
|
|
||||||
return nil, fmt.Errorf("could not find parent to initialize cpuset %s", file)
|
|
||||||
}
|
|
||||||
path := filepath.Join(dir, file)
|
|
||||||
parentPath := path
|
|
||||||
if cgroupv2 {
|
|
||||||
parentPath = fmt.Sprintf("%s.effective", parentPath)
|
|
||||||
}
|
|
||||||
data, err := ioutil.ReadFile(parentPath)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "open %s", path)
|
|
||||||
}
|
|
||||||
if len(strings.Trim(string(data), "\n")) != 0 {
|
|
||||||
return data, nil
|
|
||||||
}
|
|
||||||
data, err = cpusetCopyFileFromParent(filepath.Dir(dir), file, cgroupv2)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := ioutil.WriteFile(path, data, 0644); err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "write %s", path)
|
|
||||||
}
|
|
||||||
return data, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func cpusetCopyFromParent(path string, cgroupv2 bool) error {
|
|
||||||
for _, file := range []string{"cpuset.cpus", "cpuset.mems"} {
|
|
||||||
if _, err := cpusetCopyFileFromParent(path, file, cgroupv2); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getCpusetHandler() *cpusetHandler {
|
|
||||||
return &cpusetHandler{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply set the specified constraints
|
|
||||||
func (c *cpusetHandler) Apply(ctr *CgroupControl, res *spec.LinuxResources) error {
|
|
||||||
if res.CPU == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return fmt.Errorf("cpuset apply not implemented yet")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the cgroup
|
|
||||||
func (c *cpusetHandler) Create(ctr *CgroupControl) (bool, error) {
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
path := filepath.Join(cgroupRoot, ctr.path)
|
|
||||||
return true, cpusetCopyFromParent(path, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
created, err := ctr.createCgroupDirectory(CPUset)
|
|
||||||
if !created || err != nil {
|
|
||||||
return created, err
|
|
||||||
}
|
|
||||||
return true, cpusetCopyFromParent(ctr.getCgroupv1Path(CPUset), false)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Destroy the cgroup
|
|
||||||
func (c *cpusetHandler) Destroy(ctr *CgroupControl) error {
|
|
||||||
return rmDirRecursively(ctr.getCgroupv1Path(CPUset))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stat fills a metrics structure with usage stats for the controller
|
|
||||||
func (c *cpusetHandler) Stat(ctr *CgroupControl, m *Metrics) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,66 +0,0 @@
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
)
|
|
||||||
|
|
||||||
type memHandler struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func getMemoryHandler() *memHandler {
|
|
||||||
return &memHandler{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply set the specified constraints
|
|
||||||
func (c *memHandler) Apply(ctr *CgroupControl, res *spec.LinuxResources) error {
|
|
||||||
if res.Memory == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return fmt.Errorf("memory apply not implemented yet")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the cgroup
|
|
||||||
func (c *memHandler) Create(ctr *CgroupControl) (bool, error) {
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
return ctr.createCgroupDirectory(Memory)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Destroy the cgroup
|
|
||||||
func (c *memHandler) Destroy(ctr *CgroupControl) error {
|
|
||||||
return rmDirRecursively(ctr.getCgroupv1Path(Memory))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stat fills a metrics structure with usage stats for the controller
|
|
||||||
func (c *memHandler) Stat(ctr *CgroupControl, m *Metrics) error {
|
|
||||||
var err error
|
|
||||||
usage := MemoryUsage{}
|
|
||||||
|
|
||||||
var memoryRoot string
|
|
||||||
filenames := map[string]string{}
|
|
||||||
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
memoryRoot = filepath.Join(cgroupRoot, ctr.path)
|
|
||||||
filenames["usage"] = "memory.current"
|
|
||||||
filenames["limit"] = "memory.max"
|
|
||||||
} else {
|
|
||||||
memoryRoot = ctr.getCgroupv1Path(Memory)
|
|
||||||
filenames["usage"] = "memory.usage_in_bytes"
|
|
||||||
filenames["limit"] = "memory.limit_in_bytes"
|
|
||||||
}
|
|
||||||
usage.Usage, err = readFileAsUint64(filepath.Join(memoryRoot, filenames["usage"]))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
usage.Limit, err = readFileAsUint64(filepath.Join(memoryRoot, filenames["limit"]))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
m.Memory = MemoryMetrics{Usage: usage}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,62 +0,0 @@
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
)
|
|
||||||
|
|
||||||
type pidHandler struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func getPidsHandler() *pidHandler {
|
|
||||||
return &pidHandler{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply set the specified constraints
|
|
||||||
func (c *pidHandler) Apply(ctr *CgroupControl, res *spec.LinuxResources) error {
|
|
||||||
if res.Pids == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
var PIDRoot string
|
|
||||||
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
PIDRoot = filepath.Join(cgroupRoot, ctr.path)
|
|
||||||
} else {
|
|
||||||
PIDRoot = ctr.getCgroupv1Path(Pids)
|
|
||||||
}
|
|
||||||
|
|
||||||
p := filepath.Join(PIDRoot, "pids.max")
|
|
||||||
return ioutil.WriteFile(p, []byte(fmt.Sprintf("%d\n", res.Pids.Limit)), 0644)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the cgroup
|
|
||||||
func (c *pidHandler) Create(ctr *CgroupControl) (bool, error) {
|
|
||||||
return ctr.createCgroupDirectory(Pids)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Destroy the cgroup
|
|
||||||
func (c *pidHandler) Destroy(ctr *CgroupControl) error {
|
|
||||||
return rmDirRecursively(ctr.getCgroupv1Path(Pids))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stat fills a metrics structure with usage stats for the controller
|
|
||||||
func (c *pidHandler) Stat(ctr *CgroupControl, m *Metrics) error {
|
|
||||||
var PIDRoot string
|
|
||||||
|
|
||||||
if ctr.cgroup2 {
|
|
||||||
PIDRoot = filepath.Join(cgroupRoot, ctr.path)
|
|
||||||
} else {
|
|
||||||
PIDRoot = ctr.getCgroupv1Path(Pids)
|
|
||||||
}
|
|
||||||
|
|
||||||
current, err := readFileAsUint64(filepath.Join(PIDRoot, "pids.current"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
m.Pids = PidsMetrics{Current: current}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,79 +0,0 @@
|
||||||
package cgroups
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
systemdDbus "github.com/coreos/go-systemd/dbus"
|
|
||||||
"github.com/godbus/dbus"
|
|
||||||
)
|
|
||||||
|
|
||||||
func systemdCreate(path string, c *systemdDbus.Conn) error {
|
|
||||||
slice, name := filepath.Split(path)
|
|
||||||
slice = strings.TrimSuffix(slice, "/")
|
|
||||||
|
|
||||||
var lastError error
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
properties := []systemdDbus.Property{
|
|
||||||
systemdDbus.PropDescription(fmt.Sprintf("cgroup %s", name)),
|
|
||||||
systemdDbus.PropWants(slice),
|
|
||||||
}
|
|
||||||
pMap := map[string]bool{
|
|
||||||
"DefaultDependencies": false,
|
|
||||||
"MemoryAccounting": true,
|
|
||||||
"CPUAccounting": true,
|
|
||||||
"BlockIOAccounting": true,
|
|
||||||
}
|
|
||||||
if i == 0 {
|
|
||||||
pMap["Delegate"] = true
|
|
||||||
}
|
|
||||||
for k, v := range pMap {
|
|
||||||
p := systemdDbus.Property{
|
|
||||||
Name: k,
|
|
||||||
Value: dbus.MakeVariant(v),
|
|
||||||
}
|
|
||||||
properties = append(properties, p)
|
|
||||||
}
|
|
||||||
|
|
||||||
ch := make(chan string)
|
|
||||||
_, err := c.StartTransientUnit(name, "replace", properties, ch)
|
|
||||||
if err != nil {
|
|
||||||
lastError = err
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
<-ch
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return lastError
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
systemdDestroyConn is copied from containerd/cgroups/systemd.go file, that
|
|
||||||
has the following license:
|
|
||||||
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
func systemdDestroyConn(path string, c *systemdDbus.Conn) error {
|
|
||||||
name := filepath.Base(path)
|
|
||||||
|
|
||||||
ch := make(chan string)
|
|
||||||
_, err := c.StopUnit(name, "replace", ch)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
<-ch
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -350,7 +350,7 @@ type NetworkConfig struct {
|
||||||
// might change in the future.
|
// might change in the future.
|
||||||
func NewConfig(userConfigPath string) (*Config, error) {
|
func NewConfig(userConfigPath string) (*Config, error) {
|
||||||
|
|
||||||
// Genereate the default config for the system
|
// Generate the default config for the system
|
||||||
config, err := DefaultConfig()
|
config, err := DefaultConfig()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -361,7 +361,7 @@ func NewConfig(userConfigPath string) (*Config, error) {
|
||||||
if userConfigPath != "" {
|
if userConfigPath != "" {
|
||||||
var err error
|
var err error
|
||||||
// ReadConfigFromFile reads in container config in the specified
|
// ReadConfigFromFile reads in container config in the specified
|
||||||
// file and then merge changes with the current defauls.
|
// file and then merge changes with the current default.
|
||||||
config, err = ReadConfigFromFile(userConfigPath, config)
|
config, err = ReadConfigFromFile(userConfigPath, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(err, "error reading user config %q", userConfigPath)
|
return nil, errors.Wrapf(err, "error reading user config %q", userConfigPath)
|
||||||
|
@ -395,9 +395,9 @@ func NewConfig(userConfigPath string) (*Config, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadConfigFromFile reads the specified config file at `path` and attempts to
|
// ReadConfigFromFile reads the specified config file at `path` and attempts to
|
||||||
// unmarshal its content into a Config. The config param specifies the previos
|
// unmarshal its content into a Config. The config param specifies the previous
|
||||||
// default config. If the path, only specifies a few fields in the Toml file
|
// default config. If the path, only specifies a few fields in the Toml file
|
||||||
// the defaults from the config paramater will be used for all other fields.
|
// the defaults from the config parameter will be used for all other fields.
|
||||||
func ReadConfigFromFile(path string, config *Config) (*Config, error) {
|
func ReadConfigFromFile(path string, config *Config) (*Config, error) {
|
||||||
logrus.Debugf("Reading configuration file %q", path)
|
logrus.Debugf("Reading configuration file %q", path)
|
||||||
_, err := toml.DecodeFile(path, config)
|
_, err := toml.DecodeFile(path, config)
|
||||||
|
|
|
@ -7,8 +7,8 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
"github.com/containers/common/pkg/cgroups"
|
|
||||||
"github.com/containers/common/pkg/unshare"
|
"github.com/containers/common/pkg/unshare"
|
||||||
"github.com/containers/storage"
|
"github.com/containers/storage"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
@ -113,6 +113,22 @@ const (
|
||||||
SeccompDefaultPath = _installPrefix + "/share/containers/seccomp.json"
|
SeccompDefaultPath = _installPrefix + "/share/containers/seccomp.json"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
cgroupRoot = "/sys/fs/cgroup"
|
||||||
|
_cgroup2SuperMagic = 0x63677270
|
||||||
|
)
|
||||||
|
|
||||||
|
// isCgroup2UnifiedMode returns whether we are running in cgroup 2 cgroup2 mode.
|
||||||
|
func isCgroup2UnifiedMode() (isUnified bool, isUnifiedErr error) {
|
||||||
|
var st syscall.Statfs_t
|
||||||
|
if err := syscall.Statfs(cgroupRoot, &st); err != nil {
|
||||||
|
isUnified, isUnifiedErr = false, err
|
||||||
|
} else {
|
||||||
|
isUnified, isUnifiedErr = st.Type == _cgroup2SuperMagic, nil
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// DefaultConfig defines the default values from containers.conf
|
// DefaultConfig defines the default values from containers.conf
|
||||||
func DefaultConfig() (*Config, error) {
|
func DefaultConfig() (*Config, error) {
|
||||||
|
|
||||||
|
@ -207,7 +223,7 @@ func defaultConfigFromMemory() (*LibpodConfig, error) {
|
||||||
|
|
||||||
c.OCIRuntime = "runc"
|
c.OCIRuntime = "runc"
|
||||||
// If we're running on cgroups v2, default to using crun.
|
// If we're running on cgroups v2, default to using crun.
|
||||||
if onCgroupsv2, _ := cgroups.IsCgroup2UnifiedMode(); onCgroupsv2 {
|
if onCgroupsv2, _ := isCgroup2UnifiedMode(); onCgroupsv2 {
|
||||||
c.OCIRuntime = "crun"
|
c.OCIRuntime = "crun"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,191 +0,0 @@
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction, and
|
|
||||||
distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright
|
|
||||||
owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all other entities
|
|
||||||
that control, are controlled by, or are under common control with that entity.
|
|
||||||
For the purposes of this definition, "control" means (i) the power, direct or
|
|
||||||
indirect, to cause the direction or management of such entity, whether by
|
|
||||||
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity exercising
|
|
||||||
permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications, including
|
|
||||||
but not limited to software source code, documentation source, and configuration
|
|
||||||
files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical transformation or
|
|
||||||
translation of a Source form, including but not limited to compiled object code,
|
|
||||||
generated documentation, and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or Object form, made
|
|
||||||
available under the License, as indicated by a copyright notice that is included
|
|
||||||
in or attached to the work (an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object form, that
|
|
||||||
is based on (or derived from) the Work and for which the editorial revisions,
|
|
||||||
annotations, elaborations, or other modifications represent, as a whole, an
|
|
||||||
original work of authorship. For the purposes of this License, Derivative Works
|
|
||||||
shall not include works that remain separable from, or merely link (or bind by
|
|
||||||
name) to the interfaces of, the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including the original version
|
|
||||||
of the Work and any modifications or additions to that Work or Derivative Works
|
|
||||||
thereof, that is intentionally submitted to Licensor for inclusion in the Work
|
|
||||||
by the copyright owner or by an individual or Legal Entity authorized to submit
|
|
||||||
on behalf of the copyright owner. For the purposes of this definition,
|
|
||||||
"submitted" means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems, and
|
|
||||||
issue tracking systems that are managed by, or on behalf of, the Licensor for
|
|
||||||
the purpose of discussing and improving the Work, but excluding communication
|
|
||||||
that is conspicuously marked or otherwise designated in writing by the copyright
|
|
||||||
owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
|
|
||||||
of whom a Contribution has been received by Licensor and subsequently
|
|
||||||
incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License.
|
|
||||||
|
|
||||||
Subject to the terms and conditions of this License, each Contributor hereby
|
|
||||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
|
||||||
irrevocable copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the Work and such
|
|
||||||
Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License.
|
|
||||||
|
|
||||||
Subject to the terms and conditions of this License, each Contributor hereby
|
|
||||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
|
||||||
irrevocable (except as stated in this section) patent license to make, have
|
|
||||||
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
|
|
||||||
such license applies only to those patent claims licensable by such Contributor
|
|
||||||
that are necessarily infringed by their Contribution(s) alone or by combination
|
|
||||||
of their Contribution(s) with the Work to which such Contribution(s) was
|
|
||||||
submitted. If You institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
|
|
||||||
Contribution incorporated within the Work constitutes direct or contributory
|
|
||||||
patent infringement, then any patent licenses granted to You under this License
|
|
||||||
for that Work shall terminate as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution.
|
|
||||||
|
|
||||||
You may reproduce and distribute copies of the Work or Derivative Works thereof
|
|
||||||
in any medium, with or without modifications, and in Source or Object form,
|
|
||||||
provided that You meet the following conditions:
|
|
||||||
|
|
||||||
You must give any other recipients of the Work or Derivative Works a copy of
|
|
||||||
this License; and
|
|
||||||
You must cause any modified files to carry prominent notices stating that You
|
|
||||||
changed the files; and
|
|
||||||
You must retain, in the Source form of any Derivative Works that You distribute,
|
|
||||||
all copyright, patent, trademark, and attribution notices from the Source form
|
|
||||||
of the Work, excluding those notices that do not pertain to any part of the
|
|
||||||
Derivative Works; and
|
|
||||||
If the Work includes a "NOTICE" text file as part of its distribution, then any
|
|
||||||
Derivative Works that You distribute must include a readable copy of the
|
|
||||||
attribution notices contained within such NOTICE file, excluding those notices
|
|
||||||
that do not pertain to any part of the Derivative Works, in at least one of the
|
|
||||||
following places: within a NOTICE text file distributed as part of the
|
|
||||||
Derivative Works; within the Source form or documentation, if provided along
|
|
||||||
with the Derivative Works; or, within a display generated by the Derivative
|
|
||||||
Works, if and wherever such third-party notices normally appear. The contents of
|
|
||||||
the NOTICE file are for informational purposes only and do not modify the
|
|
||||||
License. You may add Your own attribution notices within Derivative Works that
|
|
||||||
You distribute, alongside or as an addendum to the NOTICE text from the Work,
|
|
||||||
provided that such additional attribution notices cannot be construed as
|
|
||||||
modifying the License.
|
|
||||||
You may add Your own copyright statement to Your modifications and may provide
|
|
||||||
additional or different license terms and conditions for use, reproduction, or
|
|
||||||
distribution of Your modifications, or for any such Derivative Works as a whole,
|
|
||||||
provided Your use, reproduction, and distribution of the Work otherwise complies
|
|
||||||
with the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions.
|
|
||||||
|
|
||||||
Unless You explicitly state otherwise, any Contribution intentionally submitted
|
|
||||||
for inclusion in the Work by You to the Licensor shall be under the terms and
|
|
||||||
conditions of this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify the terms of
|
|
||||||
any separate license agreement you may have executed with Licensor regarding
|
|
||||||
such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks.
|
|
||||||
|
|
||||||
This License does not grant permission to use the trade names, trademarks,
|
|
||||||
service marks, or product names of the Licensor, except as required for
|
|
||||||
reasonable and customary use in describing the origin of the Work and
|
|
||||||
reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, Licensor provides the
|
|
||||||
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
|
|
||||||
including, without limitation, any warranties or conditions of TITLE,
|
|
||||||
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
|
|
||||||
solely responsible for determining the appropriateness of using or
|
|
||||||
redistributing the Work and assume any risks associated with Your exercise of
|
|
||||||
permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability.
|
|
||||||
|
|
||||||
In no event and under no legal theory, whether in tort (including negligence),
|
|
||||||
contract, or otherwise, unless required by applicable law (such as deliberate
|
|
||||||
and grossly negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special, incidental,
|
|
||||||
or consequential damages of any character arising as a result of this License or
|
|
||||||
out of the use or inability to use the Work (including but not limited to
|
|
||||||
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
|
|
||||||
any and all other commercial damages or losses), even if such Contributor has
|
|
||||||
been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability.
|
|
||||||
|
|
||||||
While redistributing the Work or Derivative Works thereof, You may choose to
|
|
||||||
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
|
|
||||||
other liability obligations and/or rights consistent with this License. However,
|
|
||||||
in accepting such obligations, You may act only on Your own behalf and on Your
|
|
||||||
sole responsibility, not on behalf of any other Contributor, and only if You
|
|
||||||
agree to indemnify, defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason of your
|
|
||||||
accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following boilerplate
|
|
||||||
notice, with the fields enclosed by brackets "[]" replaced with your own
|
|
||||||
identifying information. (Don't include the brackets!) The text should be
|
|
||||||
enclosed in the appropriate comment syntax for the file format. We also
|
|
||||||
recommend that a file or class name and description of purpose be included on
|
|
||||||
the same "printed page" as the copyright notice for easier identification within
|
|
||||||
third-party archives.
|
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
|
@ -1,5 +0,0 @@
|
||||||
CoreOS Project
|
|
||||||
Copyright 2018 CoreOS, Inc
|
|
||||||
|
|
||||||
This product includes software developed at CoreOS, Inc.
|
|
||||||
(http://www.coreos.com/).
|
|
|
@ -1,240 +0,0 @@
|
||||||
// Copyright 2015 CoreOS, Inc.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
// Integration with the systemd D-Bus API. See http://www.freedesktop.org/wiki/Software/systemd/dbus/
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/hex"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/godbus/dbus"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
alpha = `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ`
|
|
||||||
num = `0123456789`
|
|
||||||
alphanum = alpha + num
|
|
||||||
signalBuffer = 100
|
|
||||||
)
|
|
||||||
|
|
||||||
// needsEscape checks whether a byte in a potential dbus ObjectPath needs to be escaped
|
|
||||||
func needsEscape(i int, b byte) bool {
|
|
||||||
// Escape everything that is not a-z-A-Z-0-9
|
|
||||||
// Also escape 0-9 if it's the first character
|
|
||||||
return strings.IndexByte(alphanum, b) == -1 ||
|
|
||||||
(i == 0 && strings.IndexByte(num, b) != -1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PathBusEscape sanitizes a constituent string of a dbus ObjectPath using the
|
|
||||||
// rules that systemd uses for serializing special characters.
|
|
||||||
func PathBusEscape(path string) string {
|
|
||||||
// Special case the empty string
|
|
||||||
if len(path) == 0 {
|
|
||||||
return "_"
|
|
||||||
}
|
|
||||||
n := []byte{}
|
|
||||||
for i := 0; i < len(path); i++ {
|
|
||||||
c := path[i]
|
|
||||||
if needsEscape(i, c) {
|
|
||||||
e := fmt.Sprintf("_%x", c)
|
|
||||||
n = append(n, []byte(e)...)
|
|
||||||
} else {
|
|
||||||
n = append(n, c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return string(n)
|
|
||||||
}
|
|
||||||
|
|
||||||
// pathBusUnescape is the inverse of PathBusEscape.
|
|
||||||
func pathBusUnescape(path string) string {
|
|
||||||
if path == "_" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
n := []byte{}
|
|
||||||
for i := 0; i < len(path); i++ {
|
|
||||||
c := path[i]
|
|
||||||
if c == '_' && i+2 < len(path) {
|
|
||||||
res, err := hex.DecodeString(path[i+1 : i+3])
|
|
||||||
if err == nil {
|
|
||||||
n = append(n, res...)
|
|
||||||
}
|
|
||||||
i += 2
|
|
||||||
} else {
|
|
||||||
n = append(n, c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return string(n)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Conn is a connection to systemd's dbus endpoint.
|
|
||||||
type Conn struct {
|
|
||||||
// sysconn/sysobj are only used to call dbus methods
|
|
||||||
sysconn *dbus.Conn
|
|
||||||
sysobj dbus.BusObject
|
|
||||||
|
|
||||||
// sigconn/sigobj are only used to receive dbus signals
|
|
||||||
sigconn *dbus.Conn
|
|
||||||
sigobj dbus.BusObject
|
|
||||||
|
|
||||||
jobListener struct {
|
|
||||||
jobs map[dbus.ObjectPath]chan<- string
|
|
||||||
sync.Mutex
|
|
||||||
}
|
|
||||||
subStateSubscriber struct {
|
|
||||||
updateCh chan<- *SubStateUpdate
|
|
||||||
errCh chan<- error
|
|
||||||
sync.Mutex
|
|
||||||
ignore map[dbus.ObjectPath]int64
|
|
||||||
cleanIgnore int64
|
|
||||||
}
|
|
||||||
propertiesSubscriber struct {
|
|
||||||
updateCh chan<- *PropertiesUpdate
|
|
||||||
errCh chan<- error
|
|
||||||
sync.Mutex
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// New establishes a connection to any available bus and authenticates.
|
|
||||||
// Callers should call Close() when done with the connection.
|
|
||||||
func New() (*Conn, error) {
|
|
||||||
conn, err := NewSystemConnection()
|
|
||||||
if err != nil && os.Geteuid() == 0 {
|
|
||||||
return NewSystemdConnection()
|
|
||||||
}
|
|
||||||
return conn, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewSystemConnection establishes a connection to the system bus and authenticates.
|
|
||||||
// Callers should call Close() when done with the connection
|
|
||||||
func NewSystemConnection() (*Conn, error) {
|
|
||||||
return NewConnection(func() (*dbus.Conn, error) {
|
|
||||||
return dbusAuthHelloConnection(dbus.SystemBusPrivate)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewUserConnection establishes a connection to the session bus and
|
|
||||||
// authenticates. This can be used to connect to systemd user instances.
|
|
||||||
// Callers should call Close() when done with the connection.
|
|
||||||
func NewUserConnection() (*Conn, error) {
|
|
||||||
return NewConnection(func() (*dbus.Conn, error) {
|
|
||||||
return dbusAuthHelloConnection(dbus.SessionBusPrivate)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewSystemdConnection establishes a private, direct connection to systemd.
|
|
||||||
// This can be used for communicating with systemd without a dbus daemon.
|
|
||||||
// Callers should call Close() when done with the connection.
|
|
||||||
func NewSystemdConnection() (*Conn, error) {
|
|
||||||
return NewConnection(func() (*dbus.Conn, error) {
|
|
||||||
// We skip Hello when talking directly to systemd.
|
|
||||||
return dbusAuthConnection(func(opts ...dbus.ConnOption) (*dbus.Conn, error) {
|
|
||||||
return dbus.Dial("unix:path=/run/systemd/private")
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close closes an established connection
|
|
||||||
func (c *Conn) Close() {
|
|
||||||
c.sysconn.Close()
|
|
||||||
c.sigconn.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewConnection establishes a connection to a bus using a caller-supplied function.
|
|
||||||
// This allows connecting to remote buses through a user-supplied mechanism.
|
|
||||||
// The supplied function may be called multiple times, and should return independent connections.
|
|
||||||
// The returned connection must be fully initialised: the org.freedesktop.DBus.Hello call must have succeeded,
|
|
||||||
// and any authentication should be handled by the function.
|
|
||||||
func NewConnection(dialBus func() (*dbus.Conn, error)) (*Conn, error) {
|
|
||||||
sysconn, err := dialBus()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
sigconn, err := dialBus()
|
|
||||||
if err != nil {
|
|
||||||
sysconn.Close()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
c := &Conn{
|
|
||||||
sysconn: sysconn,
|
|
||||||
sysobj: systemdObject(sysconn),
|
|
||||||
sigconn: sigconn,
|
|
||||||
sigobj: systemdObject(sigconn),
|
|
||||||
}
|
|
||||||
|
|
||||||
c.subStateSubscriber.ignore = make(map[dbus.ObjectPath]int64)
|
|
||||||
c.jobListener.jobs = make(map[dbus.ObjectPath]chan<- string)
|
|
||||||
|
|
||||||
// Setup the listeners on jobs so that we can get completions
|
|
||||||
c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
|
|
||||||
"type='signal', interface='org.freedesktop.systemd1.Manager', member='JobRemoved'")
|
|
||||||
|
|
||||||
c.dispatch()
|
|
||||||
return c, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetManagerProperty returns the value of a property on the org.freedesktop.systemd1.Manager
|
|
||||||
// interface. The value is returned in its string representation, as defined at
|
|
||||||
// https://developer.gnome.org/glib/unstable/gvariant-text.html
|
|
||||||
func (c *Conn) GetManagerProperty(prop string) (string, error) {
|
|
||||||
variant, err := c.sysobj.GetProperty("org.freedesktop.systemd1.Manager." + prop)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return variant.String(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func dbusAuthConnection(createBus func(opts ...dbus.ConnOption) (*dbus.Conn, error)) (*dbus.Conn, error) {
|
|
||||||
conn, err := createBus()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only use EXTERNAL method, and hardcode the uid (not username)
|
|
||||||
// to avoid a username lookup (which requires a dynamically linked
|
|
||||||
// libc)
|
|
||||||
methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(os.Getuid()))}
|
|
||||||
|
|
||||||
err = conn.Auth(methods)
|
|
||||||
if err != nil {
|
|
||||||
conn.Close()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return conn, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func dbusAuthHelloConnection(createBus func(opts ...dbus.ConnOption) (*dbus.Conn, error)) (*dbus.Conn, error) {
|
|
||||||
conn, err := dbusAuthConnection(createBus)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = conn.Hello(); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return conn, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func systemdObject(conn *dbus.Conn) dbus.BusObject {
|
|
||||||
return conn.Object("org.freedesktop.systemd1", dbus.ObjectPath("/org/freedesktop/systemd1"))
|
|
||||||
}
|
|
|
@ -1,600 +0,0 @@
|
||||||
// Copyright 2015, 2018 CoreOS, Inc.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"path"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"github.com/godbus/dbus"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (c *Conn) jobComplete(signal *dbus.Signal) {
|
|
||||||
var id uint32
|
|
||||||
var job dbus.ObjectPath
|
|
||||||
var unit string
|
|
||||||
var result string
|
|
||||||
dbus.Store(signal.Body, &id, &job, &unit, &result)
|
|
||||||
c.jobListener.Lock()
|
|
||||||
out, ok := c.jobListener.jobs[job]
|
|
||||||
if ok {
|
|
||||||
out <- result
|
|
||||||
delete(c.jobListener.jobs, job)
|
|
||||||
}
|
|
||||||
c.jobListener.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) startJob(ch chan<- string, job string, args ...interface{}) (int, error) {
|
|
||||||
if ch != nil {
|
|
||||||
c.jobListener.Lock()
|
|
||||||
defer c.jobListener.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
var p dbus.ObjectPath
|
|
||||||
err := c.sysobj.Call(job, 0, args...).Store(&p)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if ch != nil {
|
|
||||||
c.jobListener.jobs[p] = ch
|
|
||||||
}
|
|
||||||
|
|
||||||
// ignore error since 0 is fine if conversion fails
|
|
||||||
jobID, _ := strconv.Atoi(path.Base(string(p)))
|
|
||||||
|
|
||||||
return jobID, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// StartUnit enqueues a start job and depending jobs, if any (unless otherwise
|
|
||||||
// specified by the mode string).
|
|
||||||
//
|
|
||||||
// Takes the unit to activate, plus a mode string. The mode needs to be one of
|
|
||||||
// replace, fail, isolate, ignore-dependencies, ignore-requirements. If
|
|
||||||
// "replace" the call will start the unit and its dependencies, possibly
|
|
||||||
// replacing already queued jobs that conflict with this. If "fail" the call
|
|
||||||
// will start the unit and its dependencies, but will fail if this would change
|
|
||||||
// an already queued job. If "isolate" the call will start the unit in question
|
|
||||||
// and terminate all units that aren't dependencies of it. If
|
|
||||||
// "ignore-dependencies" it will start a unit but ignore all its dependencies.
|
|
||||||
// If "ignore-requirements" it will start a unit but only ignore the
|
|
||||||
// requirement dependencies. It is not recommended to make use of the latter
|
|
||||||
// two options.
|
|
||||||
//
|
|
||||||
// If the provided channel is non-nil, a result string will be sent to it upon
|
|
||||||
// job completion: one of done, canceled, timeout, failed, dependency, skipped.
|
|
||||||
// done indicates successful execution of a job. canceled indicates that a job
|
|
||||||
// has been canceled before it finished execution. timeout indicates that the
|
|
||||||
// job timeout was reached. failed indicates that the job failed. dependency
|
|
||||||
// indicates that a job this job has been depending on failed and the job hence
|
|
||||||
// has been removed too. skipped indicates that a job was skipped because it
|
|
||||||
// didn't apply to the units current state.
|
|
||||||
//
|
|
||||||
// If no error occurs, the ID of the underlying systemd job will be returned. There
|
|
||||||
// does exist the possibility for no error to be returned, but for the returned job
|
|
||||||
// ID to be 0. In this case, the actual underlying ID is not 0 and this datapoint
|
|
||||||
// should not be considered authoritative.
|
|
||||||
//
|
|
||||||
// If an error does occur, it will be returned to the user alongside a job ID of 0.
|
|
||||||
func (c *Conn) StartUnit(name string, mode string, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartUnit", name, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// StopUnit is similar to StartUnit but stops the specified unit rather
|
|
||||||
// than starting it.
|
|
||||||
func (c *Conn) StopUnit(name string, mode string, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.StopUnit", name, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReloadUnit reloads a unit. Reloading is done only if the unit is already running and fails otherwise.
|
|
||||||
func (c *Conn) ReloadUnit(name string, mode string, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadUnit", name, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// RestartUnit restarts a service. If a service is restarted that isn't
|
|
||||||
// running it will be started.
|
|
||||||
func (c *Conn) RestartUnit(name string, mode string, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.RestartUnit", name, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TryRestartUnit is like RestartUnit, except that a service that isn't running
|
|
||||||
// is not affected by the restart.
|
|
||||||
func (c *Conn) TryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.TryRestartUnit", name, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReloadOrRestartUnit attempts a reload if the unit supports it and use a restart
|
|
||||||
// otherwise.
|
|
||||||
func (c *Conn) ReloadOrRestartUnit(name string, mode string, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrRestartUnit", name, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReloadOrTryRestartUnit attempts a reload if the unit supports it and use a "Try"
|
|
||||||
// flavored restart otherwise.
|
|
||||||
func (c *Conn) ReloadOrTryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrTryRestartUnit", name, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// StartTransientUnit() may be used to create and start a transient unit, which
|
|
||||||
// will be released as soon as it is not running or referenced anymore or the
|
|
||||||
// system is rebooted. name is the unit name including suffix, and must be
|
|
||||||
// unique. mode is the same as in StartUnit(), properties contains properties
|
|
||||||
// of the unit.
|
|
||||||
func (c *Conn) StartTransientUnit(name string, mode string, properties []Property, ch chan<- string) (int, error) {
|
|
||||||
return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartTransientUnit", name, mode, properties, make([]PropertyCollection, 0))
|
|
||||||
}
|
|
||||||
|
|
||||||
// KillUnit takes the unit name and a UNIX signal number to send. All of the unit's
|
|
||||||
// processes are killed.
|
|
||||||
func (c *Conn) KillUnit(name string, signal int32) {
|
|
||||||
c.sysobj.Call("org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store()
|
|
||||||
}
|
|
||||||
|
|
||||||
// ResetFailedUnit resets the "failed" state of a specific unit.
|
|
||||||
func (c *Conn) ResetFailedUnit(name string) error {
|
|
||||||
return c.sysobj.Call("org.freedesktop.systemd1.Manager.ResetFailedUnit", 0, name).Store()
|
|
||||||
}
|
|
||||||
|
|
||||||
// SystemState returns the systemd state. Equivalent to `systemctl is-system-running`.
|
|
||||||
func (c *Conn) SystemState() (*Property, error) {
|
|
||||||
var err error
|
|
||||||
var prop dbus.Variant
|
|
||||||
|
|
||||||
obj := c.sysconn.Object("org.freedesktop.systemd1", "/org/freedesktop/systemd1")
|
|
||||||
err = obj.Call("org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.systemd1.Manager", "SystemState").Store(&prop)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return &Property{Name: "SystemState", Value: prop}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// getProperties takes the unit path and returns all of its dbus object properties, for the given dbus interface
|
|
||||||
func (c *Conn) getProperties(path dbus.ObjectPath, dbusInterface string) (map[string]interface{}, error) {
|
|
||||||
var err error
|
|
||||||
var props map[string]dbus.Variant
|
|
||||||
|
|
||||||
if !path.IsValid() {
|
|
||||||
return nil, fmt.Errorf("invalid unit name: %v", path)
|
|
||||||
}
|
|
||||||
|
|
||||||
obj := c.sysconn.Object("org.freedesktop.systemd1", path)
|
|
||||||
err = obj.Call("org.freedesktop.DBus.Properties.GetAll", 0, dbusInterface).Store(&props)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
out := make(map[string]interface{}, len(props))
|
|
||||||
for k, v := range props {
|
|
||||||
out[k] = v.Value()
|
|
||||||
}
|
|
||||||
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUnitProperties takes the (unescaped) unit name and returns all of its dbus object properties.
|
|
||||||
func (c *Conn) GetUnitProperties(unit string) (map[string]interface{}, error) {
|
|
||||||
path := unitPath(unit)
|
|
||||||
return c.getProperties(path, "org.freedesktop.systemd1.Unit")
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUnitPathProperties takes the (escaped) unit path and returns all of its dbus object properties.
|
|
||||||
func (c *Conn) GetUnitPathProperties(path dbus.ObjectPath) (map[string]interface{}, error) {
|
|
||||||
return c.getProperties(path, "org.freedesktop.systemd1.Unit")
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetAllProperties takes the (unescaped) unit name and returns all of its dbus object properties.
|
|
||||||
func (c *Conn) GetAllProperties(unit string) (map[string]interface{}, error) {
|
|
||||||
path := unitPath(unit)
|
|
||||||
return c.getProperties(path, "")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) getProperty(unit string, dbusInterface string, propertyName string) (*Property, error) {
|
|
||||||
var err error
|
|
||||||
var prop dbus.Variant
|
|
||||||
|
|
||||||
path := unitPath(unit)
|
|
||||||
if !path.IsValid() {
|
|
||||||
return nil, errors.New("invalid unit name: " + unit)
|
|
||||||
}
|
|
||||||
|
|
||||||
obj := c.sysconn.Object("org.freedesktop.systemd1", path)
|
|
||||||
err = obj.Call("org.freedesktop.DBus.Properties.Get", 0, dbusInterface, propertyName).Store(&prop)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return &Property{Name: propertyName, Value: prop}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) GetUnitProperty(unit string, propertyName string) (*Property, error) {
|
|
||||||
return c.getProperty(unit, "org.freedesktop.systemd1.Unit", propertyName)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetServiceProperty returns property for given service name and property name
|
|
||||||
func (c *Conn) GetServiceProperty(service string, propertyName string) (*Property, error) {
|
|
||||||
return c.getProperty(service, "org.freedesktop.systemd1.Service", propertyName)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUnitTypeProperties returns the extra properties for a unit, specific to the unit type.
|
|
||||||
// Valid values for unitType: Service, Socket, Target, Device, Mount, Automount, Snapshot, Timer, Swap, Path, Slice, Scope
|
|
||||||
// return "dbus.Error: Unknown interface" if the unitType is not the correct type of the unit
|
|
||||||
func (c *Conn) GetUnitTypeProperties(unit string, unitType string) (map[string]interface{}, error) {
|
|
||||||
path := unitPath(unit)
|
|
||||||
return c.getProperties(path, "org.freedesktop.systemd1."+unitType)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetUnitProperties() may be used to modify certain unit properties at runtime.
|
|
||||||
// Not all properties may be changed at runtime, but many resource management
|
|
||||||
// settings (primarily those in systemd.cgroup(5)) may. The changes are applied
|
|
||||||
// instantly, and stored on disk for future boots, unless runtime is true, in which
|
|
||||||
// case the settings only apply until the next reboot. name is the name of the unit
|
|
||||||
// to modify. properties are the settings to set, encoded as an array of property
|
|
||||||
// name and value pairs.
|
|
||||||
func (c *Conn) SetUnitProperties(name string, runtime bool, properties ...Property) error {
|
|
||||||
return c.sysobj.Call("org.freedesktop.systemd1.Manager.SetUnitProperties", 0, name, runtime, properties).Store()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) {
|
|
||||||
return c.getProperty(unit, "org.freedesktop.systemd1."+unitType, propertyName)
|
|
||||||
}
|
|
||||||
|
|
||||||
type UnitStatus struct {
|
|
||||||
Name string // The primary unit name as string
|
|
||||||
Description string // The human readable description string
|
|
||||||
LoadState string // The load state (i.e. whether the unit file has been loaded successfully)
|
|
||||||
ActiveState string // The active state (i.e. whether the unit is currently started or not)
|
|
||||||
SubState string // The sub state (a more fine-grained version of the active state that is specific to the unit type, which the active state is not)
|
|
||||||
Followed string // A unit that is being followed in its state by this unit, if there is any, otherwise the empty string.
|
|
||||||
Path dbus.ObjectPath // The unit object path
|
|
||||||
JobId uint32 // If there is a job queued for the job unit the numeric job id, 0 otherwise
|
|
||||||
JobType string // The job type as string
|
|
||||||
JobPath dbus.ObjectPath // The job object path
|
|
||||||
}
|
|
||||||
|
|
||||||
type storeFunc func(retvalues ...interface{}) error
|
|
||||||
|
|
||||||
func (c *Conn) listUnitsInternal(f storeFunc) ([]UnitStatus, error) {
|
|
||||||
result := make([][]interface{}, 0)
|
|
||||||
err := f(&result)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resultInterface := make([]interface{}, len(result))
|
|
||||||
for i := range result {
|
|
||||||
resultInterface[i] = result[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
status := make([]UnitStatus, len(result))
|
|
||||||
statusInterface := make([]interface{}, len(status))
|
|
||||||
for i := range status {
|
|
||||||
statusInterface[i] = &status[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
err = dbus.Store(resultInterface, statusInterface...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return status, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListUnits returns an array with all currently loaded units. Note that
|
|
||||||
// units may be known by multiple names at the same time, and hence there might
|
|
||||||
// be more unit names loaded than actual units behind them.
|
|
||||||
// Also note that a unit is only loaded if it is active and/or enabled.
|
|
||||||
// Units that are both disabled and inactive will thus not be returned.
|
|
||||||
func (c *Conn) ListUnits() ([]UnitStatus, error) {
|
|
||||||
return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnits", 0).Store)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListUnitsFiltered returns an array with units filtered by state.
|
|
||||||
// It takes a list of units' statuses to filter.
|
|
||||||
func (c *Conn) ListUnitsFiltered(states []string) ([]UnitStatus, error) {
|
|
||||||
return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsFiltered", 0, states).Store)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListUnitsByPatterns returns an array with units.
|
|
||||||
// It takes a list of units' statuses and names to filter.
|
|
||||||
// Note that units may be known by multiple names at the same time,
|
|
||||||
// and hence there might be more unit names loaded than actual units behind them.
|
|
||||||
func (c *Conn) ListUnitsByPatterns(states []string, patterns []string) ([]UnitStatus, error) {
|
|
||||||
return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByPatterns", 0, states, patterns).Store)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListUnitsByNames returns an array with units. It takes a list of units'
|
|
||||||
// names and returns an UnitStatus array. Comparing to ListUnitsByPatterns
|
|
||||||
// method, this method returns statuses even for inactive or non-existing
|
|
||||||
// units. Input array should contain exact unit names, but not patterns.
|
|
||||||
// Note: Requires systemd v230 or higher
|
|
||||||
func (c *Conn) ListUnitsByNames(units []string) ([]UnitStatus, error) {
|
|
||||||
return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByNames", 0, units).Store)
|
|
||||||
}
|
|
||||||
|
|
||||||
type UnitFile struct {
|
|
||||||
Path string
|
|
||||||
Type string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) listUnitFilesInternal(f storeFunc) ([]UnitFile, error) {
|
|
||||||
result := make([][]interface{}, 0)
|
|
||||||
err := f(&result)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resultInterface := make([]interface{}, len(result))
|
|
||||||
for i := range result {
|
|
||||||
resultInterface[i] = result[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
files := make([]UnitFile, len(result))
|
|
||||||
fileInterface := make([]interface{}, len(files))
|
|
||||||
for i := range files {
|
|
||||||
fileInterface[i] = &files[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
err = dbus.Store(resultInterface, fileInterface...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return files, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListUnitFiles returns an array of all available units on disk.
|
|
||||||
func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
|
|
||||||
return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFiles", 0).Store)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListUnitFilesByPatterns returns an array of all available units on disk matched the patterns.
|
|
||||||
func (c *Conn) ListUnitFilesByPatterns(states []string, patterns []string) ([]UnitFile, error) {
|
|
||||||
return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFilesByPatterns", 0, states, patterns).Store)
|
|
||||||
}
|
|
||||||
|
|
||||||
type LinkUnitFileChange EnableUnitFileChange
|
|
||||||
|
|
||||||
// LinkUnitFiles() links unit files (that are located outside of the
|
|
||||||
// usual unit search paths) into the unit search path.
|
|
||||||
//
|
|
||||||
// It takes a list of absolute paths to unit files to link and two
|
|
||||||
// booleans. The first boolean controls whether the unit shall be
|
|
||||||
// enabled for runtime only (true, /run), or persistently (false,
|
|
||||||
// /etc).
|
|
||||||
// The second controls whether symlinks pointing to other units shall
|
|
||||||
// be replaced if necessary.
|
|
||||||
//
|
|
||||||
// This call returns a list of the changes made. The list consists of
|
|
||||||
// structures with three strings: the type of the change (one of symlink
|
|
||||||
// or unlink), the file name of the symlink and the destination of the
|
|
||||||
// symlink.
|
|
||||||
func (c *Conn) LinkUnitFiles(files []string, runtime bool, force bool) ([]LinkUnitFileChange, error) {
|
|
||||||
result := make([][]interface{}, 0)
|
|
||||||
err := c.sysobj.Call("org.freedesktop.systemd1.Manager.LinkUnitFiles", 0, files, runtime, force).Store(&result)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resultInterface := make([]interface{}, len(result))
|
|
||||||
for i := range result {
|
|
||||||
resultInterface[i] = result[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
changes := make([]LinkUnitFileChange, len(result))
|
|
||||||
changesInterface := make([]interface{}, len(changes))
|
|
||||||
for i := range changes {
|
|
||||||
changesInterface[i] = &changes[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
err = dbus.Store(resultInterface, changesInterface...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return changes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnableUnitFiles() may be used to enable one or more units in the system (by
|
|
||||||
// creating symlinks to them in /etc or /run).
|
|
||||||
//
|
|
||||||
// It takes a list of unit files to enable (either just file names or full
|
|
||||||
// absolute paths if the unit files are residing outside the usual unit
|
|
||||||
// search paths), and two booleans: the first controls whether the unit shall
|
|
||||||
// be enabled for runtime only (true, /run), or persistently (false, /etc).
|
|
||||||
// The second one controls whether symlinks pointing to other units shall
|
|
||||||
// be replaced if necessary.
|
|
||||||
//
|
|
||||||
// This call returns one boolean and an array with the changes made. The
|
|
||||||
// boolean signals whether the unit files contained any enablement
|
|
||||||
// information (i.e. an [Install]) section. The changes list consists of
|
|
||||||
// structures with three strings: the type of the change (one of symlink
|
|
||||||
// or unlink), the file name of the symlink and the destination of the
|
|
||||||
// symlink.
|
|
||||||
func (c *Conn) EnableUnitFiles(files []string, runtime bool, force bool) (bool, []EnableUnitFileChange, error) {
|
|
||||||
var carries_install_info bool
|
|
||||||
|
|
||||||
result := make([][]interface{}, 0)
|
|
||||||
err := c.sysobj.Call("org.freedesktop.systemd1.Manager.EnableUnitFiles", 0, files, runtime, force).Store(&carries_install_info, &result)
|
|
||||||
if err != nil {
|
|
||||||
return false, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resultInterface := make([]interface{}, len(result))
|
|
||||||
for i := range result {
|
|
||||||
resultInterface[i] = result[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
changes := make([]EnableUnitFileChange, len(result))
|
|
||||||
changesInterface := make([]interface{}, len(changes))
|
|
||||||
for i := range changes {
|
|
||||||
changesInterface[i] = &changes[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
err = dbus.Store(resultInterface, changesInterface...)
|
|
||||||
if err != nil {
|
|
||||||
return false, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return carries_install_info, changes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type EnableUnitFileChange struct {
|
|
||||||
Type string // Type of the change (one of symlink or unlink)
|
|
||||||
Filename string // File name of the symlink
|
|
||||||
Destination string // Destination of the symlink
|
|
||||||
}
|
|
||||||
|
|
||||||
// DisableUnitFiles() may be used to disable one or more units in the system (by
|
|
||||||
// removing symlinks to them from /etc or /run).
|
|
||||||
//
|
|
||||||
// It takes a list of unit files to disable (either just file names or full
|
|
||||||
// absolute paths if the unit files are residing outside the usual unit
|
|
||||||
// search paths), and one boolean: whether the unit was enabled for runtime
|
|
||||||
// only (true, /run), or persistently (false, /etc).
|
|
||||||
//
|
|
||||||
// This call returns an array with the changes made. The changes list
|
|
||||||
// consists of structures with three strings: the type of the change (one of
|
|
||||||
// symlink or unlink), the file name of the symlink and the destination of the
|
|
||||||
// symlink.
|
|
||||||
func (c *Conn) DisableUnitFiles(files []string, runtime bool) ([]DisableUnitFileChange, error) {
|
|
||||||
result := make([][]interface{}, 0)
|
|
||||||
err := c.sysobj.Call("org.freedesktop.systemd1.Manager.DisableUnitFiles", 0, files, runtime).Store(&result)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resultInterface := make([]interface{}, len(result))
|
|
||||||
for i := range result {
|
|
||||||
resultInterface[i] = result[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
changes := make([]DisableUnitFileChange, len(result))
|
|
||||||
changesInterface := make([]interface{}, len(changes))
|
|
||||||
for i := range changes {
|
|
||||||
changesInterface[i] = &changes[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
err = dbus.Store(resultInterface, changesInterface...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return changes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type DisableUnitFileChange struct {
|
|
||||||
Type string // Type of the change (one of symlink or unlink)
|
|
||||||
Filename string // File name of the symlink
|
|
||||||
Destination string // Destination of the symlink
|
|
||||||
}
|
|
||||||
|
|
||||||
// MaskUnitFiles masks one or more units in the system
|
|
||||||
//
|
|
||||||
// It takes three arguments:
|
|
||||||
// * list of units to mask (either just file names or full
|
|
||||||
// absolute paths if the unit files are residing outside
|
|
||||||
// the usual unit search paths)
|
|
||||||
// * runtime to specify whether the unit was enabled for runtime
|
|
||||||
// only (true, /run/systemd/..), or persistently (false, /etc/systemd/..)
|
|
||||||
// * force flag
|
|
||||||
func (c *Conn) MaskUnitFiles(files []string, runtime bool, force bool) ([]MaskUnitFileChange, error) {
|
|
||||||
result := make([][]interface{}, 0)
|
|
||||||
err := c.sysobj.Call("org.freedesktop.systemd1.Manager.MaskUnitFiles", 0, files, runtime, force).Store(&result)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resultInterface := make([]interface{}, len(result))
|
|
||||||
for i := range result {
|
|
||||||
resultInterface[i] = result[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
changes := make([]MaskUnitFileChange, len(result))
|
|
||||||
changesInterface := make([]interface{}, len(changes))
|
|
||||||
for i := range changes {
|
|
||||||
changesInterface[i] = &changes[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
err = dbus.Store(resultInterface, changesInterface...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return changes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type MaskUnitFileChange struct {
|
|
||||||
Type string // Type of the change (one of symlink or unlink)
|
|
||||||
Filename string // File name of the symlink
|
|
||||||
Destination string // Destination of the symlink
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmaskUnitFiles unmasks one or more units in the system
|
|
||||||
//
|
|
||||||
// It takes two arguments:
|
|
||||||
// * list of unit files to mask (either just file names or full
|
|
||||||
// absolute paths if the unit files are residing outside
|
|
||||||
// the usual unit search paths)
|
|
||||||
// * runtime to specify whether the unit was enabled for runtime
|
|
||||||
// only (true, /run/systemd/..), or persistently (false, /etc/systemd/..)
|
|
||||||
func (c *Conn) UnmaskUnitFiles(files []string, runtime bool) ([]UnmaskUnitFileChange, error) {
|
|
||||||
result := make([][]interface{}, 0)
|
|
||||||
err := c.sysobj.Call("org.freedesktop.systemd1.Manager.UnmaskUnitFiles", 0, files, runtime).Store(&result)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resultInterface := make([]interface{}, len(result))
|
|
||||||
for i := range result {
|
|
||||||
resultInterface[i] = result[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
changes := make([]UnmaskUnitFileChange, len(result))
|
|
||||||
changesInterface := make([]interface{}, len(changes))
|
|
||||||
for i := range changes {
|
|
||||||
changesInterface[i] = &changes[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
err = dbus.Store(resultInterface, changesInterface...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return changes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type UnmaskUnitFileChange struct {
|
|
||||||
Type string // Type of the change (one of symlink or unlink)
|
|
||||||
Filename string // File name of the symlink
|
|
||||||
Destination string // Destination of the symlink
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reload instructs systemd to scan for and reload unit files. This is
|
|
||||||
// equivalent to a 'systemctl daemon-reload'.
|
|
||||||
func (c *Conn) Reload() error {
|
|
||||||
return c.sysobj.Call("org.freedesktop.systemd1.Manager.Reload", 0).Store()
|
|
||||||
}
|
|
||||||
|
|
||||||
func unitPath(name string) dbus.ObjectPath {
|
|
||||||
return dbus.ObjectPath("/org/freedesktop/systemd1/unit/" + PathBusEscape(name))
|
|
||||||
}
|
|
||||||
|
|
||||||
// unitName returns the unescaped base element of the supplied escaped path
|
|
||||||
func unitName(dpath dbus.ObjectPath) string {
|
|
||||||
return pathBusUnescape(path.Base(string(dpath)))
|
|
||||||
}
|
|
|
@ -1,237 +0,0 @@
|
||||||
// Copyright 2015 CoreOS, Inc.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/godbus/dbus"
|
|
||||||
)
|
|
||||||
|
|
||||||
// From the systemd docs:
|
|
||||||
//
|
|
||||||
// The properties array of StartTransientUnit() may take many of the settings
|
|
||||||
// that may also be configured in unit files. Not all parameters are currently
|
|
||||||
// accepted though, but we plan to cover more properties with future release.
|
|
||||||
// Currently you may set the Description, Slice and all dependency types of
|
|
||||||
// units, as well as RemainAfterExit, ExecStart for service units,
|
|
||||||
// TimeoutStopUSec and PIDs for scope units, and CPUAccounting, CPUShares,
|
|
||||||
// BlockIOAccounting, BlockIOWeight, BlockIOReadBandwidth,
|
|
||||||
// BlockIOWriteBandwidth, BlockIODeviceWeight, MemoryAccounting, MemoryLimit,
|
|
||||||
// DevicePolicy, DeviceAllow for services/scopes/slices. These fields map
|
|
||||||
// directly to their counterparts in unit files and as normal D-Bus object
|
|
||||||
// properties. The exception here is the PIDs field of scope units which is
|
|
||||||
// used for construction of the scope only and specifies the initial PIDs to
|
|
||||||
// add to the scope object.
|
|
||||||
|
|
||||||
type Property struct {
|
|
||||||
Name string
|
|
||||||
Value dbus.Variant
|
|
||||||
}
|
|
||||||
|
|
||||||
type PropertyCollection struct {
|
|
||||||
Name string
|
|
||||||
Properties []Property
|
|
||||||
}
|
|
||||||
|
|
||||||
type execStart struct {
|
|
||||||
Path string // the binary path to execute
|
|
||||||
Args []string // an array with all arguments to pass to the executed command, starting with argument 0
|
|
||||||
UncleanIsFailure bool // a boolean whether it should be considered a failure if the process exits uncleanly
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropExecStart sets the ExecStart service property. The first argument is a
|
|
||||||
// slice with the binary path to execute followed by the arguments to pass to
|
|
||||||
// the executed command. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=
|
|
||||||
func PropExecStart(command []string, uncleanIsFailure bool) Property {
|
|
||||||
execStarts := []execStart{
|
|
||||||
execStart{
|
|
||||||
Path: command[0],
|
|
||||||
Args: command,
|
|
||||||
UncleanIsFailure: uncleanIsFailure,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
return Property{
|
|
||||||
Name: "ExecStart",
|
|
||||||
Value: dbus.MakeVariant(execStarts),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRemainAfterExit sets the RemainAfterExit service property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
|
|
||||||
func PropRemainAfterExit(b bool) Property {
|
|
||||||
return Property{
|
|
||||||
Name: "RemainAfterExit",
|
|
||||||
Value: dbus.MakeVariant(b),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropType sets the Type service property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=
|
|
||||||
func PropType(t string) Property {
|
|
||||||
return Property{
|
|
||||||
Name: "Type",
|
|
||||||
Value: dbus.MakeVariant(t),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropDescription sets the Description unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit#Description=
|
|
||||||
func PropDescription(desc string) Property {
|
|
||||||
return Property{
|
|
||||||
Name: "Description",
|
|
||||||
Value: dbus.MakeVariant(desc),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func propDependency(name string, units []string) Property {
|
|
||||||
return Property{
|
|
||||||
Name: name,
|
|
||||||
Value: dbus.MakeVariant(units),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRequires sets the Requires unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requires=
|
|
||||||
func PropRequires(units ...string) Property {
|
|
||||||
return propDependency("Requires", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRequiresOverridable sets the RequiresOverridable unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresOverridable=
|
|
||||||
func PropRequiresOverridable(units ...string) Property {
|
|
||||||
return propDependency("RequiresOverridable", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRequisite sets the Requisite unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requisite=
|
|
||||||
func PropRequisite(units ...string) Property {
|
|
||||||
return propDependency("Requisite", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRequisiteOverridable sets the RequisiteOverridable unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequisiteOverridable=
|
|
||||||
func PropRequisiteOverridable(units ...string) Property {
|
|
||||||
return propDependency("RequisiteOverridable", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropWants sets the Wants unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
|
|
||||||
func PropWants(units ...string) Property {
|
|
||||||
return propDependency("Wants", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropBindsTo sets the BindsTo unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#BindsTo=
|
|
||||||
func PropBindsTo(units ...string) Property {
|
|
||||||
return propDependency("BindsTo", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRequiredBy sets the RequiredBy unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredBy=
|
|
||||||
func PropRequiredBy(units ...string) Property {
|
|
||||||
return propDependency("RequiredBy", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRequiredByOverridable sets the RequiredByOverridable unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredByOverridable=
|
|
||||||
func PropRequiredByOverridable(units ...string) Property {
|
|
||||||
return propDependency("RequiredByOverridable", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropWantedBy sets the WantedBy unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
|
|
||||||
func PropWantedBy(units ...string) Property {
|
|
||||||
return propDependency("WantedBy", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropBoundBy sets the BoundBy unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/main/systemd.unit.html#BoundBy=
|
|
||||||
func PropBoundBy(units ...string) Property {
|
|
||||||
return propDependency("BoundBy", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropConflicts sets the Conflicts unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=
|
|
||||||
func PropConflicts(units ...string) Property {
|
|
||||||
return propDependency("Conflicts", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropConflictedBy sets the ConflictedBy unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#ConflictedBy=
|
|
||||||
func PropConflictedBy(units ...string) Property {
|
|
||||||
return propDependency("ConflictedBy", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropBefore sets the Before unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=
|
|
||||||
func PropBefore(units ...string) Property {
|
|
||||||
return propDependency("Before", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropAfter sets the After unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#After=
|
|
||||||
func PropAfter(units ...string) Property {
|
|
||||||
return propDependency("After", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropOnFailure sets the OnFailure unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=
|
|
||||||
func PropOnFailure(units ...string) Property {
|
|
||||||
return propDependency("OnFailure", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropTriggers sets the Triggers unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Triggers=
|
|
||||||
func PropTriggers(units ...string) Property {
|
|
||||||
return propDependency("Triggers", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropTriggeredBy sets the TriggeredBy unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#TriggeredBy=
|
|
||||||
func PropTriggeredBy(units ...string) Property {
|
|
||||||
return propDependency("TriggeredBy", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropPropagatesReloadTo sets the PropagatesReloadTo unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#PropagatesReloadTo=
|
|
||||||
func PropPropagatesReloadTo(units ...string) Property {
|
|
||||||
return propDependency("PropagatesReloadTo", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropRequiresMountsFor sets the RequiresMountsFor unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresMountsFor=
|
|
||||||
func PropRequiresMountsFor(units ...string) Property {
|
|
||||||
return propDependency("RequiresMountsFor", units)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropSlice sets the Slice unit property. See
|
|
||||||
// http://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#Slice=
|
|
||||||
func PropSlice(slice string) Property {
|
|
||||||
return Property{
|
|
||||||
Name: "Slice",
|
|
||||||
Value: dbus.MakeVariant(slice),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropPids sets the PIDs field of scope units used in the initial construction
|
|
||||||
// of the scope only and specifies the initial PIDs to add to the scope object.
|
|
||||||
// See https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/#properties
|
|
||||||
func PropPids(pids ...uint32) Property {
|
|
||||||
return Property{
|
|
||||||
Name: "PIDs",
|
|
||||||
Value: dbus.MakeVariant(pids),
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,47 +0,0 @@
|
||||||
// Copyright 2015 CoreOS, Inc.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
type set struct {
|
|
||||||
data map[string]bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *set) Add(value string) {
|
|
||||||
s.data[value] = true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *set) Remove(value string) {
|
|
||||||
delete(s.data, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *set) Contains(value string) (exists bool) {
|
|
||||||
_, exists = s.data[value]
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *set) Length() int {
|
|
||||||
return len(s.data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *set) Values() (values []string) {
|
|
||||||
for val := range s.data {
|
|
||||||
values = append(values, val)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func newSet() *set {
|
|
||||||
return &set{make(map[string]bool)}
|
|
||||||
}
|
|
|
@ -1,333 +0,0 @@
|
||||||
// Copyright 2015 CoreOS, Inc.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"log"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/godbus/dbus"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
cleanIgnoreInterval = int64(10 * time.Second)
|
|
||||||
ignoreInterval = int64(30 * time.Millisecond)
|
|
||||||
)
|
|
||||||
|
|
||||||
// Subscribe sets up this connection to subscribe to all systemd dbus events.
|
|
||||||
// This is required before calling SubscribeUnits. When the connection closes
|
|
||||||
// systemd will automatically stop sending signals so there is no need to
|
|
||||||
// explicitly call Unsubscribe().
|
|
||||||
func (c *Conn) Subscribe() error {
|
|
||||||
c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
|
|
||||||
"type='signal',interface='org.freedesktop.systemd1.Manager',member='UnitNew'")
|
|
||||||
c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
|
|
||||||
"type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'")
|
|
||||||
|
|
||||||
return c.sigobj.Call("org.freedesktop.systemd1.Manager.Subscribe", 0).Store()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unsubscribe this connection from systemd dbus events.
|
|
||||||
func (c *Conn) Unsubscribe() error {
|
|
||||||
return c.sigobj.Call("org.freedesktop.systemd1.Manager.Unsubscribe", 0).Store()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) dispatch() {
|
|
||||||
ch := make(chan *dbus.Signal, signalBuffer)
|
|
||||||
|
|
||||||
c.sigconn.Signal(ch)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
signal, ok := <-ch
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if signal.Name == "org.freedesktop.systemd1.Manager.JobRemoved" {
|
|
||||||
c.jobComplete(signal)
|
|
||||||
}
|
|
||||||
|
|
||||||
if c.subStateSubscriber.updateCh == nil &&
|
|
||||||
c.propertiesSubscriber.updateCh == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
var unitPath dbus.ObjectPath
|
|
||||||
switch signal.Name {
|
|
||||||
case "org.freedesktop.systemd1.Manager.JobRemoved":
|
|
||||||
unitName := signal.Body[2].(string)
|
|
||||||
c.sysobj.Call("org.freedesktop.systemd1.Manager.GetUnit", 0, unitName).Store(&unitPath)
|
|
||||||
case "org.freedesktop.systemd1.Manager.UnitNew":
|
|
||||||
unitPath = signal.Body[1].(dbus.ObjectPath)
|
|
||||||
case "org.freedesktop.DBus.Properties.PropertiesChanged":
|
|
||||||
if signal.Body[0].(string) == "org.freedesktop.systemd1.Unit" {
|
|
||||||
unitPath = signal.Path
|
|
||||||
|
|
||||||
if len(signal.Body) >= 2 {
|
|
||||||
if changed, ok := signal.Body[1].(map[string]dbus.Variant); ok {
|
|
||||||
c.sendPropertiesUpdate(unitPath, changed)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if unitPath == dbus.ObjectPath("") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
c.sendSubStateUpdate(unitPath)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
// SubscribeUnits returns two unbuffered channels which will receive all changed units every
|
|
||||||
// interval. Deleted units are sent as nil.
|
|
||||||
func (c *Conn) SubscribeUnits(interval time.Duration) (<-chan map[string]*UnitStatus, <-chan error) {
|
|
||||||
return c.SubscribeUnitsCustom(interval, 0, func(u1, u2 *UnitStatus) bool { return *u1 != *u2 }, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SubscribeUnitsCustom is like SubscribeUnits but lets you specify the buffer
|
|
||||||
// size of the channels, the comparison function for detecting changes and a filter
|
|
||||||
// function for cutting down on the noise that your channel receives.
|
|
||||||
func (c *Conn) SubscribeUnitsCustom(interval time.Duration, buffer int, isChanged func(*UnitStatus, *UnitStatus) bool, filterUnit func(string) bool) (<-chan map[string]*UnitStatus, <-chan error) {
|
|
||||||
old := make(map[string]*UnitStatus)
|
|
||||||
statusChan := make(chan map[string]*UnitStatus, buffer)
|
|
||||||
errChan := make(chan error, buffer)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
timerChan := time.After(interval)
|
|
||||||
|
|
||||||
units, err := c.ListUnits()
|
|
||||||
if err == nil {
|
|
||||||
cur := make(map[string]*UnitStatus)
|
|
||||||
for i := range units {
|
|
||||||
if filterUnit != nil && filterUnit(units[i].Name) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
cur[units[i].Name] = &units[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
// add all new or changed units
|
|
||||||
changed := make(map[string]*UnitStatus)
|
|
||||||
for n, u := range cur {
|
|
||||||
if oldU, ok := old[n]; !ok || isChanged(oldU, u) {
|
|
||||||
changed[n] = u
|
|
||||||
}
|
|
||||||
delete(old, n)
|
|
||||||
}
|
|
||||||
|
|
||||||
// add all deleted units
|
|
||||||
for oldN := range old {
|
|
||||||
changed[oldN] = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
old = cur
|
|
||||||
|
|
||||||
if len(changed) != 0 {
|
|
||||||
statusChan <- changed
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
errChan <- err
|
|
||||||
}
|
|
||||||
|
|
||||||
<-timerChan
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
return statusChan, errChan
|
|
||||||
}
|
|
||||||
|
|
||||||
type SubStateUpdate struct {
|
|
||||||
UnitName string
|
|
||||||
SubState string
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetSubStateSubscriber writes to updateCh when any unit's substate changes.
|
|
||||||
// Although this writes to updateCh on every state change, the reported state
|
|
||||||
// may be more recent than the change that generated it (due to an unavoidable
|
|
||||||
// race in the systemd dbus interface). That is, this method provides a good
|
|
||||||
// way to keep a current view of all units' states, but is not guaranteed to
|
|
||||||
// show every state transition they go through. Furthermore, state changes
|
|
||||||
// will only be written to the channel with non-blocking writes. If updateCh
|
|
||||||
// is full, it attempts to write an error to errCh; if errCh is full, the error
|
|
||||||
// passes silently.
|
|
||||||
func (c *Conn) SetSubStateSubscriber(updateCh chan<- *SubStateUpdate, errCh chan<- error) {
|
|
||||||
if c == nil {
|
|
||||||
msg := "nil receiver"
|
|
||||||
select {
|
|
||||||
case errCh <- errors.New(msg):
|
|
||||||
default:
|
|
||||||
log.Printf("full error channel while reporting: %s\n", msg)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
c.subStateSubscriber.Lock()
|
|
||||||
defer c.subStateSubscriber.Unlock()
|
|
||||||
c.subStateSubscriber.updateCh = updateCh
|
|
||||||
c.subStateSubscriber.errCh = errCh
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) sendSubStateUpdate(unitPath dbus.ObjectPath) {
|
|
||||||
c.subStateSubscriber.Lock()
|
|
||||||
defer c.subStateSubscriber.Unlock()
|
|
||||||
|
|
||||||
if c.subStateSubscriber.updateCh == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
isIgnored := c.shouldIgnore(unitPath)
|
|
||||||
defer c.cleanIgnore()
|
|
||||||
if isIgnored {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
info, err := c.GetUnitPathProperties(unitPath)
|
|
||||||
if err != nil {
|
|
||||||
select {
|
|
||||||
case c.subStateSubscriber.errCh <- err:
|
|
||||||
default:
|
|
||||||
log.Printf("full error channel while reporting: %s\n", err)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer c.updateIgnore(unitPath, info)
|
|
||||||
|
|
||||||
name, ok := info["Id"].(string)
|
|
||||||
if !ok {
|
|
||||||
msg := "failed to cast info.Id"
|
|
||||||
select {
|
|
||||||
case c.subStateSubscriber.errCh <- errors.New(msg):
|
|
||||||
default:
|
|
||||||
log.Printf("full error channel while reporting: %s\n", err)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
substate, ok := info["SubState"].(string)
|
|
||||||
if !ok {
|
|
||||||
msg := "failed to cast info.SubState"
|
|
||||||
select {
|
|
||||||
case c.subStateSubscriber.errCh <- errors.New(msg):
|
|
||||||
default:
|
|
||||||
log.Printf("full error channel while reporting: %s\n", msg)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
update := &SubStateUpdate{name, substate}
|
|
||||||
select {
|
|
||||||
case c.subStateSubscriber.updateCh <- update:
|
|
||||||
default:
|
|
||||||
msg := "update channel is full"
|
|
||||||
select {
|
|
||||||
case c.subStateSubscriber.errCh <- errors.New(msg):
|
|
||||||
default:
|
|
||||||
log.Printf("full error channel while reporting: %s\n", msg)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The ignore functions work around a wart in the systemd dbus interface.
|
|
||||||
// Requesting the properties of an unloaded unit will cause systemd to send a
|
|
||||||
// pair of UnitNew/UnitRemoved signals. Because we need to get a unit's
|
|
||||||
// properties on UnitNew (as that's the only indication of a new unit coming up
|
|
||||||
// for the first time), we would enter an infinite loop if we did not attempt
|
|
||||||
// to detect and ignore these spurious signals. The signal themselves are
|
|
||||||
// indistinguishable from relevant ones, so we (somewhat hackishly) ignore an
|
|
||||||
// unloaded unit's signals for a short time after requesting its properties.
|
|
||||||
// This means that we will miss e.g. a transient unit being restarted
|
|
||||||
// *immediately* upon failure and also a transient unit being started
|
|
||||||
// immediately after requesting its status (with systemctl status, for example,
|
|
||||||
// because this causes a UnitNew signal to be sent which then causes us to fetch
|
|
||||||
// the properties).
|
|
||||||
|
|
||||||
func (c *Conn) shouldIgnore(path dbus.ObjectPath) bool {
|
|
||||||
t, ok := c.subStateSubscriber.ignore[path]
|
|
||||||
return ok && t >= time.Now().UnixNano()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) updateIgnore(path dbus.ObjectPath, info map[string]interface{}) {
|
|
||||||
loadState, ok := info["LoadState"].(string)
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// unit is unloaded - it will trigger bad systemd dbus behavior
|
|
||||||
if loadState == "not-found" {
|
|
||||||
c.subStateSubscriber.ignore[path] = time.Now().UnixNano() + ignoreInterval
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// without this, ignore would grow unboundedly over time
|
|
||||||
func (c *Conn) cleanIgnore() {
|
|
||||||
now := time.Now().UnixNano()
|
|
||||||
if c.subStateSubscriber.cleanIgnore < now {
|
|
||||||
c.subStateSubscriber.cleanIgnore = now + cleanIgnoreInterval
|
|
||||||
|
|
||||||
for p, t := range c.subStateSubscriber.ignore {
|
|
||||||
if t < now {
|
|
||||||
delete(c.subStateSubscriber.ignore, p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// PropertiesUpdate holds a map of a unit's changed properties
|
|
||||||
type PropertiesUpdate struct {
|
|
||||||
UnitName string
|
|
||||||
Changed map[string]dbus.Variant
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetPropertiesSubscriber writes to updateCh when any unit's properties
|
|
||||||
// change. Every property change reported by systemd will be sent; that is, no
|
|
||||||
// transitions will be "missed" (as they might be with SetSubStateSubscriber).
|
|
||||||
// However, state changes will only be written to the channel with non-blocking
|
|
||||||
// writes. If updateCh is full, it attempts to write an error to errCh; if
|
|
||||||
// errCh is full, the error passes silently.
|
|
||||||
func (c *Conn) SetPropertiesSubscriber(updateCh chan<- *PropertiesUpdate, errCh chan<- error) {
|
|
||||||
c.propertiesSubscriber.Lock()
|
|
||||||
defer c.propertiesSubscriber.Unlock()
|
|
||||||
c.propertiesSubscriber.updateCh = updateCh
|
|
||||||
c.propertiesSubscriber.errCh = errCh
|
|
||||||
}
|
|
||||||
|
|
||||||
// we don't need to worry about shouldIgnore() here because
|
|
||||||
// sendPropertiesUpdate doesn't call GetProperties()
|
|
||||||
func (c *Conn) sendPropertiesUpdate(unitPath dbus.ObjectPath, changedProps map[string]dbus.Variant) {
|
|
||||||
c.propertiesSubscriber.Lock()
|
|
||||||
defer c.propertiesSubscriber.Unlock()
|
|
||||||
|
|
||||||
if c.propertiesSubscriber.updateCh == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
update := &PropertiesUpdate{unitName(unitPath), changedProps}
|
|
||||||
|
|
||||||
select {
|
|
||||||
case c.propertiesSubscriber.updateCh <- update:
|
|
||||||
default:
|
|
||||||
msg := "update channel is full"
|
|
||||||
select {
|
|
||||||
case c.propertiesSubscriber.errCh <- errors.New(msg):
|
|
||||||
default:
|
|
||||||
log.Printf("full error channel while reporting: %s\n", msg)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,57 +0,0 @@
|
||||||
// Copyright 2015 CoreOS, Inc.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// SubscriptionSet returns a subscription set which is like conn.Subscribe but
|
|
||||||
// can filter to only return events for a set of units.
|
|
||||||
type SubscriptionSet struct {
|
|
||||||
*set
|
|
||||||
conn *Conn
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *SubscriptionSet) filter(unit string) bool {
|
|
||||||
return !s.Contains(unit)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Subscribe starts listening for dbus events for all of the units in the set.
|
|
||||||
// Returns channels identical to conn.SubscribeUnits.
|
|
||||||
func (s *SubscriptionSet) Subscribe() (<-chan map[string]*UnitStatus, <-chan error) {
|
|
||||||
// TODO: Make fully evented by using systemd 209 with properties changed values
|
|
||||||
return s.conn.SubscribeUnitsCustom(time.Second, 0,
|
|
||||||
mismatchUnitStatus,
|
|
||||||
func(unit string) bool { return s.filter(unit) },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewSubscriptionSet returns a new subscription set.
|
|
||||||
func (conn *Conn) NewSubscriptionSet() *SubscriptionSet {
|
|
||||||
return &SubscriptionSet{newSet(), conn}
|
|
||||||
}
|
|
||||||
|
|
||||||
// mismatchUnitStatus returns true if the provided UnitStatus objects
|
|
||||||
// are not equivalent. false is returned if the objects are equivalent.
|
|
||||||
// Only the Name, Description and state-related fields are used in
|
|
||||||
// the comparison.
|
|
||||||
func mismatchUnitStatus(u1, u2 *UnitStatus) bool {
|
|
||||||
return u1.Name != u2.Name ||
|
|
||||||
u1.Description != u2.Description ||
|
|
||||||
u1.LoadState != u2.LoadState ||
|
|
||||||
u1.ActiveState != u2.ActiveState ||
|
|
||||||
u1.SubState != u2.SubState
|
|
||||||
}
|
|
|
@ -1,46 +0,0 @@
|
||||||
dist: precise
|
|
||||||
language: go
|
|
||||||
go_import_path: github.com/godbus/dbus
|
|
||||||
sudo: true
|
|
||||||
|
|
||||||
go:
|
|
||||||
- 1.7.3
|
|
||||||
- 1.8.7
|
|
||||||
- 1.9.5
|
|
||||||
- 1.10.1
|
|
||||||
- tip
|
|
||||||
|
|
||||||
env:
|
|
||||||
global:
|
|
||||||
matrix:
|
|
||||||
- TARGET=amd64
|
|
||||||
- TARGET=arm64
|
|
||||||
- TARGET=arm
|
|
||||||
- TARGET=386
|
|
||||||
- TARGET=ppc64le
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
fast_finish: true
|
|
||||||
allow_failures:
|
|
||||||
- go: tip
|
|
||||||
exclude:
|
|
||||||
- go: tip
|
|
||||||
env: TARGET=arm
|
|
||||||
- go: tip
|
|
||||||
env: TARGET=arm64
|
|
||||||
- go: tip
|
|
||||||
env: TARGET=386
|
|
||||||
- go: tip
|
|
||||||
env: TARGET=ppc64le
|
|
||||||
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- dbus
|
|
||||||
- dbus-x11
|
|
||||||
|
|
||||||
before_install:
|
|
||||||
|
|
||||||
script:
|
|
||||||
- go test -v -race ./... # Run all the tests with the race detector enabled
|
|
||||||
- go vet ./... # go vet is the official Go static analyzer
|
|
|
@ -1,50 +0,0 @@
|
||||||
# How to Contribute
|
|
||||||
|
|
||||||
## Getting Started
|
|
||||||
|
|
||||||
- Fork the repository on GitHub
|
|
||||||
- Read the [README](README.markdown) for build and test instructions
|
|
||||||
- Play with the project, submit bugs, submit patches!
|
|
||||||
|
|
||||||
## Contribution Flow
|
|
||||||
|
|
||||||
This is a rough outline of what a contributor's workflow looks like:
|
|
||||||
|
|
||||||
- Create a topic branch from where you want to base your work (usually master).
|
|
||||||
- Make commits of logical units.
|
|
||||||
- Make sure your commit messages are in the proper format (see below).
|
|
||||||
- Push your changes to a topic branch in your fork of the repository.
|
|
||||||
- Make sure the tests pass, and add any new tests as appropriate.
|
|
||||||
- Submit a pull request to the original repository.
|
|
||||||
|
|
||||||
Thanks for your contributions!
|
|
||||||
|
|
||||||
### Format of the Commit Message
|
|
||||||
|
|
||||||
We follow a rough convention for commit messages that is designed to answer two
|
|
||||||
questions: what changed and why. The subject line should feature the what and
|
|
||||||
the body of the commit should describe the why.
|
|
||||||
|
|
||||||
```
|
|
||||||
scripts: add the test-cluster command
|
|
||||||
|
|
||||||
this uses tmux to setup a test cluster that you can easily kill and
|
|
||||||
start for debugging.
|
|
||||||
|
|
||||||
Fixes #38
|
|
||||||
```
|
|
||||||
|
|
||||||
The format can be described more formally as follows:
|
|
||||||
|
|
||||||
```
|
|
||||||
<subsystem>: <what changed>
|
|
||||||
<BLANK LINE>
|
|
||||||
<why this change was made>
|
|
||||||
<BLANK LINE>
|
|
||||||
<footer>
|
|
||||||
```
|
|
||||||
|
|
||||||
The first line is the subject and should be no longer than 70 characters, the
|
|
||||||
second line is always blank, and other lines should be wrapped at 80 characters.
|
|
||||||
This allows the message to be easier to read on GitHub as well as in various
|
|
||||||
git tools.
|
|
|
@ -1,25 +0,0 @@
|
||||||
Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
1. Redistributions of source code must retain the above copyright notice,
|
|
||||||
this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
||||||
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
|
|
||||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
@ -1,3 +0,0 @@
|
||||||
Brandon Philips <brandon@ifup.org> (@philips)
|
|
||||||
Brian Waldon <brian@waldon.cc> (@bcwaldon)
|
|
||||||
John Southworth <jsouthwo@brocade.com> (@jsouthworth)
|
|
|
@ -1,44 +0,0 @@
|
||||||
[](https://travis-ci.org/godbus/dbus)
|
|
||||||
|
|
||||||
dbus
|
|
||||||
----
|
|
||||||
|
|
||||||
dbus is a simple library that implements native Go client bindings for the
|
|
||||||
D-Bus message bus system.
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* Complete native implementation of the D-Bus message protocol
|
|
||||||
* Go-like API (channels for signals / asynchronous method calls, Goroutine-safe connections)
|
|
||||||
* Subpackages that help with the introspection / property interfaces
|
|
||||||
|
|
||||||
### Installation
|
|
||||||
|
|
||||||
This packages requires Go 1.7. If you installed it and set up your GOPATH, just run:
|
|
||||||
|
|
||||||
```
|
|
||||||
go get github.com/godbus/dbus
|
|
||||||
```
|
|
||||||
|
|
||||||
If you want to use the subpackages, you can install them the same way.
|
|
||||||
|
|
||||||
### Usage
|
|
||||||
|
|
||||||
The complete package documentation and some simple examples are available at
|
|
||||||
[godoc.org](http://godoc.org/github.com/godbus/dbus). Also, the
|
|
||||||
[_examples](https://github.com/godbus/dbus/tree/master/_examples) directory
|
|
||||||
gives a short overview over the basic usage.
|
|
||||||
|
|
||||||
#### Projects using godbus
|
|
||||||
- [notify](https://github.com/esiqveland/notify) provides desktop notifications over dbus into a library.
|
|
||||||
- [go-bluetooth](https://github.com/muka/go-bluetooth) provides a bluetooth client over bluez dbus API.
|
|
||||||
|
|
||||||
Please note that the API is considered unstable for now and may change without
|
|
||||||
further notice.
|
|
||||||
|
|
||||||
### License
|
|
||||||
|
|
||||||
go.dbus is available under the Simplified BSD License; see LICENSE for the full
|
|
||||||
text.
|
|
||||||
|
|
||||||
Nearly all of the credit for this library goes to github.com/guelfey/go.dbus.
|
|
|
@ -1,252 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"bytes"
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
)
|
|
||||||
|
|
||||||
// AuthStatus represents the Status of an authentication mechanism.
|
|
||||||
type AuthStatus byte
|
|
||||||
|
|
||||||
const (
|
|
||||||
// AuthOk signals that authentication is finished; the next command
|
|
||||||
// from the server should be an OK.
|
|
||||||
AuthOk AuthStatus = iota
|
|
||||||
|
|
||||||
// AuthContinue signals that additional data is needed; the next command
|
|
||||||
// from the server should be a DATA.
|
|
||||||
AuthContinue
|
|
||||||
|
|
||||||
// AuthError signals an error; the server sent invalid data or some
|
|
||||||
// other unexpected thing happened and the current authentication
|
|
||||||
// process should be aborted.
|
|
||||||
AuthError
|
|
||||||
)
|
|
||||||
|
|
||||||
type authState byte
|
|
||||||
|
|
||||||
const (
|
|
||||||
waitingForData authState = iota
|
|
||||||
waitingForOk
|
|
||||||
waitingForReject
|
|
||||||
)
|
|
||||||
|
|
||||||
// Auth defines the behaviour of an authentication mechanism.
|
|
||||||
type Auth interface {
|
|
||||||
// Return the name of the mechnism, the argument to the first AUTH command
|
|
||||||
// and the next status.
|
|
||||||
FirstData() (name, resp []byte, status AuthStatus)
|
|
||||||
|
|
||||||
// Process the given DATA command, and return the argument to the DATA
|
|
||||||
// command and the next status. If len(resp) == 0, no DATA command is sent.
|
|
||||||
HandleData(data []byte) (resp []byte, status AuthStatus)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Auth authenticates the connection, trying the given list of authentication
|
|
||||||
// mechanisms (in that order). If nil is passed, the EXTERNAL and
|
|
||||||
// DBUS_COOKIE_SHA1 mechanisms are tried for the current user. For private
|
|
||||||
// connections, this method must be called before sending any messages to the
|
|
||||||
// bus. Auth must not be called on shared connections.
|
|
||||||
func (conn *Conn) Auth(methods []Auth) error {
|
|
||||||
if methods == nil {
|
|
||||||
uid := strconv.Itoa(os.Getuid())
|
|
||||||
methods = []Auth{AuthExternal(uid), AuthCookieSha1(uid, getHomeDir())}
|
|
||||||
}
|
|
||||||
in := bufio.NewReader(conn.transport)
|
|
||||||
err := conn.transport.SendNullByte()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
err = authWriteLine(conn.transport, []byte("AUTH"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
s, err := authReadLine(in)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if len(s) < 2 || !bytes.Equal(s[0], []byte("REJECTED")) {
|
|
||||||
return errors.New("dbus: authentication protocol error")
|
|
||||||
}
|
|
||||||
s = s[1:]
|
|
||||||
for _, v := range s {
|
|
||||||
for _, m := range methods {
|
|
||||||
if name, data, status := m.FirstData(); bytes.Equal(v, name) {
|
|
||||||
var ok bool
|
|
||||||
err = authWriteLine(conn.transport, []byte("AUTH"), []byte(v), data)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
switch status {
|
|
||||||
case AuthOk:
|
|
||||||
err, ok = conn.tryAuth(m, waitingForOk, in)
|
|
||||||
case AuthContinue:
|
|
||||||
err, ok = conn.tryAuth(m, waitingForData, in)
|
|
||||||
default:
|
|
||||||
panic("dbus: invalid authentication status")
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if ok {
|
|
||||||
if conn.transport.SupportsUnixFDs() {
|
|
||||||
err = authWriteLine(conn, []byte("NEGOTIATE_UNIX_FD"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
line, err := authReadLine(in)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
switch {
|
|
||||||
case bytes.Equal(line[0], []byte("AGREE_UNIX_FD")):
|
|
||||||
conn.EnableUnixFDs()
|
|
||||||
conn.unixFD = true
|
|
||||||
case bytes.Equal(line[0], []byte("ERROR")):
|
|
||||||
default:
|
|
||||||
return errors.New("dbus: authentication protocol error")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
err = authWriteLine(conn.transport, []byte("BEGIN"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
go conn.inWorker()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return errors.New("dbus: authentication failed")
|
|
||||||
}
|
|
||||||
|
|
||||||
// tryAuth tries to authenticate with m as the mechanism, using state as the
|
|
||||||
// initial authState and in for reading input. It returns (nil, true) on
|
|
||||||
// success, (nil, false) on a REJECTED and (someErr, false) if some other
|
|
||||||
// error occured.
|
|
||||||
func (conn *Conn) tryAuth(m Auth, state authState, in *bufio.Reader) (error, bool) {
|
|
||||||
for {
|
|
||||||
s, err := authReadLine(in)
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
switch {
|
|
||||||
case state == waitingForData && string(s[0]) == "DATA":
|
|
||||||
if len(s) != 2 {
|
|
||||||
err = authWriteLine(conn.transport, []byte("ERROR"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
data, status := m.HandleData(s[1])
|
|
||||||
switch status {
|
|
||||||
case AuthOk, AuthContinue:
|
|
||||||
if len(data) != 0 {
|
|
||||||
err = authWriteLine(conn.transport, []byte("DATA"), data)
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if status == AuthOk {
|
|
||||||
state = waitingForOk
|
|
||||||
}
|
|
||||||
case AuthError:
|
|
||||||
err = authWriteLine(conn.transport, []byte("ERROR"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case state == waitingForData && string(s[0]) == "REJECTED":
|
|
||||||
return nil, false
|
|
||||||
case state == waitingForData && string(s[0]) == "ERROR":
|
|
||||||
err = authWriteLine(conn.transport, []byte("CANCEL"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
state = waitingForReject
|
|
||||||
case state == waitingForData && string(s[0]) == "OK":
|
|
||||||
if len(s) != 2 {
|
|
||||||
err = authWriteLine(conn.transport, []byte("CANCEL"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
state = waitingForReject
|
|
||||||
}
|
|
||||||
conn.uuid = string(s[1])
|
|
||||||
return nil, true
|
|
||||||
case state == waitingForData:
|
|
||||||
err = authWriteLine(conn.transport, []byte("ERROR"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
case state == waitingForOk && string(s[0]) == "OK":
|
|
||||||
if len(s) != 2 {
|
|
||||||
err = authWriteLine(conn.transport, []byte("CANCEL"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
state = waitingForReject
|
|
||||||
}
|
|
||||||
conn.uuid = string(s[1])
|
|
||||||
return nil, true
|
|
||||||
case state == waitingForOk && string(s[0]) == "REJECTED":
|
|
||||||
return nil, false
|
|
||||||
case state == waitingForOk && (string(s[0]) == "DATA" ||
|
|
||||||
string(s[0]) == "ERROR"):
|
|
||||||
|
|
||||||
err = authWriteLine(conn.transport, []byte("CANCEL"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
state = waitingForReject
|
|
||||||
case state == waitingForOk:
|
|
||||||
err = authWriteLine(conn.transport, []byte("ERROR"))
|
|
||||||
if err != nil {
|
|
||||||
return err, false
|
|
||||||
}
|
|
||||||
case state == waitingForReject && string(s[0]) == "REJECTED":
|
|
||||||
return nil, false
|
|
||||||
case state == waitingForReject:
|
|
||||||
return errors.New("dbus: authentication protocol error"), false
|
|
||||||
default:
|
|
||||||
panic("dbus: invalid auth state")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// authReadLine reads a line and separates it into its fields.
|
|
||||||
func authReadLine(in *bufio.Reader) ([][]byte, error) {
|
|
||||||
data, err := in.ReadBytes('\n')
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
data = bytes.TrimSuffix(data, []byte("\r\n"))
|
|
||||||
return bytes.Split(data, []byte{' '}), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// authWriteLine writes the given line in the authentication protocol format
|
|
||||||
// (elements of data separated by a " " and terminated by "\r\n").
|
|
||||||
func authWriteLine(out io.Writer, data ...[]byte) error {
|
|
||||||
buf := make([]byte, 0)
|
|
||||||
for i, v := range data {
|
|
||||||
buf = append(buf, v...)
|
|
||||||
if i != len(data)-1 {
|
|
||||||
buf = append(buf, ' ')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
buf = append(buf, '\r')
|
|
||||||
buf = append(buf, '\n')
|
|
||||||
n, err := out.Write(buf)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if n != len(buf) {
|
|
||||||
return io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,16 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
// AuthAnonymous returns an Auth that uses the ANONYMOUS mechanism.
|
|
||||||
func AuthAnonymous() Auth {
|
|
||||||
return &authAnonymous{}
|
|
||||||
}
|
|
||||||
|
|
||||||
type authAnonymous struct{}
|
|
||||||
|
|
||||||
func (a *authAnonymous) FirstData() (name, resp []byte, status AuthStatus) {
|
|
||||||
return []byte("ANONYMOUS"), nil, AuthOk
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *authAnonymous) HandleData(data []byte) (resp []byte, status AuthStatus) {
|
|
||||||
return nil, AuthError
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/hex"
|
|
||||||
)
|
|
||||||
|
|
||||||
// AuthExternal returns an Auth that authenticates as the given user with the
|
|
||||||
// EXTERNAL mechanism.
|
|
||||||
func AuthExternal(user string) Auth {
|
|
||||||
return authExternal{user}
|
|
||||||
}
|
|
||||||
|
|
||||||
// AuthExternal implements the EXTERNAL authentication mechanism.
|
|
||||||
type authExternal struct {
|
|
||||||
user string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a authExternal) FirstData() ([]byte, []byte, AuthStatus) {
|
|
||||||
b := make([]byte, 2*len(a.user))
|
|
||||||
hex.Encode(b, []byte(a.user))
|
|
||||||
return []byte("EXTERNAL"), b, AuthOk
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a authExternal) HandleData(b []byte) ([]byte, AuthStatus) {
|
|
||||||
return nil, AuthError
|
|
||||||
}
|
|
|
@ -1,102 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"bytes"
|
|
||||||
"crypto/rand"
|
|
||||||
"crypto/sha1"
|
|
||||||
"encoding/hex"
|
|
||||||
"os"
|
|
||||||
)
|
|
||||||
|
|
||||||
// AuthCookieSha1 returns an Auth that authenticates as the given user with the
|
|
||||||
// DBUS_COOKIE_SHA1 mechanism. The home parameter should specify the home
|
|
||||||
// directory of the user.
|
|
||||||
func AuthCookieSha1(user, home string) Auth {
|
|
||||||
return authCookieSha1{user, home}
|
|
||||||
}
|
|
||||||
|
|
||||||
type authCookieSha1 struct {
|
|
||||||
user, home string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a authCookieSha1) FirstData() ([]byte, []byte, AuthStatus) {
|
|
||||||
b := make([]byte, 2*len(a.user))
|
|
||||||
hex.Encode(b, []byte(a.user))
|
|
||||||
return []byte("DBUS_COOKIE_SHA1"), b, AuthContinue
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a authCookieSha1) HandleData(data []byte) ([]byte, AuthStatus) {
|
|
||||||
challenge := make([]byte, len(data)/2)
|
|
||||||
_, err := hex.Decode(challenge, data)
|
|
||||||
if err != nil {
|
|
||||||
return nil, AuthError
|
|
||||||
}
|
|
||||||
b := bytes.Split(challenge, []byte{' '})
|
|
||||||
if len(b) != 3 {
|
|
||||||
return nil, AuthError
|
|
||||||
}
|
|
||||||
context := b[0]
|
|
||||||
id := b[1]
|
|
||||||
svchallenge := b[2]
|
|
||||||
cookie := a.getCookie(context, id)
|
|
||||||
if cookie == nil {
|
|
||||||
return nil, AuthError
|
|
||||||
}
|
|
||||||
clchallenge := a.generateChallenge()
|
|
||||||
if clchallenge == nil {
|
|
||||||
return nil, AuthError
|
|
||||||
}
|
|
||||||
hash := sha1.New()
|
|
||||||
hash.Write(bytes.Join([][]byte{svchallenge, clchallenge, cookie}, []byte{':'}))
|
|
||||||
hexhash := make([]byte, 2*hash.Size())
|
|
||||||
hex.Encode(hexhash, hash.Sum(nil))
|
|
||||||
data = append(clchallenge, ' ')
|
|
||||||
data = append(data, hexhash...)
|
|
||||||
resp := make([]byte, 2*len(data))
|
|
||||||
hex.Encode(resp, data)
|
|
||||||
return resp, AuthOk
|
|
||||||
}
|
|
||||||
|
|
||||||
// getCookie searches for the cookie identified by id in context and returns
|
|
||||||
// the cookie content or nil. (Since HandleData can't return a specific error,
|
|
||||||
// but only whether an error occured, this function also doesn't bother to
|
|
||||||
// return an error.)
|
|
||||||
func (a authCookieSha1) getCookie(context, id []byte) []byte {
|
|
||||||
file, err := os.Open(a.home + "/.dbus-keyrings/" + string(context))
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
rd := bufio.NewReader(file)
|
|
||||||
for {
|
|
||||||
line, err := rd.ReadBytes('\n')
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
line = line[:len(line)-1]
|
|
||||||
b := bytes.Split(line, []byte{' '})
|
|
||||||
if len(b) != 3 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if bytes.Equal(b[0], id) {
|
|
||||||
return b[2]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// generateChallenge returns a random, hex-encoded challenge, or nil on error
|
|
||||||
// (see above).
|
|
||||||
func (a authCookieSha1) generateChallenge() []byte {
|
|
||||||
b := make([]byte, 16)
|
|
||||||
n, err := rand.Read(b)
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if n != 16 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
enc := make([]byte, 32)
|
|
||||||
hex.Encode(enc, b)
|
|
||||||
return enc
|
|
||||||
}
|
|
|
@ -1,60 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
var errSignature = errors.New("dbus: mismatched signature")
|
|
||||||
|
|
||||||
// Call represents a pending or completed method call.
|
|
||||||
type Call struct {
|
|
||||||
Destination string
|
|
||||||
Path ObjectPath
|
|
||||||
Method string
|
|
||||||
Args []interface{}
|
|
||||||
|
|
||||||
// Strobes when the call is complete.
|
|
||||||
Done chan *Call
|
|
||||||
|
|
||||||
// After completion, the error status. If this is non-nil, it may be an
|
|
||||||
// error message from the peer (with Error as its type) or some other error.
|
|
||||||
Err error
|
|
||||||
|
|
||||||
// Holds the response once the call is done.
|
|
||||||
Body []interface{}
|
|
||||||
|
|
||||||
// tracks context and canceler
|
|
||||||
ctx context.Context
|
|
||||||
ctxCanceler context.CancelFunc
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Call) Context() context.Context {
|
|
||||||
if c.ctx == nil {
|
|
||||||
return context.Background()
|
|
||||||
}
|
|
||||||
|
|
||||||
return c.ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Call) ContextCancel() {
|
|
||||||
if c.ctxCanceler != nil {
|
|
||||||
c.ctxCanceler()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store stores the body of the reply into the provided pointers. It returns
|
|
||||||
// an error if the signatures of the body and retvalues don't match, or if
|
|
||||||
// the error status is not nil.
|
|
||||||
func (c *Call) Store(retvalues ...interface{}) error {
|
|
||||||
if c.Err != nil {
|
|
||||||
return c.Err
|
|
||||||
}
|
|
||||||
|
|
||||||
return Store(c.Body, retvalues...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Call) done() {
|
|
||||||
c.Done <- c
|
|
||||||
c.ContextCancel()
|
|
||||||
}
|
|
|
@ -1,847 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
systemBus *Conn
|
|
||||||
systemBusLck sync.Mutex
|
|
||||||
sessionBus *Conn
|
|
||||||
sessionBusLck sync.Mutex
|
|
||||||
)
|
|
||||||
|
|
||||||
// ErrClosed is the error returned by calls on a closed connection.
|
|
||||||
var ErrClosed = errors.New("dbus: connection closed by user")
|
|
||||||
|
|
||||||
// Conn represents a connection to a message bus (usually, the system or
|
|
||||||
// session bus).
|
|
||||||
//
|
|
||||||
// Connections are either shared or private. Shared connections
|
|
||||||
// are shared between calls to the functions that return them. As a result,
|
|
||||||
// the methods Close, Auth and Hello must not be called on them.
|
|
||||||
//
|
|
||||||
// Multiple goroutines may invoke methods on a connection simultaneously.
|
|
||||||
type Conn struct {
|
|
||||||
transport
|
|
||||||
|
|
||||||
busObj BusObject
|
|
||||||
unixFD bool
|
|
||||||
uuid string
|
|
||||||
|
|
||||||
handler Handler
|
|
||||||
signalHandler SignalHandler
|
|
||||||
serialGen SerialGenerator
|
|
||||||
|
|
||||||
names *nameTracker
|
|
||||||
calls *callTracker
|
|
||||||
outHandler *outputHandler
|
|
||||||
|
|
||||||
eavesdropped chan<- *Message
|
|
||||||
eavesdroppedLck sync.Mutex
|
|
||||||
}
|
|
||||||
|
|
||||||
// SessionBus returns a shared connection to the session bus, connecting to it
|
|
||||||
// if not already done.
|
|
||||||
func SessionBus() (conn *Conn, err error) {
|
|
||||||
sessionBusLck.Lock()
|
|
||||||
defer sessionBusLck.Unlock()
|
|
||||||
if sessionBus != nil {
|
|
||||||
return sessionBus, nil
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if conn != nil {
|
|
||||||
sessionBus = conn
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
conn, err = SessionBusPrivate()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Auth(nil); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Hello(); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func getSessionBusAddress() (string, error) {
|
|
||||||
if address := os.Getenv("DBUS_SESSION_BUS_ADDRESS"); address != "" && address != "autolaunch:" {
|
|
||||||
return address, nil
|
|
||||||
|
|
||||||
} else if address := tryDiscoverDbusSessionBusAddress(); address != "" {
|
|
||||||
os.Setenv("DBUS_SESSION_BUS_ADDRESS", address)
|
|
||||||
return address, nil
|
|
||||||
}
|
|
||||||
return getSessionBusPlatformAddress()
|
|
||||||
}
|
|
||||||
|
|
||||||
// SessionBusPrivate returns a new private connection to the session bus.
|
|
||||||
func SessionBusPrivate(opts ...ConnOption) (*Conn, error) {
|
|
||||||
address, err := getSessionBusAddress()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return Dial(address, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SessionBusPrivate returns a new private connection to the session bus.
|
|
||||||
//
|
|
||||||
// Deprecated: use SessionBusPrivate with options instead.
|
|
||||||
func SessionBusPrivateHandler(handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
|
||||||
return SessionBusPrivate(WithHandler(handler), WithSignalHandler(signalHandler))
|
|
||||||
}
|
|
||||||
|
|
||||||
// SystemBus returns a shared connection to the system bus, connecting to it if
|
|
||||||
// not already done.
|
|
||||||
func SystemBus() (conn *Conn, err error) {
|
|
||||||
systemBusLck.Lock()
|
|
||||||
defer systemBusLck.Unlock()
|
|
||||||
if systemBus != nil {
|
|
||||||
return systemBus, nil
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if conn != nil {
|
|
||||||
systemBus = conn
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
conn, err = SystemBusPrivate()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Auth(nil); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Hello(); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// SystemBusPrivate returns a new private connection to the system bus.
|
|
||||||
// Note: this connection is not ready to use. One must perform Auth and Hello
|
|
||||||
// on the connection before it is useable.
|
|
||||||
func SystemBusPrivate(opts ...ConnOption) (*Conn, error) {
|
|
||||||
return Dial(getSystemBusPlatformAddress(), opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SystemBusPrivateHandler returns a new private connection to the system bus, using the provided handlers.
|
|
||||||
//
|
|
||||||
// Deprecated: use SystemBusPrivate with options instead.
|
|
||||||
func SystemBusPrivateHandler(handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
|
||||||
return SystemBusPrivate(WithHandler(handler), WithSignalHandler(signalHandler))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dial establishes a new private connection to the message bus specified by address.
|
|
||||||
func Dial(address string, opts ...ConnOption) (*Conn, error) {
|
|
||||||
tr, err := getTransport(address)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return newConn(tr, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// DialHandler establishes a new private connection to the message bus specified by address, using the supplied handlers.
|
|
||||||
//
|
|
||||||
// Deprecated: use Dial with options instead.
|
|
||||||
func DialHandler(address string, handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
|
||||||
return Dial(address, WithSignalHandler(signalHandler))
|
|
||||||
}
|
|
||||||
|
|
||||||
// ConnOption is a connection option.
|
|
||||||
type ConnOption func(conn *Conn) error
|
|
||||||
|
|
||||||
// WithHandler overrides the default handler.
|
|
||||||
func WithHandler(handler Handler) ConnOption {
|
|
||||||
return func(conn *Conn) error {
|
|
||||||
conn.handler = handler
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithSignalHandler overrides the default signal handler.
|
|
||||||
func WithSignalHandler(handler SignalHandler) ConnOption {
|
|
||||||
return func(conn *Conn) error {
|
|
||||||
conn.signalHandler = handler
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithSerialGenerator overrides the default signals generator.
|
|
||||||
func WithSerialGenerator(gen SerialGenerator) ConnOption {
|
|
||||||
return func(conn *Conn) error {
|
|
||||||
conn.serialGen = gen
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewConn creates a new private *Conn from an already established connection.
|
|
||||||
func NewConn(conn io.ReadWriteCloser, opts ...ConnOption) (*Conn, error) {
|
|
||||||
return newConn(genericTransport{conn}, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewConnHandler creates a new private *Conn from an already established connection, using the supplied handlers.
|
|
||||||
//
|
|
||||||
// Deprecated: use NewConn with options instead.
|
|
||||||
func NewConnHandler(conn io.ReadWriteCloser, handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
|
||||||
return NewConn(genericTransport{conn}, WithHandler(handler), WithSignalHandler(signalHandler))
|
|
||||||
}
|
|
||||||
|
|
||||||
// newConn creates a new *Conn from a transport.
|
|
||||||
func newConn(tr transport, opts ...ConnOption) (*Conn, error) {
|
|
||||||
conn := new(Conn)
|
|
||||||
conn.transport = tr
|
|
||||||
for _, opt := range opts {
|
|
||||||
if err := opt(conn); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
conn.calls = newCallTracker()
|
|
||||||
if conn.handler == nil {
|
|
||||||
conn.handler = NewDefaultHandler()
|
|
||||||
}
|
|
||||||
if conn.signalHandler == nil {
|
|
||||||
conn.signalHandler = NewDefaultSignalHandler()
|
|
||||||
}
|
|
||||||
if conn.serialGen == nil {
|
|
||||||
conn.serialGen = newSerialGenerator()
|
|
||||||
}
|
|
||||||
conn.outHandler = &outputHandler{conn: conn}
|
|
||||||
conn.names = newNameTracker()
|
|
||||||
conn.busObj = conn.Object("org.freedesktop.DBus", "/org/freedesktop/DBus")
|
|
||||||
return conn, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// BusObject returns the object owned by the bus daemon which handles
|
|
||||||
// administrative requests.
|
|
||||||
func (conn *Conn) BusObject() BusObject {
|
|
||||||
return conn.busObj
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close closes the connection. Any blocked operations will return with errors
|
|
||||||
// and the channels passed to Eavesdrop and Signal are closed. This method must
|
|
||||||
// not be called on shared connections.
|
|
||||||
func (conn *Conn) Close() error {
|
|
||||||
conn.outHandler.close()
|
|
||||||
if term, ok := conn.signalHandler.(Terminator); ok {
|
|
||||||
term.Terminate()
|
|
||||||
}
|
|
||||||
|
|
||||||
if term, ok := conn.handler.(Terminator); ok {
|
|
||||||
term.Terminate()
|
|
||||||
}
|
|
||||||
|
|
||||||
conn.eavesdroppedLck.Lock()
|
|
||||||
if conn.eavesdropped != nil {
|
|
||||||
close(conn.eavesdropped)
|
|
||||||
}
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
|
|
||||||
return conn.transport.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Eavesdrop causes conn to send all incoming messages to the given channel
|
|
||||||
// without further processing. Method replies, errors and signals will not be
|
|
||||||
// sent to the appropiate channels and method calls will not be handled. If nil
|
|
||||||
// is passed, the normal behaviour is restored.
|
|
||||||
//
|
|
||||||
// The caller has to make sure that ch is sufficiently buffered;
|
|
||||||
// if a message arrives when a write to ch is not possible, the message is
|
|
||||||
// discarded.
|
|
||||||
func (conn *Conn) Eavesdrop(ch chan<- *Message) {
|
|
||||||
conn.eavesdroppedLck.Lock()
|
|
||||||
conn.eavesdropped = ch
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// getSerial returns an unused serial.
|
|
||||||
func (conn *Conn) getSerial() uint32 {
|
|
||||||
return conn.serialGen.GetSerial()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hello sends the initial org.freedesktop.DBus.Hello call. This method must be
|
|
||||||
// called after authentication, but before sending any other messages to the
|
|
||||||
// bus. Hello must not be called for shared connections.
|
|
||||||
func (conn *Conn) Hello() error {
|
|
||||||
var s string
|
|
||||||
err := conn.busObj.Call("org.freedesktop.DBus.Hello", 0).Store(&s)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
conn.names.acquireUniqueConnectionName(s)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// inWorker runs in an own goroutine, reading incoming messages from the
|
|
||||||
// transport and dispatching them appropiately.
|
|
||||||
func (conn *Conn) inWorker() {
|
|
||||||
for {
|
|
||||||
msg, err := conn.ReadMessage()
|
|
||||||
if err != nil {
|
|
||||||
if _, ok := err.(InvalidMessageError); !ok {
|
|
||||||
// Some read error occured (usually EOF); we can't really do
|
|
||||||
// anything but to shut down all stuff and returns errors to all
|
|
||||||
// pending replies.
|
|
||||||
conn.Close()
|
|
||||||
conn.calls.finalizeAllWithError(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// invalid messages are ignored
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
conn.eavesdroppedLck.Lock()
|
|
||||||
if conn.eavesdropped != nil {
|
|
||||||
select {
|
|
||||||
case conn.eavesdropped <- msg:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
dest, _ := msg.Headers[FieldDestination].value.(string)
|
|
||||||
found := dest == "" ||
|
|
||||||
!conn.names.uniqueNameIsKnown() ||
|
|
||||||
conn.names.isKnownName(dest)
|
|
||||||
if !found {
|
|
||||||
// Eavesdropped a message, but no channel for it is registered.
|
|
||||||
// Ignore it.
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
switch msg.Type {
|
|
||||||
case TypeError:
|
|
||||||
conn.serialGen.RetireSerial(conn.calls.handleDBusError(msg))
|
|
||||||
case TypeMethodReply:
|
|
||||||
conn.serialGen.RetireSerial(conn.calls.handleReply(msg))
|
|
||||||
case TypeSignal:
|
|
||||||
conn.handleSignal(msg)
|
|
||||||
case TypeMethodCall:
|
|
||||||
go conn.handleCall(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) handleSignal(msg *Message) {
|
|
||||||
iface := msg.Headers[FieldInterface].value.(string)
|
|
||||||
member := msg.Headers[FieldMember].value.(string)
|
|
||||||
// as per http://dbus.freedesktop.org/doc/dbus-specification.html ,
|
|
||||||
// sender is optional for signals.
|
|
||||||
sender, _ := msg.Headers[FieldSender].value.(string)
|
|
||||||
if iface == "org.freedesktop.DBus" && sender == "org.freedesktop.DBus" {
|
|
||||||
if member == "NameLost" {
|
|
||||||
// If we lost the name on the bus, remove it from our
|
|
||||||
// tracking list.
|
|
||||||
name, ok := msg.Body[0].(string)
|
|
||||||
if !ok {
|
|
||||||
panic("Unable to read the lost name")
|
|
||||||
}
|
|
||||||
conn.names.loseName(name)
|
|
||||||
} else if member == "NameAcquired" {
|
|
||||||
// If we acquired the name on the bus, add it to our
|
|
||||||
// tracking list.
|
|
||||||
name, ok := msg.Body[0].(string)
|
|
||||||
if !ok {
|
|
||||||
panic("Unable to read the acquired name")
|
|
||||||
}
|
|
||||||
conn.names.acquireName(name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
signal := &Signal{
|
|
||||||
Sender: sender,
|
|
||||||
Path: msg.Headers[FieldPath].value.(ObjectPath),
|
|
||||||
Name: iface + "." + member,
|
|
||||||
Body: msg.Body,
|
|
||||||
}
|
|
||||||
conn.signalHandler.DeliverSignal(iface, member, signal)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Names returns the list of all names that are currently owned by this
|
|
||||||
// connection. The slice is always at least one element long, the first element
|
|
||||||
// being the unique name of the connection.
|
|
||||||
func (conn *Conn) Names() []string {
|
|
||||||
return conn.names.listKnownNames()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Object returns the object identified by the given destination name and path.
|
|
||||||
func (conn *Conn) Object(dest string, path ObjectPath) BusObject {
|
|
||||||
return &Object{conn, dest, path}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) sendMessage(msg *Message) {
|
|
||||||
conn.sendMessageAndIfClosed(msg, func() {})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) sendMessageAndIfClosed(msg *Message, ifClosed func()) {
|
|
||||||
err := conn.outHandler.sendAndIfClosed(msg, ifClosed)
|
|
||||||
conn.calls.handleSendError(msg, err)
|
|
||||||
if err != nil {
|
|
||||||
conn.serialGen.RetireSerial(msg.serial)
|
|
||||||
} else if msg.Type != TypeMethodCall {
|
|
||||||
conn.serialGen.RetireSerial(msg.serial)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send sends the given message to the message bus. You usually don't need to
|
|
||||||
// use this; use the higher-level equivalents (Call / Go, Emit and Export)
|
|
||||||
// instead. If msg is a method call and NoReplyExpected is not set, a non-nil
|
|
||||||
// call is returned and the same value is sent to ch (which must be buffered)
|
|
||||||
// once the call is complete. Otherwise, ch is ignored and a Call structure is
|
|
||||||
// returned of which only the Err member is valid.
|
|
||||||
func (conn *Conn) Send(msg *Message, ch chan *Call) *Call {
|
|
||||||
return conn.send(context.Background(), msg, ch)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SendWithContext acts like Send but takes a context
|
|
||||||
func (conn *Conn) SendWithContext(ctx context.Context, msg *Message, ch chan *Call) *Call {
|
|
||||||
return conn.send(ctx, msg, ch)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) send(ctx context.Context, msg *Message, ch chan *Call) *Call {
|
|
||||||
if ctx == nil {
|
|
||||||
panic("nil context")
|
|
||||||
}
|
|
||||||
|
|
||||||
var call *Call
|
|
||||||
ctx, canceler := context.WithCancel(ctx)
|
|
||||||
msg.serial = conn.getSerial()
|
|
||||||
if msg.Type == TypeMethodCall && msg.Flags&FlagNoReplyExpected == 0 {
|
|
||||||
if ch == nil {
|
|
||||||
ch = make(chan *Call, 5)
|
|
||||||
} else if cap(ch) == 0 {
|
|
||||||
panic("dbus: unbuffered channel passed to (*Conn).Send")
|
|
||||||
}
|
|
||||||
call = new(Call)
|
|
||||||
call.Destination, _ = msg.Headers[FieldDestination].value.(string)
|
|
||||||
call.Path, _ = msg.Headers[FieldPath].value.(ObjectPath)
|
|
||||||
iface, _ := msg.Headers[FieldInterface].value.(string)
|
|
||||||
member, _ := msg.Headers[FieldMember].value.(string)
|
|
||||||
call.Method = iface + "." + member
|
|
||||||
call.Args = msg.Body
|
|
||||||
call.Done = ch
|
|
||||||
call.ctx = ctx
|
|
||||||
call.ctxCanceler = canceler
|
|
||||||
conn.calls.track(msg.serial, call)
|
|
||||||
go func() {
|
|
||||||
<-ctx.Done()
|
|
||||||
conn.calls.handleSendError(msg, ctx.Err())
|
|
||||||
}()
|
|
||||||
conn.sendMessageAndIfClosed(msg, func() {
|
|
||||||
conn.calls.handleSendError(msg, ErrClosed)
|
|
||||||
canceler()
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
canceler()
|
|
||||||
call = &Call{Err: nil}
|
|
||||||
conn.sendMessageAndIfClosed(msg, func() {
|
|
||||||
call = &Call{Err: ErrClosed}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return call
|
|
||||||
}
|
|
||||||
|
|
||||||
// sendError creates an error message corresponding to the parameters and sends
|
|
||||||
// it to conn.out.
|
|
||||||
func (conn *Conn) sendError(err error, dest string, serial uint32) {
|
|
||||||
var e *Error
|
|
||||||
switch em := err.(type) {
|
|
||||||
case Error:
|
|
||||||
e = &em
|
|
||||||
case *Error:
|
|
||||||
e = em
|
|
||||||
case DBusError:
|
|
||||||
name, body := em.DBusError()
|
|
||||||
e = NewError(name, body)
|
|
||||||
default:
|
|
||||||
e = MakeFailedError(err)
|
|
||||||
}
|
|
||||||
msg := new(Message)
|
|
||||||
msg.Type = TypeError
|
|
||||||
msg.serial = conn.getSerial()
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
if dest != "" {
|
|
||||||
msg.Headers[FieldDestination] = MakeVariant(dest)
|
|
||||||
}
|
|
||||||
msg.Headers[FieldErrorName] = MakeVariant(e.Name)
|
|
||||||
msg.Headers[FieldReplySerial] = MakeVariant(serial)
|
|
||||||
msg.Body = e.Body
|
|
||||||
if len(e.Body) > 0 {
|
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(e.Body...))
|
|
||||||
}
|
|
||||||
conn.sendMessage(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
// sendReply creates a method reply message corresponding to the parameters and
|
|
||||||
// sends it to conn.out.
|
|
||||||
func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) {
|
|
||||||
msg := new(Message)
|
|
||||||
msg.Type = TypeMethodReply
|
|
||||||
msg.serial = conn.getSerial()
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
if dest != "" {
|
|
||||||
msg.Headers[FieldDestination] = MakeVariant(dest)
|
|
||||||
}
|
|
||||||
msg.Headers[FieldReplySerial] = MakeVariant(serial)
|
|
||||||
msg.Body = values
|
|
||||||
if len(values) > 0 {
|
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
|
|
||||||
}
|
|
||||||
conn.sendMessage(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) defaultSignalAction(fn func(h *defaultSignalHandler, ch chan<- *Signal), ch chan<- *Signal) {
|
|
||||||
if !isDefaultSignalHandler(conn.signalHandler) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
handler := conn.signalHandler.(*defaultSignalHandler)
|
|
||||||
fn(handler, ch)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signal registers the given channel to be passed all received signal messages.
|
|
||||||
// The caller has to make sure that ch is sufficiently buffered; if a message
|
|
||||||
// arrives when a write to c is not possible, it is discarded.
|
|
||||||
//
|
|
||||||
// Multiple of these channels can be registered at the same time.
|
|
||||||
//
|
|
||||||
// These channels are "overwritten" by Eavesdrop; i.e., if there currently is a
|
|
||||||
// channel for eavesdropped messages, this channel receives all signals, and
|
|
||||||
// none of the channels passed to Signal will receive any signals.
|
|
||||||
func (conn *Conn) Signal(ch chan<- *Signal) {
|
|
||||||
conn.defaultSignalAction((*defaultSignalHandler).addSignal, ch)
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoveSignal removes the given channel from the list of the registered channels.
|
|
||||||
func (conn *Conn) RemoveSignal(ch chan<- *Signal) {
|
|
||||||
conn.defaultSignalAction((*defaultSignalHandler).removeSignal, ch)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SupportsUnixFDs returns whether the underlying transport supports passing of
|
|
||||||
// unix file descriptors. If this is false, method calls containing unix file
|
|
||||||
// descriptors will return an error and emitted signals containing them will
|
|
||||||
// not be sent.
|
|
||||||
func (conn *Conn) SupportsUnixFDs() bool {
|
|
||||||
return conn.unixFD
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error represents a D-Bus message of type Error.
|
|
||||||
type Error struct {
|
|
||||||
Name string
|
|
||||||
Body []interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewError(name string, body []interface{}) *Error {
|
|
||||||
return &Error{name, body}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e Error) Error() string {
|
|
||||||
if len(e.Body) >= 1 {
|
|
||||||
s, ok := e.Body[0].(string)
|
|
||||||
if ok {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return e.Name
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signal represents a D-Bus message of type Signal. The name member is given in
|
|
||||||
// "interface.member" notation, e.g. org.freedesktop.D-Bus.NameLost.
|
|
||||||
type Signal struct {
|
|
||||||
Sender string
|
|
||||||
Path ObjectPath
|
|
||||||
Name string
|
|
||||||
Body []interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// transport is a D-Bus transport.
|
|
||||||
type transport interface {
|
|
||||||
// Read and Write raw data (for example, for the authentication protocol).
|
|
||||||
io.ReadWriteCloser
|
|
||||||
|
|
||||||
// Send the initial null byte used for the EXTERNAL mechanism.
|
|
||||||
SendNullByte() error
|
|
||||||
|
|
||||||
// Returns whether this transport supports passing Unix FDs.
|
|
||||||
SupportsUnixFDs() bool
|
|
||||||
|
|
||||||
// Signal the transport that Unix FD passing is enabled for this connection.
|
|
||||||
EnableUnixFDs()
|
|
||||||
|
|
||||||
// Read / send a message, handling things like Unix FDs.
|
|
||||||
ReadMessage() (*Message, error)
|
|
||||||
SendMessage(*Message) error
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
transports = make(map[string]func(string) (transport, error))
|
|
||||||
)
|
|
||||||
|
|
||||||
func getTransport(address string) (transport, error) {
|
|
||||||
var err error
|
|
||||||
var t transport
|
|
||||||
|
|
||||||
addresses := strings.Split(address, ";")
|
|
||||||
for _, v := range addresses {
|
|
||||||
i := strings.IndexRune(v, ':')
|
|
||||||
if i == -1 {
|
|
||||||
err = errors.New("dbus: invalid bus address (no transport)")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
f := transports[v[:i]]
|
|
||||||
if f == nil {
|
|
||||||
err = errors.New("dbus: invalid bus address (invalid or unsupported transport)")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
t, err = f(v[i+1:])
|
|
||||||
if err == nil {
|
|
||||||
return t, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// dereferenceAll returns a slice that, assuming that vs is a slice of pointers
|
|
||||||
// of arbitrary types, containes the values that are obtained from dereferencing
|
|
||||||
// all elements in vs.
|
|
||||||
func dereferenceAll(vs []interface{}) []interface{} {
|
|
||||||
for i := range vs {
|
|
||||||
v := reflect.ValueOf(vs[i])
|
|
||||||
v = v.Elem()
|
|
||||||
vs[i] = v.Interface()
|
|
||||||
}
|
|
||||||
return vs
|
|
||||||
}
|
|
||||||
|
|
||||||
// getKey gets a key from a the list of keys. Returns "" on error / not found...
|
|
||||||
func getKey(s, key string) string {
|
|
||||||
for _, keyEqualsValue := range strings.Split(s, ",") {
|
|
||||||
keyValue := strings.SplitN(keyEqualsValue, "=", 2)
|
|
||||||
if len(keyValue) == 2 && keyValue[0] == key {
|
|
||||||
return keyValue[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
type outputHandler struct {
|
|
||||||
conn *Conn
|
|
||||||
sendLck sync.Mutex
|
|
||||||
closed struct {
|
|
||||||
isClosed bool
|
|
||||||
lck sync.RWMutex
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *outputHandler) sendAndIfClosed(msg *Message, ifClosed func()) error {
|
|
||||||
h.closed.lck.RLock()
|
|
||||||
defer h.closed.lck.RUnlock()
|
|
||||||
if h.closed.isClosed {
|
|
||||||
ifClosed()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
h.sendLck.Lock()
|
|
||||||
defer h.sendLck.Unlock()
|
|
||||||
return h.conn.SendMessage(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *outputHandler) close() {
|
|
||||||
h.closed.lck.Lock()
|
|
||||||
defer h.closed.lck.Unlock()
|
|
||||||
h.closed.isClosed = true
|
|
||||||
}
|
|
||||||
|
|
||||||
type serialGenerator struct {
|
|
||||||
lck sync.Mutex
|
|
||||||
nextSerial uint32
|
|
||||||
serialUsed map[uint32]bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func newSerialGenerator() *serialGenerator {
|
|
||||||
return &serialGenerator{
|
|
||||||
serialUsed: map[uint32]bool{0: true},
|
|
||||||
nextSerial: 1,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (gen *serialGenerator) GetSerial() uint32 {
|
|
||||||
gen.lck.Lock()
|
|
||||||
defer gen.lck.Unlock()
|
|
||||||
n := gen.nextSerial
|
|
||||||
for gen.serialUsed[n] {
|
|
||||||
n++
|
|
||||||
}
|
|
||||||
gen.serialUsed[n] = true
|
|
||||||
gen.nextSerial = n + 1
|
|
||||||
return n
|
|
||||||
}
|
|
||||||
|
|
||||||
func (gen *serialGenerator) RetireSerial(serial uint32) {
|
|
||||||
gen.lck.Lock()
|
|
||||||
defer gen.lck.Unlock()
|
|
||||||
delete(gen.serialUsed, serial)
|
|
||||||
}
|
|
||||||
|
|
||||||
type nameTracker struct {
|
|
||||||
lck sync.RWMutex
|
|
||||||
unique string
|
|
||||||
names map[string]struct{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newNameTracker() *nameTracker {
|
|
||||||
return &nameTracker{names: map[string]struct{}{}}
|
|
||||||
}
|
|
||||||
func (tracker *nameTracker) acquireUniqueConnectionName(name string) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
defer tracker.lck.Unlock()
|
|
||||||
tracker.unique = name
|
|
||||||
}
|
|
||||||
func (tracker *nameTracker) acquireName(name string) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
defer tracker.lck.Unlock()
|
|
||||||
tracker.names[name] = struct{}{}
|
|
||||||
}
|
|
||||||
func (tracker *nameTracker) loseName(name string) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
defer tracker.lck.Unlock()
|
|
||||||
delete(tracker.names, name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *nameTracker) uniqueNameIsKnown() bool {
|
|
||||||
tracker.lck.RLock()
|
|
||||||
defer tracker.lck.RUnlock()
|
|
||||||
return tracker.unique != ""
|
|
||||||
}
|
|
||||||
func (tracker *nameTracker) isKnownName(name string) bool {
|
|
||||||
tracker.lck.RLock()
|
|
||||||
defer tracker.lck.RUnlock()
|
|
||||||
_, ok := tracker.names[name]
|
|
||||||
return ok || name == tracker.unique
|
|
||||||
}
|
|
||||||
func (tracker *nameTracker) listKnownNames() []string {
|
|
||||||
tracker.lck.RLock()
|
|
||||||
defer tracker.lck.RUnlock()
|
|
||||||
out := make([]string, 0, len(tracker.names)+1)
|
|
||||||
out = append(out, tracker.unique)
|
|
||||||
for k := range tracker.names {
|
|
||||||
out = append(out, k)
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
type callTracker struct {
|
|
||||||
calls map[uint32]*Call
|
|
||||||
lck sync.RWMutex
|
|
||||||
}
|
|
||||||
|
|
||||||
func newCallTracker() *callTracker {
|
|
||||||
return &callTracker{calls: map[uint32]*Call{}}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *callTracker) track(sn uint32, call *Call) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
tracker.calls[sn] = call
|
|
||||||
tracker.lck.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *callTracker) handleReply(msg *Message) uint32 {
|
|
||||||
serial := msg.Headers[FieldReplySerial].value.(uint32)
|
|
||||||
tracker.lck.RLock()
|
|
||||||
_, ok := tracker.calls[serial]
|
|
||||||
tracker.lck.RUnlock()
|
|
||||||
if ok {
|
|
||||||
tracker.finalizeWithBody(serial, msg.Body)
|
|
||||||
}
|
|
||||||
return serial
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *callTracker) handleDBusError(msg *Message) uint32 {
|
|
||||||
serial := msg.Headers[FieldReplySerial].value.(uint32)
|
|
||||||
tracker.lck.RLock()
|
|
||||||
_, ok := tracker.calls[serial]
|
|
||||||
tracker.lck.RUnlock()
|
|
||||||
if ok {
|
|
||||||
name, _ := msg.Headers[FieldErrorName].value.(string)
|
|
||||||
tracker.finalizeWithError(serial, Error{name, msg.Body})
|
|
||||||
}
|
|
||||||
return serial
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *callTracker) handleSendError(msg *Message, err error) {
|
|
||||||
if err == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
tracker.lck.RLock()
|
|
||||||
_, ok := tracker.calls[msg.serial]
|
|
||||||
tracker.lck.RUnlock()
|
|
||||||
if ok {
|
|
||||||
tracker.finalizeWithError(msg.serial, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// finalize was the only func that did not strobe Done
|
|
||||||
func (tracker *callTracker) finalize(sn uint32) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
defer tracker.lck.Unlock()
|
|
||||||
c, ok := tracker.calls[sn]
|
|
||||||
if ok {
|
|
||||||
delete(tracker.calls, sn)
|
|
||||||
c.ContextCancel()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *callTracker) finalizeWithBody(sn uint32, body []interface{}) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
c, ok := tracker.calls[sn]
|
|
||||||
if ok {
|
|
||||||
delete(tracker.calls, sn)
|
|
||||||
}
|
|
||||||
tracker.lck.Unlock()
|
|
||||||
if ok {
|
|
||||||
c.Body = body
|
|
||||||
c.done()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *callTracker) finalizeWithError(sn uint32, err error) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
c, ok := tracker.calls[sn]
|
|
||||||
if ok {
|
|
||||||
delete(tracker.calls, sn)
|
|
||||||
}
|
|
||||||
tracker.lck.Unlock()
|
|
||||||
if ok {
|
|
||||||
c.Err = err
|
|
||||||
c.done()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tracker *callTracker) finalizeAllWithError(err error) {
|
|
||||||
tracker.lck.Lock()
|
|
||||||
closedCalls := make([]*Call, 0, len(tracker.calls))
|
|
||||||
for sn := range tracker.calls {
|
|
||||||
closedCalls = append(closedCalls, tracker.calls[sn])
|
|
||||||
}
|
|
||||||
tracker.calls = map[uint32]*Call{}
|
|
||||||
tracker.lck.Unlock()
|
|
||||||
for _, call := range closedCalls {
|
|
||||||
call.Err = err
|
|
||||||
call.done()
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,37 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
)
|
|
||||||
|
|
||||||
const defaultSystemBusAddress = "unix:path=/opt/local/var/run/dbus/system_bus_socket"
|
|
||||||
|
|
||||||
func getSessionBusPlatformAddress() (string, error) {
|
|
||||||
cmd := exec.Command("launchctl", "getenv", "DBUS_LAUNCHD_SESSION_BUS_SOCKET")
|
|
||||||
b, err := cmd.CombinedOutput()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(b) == 0 {
|
|
||||||
return "", errors.New("dbus: couldn't determine address of session bus")
|
|
||||||
}
|
|
||||||
|
|
||||||
return "unix:path=" + string(b[:len(b)-1]), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getSystemBusPlatformAddress() string {
|
|
||||||
address := os.Getenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET")
|
|
||||||
if address != "" {
|
|
||||||
return fmt.Sprintf("unix:path=%s", address)
|
|
||||||
}
|
|
||||||
return defaultSystemBusAddress
|
|
||||||
}
|
|
||||||
|
|
||||||
func tryDiscoverDbusSessionBusAddress() string {
|
|
||||||
return ""
|
|
||||||
}
|
|
|
@ -1,93 +0,0 @@
|
||||||
// +build !darwin
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"os/user"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var execCommand = exec.Command
|
|
||||||
|
|
||||||
func getSessionBusPlatformAddress() (string, error) {
|
|
||||||
cmd := execCommand("dbus-launch")
|
|
||||||
b, err := cmd.CombinedOutput()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
i := bytes.IndexByte(b, '=')
|
|
||||||
j := bytes.IndexByte(b, '\n')
|
|
||||||
|
|
||||||
if i == -1 || j == -1 || i > j {
|
|
||||||
return "", errors.New("dbus: couldn't determine address of session bus")
|
|
||||||
}
|
|
||||||
|
|
||||||
env, addr := string(b[0:i]), string(b[i+1:j])
|
|
||||||
os.Setenv(env, addr)
|
|
||||||
|
|
||||||
return addr, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// tryDiscoverDbusSessionBusAddress tries to discover an existing dbus session
|
|
||||||
// and return the value of its DBUS_SESSION_BUS_ADDRESS.
|
|
||||||
// It tries different techniques employed by different operating systems,
|
|
||||||
// returning the first valid address it finds, or an empty string.
|
|
||||||
//
|
|
||||||
// * /run/user/<uid>/bus if this exists, it *is* the bus socket. present on
|
|
||||||
// Ubuntu 18.04
|
|
||||||
// * /run/user/<uid>/dbus-session: if this exists, it can be parsed for the bus
|
|
||||||
// address. present on Ubuntu 16.04
|
|
||||||
//
|
|
||||||
// See https://dbus.freedesktop.org/doc/dbus-launch.1.html
|
|
||||||
func tryDiscoverDbusSessionBusAddress() string {
|
|
||||||
if runtimeDirectory, err := getRuntimeDirectory(); err == nil {
|
|
||||||
|
|
||||||
if runUserBusFile := path.Join(runtimeDirectory, "bus"); fileExists(runUserBusFile) {
|
|
||||||
// if /run/user/<uid>/bus exists, that file itself
|
|
||||||
// *is* the unix socket, so return its path
|
|
||||||
return fmt.Sprintf("unix:path=%s", runUserBusFile)
|
|
||||||
}
|
|
||||||
if runUserSessionDbusFile := path.Join(runtimeDirectory, "dbus-session"); fileExists(runUserSessionDbusFile) {
|
|
||||||
// if /run/user/<uid>/dbus-session exists, it's a
|
|
||||||
// text file // containing the address of the socket, e.g.:
|
|
||||||
// DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-E1c73yNqrG
|
|
||||||
|
|
||||||
if f, err := ioutil.ReadFile(runUserSessionDbusFile); err == nil {
|
|
||||||
fileContent := string(f)
|
|
||||||
|
|
||||||
prefix := "DBUS_SESSION_BUS_ADDRESS="
|
|
||||||
|
|
||||||
if strings.HasPrefix(fileContent, prefix) {
|
|
||||||
address := strings.TrimRight(strings.TrimPrefix(fileContent, prefix), "\n\r")
|
|
||||||
return address
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func getRuntimeDirectory() (string, error) {
|
|
||||||
if currentUser, err := user.Current(); err != nil {
|
|
||||||
return "", err
|
|
||||||
} else {
|
|
||||||
return fmt.Sprintf("/run/user/%s", currentUser.Uid), nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func fileExists(filename string) bool {
|
|
||||||
if _, err := os.Stat(filename); !os.IsNotExist(err) {
|
|
||||||
return true
|
|
||||||
} else {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,18 +0,0 @@
|
||||||
//+build !windows,!solaris,!darwin
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"fmt"
|
|
||||||
)
|
|
||||||
|
|
||||||
const defaultSystemBusAddress = "unix:path=/var/run/dbus/system_bus_socket"
|
|
||||||
|
|
||||||
func getSystemBusPlatformAddress() string {
|
|
||||||
address := os.Getenv("DBUS_SYSTEM_BUS_ADDRESS")
|
|
||||||
if address != "" {
|
|
||||||
return fmt.Sprintf("unix:path=%s", address)
|
|
||||||
}
|
|
||||||
return defaultSystemBusAddress
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
//+build windows
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import "os"
|
|
||||||
|
|
||||||
const defaultSystemBusAddress = "tcp:host=127.0.0.1,port=12434"
|
|
||||||
|
|
||||||
func getSystemBusPlatformAddress() string {
|
|
||||||
address := os.Getenv("DBUS_SYSTEM_BUS_ADDRESS")
|
|
||||||
if address != "" {
|
|
||||||
return address
|
|
||||||
}
|
|
||||||
return defaultSystemBusAddress
|
|
||||||
}
|
|
|
@ -1,427 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
byteType = reflect.TypeOf(byte(0))
|
|
||||||
boolType = reflect.TypeOf(false)
|
|
||||||
uint8Type = reflect.TypeOf(uint8(0))
|
|
||||||
int16Type = reflect.TypeOf(int16(0))
|
|
||||||
uint16Type = reflect.TypeOf(uint16(0))
|
|
||||||
intType = reflect.TypeOf(int(0))
|
|
||||||
uintType = reflect.TypeOf(uint(0))
|
|
||||||
int32Type = reflect.TypeOf(int32(0))
|
|
||||||
uint32Type = reflect.TypeOf(uint32(0))
|
|
||||||
int64Type = reflect.TypeOf(int64(0))
|
|
||||||
uint64Type = reflect.TypeOf(uint64(0))
|
|
||||||
float64Type = reflect.TypeOf(float64(0))
|
|
||||||
stringType = reflect.TypeOf("")
|
|
||||||
signatureType = reflect.TypeOf(Signature{""})
|
|
||||||
objectPathType = reflect.TypeOf(ObjectPath(""))
|
|
||||||
variantType = reflect.TypeOf(Variant{Signature{""}, nil})
|
|
||||||
interfacesType = reflect.TypeOf([]interface{}{})
|
|
||||||
interfaceType = reflect.TypeOf((*interface{})(nil)).Elem()
|
|
||||||
unixFDType = reflect.TypeOf(UnixFD(0))
|
|
||||||
unixFDIndexType = reflect.TypeOf(UnixFDIndex(0))
|
|
||||||
)
|
|
||||||
|
|
||||||
// An InvalidTypeError signals that a value which cannot be represented in the
|
|
||||||
// D-Bus wire format was passed to a function.
|
|
||||||
type InvalidTypeError struct {
|
|
||||||
Type reflect.Type
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e InvalidTypeError) Error() string {
|
|
||||||
return "dbus: invalid type " + e.Type.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store copies the values contained in src to dest, which must be a slice of
|
|
||||||
// pointers. It converts slices of interfaces from src to corresponding structs
|
|
||||||
// in dest. An error is returned if the lengths of src and dest or the types of
|
|
||||||
// their elements don't match.
|
|
||||||
func Store(src []interface{}, dest ...interface{}) error {
|
|
||||||
if len(src) != len(dest) {
|
|
||||||
return errors.New("dbus.Store: length mismatch")
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := range src {
|
|
||||||
if err := storeInterfaces(src[i], dest[i]); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeInterfaces(src, dest interface{}) error {
|
|
||||||
return store(reflect.ValueOf(dest), reflect.ValueOf(src))
|
|
||||||
}
|
|
||||||
|
|
||||||
func store(dest, src reflect.Value) error {
|
|
||||||
if dest.Kind() == reflect.Ptr {
|
|
||||||
return store(dest.Elem(), src)
|
|
||||||
}
|
|
||||||
switch src.Kind() {
|
|
||||||
case reflect.Slice:
|
|
||||||
return storeSlice(dest, src)
|
|
||||||
case reflect.Map:
|
|
||||||
return storeMap(dest, src)
|
|
||||||
default:
|
|
||||||
return storeBase(dest, src)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeBase(dest, src reflect.Value) error {
|
|
||||||
return setDest(dest, src)
|
|
||||||
}
|
|
||||||
|
|
||||||
func setDest(dest, src reflect.Value) error {
|
|
||||||
if !isVariant(src.Type()) && isVariant(dest.Type()) {
|
|
||||||
//special conversion for dbus.Variant
|
|
||||||
dest.Set(reflect.ValueOf(MakeVariant(src.Interface())))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if isVariant(src.Type()) && !isVariant(dest.Type()) {
|
|
||||||
src = getVariantValue(src)
|
|
||||||
}
|
|
||||||
if !src.Type().ConvertibleTo(dest.Type()) {
|
|
||||||
return fmt.Errorf(
|
|
||||||
"dbus.Store: type mismatch: cannot convert %s to %s",
|
|
||||||
src.Type(), dest.Type())
|
|
||||||
}
|
|
||||||
dest.Set(src.Convert(dest.Type()))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func kindsAreCompatible(dest, src reflect.Type) bool {
|
|
||||||
switch {
|
|
||||||
case isVariant(dest):
|
|
||||||
return true
|
|
||||||
case dest.Kind() == reflect.Interface:
|
|
||||||
return true
|
|
||||||
default:
|
|
||||||
return dest.Kind() == src.Kind()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func isConvertibleTo(dest, src reflect.Type) bool {
|
|
||||||
switch {
|
|
||||||
case isVariant(dest):
|
|
||||||
return true
|
|
||||||
case dest.Kind() == reflect.Interface:
|
|
||||||
return true
|
|
||||||
case dest.Kind() == reflect.Slice:
|
|
||||||
return src.Kind() == reflect.Slice &&
|
|
||||||
isConvertibleTo(dest.Elem(), src.Elem())
|
|
||||||
case dest.Kind() == reflect.Struct:
|
|
||||||
return src == interfacesType
|
|
||||||
default:
|
|
||||||
return src.ConvertibleTo(dest)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeMap(dest, src reflect.Value) error {
|
|
||||||
switch {
|
|
||||||
case !kindsAreCompatible(dest.Type(), src.Type()):
|
|
||||||
return fmt.Errorf(
|
|
||||||
"dbus.Store: type mismatch: "+
|
|
||||||
"map: cannot store a value of %s into %s",
|
|
||||||
src.Type(), dest.Type())
|
|
||||||
case isVariant(dest.Type()):
|
|
||||||
return storeMapIntoVariant(dest, src)
|
|
||||||
case dest.Kind() == reflect.Interface:
|
|
||||||
return storeMapIntoInterface(dest, src)
|
|
||||||
case isConvertibleTo(dest.Type().Key(), src.Type().Key()) &&
|
|
||||||
isConvertibleTo(dest.Type().Elem(), src.Type().Elem()):
|
|
||||||
return storeMapIntoMap(dest, src)
|
|
||||||
default:
|
|
||||||
return fmt.Errorf(
|
|
||||||
"dbus.Store: type mismatch: "+
|
|
||||||
"map: cannot convert a value of %s into %s",
|
|
||||||
src.Type(), dest.Type())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeMapIntoVariant(dest, src reflect.Value) error {
|
|
||||||
dv := reflect.MakeMap(src.Type())
|
|
||||||
err := store(dv, src)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return storeBase(dest, dv)
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeMapIntoInterface(dest, src reflect.Value) error {
|
|
||||||
var dv reflect.Value
|
|
||||||
if isVariant(src.Type().Elem()) {
|
|
||||||
//Convert variants to interface{} recursively when converting
|
|
||||||
//to interface{}
|
|
||||||
dv = reflect.MakeMap(
|
|
||||||
reflect.MapOf(src.Type().Key(), interfaceType))
|
|
||||||
} else {
|
|
||||||
dv = reflect.MakeMap(src.Type())
|
|
||||||
}
|
|
||||||
err := store(dv, src)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return storeBase(dest, dv)
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeMapIntoMap(dest, src reflect.Value) error {
|
|
||||||
if dest.IsNil() {
|
|
||||||
dest.Set(reflect.MakeMap(dest.Type()))
|
|
||||||
}
|
|
||||||
keys := src.MapKeys()
|
|
||||||
for _, key := range keys {
|
|
||||||
dkey := key.Convert(dest.Type().Key())
|
|
||||||
dval := reflect.New(dest.Type().Elem()).Elem()
|
|
||||||
err := store(dval, getVariantValue(src.MapIndex(key)))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
dest.SetMapIndex(dkey, dval)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeSlice(dest, src reflect.Value) error {
|
|
||||||
switch {
|
|
||||||
case src.Type() == interfacesType && dest.Kind() == reflect.Struct:
|
|
||||||
//The decoder always decodes structs as slices of interface{}
|
|
||||||
return storeStruct(dest, src)
|
|
||||||
case !kindsAreCompatible(dest.Type(), src.Type()):
|
|
||||||
return fmt.Errorf(
|
|
||||||
"dbus.Store: type mismatch: "+
|
|
||||||
"slice: cannot store a value of %s into %s",
|
|
||||||
src.Type(), dest.Type())
|
|
||||||
case isVariant(dest.Type()):
|
|
||||||
return storeSliceIntoVariant(dest, src)
|
|
||||||
case dest.Kind() == reflect.Interface:
|
|
||||||
return storeSliceIntoInterface(dest, src)
|
|
||||||
case isConvertibleTo(dest.Type().Elem(), src.Type().Elem()):
|
|
||||||
return storeSliceIntoSlice(dest, src)
|
|
||||||
default:
|
|
||||||
return fmt.Errorf(
|
|
||||||
"dbus.Store: type mismatch: "+
|
|
||||||
"slice: cannot convert a value of %s into %s",
|
|
||||||
src.Type(), dest.Type())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeStruct(dest, src reflect.Value) error {
|
|
||||||
if isVariant(dest.Type()) {
|
|
||||||
return storeBase(dest, src)
|
|
||||||
}
|
|
||||||
dval := make([]interface{}, 0, dest.NumField())
|
|
||||||
dtype := dest.Type()
|
|
||||||
for i := 0; i < dest.NumField(); i++ {
|
|
||||||
field := dest.Field(i)
|
|
||||||
ftype := dtype.Field(i)
|
|
||||||
if ftype.PkgPath != "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if ftype.Tag.Get("dbus") == "-" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
dval = append(dval, field.Addr().Interface())
|
|
||||||
}
|
|
||||||
if src.Len() != len(dval) {
|
|
||||||
return fmt.Errorf(
|
|
||||||
"dbus.Store: type mismatch: "+
|
|
||||||
"destination struct does not have "+
|
|
||||||
"enough fields need: %d have: %d",
|
|
||||||
src.Len(), len(dval))
|
|
||||||
}
|
|
||||||
return Store(src.Interface().([]interface{}), dval...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeSliceIntoVariant(dest, src reflect.Value) error {
|
|
||||||
dv := reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
|
|
||||||
err := store(dv, src)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return storeBase(dest, dv)
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeSliceIntoInterface(dest, src reflect.Value) error {
|
|
||||||
var dv reflect.Value
|
|
||||||
if isVariant(src.Type().Elem()) {
|
|
||||||
//Convert variants to interface{} recursively when converting
|
|
||||||
//to interface{}
|
|
||||||
dv = reflect.MakeSlice(reflect.SliceOf(interfaceType),
|
|
||||||
src.Len(), src.Cap())
|
|
||||||
} else {
|
|
||||||
dv = reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
|
|
||||||
}
|
|
||||||
err := store(dv, src)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return storeBase(dest, dv)
|
|
||||||
}
|
|
||||||
|
|
||||||
func storeSliceIntoSlice(dest, src reflect.Value) error {
|
|
||||||
if dest.IsNil() || dest.Len() < src.Len() {
|
|
||||||
dest.Set(reflect.MakeSlice(dest.Type(), src.Len(), src.Cap()))
|
|
||||||
}
|
|
||||||
if dest.Len() != src.Len() {
|
|
||||||
return fmt.Errorf(
|
|
||||||
"dbus.Store: type mismatch: "+
|
|
||||||
"slices are different lengths "+
|
|
||||||
"need: %d have: %d",
|
|
||||||
src.Len(), dest.Len())
|
|
||||||
}
|
|
||||||
for i := 0; i < src.Len(); i++ {
|
|
||||||
err := store(dest.Index(i), getVariantValue(src.Index(i)))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getVariantValue(in reflect.Value) reflect.Value {
|
|
||||||
if isVariant(in.Type()) {
|
|
||||||
return reflect.ValueOf(in.Interface().(Variant).Value())
|
|
||||||
}
|
|
||||||
return in
|
|
||||||
}
|
|
||||||
|
|
||||||
func isVariant(t reflect.Type) bool {
|
|
||||||
return t == variantType
|
|
||||||
}
|
|
||||||
|
|
||||||
// An ObjectPath is an object path as defined by the D-Bus spec.
|
|
||||||
type ObjectPath string
|
|
||||||
|
|
||||||
// IsValid returns whether the object path is valid.
|
|
||||||
func (o ObjectPath) IsValid() bool {
|
|
||||||
s := string(o)
|
|
||||||
if len(s) == 0 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if s[0] != '/' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if s[len(s)-1] == '/' && len(s) != 1 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
// probably not used, but technically possible
|
|
||||||
if s == "/" {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
split := strings.Split(s[1:], "/")
|
|
||||||
for _, v := range split {
|
|
||||||
if len(v) == 0 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range v {
|
|
||||||
if !isMemberChar(c) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// A UnixFD is a Unix file descriptor sent over the wire. See the package-level
|
|
||||||
// documentation for more information about Unix file descriptor passsing.
|
|
||||||
type UnixFD int32
|
|
||||||
|
|
||||||
// A UnixFDIndex is the representation of a Unix file descriptor in a message.
|
|
||||||
type UnixFDIndex uint32
|
|
||||||
|
|
||||||
// alignment returns the alignment of values of type t.
|
|
||||||
func alignment(t reflect.Type) int {
|
|
||||||
switch t {
|
|
||||||
case variantType:
|
|
||||||
return 1
|
|
||||||
case objectPathType:
|
|
||||||
return 4
|
|
||||||
case signatureType:
|
|
||||||
return 1
|
|
||||||
case interfacesType:
|
|
||||||
return 4
|
|
||||||
}
|
|
||||||
switch t.Kind() {
|
|
||||||
case reflect.Uint8:
|
|
||||||
return 1
|
|
||||||
case reflect.Uint16, reflect.Int16:
|
|
||||||
return 2
|
|
||||||
case reflect.Uint, reflect.Int, reflect.Uint32, reflect.Int32, reflect.String, reflect.Array, reflect.Slice, reflect.Map:
|
|
||||||
return 4
|
|
||||||
case reflect.Uint64, reflect.Int64, reflect.Float64, reflect.Struct:
|
|
||||||
return 8
|
|
||||||
case reflect.Ptr:
|
|
||||||
return alignment(t.Elem())
|
|
||||||
}
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
// isKeyType returns whether t is a valid type for a D-Bus dict.
|
|
||||||
func isKeyType(t reflect.Type) bool {
|
|
||||||
switch t.Kind() {
|
|
||||||
case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
|
|
||||||
reflect.Int16, reflect.Int32, reflect.Int64, reflect.Float64,
|
|
||||||
reflect.String, reflect.Uint, reflect.Int:
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// isValidInterface returns whether s is a valid name for an interface.
|
|
||||||
func isValidInterface(s string) bool {
|
|
||||||
if len(s) == 0 || len(s) > 255 || s[0] == '.' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
elem := strings.Split(s, ".")
|
|
||||||
if len(elem) < 2 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, v := range elem {
|
|
||||||
if len(v) == 0 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if v[0] >= '0' && v[0] <= '9' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range v {
|
|
||||||
if !isMemberChar(c) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// isValidMember returns whether s is a valid name for a member.
|
|
||||||
func isValidMember(s string) bool {
|
|
||||||
if len(s) == 0 || len(s) > 255 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
i := strings.Index(s, ".")
|
|
||||||
if i != -1 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if s[0] >= '0' && s[0] <= '9' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range s {
|
|
||||||
if !isMemberChar(c) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func isMemberChar(c rune) bool {
|
|
||||||
return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') ||
|
|
||||||
(c >= 'a' && c <= 'z') || c == '_'
|
|
||||||
}
|
|
|
@ -1,286 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/binary"
|
|
||||||
"io"
|
|
||||||
"reflect"
|
|
||||||
)
|
|
||||||
|
|
||||||
type decoder struct {
|
|
||||||
in io.Reader
|
|
||||||
order binary.ByteOrder
|
|
||||||
pos int
|
|
||||||
}
|
|
||||||
|
|
||||||
// newDecoder returns a new decoder that reads values from in. The input is
|
|
||||||
// expected to be in the given byte order.
|
|
||||||
func newDecoder(in io.Reader, order binary.ByteOrder) *decoder {
|
|
||||||
dec := new(decoder)
|
|
||||||
dec.in = in
|
|
||||||
dec.order = order
|
|
||||||
return dec
|
|
||||||
}
|
|
||||||
|
|
||||||
// align aligns the input to the given boundary and panics on error.
|
|
||||||
func (dec *decoder) align(n int) {
|
|
||||||
if dec.pos%n != 0 {
|
|
||||||
newpos := (dec.pos + n - 1) & ^(n - 1)
|
|
||||||
empty := make([]byte, newpos-dec.pos)
|
|
||||||
if _, err := io.ReadFull(dec.in, empty); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
dec.pos = newpos
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calls binary.Read(dec.in, dec.order, v) and panics on read errors.
|
|
||||||
func (dec *decoder) binread(v interface{}) {
|
|
||||||
if err := binary.Read(dec.in, dec.order, v); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dec *decoder) Decode(sig Signature) (vs []interface{}, err error) {
|
|
||||||
defer func() {
|
|
||||||
var ok bool
|
|
||||||
v := recover()
|
|
||||||
if err, ok = v.(error); ok {
|
|
||||||
if err == io.EOF || err == io.ErrUnexpectedEOF {
|
|
||||||
err = FormatError("unexpected EOF")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
vs = make([]interface{}, 0)
|
|
||||||
s := sig.str
|
|
||||||
for s != "" {
|
|
||||||
err, rem := validSingle(s, 0)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
v := dec.decode(s[:len(s)-len(rem)], 0)
|
|
||||||
vs = append(vs, v)
|
|
||||||
s = rem
|
|
||||||
}
|
|
||||||
return vs, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dec *decoder) decode(s string, depth int) interface{} {
|
|
||||||
dec.align(alignment(typeFor(s)))
|
|
||||||
switch s[0] {
|
|
||||||
case 'y':
|
|
||||||
var b [1]byte
|
|
||||||
if _, err := dec.in.Read(b[:]); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
dec.pos++
|
|
||||||
return b[0]
|
|
||||||
case 'b':
|
|
||||||
i := dec.decode("u", depth).(uint32)
|
|
||||||
switch {
|
|
||||||
case i == 0:
|
|
||||||
return false
|
|
||||||
case i == 1:
|
|
||||||
return true
|
|
||||||
default:
|
|
||||||
panic(FormatError("invalid value for boolean"))
|
|
||||||
}
|
|
||||||
case 'n':
|
|
||||||
var i int16
|
|
||||||
dec.binread(&i)
|
|
||||||
dec.pos += 2
|
|
||||||
return i
|
|
||||||
case 'i':
|
|
||||||
var i int32
|
|
||||||
dec.binread(&i)
|
|
||||||
dec.pos += 4
|
|
||||||
return i
|
|
||||||
case 'x':
|
|
||||||
var i int64
|
|
||||||
dec.binread(&i)
|
|
||||||
dec.pos += 8
|
|
||||||
return i
|
|
||||||
case 'q':
|
|
||||||
var i uint16
|
|
||||||
dec.binread(&i)
|
|
||||||
dec.pos += 2
|
|
||||||
return i
|
|
||||||
case 'u':
|
|
||||||
var i uint32
|
|
||||||
dec.binread(&i)
|
|
||||||
dec.pos += 4
|
|
||||||
return i
|
|
||||||
case 't':
|
|
||||||
var i uint64
|
|
||||||
dec.binread(&i)
|
|
||||||
dec.pos += 8
|
|
||||||
return i
|
|
||||||
case 'd':
|
|
||||||
var f float64
|
|
||||||
dec.binread(&f)
|
|
||||||
dec.pos += 8
|
|
||||||
return f
|
|
||||||
case 's':
|
|
||||||
length := dec.decode("u", depth).(uint32)
|
|
||||||
b := make([]byte, int(length)+1)
|
|
||||||
if _, err := io.ReadFull(dec.in, b); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
dec.pos += int(length) + 1
|
|
||||||
return string(b[:len(b)-1])
|
|
||||||
case 'o':
|
|
||||||
return ObjectPath(dec.decode("s", depth).(string))
|
|
||||||
case 'g':
|
|
||||||
length := dec.decode("y", depth).(byte)
|
|
||||||
b := make([]byte, int(length)+1)
|
|
||||||
if _, err := io.ReadFull(dec.in, b); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
dec.pos += int(length) + 1
|
|
||||||
sig, err := ParseSignature(string(b[:len(b)-1]))
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
return sig
|
|
||||||
case 'v':
|
|
||||||
if depth >= 64 {
|
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
|
||||||
}
|
|
||||||
var variant Variant
|
|
||||||
sig := dec.decode("g", depth).(Signature)
|
|
||||||
if len(sig.str) == 0 {
|
|
||||||
panic(FormatError("variant signature is empty"))
|
|
||||||
}
|
|
||||||
err, rem := validSingle(sig.str, 0)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
if rem != "" {
|
|
||||||
panic(FormatError("variant signature has multiple types"))
|
|
||||||
}
|
|
||||||
variant.sig = sig
|
|
||||||
variant.value = dec.decode(sig.str, depth+1)
|
|
||||||
return variant
|
|
||||||
case 'h':
|
|
||||||
return UnixFDIndex(dec.decode("u", depth).(uint32))
|
|
||||||
case 'a':
|
|
||||||
if len(s) > 1 && s[1] == '{' {
|
|
||||||
ksig := s[2:3]
|
|
||||||
vsig := s[3 : len(s)-1]
|
|
||||||
v := reflect.MakeMap(reflect.MapOf(typeFor(ksig), typeFor(vsig)))
|
|
||||||
if depth >= 63 {
|
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
|
||||||
}
|
|
||||||
length := dec.decode("u", depth).(uint32)
|
|
||||||
// Even for empty maps, the correct padding must be included
|
|
||||||
dec.align(8)
|
|
||||||
spos := dec.pos
|
|
||||||
for dec.pos < spos+int(length) {
|
|
||||||
dec.align(8)
|
|
||||||
if !isKeyType(v.Type().Key()) {
|
|
||||||
panic(InvalidTypeError{v.Type()})
|
|
||||||
}
|
|
||||||
kv := dec.decode(ksig, depth+2)
|
|
||||||
vv := dec.decode(vsig, depth+2)
|
|
||||||
v.SetMapIndex(reflect.ValueOf(kv), reflect.ValueOf(vv))
|
|
||||||
}
|
|
||||||
return v.Interface()
|
|
||||||
}
|
|
||||||
if depth >= 64 {
|
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
|
||||||
}
|
|
||||||
sig := s[1:]
|
|
||||||
length := dec.decode("u", depth).(uint32)
|
|
||||||
// capacity can be determined only for fixed-size element types
|
|
||||||
var capacity int
|
|
||||||
if s := sigByteSize(sig); s != 0 {
|
|
||||||
capacity = int(length) / s
|
|
||||||
}
|
|
||||||
v := reflect.MakeSlice(reflect.SliceOf(typeFor(sig)), 0, capacity)
|
|
||||||
// Even for empty arrays, the correct padding must be included
|
|
||||||
align := alignment(typeFor(s[1:]))
|
|
||||||
if len(s) > 1 && s[1] == '(' {
|
|
||||||
//Special case for arrays of structs
|
|
||||||
//structs decode as a slice of interface{} values
|
|
||||||
//but the dbus alignment does not match this
|
|
||||||
align = 8
|
|
||||||
}
|
|
||||||
dec.align(align)
|
|
||||||
spos := dec.pos
|
|
||||||
for dec.pos < spos+int(length) {
|
|
||||||
ev := dec.decode(s[1:], depth+1)
|
|
||||||
v = reflect.Append(v, reflect.ValueOf(ev))
|
|
||||||
}
|
|
||||||
return v.Interface()
|
|
||||||
case '(':
|
|
||||||
if depth >= 64 {
|
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
|
||||||
}
|
|
||||||
dec.align(8)
|
|
||||||
v := make([]interface{}, 0)
|
|
||||||
s = s[1 : len(s)-1]
|
|
||||||
for s != "" {
|
|
||||||
err, rem := validSingle(s, 0)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
ev := dec.decode(s[:len(s)-len(rem)], depth+1)
|
|
||||||
v = append(v, ev)
|
|
||||||
s = rem
|
|
||||||
}
|
|
||||||
return v
|
|
||||||
default:
|
|
||||||
panic(SignatureError{Sig: s})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// sigByteSize tries to calculates size of the given signature in bytes.
|
|
||||||
//
|
|
||||||
// It returns zero when it can't, for example when it contains non-fixed size
|
|
||||||
// types such as strings, maps and arrays that require reading of the transmitted
|
|
||||||
// data, for that we would need to implement the unread method for Decoder first.
|
|
||||||
func sigByteSize(sig string) int {
|
|
||||||
var total int
|
|
||||||
for offset := 0; offset < len(sig); {
|
|
||||||
switch sig[offset] {
|
|
||||||
case 'y':
|
|
||||||
total += 1
|
|
||||||
offset += 1
|
|
||||||
case 'n', 'q':
|
|
||||||
total += 2
|
|
||||||
offset += 1
|
|
||||||
case 'b', 'i', 'u', 'h':
|
|
||||||
total += 4
|
|
||||||
offset += 1
|
|
||||||
case 'x', 't', 'd':
|
|
||||||
total += 8
|
|
||||||
offset += 1
|
|
||||||
case '(':
|
|
||||||
i := 1
|
|
||||||
depth := 1
|
|
||||||
for i < len(sig[offset:]) && depth != 0 {
|
|
||||||
if sig[offset+i] == '(' {
|
|
||||||
depth++
|
|
||||||
} else if sig[offset+i] == ')' {
|
|
||||||
depth--
|
|
||||||
}
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
s := sigByteSize(sig[offset+1 : offset+i-1])
|
|
||||||
if s == 0 {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
total += s
|
|
||||||
offset += i
|
|
||||||
default:
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return total
|
|
||||||
}
|
|
||||||
|
|
||||||
// A FormatError is an error in the wire format.
|
|
||||||
type FormatError string
|
|
||||||
|
|
||||||
func (e FormatError) Error() string {
|
|
||||||
return "dbus: wire format error: " + string(e)
|
|
||||||
}
|
|
|
@ -1,321 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
func newIntrospectIntf(h *defaultHandler) *exportedIntf {
|
|
||||||
methods := make(map[string]Method)
|
|
||||||
methods["Introspect"] = exportedMethod{
|
|
||||||
reflect.ValueOf(func(msg Message) (string, *Error) {
|
|
||||||
path := msg.Headers[FieldPath].value.(ObjectPath)
|
|
||||||
return h.introspectPath(path), nil
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
return newExportedIntf(methods, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
//NewDefaultHandler returns an instance of the default
|
|
||||||
//call handler. This is useful if you want to implement only
|
|
||||||
//one of the two handlers but not both.
|
|
||||||
//
|
|
||||||
// Deprecated: this is the default value, don't use it, it will be unexported.
|
|
||||||
func NewDefaultHandler() *defaultHandler {
|
|
||||||
h := &defaultHandler{
|
|
||||||
objects: make(map[ObjectPath]*exportedObj),
|
|
||||||
defaultIntf: make(map[string]*exportedIntf),
|
|
||||||
}
|
|
||||||
h.defaultIntf["org.freedesktop.DBus.Introspectable"] = newIntrospectIntf(h)
|
|
||||||
return h
|
|
||||||
}
|
|
||||||
|
|
||||||
type defaultHandler struct {
|
|
||||||
sync.RWMutex
|
|
||||||
objects map[ObjectPath]*exportedObj
|
|
||||||
defaultIntf map[string]*exportedIntf
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *defaultHandler) PathExists(path ObjectPath) bool {
|
|
||||||
_, ok := h.objects[path]
|
|
||||||
return ok
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *defaultHandler) introspectPath(path ObjectPath) string {
|
|
||||||
subpath := make(map[string]struct{})
|
|
||||||
var xml bytes.Buffer
|
|
||||||
xml.WriteString("<node>")
|
|
||||||
for obj, _ := range h.objects {
|
|
||||||
p := string(path)
|
|
||||||
if p != "/" {
|
|
||||||
p += "/"
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(string(obj), p) {
|
|
||||||
node_name := strings.Split(string(obj[len(p):]), "/")[0]
|
|
||||||
subpath[node_name] = struct{}{}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for s, _ := range subpath {
|
|
||||||
xml.WriteString("\n\t<node name=\"" + s + "\"/>")
|
|
||||||
}
|
|
||||||
xml.WriteString("\n</node>")
|
|
||||||
return xml.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *defaultHandler) LookupObject(path ObjectPath) (ServerObject, bool) {
|
|
||||||
h.RLock()
|
|
||||||
defer h.RUnlock()
|
|
||||||
object, ok := h.objects[path]
|
|
||||||
if ok {
|
|
||||||
return object, ok
|
|
||||||
}
|
|
||||||
|
|
||||||
// If an object wasn't found for this exact path,
|
|
||||||
// look for a matching subtree registration
|
|
||||||
subtreeObject := newExportedObject()
|
|
||||||
path = path[:strings.LastIndex(string(path), "/")]
|
|
||||||
for len(path) > 0 {
|
|
||||||
object, ok = h.objects[path]
|
|
||||||
if ok {
|
|
||||||
for name, iface := range object.interfaces {
|
|
||||||
// Only include this handler if it registered for the subtree
|
|
||||||
if iface.isFallbackInterface() {
|
|
||||||
subtreeObject.interfaces[name] = iface
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
path = path[:strings.LastIndex(string(path), "/")]
|
|
||||||
}
|
|
||||||
|
|
||||||
for name, intf := range h.defaultIntf {
|
|
||||||
if _, exists := subtreeObject.interfaces[name]; exists {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
subtreeObject.interfaces[name] = intf
|
|
||||||
}
|
|
||||||
|
|
||||||
return subtreeObject, true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *defaultHandler) AddObject(path ObjectPath, object *exportedObj) {
|
|
||||||
h.Lock()
|
|
||||||
h.objects[path] = object
|
|
||||||
h.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *defaultHandler) DeleteObject(path ObjectPath) {
|
|
||||||
h.Lock()
|
|
||||||
delete(h.objects, path)
|
|
||||||
h.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
type exportedMethod struct {
|
|
||||||
reflect.Value
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m exportedMethod) Call(args ...interface{}) ([]interface{}, error) {
|
|
||||||
t := m.Type()
|
|
||||||
|
|
||||||
params := make([]reflect.Value, len(args))
|
|
||||||
for i := 0; i < len(args); i++ {
|
|
||||||
params[i] = reflect.ValueOf(args[i]).Elem()
|
|
||||||
}
|
|
||||||
|
|
||||||
ret := m.Value.Call(params)
|
|
||||||
|
|
||||||
err := ret[t.NumOut()-1].Interface().(*Error)
|
|
||||||
ret = ret[:t.NumOut()-1]
|
|
||||||
out := make([]interface{}, len(ret))
|
|
||||||
for i, val := range ret {
|
|
||||||
out[i] = val.Interface()
|
|
||||||
}
|
|
||||||
if err == nil {
|
|
||||||
//concrete type to interface nil is a special case
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
return out, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m exportedMethod) NumArguments() int {
|
|
||||||
return m.Value.Type().NumIn()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m exportedMethod) ArgumentValue(i int) interface{} {
|
|
||||||
return reflect.Zero(m.Type().In(i)).Interface()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m exportedMethod) NumReturns() int {
|
|
||||||
return m.Value.Type().NumOut()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m exportedMethod) ReturnValue(i int) interface{} {
|
|
||||||
return reflect.Zero(m.Type().Out(i)).Interface()
|
|
||||||
}
|
|
||||||
|
|
||||||
func newExportedObject() *exportedObj {
|
|
||||||
return &exportedObj{
|
|
||||||
interfaces: make(map[string]*exportedIntf),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type exportedObj struct {
|
|
||||||
mu sync.RWMutex
|
|
||||||
interfaces map[string]*exportedIntf
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj *exportedObj) LookupInterface(name string) (Interface, bool) {
|
|
||||||
if name == "" {
|
|
||||||
return obj, true
|
|
||||||
}
|
|
||||||
obj.mu.RLock()
|
|
||||||
defer obj.mu.RUnlock()
|
|
||||||
intf, exists := obj.interfaces[name]
|
|
||||||
return intf, exists
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj *exportedObj) AddInterface(name string, iface *exportedIntf) {
|
|
||||||
obj.mu.Lock()
|
|
||||||
defer obj.mu.Unlock()
|
|
||||||
obj.interfaces[name] = iface
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj *exportedObj) DeleteInterface(name string) {
|
|
||||||
obj.mu.Lock()
|
|
||||||
defer obj.mu.Unlock()
|
|
||||||
delete(obj.interfaces, name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj *exportedObj) LookupMethod(name string) (Method, bool) {
|
|
||||||
obj.mu.RLock()
|
|
||||||
defer obj.mu.RUnlock()
|
|
||||||
for _, intf := range obj.interfaces {
|
|
||||||
method, exists := intf.LookupMethod(name)
|
|
||||||
if exists {
|
|
||||||
return method, exists
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil, false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj *exportedObj) isFallbackInterface() bool {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func newExportedIntf(methods map[string]Method, includeSubtree bool) *exportedIntf {
|
|
||||||
return &exportedIntf{
|
|
||||||
methods: methods,
|
|
||||||
includeSubtree: includeSubtree,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type exportedIntf struct {
|
|
||||||
methods map[string]Method
|
|
||||||
|
|
||||||
// Whether or not this export is for the entire subtree
|
|
||||||
includeSubtree bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj *exportedIntf) LookupMethod(name string) (Method, bool) {
|
|
||||||
out, exists := obj.methods[name]
|
|
||||||
return out, exists
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj *exportedIntf) isFallbackInterface() bool {
|
|
||||||
return obj.includeSubtree
|
|
||||||
}
|
|
||||||
|
|
||||||
//NewDefaultSignalHandler returns an instance of the default
|
|
||||||
//signal handler. This is useful if you want to implement only
|
|
||||||
//one of the two handlers but not both.
|
|
||||||
//
|
|
||||||
// Deprecated: this is the default value, don't use it, it will be unexported.
|
|
||||||
func NewDefaultSignalHandler() *defaultSignalHandler {
|
|
||||||
return &defaultSignalHandler{
|
|
||||||
closeChan: make(chan struct{}),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func isDefaultSignalHandler(handler SignalHandler) bool {
|
|
||||||
_, ok := handler.(*defaultSignalHandler)
|
|
||||||
return ok
|
|
||||||
}
|
|
||||||
|
|
||||||
type defaultSignalHandler struct {
|
|
||||||
sync.RWMutex
|
|
||||||
closed bool
|
|
||||||
signals []chan<- *Signal
|
|
||||||
closeChan chan struct{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sh *defaultSignalHandler) DeliverSignal(intf, name string, signal *Signal) {
|
|
||||||
sh.RLock()
|
|
||||||
defer sh.RUnlock()
|
|
||||||
if sh.closed {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, ch := range sh.signals {
|
|
||||||
select {
|
|
||||||
case ch <- signal:
|
|
||||||
case <-sh.closeChan:
|
|
||||||
return
|
|
||||||
default:
|
|
||||||
go func(ch chan<- *Signal) {
|
|
||||||
select {
|
|
||||||
case ch <- signal:
|
|
||||||
case <-sh.closeChan:
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}(ch)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sh *defaultSignalHandler) Init() error {
|
|
||||||
sh.Lock()
|
|
||||||
sh.signals = make([]chan<- *Signal, 0)
|
|
||||||
sh.closeChan = make(chan struct{})
|
|
||||||
sh.Unlock()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sh *defaultSignalHandler) Terminate() {
|
|
||||||
sh.Lock()
|
|
||||||
if !sh.closed {
|
|
||||||
close(sh.closeChan)
|
|
||||||
}
|
|
||||||
sh.closed = true
|
|
||||||
for _, ch := range sh.signals {
|
|
||||||
close(ch)
|
|
||||||
}
|
|
||||||
sh.signals = nil
|
|
||||||
sh.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sh *defaultSignalHandler) addSignal(ch chan<- *Signal) {
|
|
||||||
sh.Lock()
|
|
||||||
defer sh.Unlock()
|
|
||||||
if sh.closed {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
sh.signals = append(sh.signals, ch)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sh *defaultSignalHandler) removeSignal(ch chan<- *Signal) {
|
|
||||||
sh.Lock()
|
|
||||||
defer sh.Unlock()
|
|
||||||
if sh.closed {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for i := len(sh.signals) - 1; i >= 0; i-- {
|
|
||||||
if ch == sh.signals[i] {
|
|
||||||
copy(sh.signals[i:], sh.signals[i+1:])
|
|
||||||
sh.signals[len(sh.signals)-1] = nil
|
|
||||||
sh.signals = sh.signals[:len(sh.signals)-1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,69 +0,0 @@
|
||||||
/*
|
|
||||||
Package dbus implements bindings to the D-Bus message bus system.
|
|
||||||
|
|
||||||
To use the message bus API, you first need to connect to a bus (usually the
|
|
||||||
session or system bus). The acquired connection then can be used to call methods
|
|
||||||
on remote objects and emit or receive signals. Using the Export method, you can
|
|
||||||
arrange D-Bus methods calls to be directly translated to method calls on a Go
|
|
||||||
value.
|
|
||||||
|
|
||||||
Conversion Rules
|
|
||||||
|
|
||||||
For outgoing messages, Go types are automatically converted to the
|
|
||||||
corresponding D-Bus types. The following types are directly encoded as their
|
|
||||||
respective D-Bus equivalents:
|
|
||||||
|
|
||||||
Go type | D-Bus type
|
|
||||||
------------+-----------
|
|
||||||
byte | BYTE
|
|
||||||
bool | BOOLEAN
|
|
||||||
int16 | INT16
|
|
||||||
uint16 | UINT16
|
|
||||||
int | INT32
|
|
||||||
uint | UINT32
|
|
||||||
int32 | INT32
|
|
||||||
uint32 | UINT32
|
|
||||||
int64 | INT64
|
|
||||||
uint64 | UINT64
|
|
||||||
float64 | DOUBLE
|
|
||||||
string | STRING
|
|
||||||
ObjectPath | OBJECT_PATH
|
|
||||||
Signature | SIGNATURE
|
|
||||||
Variant | VARIANT
|
|
||||||
interface{} | VARIANT
|
|
||||||
UnixFDIndex | UNIX_FD
|
|
||||||
|
|
||||||
Slices and arrays encode as ARRAYs of their element type.
|
|
||||||
|
|
||||||
Maps encode as DICTs, provided that their key type can be used as a key for
|
|
||||||
a DICT.
|
|
||||||
|
|
||||||
Structs other than Variant and Signature encode as a STRUCT containing their
|
|
||||||
exported fields. Fields whose tags contain `dbus:"-"` and unexported fields will
|
|
||||||
be skipped.
|
|
||||||
|
|
||||||
Pointers encode as the value they're pointed to.
|
|
||||||
|
|
||||||
Types convertible to one of the base types above will be mapped as the
|
|
||||||
base type.
|
|
||||||
|
|
||||||
Trying to encode any other type or a slice, map or struct containing an
|
|
||||||
unsupported type will result in an InvalidTypeError.
|
|
||||||
|
|
||||||
For incoming messages, the inverse of these rules are used, with the exception
|
|
||||||
of STRUCTs. Incoming STRUCTS are represented as a slice of empty interfaces
|
|
||||||
containing the struct fields in the correct order. The Store function can be
|
|
||||||
used to convert such values to Go structs.
|
|
||||||
|
|
||||||
Unix FD passing
|
|
||||||
|
|
||||||
Handling Unix file descriptors deserves special mention. To use them, you should
|
|
||||||
first check that they are supported on a connection by calling SupportsUnixFDs.
|
|
||||||
If it returns true, all method of Connection will translate messages containing
|
|
||||||
UnixFD's to messages that are accompanied by the given file descriptors with the
|
|
||||||
UnixFD values being substituted by the correct indices. Similarily, the indices
|
|
||||||
of incoming messages are automatically resolved. It shouldn't be necessary to use
|
|
||||||
UnixFDIndex.
|
|
||||||
|
|
||||||
*/
|
|
||||||
package dbus
|
|
|
@ -1,210 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/binary"
|
|
||||||
"io"
|
|
||||||
"reflect"
|
|
||||||
)
|
|
||||||
|
|
||||||
// An encoder encodes values to the D-Bus wire format.
|
|
||||||
type encoder struct {
|
|
||||||
out io.Writer
|
|
||||||
order binary.ByteOrder
|
|
||||||
pos int
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewEncoder returns a new encoder that writes to out in the given byte order.
|
|
||||||
func newEncoder(out io.Writer, order binary.ByteOrder) *encoder {
|
|
||||||
return newEncoderAtOffset(out, 0, order)
|
|
||||||
}
|
|
||||||
|
|
||||||
// newEncoderAtOffset returns a new encoder that writes to out in the given
|
|
||||||
// byte order. Specify the offset to initialize pos for proper alignment
|
|
||||||
// computation.
|
|
||||||
func newEncoderAtOffset(out io.Writer, offset int, order binary.ByteOrder) *encoder {
|
|
||||||
enc := new(encoder)
|
|
||||||
enc.out = out
|
|
||||||
enc.order = order
|
|
||||||
enc.pos = offset
|
|
||||||
return enc
|
|
||||||
}
|
|
||||||
|
|
||||||
// Aligns the next output to be on a multiple of n. Panics on write errors.
|
|
||||||
func (enc *encoder) align(n int) {
|
|
||||||
pad := enc.padding(0, n)
|
|
||||||
if pad > 0 {
|
|
||||||
empty := make([]byte, pad)
|
|
||||||
if _, err := enc.out.Write(empty); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
enc.pos += pad
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// pad returns the number of bytes of padding, based on current position and additional offset.
|
|
||||||
// and alignment.
|
|
||||||
func (enc *encoder) padding(offset, algn int) int {
|
|
||||||
abs := enc.pos + offset
|
|
||||||
if abs%algn != 0 {
|
|
||||||
newabs := (abs + algn - 1) & ^(algn - 1)
|
|
||||||
return newabs - abs
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calls binary.Write(enc.out, enc.order, v) and panics on write errors.
|
|
||||||
func (enc *encoder) binwrite(v interface{}) {
|
|
||||||
if err := binary.Write(enc.out, enc.order, v); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Encode encodes the given values to the underyling reader. All written values
|
|
||||||
// are aligned properly as required by the D-Bus spec.
|
|
||||||
func (enc *encoder) Encode(vs ...interface{}) (err error) {
|
|
||||||
defer func() {
|
|
||||||
err, _ = recover().(error)
|
|
||||||
}()
|
|
||||||
for _, v := range vs {
|
|
||||||
enc.encode(reflect.ValueOf(v), 0)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// encode encodes the given value to the writer and panics on error. depth holds
|
|
||||||
// the depth of the container nesting.
|
|
||||||
func (enc *encoder) encode(v reflect.Value, depth int) {
|
|
||||||
enc.align(alignment(v.Type()))
|
|
||||||
switch v.Kind() {
|
|
||||||
case reflect.Uint8:
|
|
||||||
var b [1]byte
|
|
||||||
b[0] = byte(v.Uint())
|
|
||||||
if _, err := enc.out.Write(b[:]); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
enc.pos++
|
|
||||||
case reflect.Bool:
|
|
||||||
if v.Bool() {
|
|
||||||
enc.encode(reflect.ValueOf(uint32(1)), depth)
|
|
||||||
} else {
|
|
||||||
enc.encode(reflect.ValueOf(uint32(0)), depth)
|
|
||||||
}
|
|
||||||
case reflect.Int16:
|
|
||||||
enc.binwrite(int16(v.Int()))
|
|
||||||
enc.pos += 2
|
|
||||||
case reflect.Uint16:
|
|
||||||
enc.binwrite(uint16(v.Uint()))
|
|
||||||
enc.pos += 2
|
|
||||||
case reflect.Int, reflect.Int32:
|
|
||||||
enc.binwrite(int32(v.Int()))
|
|
||||||
enc.pos += 4
|
|
||||||
case reflect.Uint, reflect.Uint32:
|
|
||||||
enc.binwrite(uint32(v.Uint()))
|
|
||||||
enc.pos += 4
|
|
||||||
case reflect.Int64:
|
|
||||||
enc.binwrite(v.Int())
|
|
||||||
enc.pos += 8
|
|
||||||
case reflect.Uint64:
|
|
||||||
enc.binwrite(v.Uint())
|
|
||||||
enc.pos += 8
|
|
||||||
case reflect.Float64:
|
|
||||||
enc.binwrite(v.Float())
|
|
||||||
enc.pos += 8
|
|
||||||
case reflect.String:
|
|
||||||
enc.encode(reflect.ValueOf(uint32(len(v.String()))), depth)
|
|
||||||
b := make([]byte, v.Len()+1)
|
|
||||||
copy(b, v.String())
|
|
||||||
b[len(b)-1] = 0
|
|
||||||
n, err := enc.out.Write(b)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
enc.pos += n
|
|
||||||
case reflect.Ptr:
|
|
||||||
enc.encode(v.Elem(), depth)
|
|
||||||
case reflect.Slice, reflect.Array:
|
|
||||||
if depth >= 64 {
|
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
|
||||||
}
|
|
||||||
// Lookahead offset: 4 bytes for uint32 length (with alignment),
|
|
||||||
// plus alignment for elements.
|
|
||||||
n := enc.padding(0, 4) + 4
|
|
||||||
offset := enc.pos + n + enc.padding(n, alignment(v.Type().Elem()))
|
|
||||||
|
|
||||||
var buf bytes.Buffer
|
|
||||||
bufenc := newEncoderAtOffset(&buf, offset, enc.order)
|
|
||||||
|
|
||||||
for i := 0; i < v.Len(); i++ {
|
|
||||||
bufenc.encode(v.Index(i), depth+1)
|
|
||||||
}
|
|
||||||
enc.encode(reflect.ValueOf(uint32(buf.Len())), depth)
|
|
||||||
length := buf.Len()
|
|
||||||
enc.align(alignment(v.Type().Elem()))
|
|
||||||
if _, err := buf.WriteTo(enc.out); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
enc.pos += length
|
|
||||||
case reflect.Struct:
|
|
||||||
if depth >= 64 && v.Type() != signatureType {
|
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
|
||||||
}
|
|
||||||
switch t := v.Type(); t {
|
|
||||||
case signatureType:
|
|
||||||
str := v.Field(0)
|
|
||||||
enc.encode(reflect.ValueOf(byte(str.Len())), depth+1)
|
|
||||||
b := make([]byte, str.Len()+1)
|
|
||||||
copy(b, str.String())
|
|
||||||
b[len(b)-1] = 0
|
|
||||||
n, err := enc.out.Write(b)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
enc.pos += n
|
|
||||||
case variantType:
|
|
||||||
variant := v.Interface().(Variant)
|
|
||||||
enc.encode(reflect.ValueOf(variant.sig), depth+1)
|
|
||||||
enc.encode(reflect.ValueOf(variant.value), depth+1)
|
|
||||||
default:
|
|
||||||
for i := 0; i < v.Type().NumField(); i++ {
|
|
||||||
field := t.Field(i)
|
|
||||||
if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
|
|
||||||
enc.encode(v.Field(i), depth+1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case reflect.Map:
|
|
||||||
// Maps are arrays of structures, so they actually increase the depth by
|
|
||||||
// 2.
|
|
||||||
if depth >= 63 {
|
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
|
||||||
}
|
|
||||||
if !isKeyType(v.Type().Key()) {
|
|
||||||
panic(InvalidTypeError{v.Type()})
|
|
||||||
}
|
|
||||||
keys := v.MapKeys()
|
|
||||||
// Lookahead offset: 4 bytes for uint32 length (with alignment),
|
|
||||||
// plus 8-byte alignment
|
|
||||||
n := enc.padding(0, 4) + 4
|
|
||||||
offset := enc.pos + n + enc.padding(n, 8)
|
|
||||||
|
|
||||||
var buf bytes.Buffer
|
|
||||||
bufenc := newEncoderAtOffset(&buf, offset, enc.order)
|
|
||||||
for _, k := range keys {
|
|
||||||
bufenc.align(8)
|
|
||||||
bufenc.encode(k, depth+2)
|
|
||||||
bufenc.encode(v.MapIndex(k), depth+2)
|
|
||||||
}
|
|
||||||
enc.encode(reflect.ValueOf(uint32(buf.Len())), depth)
|
|
||||||
length := buf.Len()
|
|
||||||
enc.align(8)
|
|
||||||
if _, err := buf.WriteTo(enc.out); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
enc.pos += length
|
|
||||||
case reflect.Interface:
|
|
||||||
enc.encode(reflect.ValueOf(MakeVariant(v.Interface())), depth)
|
|
||||||
default:
|
|
||||||
panic(InvalidTypeError{v.Type()})
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,412 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ErrMsgInvalidArg = Error{
|
|
||||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
|
||||||
[]interface{}{"Invalid type / number of args"},
|
|
||||||
}
|
|
||||||
ErrMsgNoObject = Error{
|
|
||||||
"org.freedesktop.DBus.Error.NoSuchObject",
|
|
||||||
[]interface{}{"No such object"},
|
|
||||||
}
|
|
||||||
ErrMsgUnknownMethod = Error{
|
|
||||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
|
||||||
[]interface{}{"Unknown / invalid method"},
|
|
||||||
}
|
|
||||||
ErrMsgUnknownInterface = Error{
|
|
||||||
"org.freedesktop.DBus.Error.UnknownInterface",
|
|
||||||
[]interface{}{"Object does not implement the interface"},
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
func MakeFailedError(err error) *Error {
|
|
||||||
return &Error{
|
|
||||||
"org.freedesktop.DBus.Error.Failed",
|
|
||||||
[]interface{}{err.Error()},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sender is a type which can be used in exported methods to receive the message
|
|
||||||
// sender.
|
|
||||||
type Sender string
|
|
||||||
|
|
||||||
func computeMethodName(name string, mapping map[string]string) string {
|
|
||||||
newname, ok := mapping[name]
|
|
||||||
if ok {
|
|
||||||
name = newname
|
|
||||||
}
|
|
||||||
return name
|
|
||||||
}
|
|
||||||
|
|
||||||
func getMethods(in interface{}, mapping map[string]string) map[string]reflect.Value {
|
|
||||||
if in == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
methods := make(map[string]reflect.Value)
|
|
||||||
val := reflect.ValueOf(in)
|
|
||||||
typ := val.Type()
|
|
||||||
for i := 0; i < typ.NumMethod(); i++ {
|
|
||||||
methtype := typ.Method(i)
|
|
||||||
method := val.Method(i)
|
|
||||||
t := method.Type()
|
|
||||||
// only track valid methods must return *Error as last arg
|
|
||||||
// and must be exported
|
|
||||||
if t.NumOut() == 0 ||
|
|
||||||
t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) ||
|
|
||||||
methtype.PkgPath != "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// map names while building table
|
|
||||||
methods[computeMethodName(methtype.Name, mapping)] = method
|
|
||||||
}
|
|
||||||
return methods
|
|
||||||
}
|
|
||||||
|
|
||||||
func standardMethodArgumentDecode(m Method, sender string, msg *Message, body []interface{}) ([]interface{}, error) {
|
|
||||||
pointers := make([]interface{}, m.NumArguments())
|
|
||||||
decode := make([]interface{}, 0, len(body))
|
|
||||||
|
|
||||||
for i := 0; i < m.NumArguments(); i++ {
|
|
||||||
tp := reflect.TypeOf(m.ArgumentValue(i))
|
|
||||||
val := reflect.New(tp)
|
|
||||||
pointers[i] = val.Interface()
|
|
||||||
if tp == reflect.TypeOf((*Sender)(nil)).Elem() {
|
|
||||||
val.Elem().SetString(sender)
|
|
||||||
} else if tp == reflect.TypeOf((*Message)(nil)).Elem() {
|
|
||||||
val.Elem().Set(reflect.ValueOf(*msg))
|
|
||||||
} else {
|
|
||||||
decode = append(decode, pointers[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(decode) != len(body) {
|
|
||||||
return nil, ErrMsgInvalidArg
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := Store(body, decode...); err != nil {
|
|
||||||
return nil, ErrMsgInvalidArg
|
|
||||||
}
|
|
||||||
|
|
||||||
return pointers, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) decodeArguments(m Method, sender string, msg *Message) ([]interface{}, error) {
|
|
||||||
if decoder, ok := m.(ArgumentDecoder); ok {
|
|
||||||
return decoder.DecodeArguments(conn, sender, msg, msg.Body)
|
|
||||||
}
|
|
||||||
return standardMethodArgumentDecode(m, sender, msg, msg.Body)
|
|
||||||
}
|
|
||||||
|
|
||||||
// handleCall handles the given method call (i.e. looks if it's one of the
|
|
||||||
// pre-implemented ones and searches for a corresponding handler if not).
|
|
||||||
func (conn *Conn) handleCall(msg *Message) {
|
|
||||||
name := msg.Headers[FieldMember].value.(string)
|
|
||||||
path := msg.Headers[FieldPath].value.(ObjectPath)
|
|
||||||
ifaceName, _ := msg.Headers[FieldInterface].value.(string)
|
|
||||||
sender, hasSender := msg.Headers[FieldSender].value.(string)
|
|
||||||
serial := msg.serial
|
|
||||||
if ifaceName == "org.freedesktop.DBus.Peer" {
|
|
||||||
switch name {
|
|
||||||
case "Ping":
|
|
||||||
conn.sendReply(sender, serial)
|
|
||||||
case "GetMachineId":
|
|
||||||
conn.sendReply(sender, serial, conn.uuid)
|
|
||||||
default:
|
|
||||||
conn.sendError(ErrMsgUnknownMethod, sender, serial)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if len(name) == 0 {
|
|
||||||
conn.sendError(ErrMsgUnknownMethod, sender, serial)
|
|
||||||
}
|
|
||||||
|
|
||||||
object, ok := conn.handler.LookupObject(path)
|
|
||||||
if !ok {
|
|
||||||
conn.sendError(ErrMsgNoObject, sender, serial)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
iface, exists := object.LookupInterface(ifaceName)
|
|
||||||
if !exists {
|
|
||||||
conn.sendError(ErrMsgUnknownInterface, sender, serial)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
m, exists := iface.LookupMethod(name)
|
|
||||||
if !exists {
|
|
||||||
conn.sendError(ErrMsgUnknownMethod, sender, serial)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
args, err := conn.decodeArguments(m, sender, msg)
|
|
||||||
if err != nil {
|
|
||||||
conn.sendError(err, sender, serial)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ret, err := m.Call(args...)
|
|
||||||
if err != nil {
|
|
||||||
conn.sendError(err, sender, serial)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if msg.Flags&FlagNoReplyExpected == 0 {
|
|
||||||
reply := new(Message)
|
|
||||||
reply.Type = TypeMethodReply
|
|
||||||
reply.serial = conn.getSerial()
|
|
||||||
reply.Headers = make(map[HeaderField]Variant)
|
|
||||||
if hasSender {
|
|
||||||
reply.Headers[FieldDestination] = msg.Headers[FieldSender]
|
|
||||||
}
|
|
||||||
reply.Headers[FieldReplySerial] = MakeVariant(msg.serial)
|
|
||||||
reply.Body = make([]interface{}, len(ret))
|
|
||||||
for i := 0; i < len(ret); i++ {
|
|
||||||
reply.Body[i] = ret[i]
|
|
||||||
}
|
|
||||||
reply.Headers[FieldSignature] = MakeVariant(SignatureOf(reply.Body...))
|
|
||||||
|
|
||||||
conn.sendMessage(reply)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit emits the given signal on the message bus. The name parameter must be
|
|
||||||
// formatted as "interface.member", e.g., "org.freedesktop.DBus.NameLost".
|
|
||||||
func (conn *Conn) Emit(path ObjectPath, name string, values ...interface{}) error {
|
|
||||||
if !path.IsValid() {
|
|
||||||
return errors.New("dbus: invalid object path")
|
|
||||||
}
|
|
||||||
i := strings.LastIndex(name, ".")
|
|
||||||
if i == -1 {
|
|
||||||
return errors.New("dbus: invalid method name")
|
|
||||||
}
|
|
||||||
iface := name[:i]
|
|
||||||
member := name[i+1:]
|
|
||||||
if !isValidMember(member) {
|
|
||||||
return errors.New("dbus: invalid method name")
|
|
||||||
}
|
|
||||||
if !isValidInterface(iface) {
|
|
||||||
return errors.New("dbus: invalid interface name")
|
|
||||||
}
|
|
||||||
msg := new(Message)
|
|
||||||
msg.Type = TypeSignal
|
|
||||||
msg.serial = conn.getSerial()
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
msg.Headers[FieldInterface] = MakeVariant(iface)
|
|
||||||
msg.Headers[FieldMember] = MakeVariant(member)
|
|
||||||
msg.Headers[FieldPath] = MakeVariant(path)
|
|
||||||
msg.Body = values
|
|
||||||
if len(values) > 0 {
|
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
|
|
||||||
}
|
|
||||||
|
|
||||||
var closed bool
|
|
||||||
conn.sendMessageAndIfClosed(msg, func() {
|
|
||||||
closed = true
|
|
||||||
})
|
|
||||||
if closed {
|
|
||||||
return ErrClosed
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Export registers the given value to be exported as an object on the
|
|
||||||
// message bus.
|
|
||||||
//
|
|
||||||
// If a method call on the given path and interface is received, an exported
|
|
||||||
// method with the same name is called with v as the receiver if the
|
|
||||||
// parameters match and the last return value is of type *Error. If this
|
|
||||||
// *Error is not nil, it is sent back to the caller as an error.
|
|
||||||
// Otherwise, a method reply is sent with the other return values as its body.
|
|
||||||
//
|
|
||||||
// Any parameters with the special type Sender are set to the sender of the
|
|
||||||
// dbus message when the method is called. Parameters of this type do not
|
|
||||||
// contribute to the dbus signature of the method (i.e. the method is exposed
|
|
||||||
// as if the parameters of type Sender were not there).
|
|
||||||
//
|
|
||||||
// Similarly, any parameters with the type Message are set to the raw message
|
|
||||||
// received on the bus. Again, parameters of this type do not contribute to the
|
|
||||||
// dbus signature of the method.
|
|
||||||
//
|
|
||||||
// Every method call is executed in a new goroutine, so the method may be called
|
|
||||||
// in multiple goroutines at once.
|
|
||||||
//
|
|
||||||
// Method calls on the interface org.freedesktop.DBus.Peer will be automatically
|
|
||||||
// handled for every object.
|
|
||||||
//
|
|
||||||
// Passing nil as the first parameter will cause conn to cease handling calls on
|
|
||||||
// the given combination of path and interface.
|
|
||||||
//
|
|
||||||
// Export returns an error if path is not a valid path name.
|
|
||||||
func (conn *Conn) Export(v interface{}, path ObjectPath, iface string) error {
|
|
||||||
return conn.ExportWithMap(v, nil, path, iface)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ExportWithMap works exactly like Export but provides the ability to remap
|
|
||||||
// method names (e.g. export a lower-case method).
|
|
||||||
//
|
|
||||||
// The keys in the map are the real method names (exported on the struct), and
|
|
||||||
// the values are the method names to be exported on DBus.
|
|
||||||
func (conn *Conn) ExportWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string) error {
|
|
||||||
return conn.export(getMethods(v, mapping), path, iface, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ExportSubtree works exactly like Export but registers the given value for
|
|
||||||
// an entire subtree rather under the root path provided.
|
|
||||||
//
|
|
||||||
// In order to make this useful, one parameter in each of the value's exported
|
|
||||||
// methods should be a Message, in which case it will contain the raw message
|
|
||||||
// (allowing one to get access to the path that caused the method to be called).
|
|
||||||
//
|
|
||||||
// Note that more specific export paths take precedence over less specific. For
|
|
||||||
// example, a method call using the ObjectPath /foo/bar/baz will call a method
|
|
||||||
// exported on /foo/bar before a method exported on /foo.
|
|
||||||
func (conn *Conn) ExportSubtree(v interface{}, path ObjectPath, iface string) error {
|
|
||||||
return conn.ExportSubtreeWithMap(v, nil, path, iface)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ExportSubtreeWithMap works exactly like ExportSubtree but provides the
|
|
||||||
// ability to remap method names (e.g. export a lower-case method).
|
|
||||||
//
|
|
||||||
// The keys in the map are the real method names (exported on the struct), and
|
|
||||||
// the values are the method names to be exported on DBus.
|
|
||||||
func (conn *Conn) ExportSubtreeWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string) error {
|
|
||||||
return conn.export(getMethods(v, mapping), path, iface, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ExportMethodTable like Export registers the given methods as an object
|
|
||||||
// on the message bus. Unlike Export the it uses a method table to define
|
|
||||||
// the object instead of a native go object.
|
|
||||||
//
|
|
||||||
// The method table is a map from method name to function closure
|
|
||||||
// representing the method. This allows an object exported on the bus to not
|
|
||||||
// necessarily be a native go object. It can be useful for generating exposed
|
|
||||||
// methods on the fly.
|
|
||||||
//
|
|
||||||
// Any non-function objects in the method table are ignored.
|
|
||||||
func (conn *Conn) ExportMethodTable(methods map[string]interface{}, path ObjectPath, iface string) error {
|
|
||||||
return conn.exportMethodTable(methods, path, iface, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Like ExportSubtree, but with the same caveats as ExportMethodTable.
|
|
||||||
func (conn *Conn) ExportSubtreeMethodTable(methods map[string]interface{}, path ObjectPath, iface string) error {
|
|
||||||
return conn.exportMethodTable(methods, path, iface, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) exportMethodTable(methods map[string]interface{}, path ObjectPath, iface string, includeSubtree bool) error {
|
|
||||||
out := make(map[string]reflect.Value)
|
|
||||||
for name, method := range methods {
|
|
||||||
rval := reflect.ValueOf(method)
|
|
||||||
if rval.Kind() != reflect.Func {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
t := rval.Type()
|
|
||||||
// only track valid methods must return *Error as last arg
|
|
||||||
if t.NumOut() == 0 ||
|
|
||||||
t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
out[name] = rval
|
|
||||||
}
|
|
||||||
return conn.export(out, path, iface, includeSubtree)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (conn *Conn) unexport(h *defaultHandler, path ObjectPath, iface string) error {
|
|
||||||
if h.PathExists(path) {
|
|
||||||
obj := h.objects[path]
|
|
||||||
obj.DeleteInterface(iface)
|
|
||||||
if len(obj.interfaces) == 0 {
|
|
||||||
h.DeleteObject(path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// exportWithMap is the worker function for all exports/registrations.
|
|
||||||
func (conn *Conn) export(methods map[string]reflect.Value, path ObjectPath, iface string, includeSubtree bool) error {
|
|
||||||
h, ok := conn.handler.(*defaultHandler)
|
|
||||||
if !ok {
|
|
||||||
return fmt.Errorf(
|
|
||||||
`dbus: export only allowed on the default hander handler have %T"`,
|
|
||||||
conn.handler)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !path.IsValid() {
|
|
||||||
return fmt.Errorf(`dbus: Invalid path name: "%s"`, path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove a previous export if the interface is nil
|
|
||||||
if methods == nil {
|
|
||||||
return conn.unexport(h, path, iface)
|
|
||||||
}
|
|
||||||
|
|
||||||
// If this is the first handler for this path, make a new map to hold all
|
|
||||||
// handlers for this path.
|
|
||||||
if !h.PathExists(path) {
|
|
||||||
h.AddObject(path, newExportedObject())
|
|
||||||
}
|
|
||||||
|
|
||||||
exportedMethods := make(map[string]Method)
|
|
||||||
for name, method := range methods {
|
|
||||||
exportedMethods[name] = exportedMethod{method}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally, save this handler
|
|
||||||
obj := h.objects[path]
|
|
||||||
obj.AddInterface(iface, newExportedIntf(exportedMethods, includeSubtree))
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReleaseName calls org.freedesktop.DBus.ReleaseName and awaits a response.
|
|
||||||
func (conn *Conn) ReleaseName(name string) (ReleaseNameReply, error) {
|
|
||||||
var r uint32
|
|
||||||
err := conn.busObj.Call("org.freedesktop.DBus.ReleaseName", 0, name).Store(&r)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
return ReleaseNameReply(r), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RequestName calls org.freedesktop.DBus.RequestName and awaits a response.
|
|
||||||
func (conn *Conn) RequestName(name string, flags RequestNameFlags) (RequestNameReply, error) {
|
|
||||||
var r uint32
|
|
||||||
err := conn.busObj.Call("org.freedesktop.DBus.RequestName", 0, name, flags).Store(&r)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
return RequestNameReply(r), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReleaseNameReply is the reply to a ReleaseName call.
|
|
||||||
type ReleaseNameReply uint32
|
|
||||||
|
|
||||||
const (
|
|
||||||
ReleaseNameReplyReleased ReleaseNameReply = 1 + iota
|
|
||||||
ReleaseNameReplyNonExistent
|
|
||||||
ReleaseNameReplyNotOwner
|
|
||||||
)
|
|
||||||
|
|
||||||
// RequestNameFlags represents the possible flags for a RequestName call.
|
|
||||||
type RequestNameFlags uint32
|
|
||||||
|
|
||||||
const (
|
|
||||||
NameFlagAllowReplacement RequestNameFlags = 1 << iota
|
|
||||||
NameFlagReplaceExisting
|
|
||||||
NameFlagDoNotQueue
|
|
||||||
)
|
|
||||||
|
|
||||||
// RequestNameReply is the reply to a RequestName call.
|
|
||||||
type RequestNameReply uint32
|
|
||||||
|
|
||||||
const (
|
|
||||||
RequestNameReplyPrimaryOwner RequestNameReply = 1 + iota
|
|
||||||
RequestNameReplyInQueue
|
|
||||||
RequestNameReplyExists
|
|
||||||
RequestNameReplyAlreadyOwner
|
|
||||||
)
|
|
|
@ -1,3 +0,0 @@
|
||||||
module github.com/godbus/dbus
|
|
||||||
|
|
||||||
go 1.12
|
|
|
@ -1,28 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
homeDir string
|
|
||||||
homeDirLock sync.Mutex
|
|
||||||
)
|
|
||||||
|
|
||||||
func getHomeDir() string {
|
|
||||||
homeDirLock.Lock()
|
|
||||||
defer homeDirLock.Unlock()
|
|
||||||
|
|
||||||
if homeDir != "" {
|
|
||||||
return homeDir
|
|
||||||
}
|
|
||||||
|
|
||||||
homeDir = os.Getenv("HOME")
|
|
||||||
if homeDir != "" {
|
|
||||||
return homeDir
|
|
||||||
}
|
|
||||||
|
|
||||||
homeDir = lookupHomeDir()
|
|
||||||
return homeDir
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
// +build !static_build
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
func lookupHomeDir() string {
|
|
||||||
u, err := user.Current()
|
|
||||||
if err != nil {
|
|
||||||
return "/"
|
|
||||||
}
|
|
||||||
return u.HomeDir
|
|
||||||
}
|
|
|
@ -1,45 +0,0 @@
|
||||||
// +build static_build
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
func lookupHomeDir() string {
|
|
||||||
myUid := os.Getuid()
|
|
||||||
|
|
||||||
f, err := os.Open("/etc/passwd")
|
|
||||||
if err != nil {
|
|
||||||
return "/"
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
s := bufio.NewScanner(f)
|
|
||||||
|
|
||||||
for s.Scan() {
|
|
||||||
if err := s.Err(); err != nil {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
line := strings.TrimSpace(s.Text())
|
|
||||||
if line == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
parts := strings.Split(line, ":")
|
|
||||||
|
|
||||||
if len(parts) >= 6 {
|
|
||||||
uid, err := strconv.Atoi(parts[2])
|
|
||||||
if err == nil && uid == myUid {
|
|
||||||
return parts[5]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default to / if we can't get a better value
|
|
||||||
return "/"
|
|
||||||
}
|
|
|
@ -1,353 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/binary"
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"reflect"
|
|
||||||
"strconv"
|
|
||||||
)
|
|
||||||
|
|
||||||
const protoVersion byte = 1
|
|
||||||
|
|
||||||
// Flags represents the possible flags of a D-Bus message.
|
|
||||||
type Flags byte
|
|
||||||
|
|
||||||
const (
|
|
||||||
// FlagNoReplyExpected signals that the message is not expected to generate
|
|
||||||
// a reply. If this flag is set on outgoing messages, any possible reply
|
|
||||||
// will be discarded.
|
|
||||||
FlagNoReplyExpected Flags = 1 << iota
|
|
||||||
// FlagNoAutoStart signals that the message bus should not automatically
|
|
||||||
// start an application when handling this message.
|
|
||||||
FlagNoAutoStart
|
|
||||||
// FlagAllowInteractiveAuthorization may be set on a method call
|
|
||||||
// message to inform the receiving side that the caller is prepared
|
|
||||||
// to wait for interactive authorization, which might take a
|
|
||||||
// considerable time to complete. For instance, if this flag is set,
|
|
||||||
// it would be appropriate to query the user for passwords or
|
|
||||||
// confirmation via Polkit or a similar framework.
|
|
||||||
FlagAllowInteractiveAuthorization
|
|
||||||
)
|
|
||||||
|
|
||||||
// Type represents the possible types of a D-Bus message.
|
|
||||||
type Type byte
|
|
||||||
|
|
||||||
const (
|
|
||||||
TypeMethodCall Type = 1 + iota
|
|
||||||
TypeMethodReply
|
|
||||||
TypeError
|
|
||||||
TypeSignal
|
|
||||||
typeMax
|
|
||||||
)
|
|
||||||
|
|
||||||
func (t Type) String() string {
|
|
||||||
switch t {
|
|
||||||
case TypeMethodCall:
|
|
||||||
return "method call"
|
|
||||||
case TypeMethodReply:
|
|
||||||
return "reply"
|
|
||||||
case TypeError:
|
|
||||||
return "error"
|
|
||||||
case TypeSignal:
|
|
||||||
return "signal"
|
|
||||||
}
|
|
||||||
return "invalid"
|
|
||||||
}
|
|
||||||
|
|
||||||
// HeaderField represents the possible byte codes for the headers
|
|
||||||
// of a D-Bus message.
|
|
||||||
type HeaderField byte
|
|
||||||
|
|
||||||
const (
|
|
||||||
FieldPath HeaderField = 1 + iota
|
|
||||||
FieldInterface
|
|
||||||
FieldMember
|
|
||||||
FieldErrorName
|
|
||||||
FieldReplySerial
|
|
||||||
FieldDestination
|
|
||||||
FieldSender
|
|
||||||
FieldSignature
|
|
||||||
FieldUnixFDs
|
|
||||||
fieldMax
|
|
||||||
)
|
|
||||||
|
|
||||||
// An InvalidMessageError describes the reason why a D-Bus message is regarded as
|
|
||||||
// invalid.
|
|
||||||
type InvalidMessageError string
|
|
||||||
|
|
||||||
func (e InvalidMessageError) Error() string {
|
|
||||||
return "dbus: invalid message: " + string(e)
|
|
||||||
}
|
|
||||||
|
|
||||||
// fieldType are the types of the various header fields.
|
|
||||||
var fieldTypes = [fieldMax]reflect.Type{
|
|
||||||
FieldPath: objectPathType,
|
|
||||||
FieldInterface: stringType,
|
|
||||||
FieldMember: stringType,
|
|
||||||
FieldErrorName: stringType,
|
|
||||||
FieldReplySerial: uint32Type,
|
|
||||||
FieldDestination: stringType,
|
|
||||||
FieldSender: stringType,
|
|
||||||
FieldSignature: signatureType,
|
|
||||||
FieldUnixFDs: uint32Type,
|
|
||||||
}
|
|
||||||
|
|
||||||
// requiredFields lists the header fields that are required by the different
|
|
||||||
// message types.
|
|
||||||
var requiredFields = [typeMax][]HeaderField{
|
|
||||||
TypeMethodCall: {FieldPath, FieldMember},
|
|
||||||
TypeMethodReply: {FieldReplySerial},
|
|
||||||
TypeError: {FieldErrorName, FieldReplySerial},
|
|
||||||
TypeSignal: {FieldPath, FieldInterface, FieldMember},
|
|
||||||
}
|
|
||||||
|
|
||||||
// Message represents a single D-Bus message.
|
|
||||||
type Message struct {
|
|
||||||
Type
|
|
||||||
Flags
|
|
||||||
Headers map[HeaderField]Variant
|
|
||||||
Body []interface{}
|
|
||||||
|
|
||||||
serial uint32
|
|
||||||
}
|
|
||||||
|
|
||||||
type header struct {
|
|
||||||
Field byte
|
|
||||||
Variant
|
|
||||||
}
|
|
||||||
|
|
||||||
// DecodeMessage tries to decode a single message in the D-Bus wire format
|
|
||||||
// from the given reader. The byte order is figured out from the first byte.
|
|
||||||
// The possibly returned error can be an error of the underlying reader, an
|
|
||||||
// InvalidMessageError or a FormatError.
|
|
||||||
func DecodeMessage(rd io.Reader) (msg *Message, err error) {
|
|
||||||
var order binary.ByteOrder
|
|
||||||
var hlength, length uint32
|
|
||||||
var typ, flags, proto byte
|
|
||||||
var headers []header
|
|
||||||
|
|
||||||
b := make([]byte, 1)
|
|
||||||
_, err = rd.Read(b)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
switch b[0] {
|
|
||||||
case 'l':
|
|
||||||
order = binary.LittleEndian
|
|
||||||
case 'B':
|
|
||||||
order = binary.BigEndian
|
|
||||||
default:
|
|
||||||
return nil, InvalidMessageError("invalid byte order")
|
|
||||||
}
|
|
||||||
|
|
||||||
dec := newDecoder(rd, order)
|
|
||||||
dec.pos = 1
|
|
||||||
|
|
||||||
msg = new(Message)
|
|
||||||
vs, err := dec.Decode(Signature{"yyyuu"})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err = Store(vs, &typ, &flags, &proto, &length, &msg.serial); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
msg.Type = Type(typ)
|
|
||||||
msg.Flags = Flags(flags)
|
|
||||||
|
|
||||||
// get the header length separately because we need it later
|
|
||||||
b = make([]byte, 4)
|
|
||||||
_, err = io.ReadFull(rd, b)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
binary.Read(bytes.NewBuffer(b), order, &hlength)
|
|
||||||
if hlength+length+16 > 1<<27 {
|
|
||||||
return nil, InvalidMessageError("message is too long")
|
|
||||||
}
|
|
||||||
dec = newDecoder(io.MultiReader(bytes.NewBuffer(b), rd), order)
|
|
||||||
dec.pos = 12
|
|
||||||
vs, err = dec.Decode(Signature{"a(yv)"})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err = Store(vs, &headers); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
for _, v := range headers {
|
|
||||||
msg.Headers[HeaderField(v.Field)] = v.Variant
|
|
||||||
}
|
|
||||||
|
|
||||||
dec.align(8)
|
|
||||||
body := make([]byte, int(length))
|
|
||||||
if length != 0 {
|
|
||||||
_, err := io.ReadFull(rd, body)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = msg.IsValid(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
sig, _ := msg.Headers[FieldSignature].value.(Signature)
|
|
||||||
if sig.str != "" {
|
|
||||||
buf := bytes.NewBuffer(body)
|
|
||||||
dec = newDecoder(buf, order)
|
|
||||||
vs, err := dec.Decode(sig)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
msg.Body = vs
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// EncodeTo encodes and sends a message to the given writer. The byte order must
|
|
||||||
// be either binary.LittleEndian or binary.BigEndian. If the message is not
|
|
||||||
// valid or an error occurs when writing, an error is returned.
|
|
||||||
func (msg *Message) EncodeTo(out io.Writer, order binary.ByteOrder) error {
|
|
||||||
if err := msg.IsValid(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
var vs [7]interface{}
|
|
||||||
switch order {
|
|
||||||
case binary.LittleEndian:
|
|
||||||
vs[0] = byte('l')
|
|
||||||
case binary.BigEndian:
|
|
||||||
vs[0] = byte('B')
|
|
||||||
default:
|
|
||||||
return errors.New("dbus: invalid byte order")
|
|
||||||
}
|
|
||||||
body := new(bytes.Buffer)
|
|
||||||
enc := newEncoder(body, order)
|
|
||||||
if len(msg.Body) != 0 {
|
|
||||||
enc.Encode(msg.Body...)
|
|
||||||
}
|
|
||||||
vs[1] = msg.Type
|
|
||||||
vs[2] = msg.Flags
|
|
||||||
vs[3] = protoVersion
|
|
||||||
vs[4] = uint32(len(body.Bytes()))
|
|
||||||
vs[5] = msg.serial
|
|
||||||
headers := make([]header, 0, len(msg.Headers))
|
|
||||||
for k, v := range msg.Headers {
|
|
||||||
headers = append(headers, header{byte(k), v})
|
|
||||||
}
|
|
||||||
vs[6] = headers
|
|
||||||
var buf bytes.Buffer
|
|
||||||
enc = newEncoder(&buf, order)
|
|
||||||
enc.Encode(vs[:]...)
|
|
||||||
enc.align(8)
|
|
||||||
body.WriteTo(&buf)
|
|
||||||
if buf.Len() > 1<<27 {
|
|
||||||
return InvalidMessageError("message is too long")
|
|
||||||
}
|
|
||||||
if _, err := buf.WriteTo(out); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsValid checks whether msg is a valid message and returns an
|
|
||||||
// InvalidMessageError if it is not.
|
|
||||||
func (msg *Message) IsValid() error {
|
|
||||||
if msg.Flags & ^(FlagNoAutoStart|FlagNoReplyExpected|FlagAllowInteractiveAuthorization) != 0 {
|
|
||||||
return InvalidMessageError("invalid flags")
|
|
||||||
}
|
|
||||||
if msg.Type == 0 || msg.Type >= typeMax {
|
|
||||||
return InvalidMessageError("invalid message type")
|
|
||||||
}
|
|
||||||
for k, v := range msg.Headers {
|
|
||||||
if k == 0 || k >= fieldMax {
|
|
||||||
return InvalidMessageError("invalid header")
|
|
||||||
}
|
|
||||||
if reflect.TypeOf(v.value) != fieldTypes[k] {
|
|
||||||
return InvalidMessageError("invalid type of header field")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, v := range requiredFields[msg.Type] {
|
|
||||||
if _, ok := msg.Headers[v]; !ok {
|
|
||||||
return InvalidMessageError("missing required header")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if path, ok := msg.Headers[FieldPath]; ok {
|
|
||||||
if !path.value.(ObjectPath).IsValid() {
|
|
||||||
return InvalidMessageError("invalid path name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if iface, ok := msg.Headers[FieldInterface]; ok {
|
|
||||||
if !isValidInterface(iface.value.(string)) {
|
|
||||||
return InvalidMessageError("invalid interface name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if member, ok := msg.Headers[FieldMember]; ok {
|
|
||||||
if !isValidMember(member.value.(string)) {
|
|
||||||
return InvalidMessageError("invalid member name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if errname, ok := msg.Headers[FieldErrorName]; ok {
|
|
||||||
if !isValidInterface(errname.value.(string)) {
|
|
||||||
return InvalidMessageError("invalid error name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(msg.Body) != 0 {
|
|
||||||
if _, ok := msg.Headers[FieldSignature]; !ok {
|
|
||||||
return InvalidMessageError("missing signature")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Serial returns the message's serial number. The returned value is only valid
|
|
||||||
// for messages received by eavesdropping.
|
|
||||||
func (msg *Message) Serial() uint32 {
|
|
||||||
return msg.serial
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns a string representation of a message similar to the format of
|
|
||||||
// dbus-monitor.
|
|
||||||
func (msg *Message) String() string {
|
|
||||||
if err := msg.IsValid(); err != nil {
|
|
||||||
return "<invalid>"
|
|
||||||
}
|
|
||||||
s := msg.Type.String()
|
|
||||||
if v, ok := msg.Headers[FieldSender]; ok {
|
|
||||||
s += " from " + v.value.(string)
|
|
||||||
}
|
|
||||||
if v, ok := msg.Headers[FieldDestination]; ok {
|
|
||||||
s += " to " + v.value.(string)
|
|
||||||
}
|
|
||||||
s += " serial " + strconv.FormatUint(uint64(msg.serial), 10)
|
|
||||||
if v, ok := msg.Headers[FieldReplySerial]; ok {
|
|
||||||
s += " reply_serial " + strconv.FormatUint(uint64(v.value.(uint32)), 10)
|
|
||||||
}
|
|
||||||
if v, ok := msg.Headers[FieldUnixFDs]; ok {
|
|
||||||
s += " unixfds " + strconv.FormatUint(uint64(v.value.(uint32)), 10)
|
|
||||||
}
|
|
||||||
if v, ok := msg.Headers[FieldPath]; ok {
|
|
||||||
s += " path " + string(v.value.(ObjectPath))
|
|
||||||
}
|
|
||||||
if v, ok := msg.Headers[FieldInterface]; ok {
|
|
||||||
s += " interface " + v.value.(string)
|
|
||||||
}
|
|
||||||
if v, ok := msg.Headers[FieldErrorName]; ok {
|
|
||||||
s += " error " + v.value.(string)
|
|
||||||
}
|
|
||||||
if v, ok := msg.Headers[FieldMember]; ok {
|
|
||||||
s += " member " + v.value.(string)
|
|
||||||
}
|
|
||||||
if len(msg.Body) != 0 {
|
|
||||||
s += "\n"
|
|
||||||
}
|
|
||||||
for i, v := range msg.Body {
|
|
||||||
s += " " + MakeVariant(v).String()
|
|
||||||
if i != len(msg.Body)-1 {
|
|
||||||
s += "\n"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s
|
|
||||||
}
|
|
|
@ -1,234 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// BusObject is the interface of a remote object on which methods can be
|
|
||||||
// invoked.
|
|
||||||
type BusObject interface {
|
|
||||||
Call(method string, flags Flags, args ...interface{}) *Call
|
|
||||||
CallWithContext(ctx context.Context, method string, flags Flags, args ...interface{}) *Call
|
|
||||||
Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call
|
|
||||||
GoWithContext(ctx context.Context, method string, flags Flags, ch chan *Call, args ...interface{}) *Call
|
|
||||||
AddMatchSignal(iface, member string, options ...MatchOption) *Call
|
|
||||||
RemoveMatchSignal(iface, member string, options ...MatchOption) *Call
|
|
||||||
GetProperty(p string) (Variant, error)
|
|
||||||
SetProperty(p string, v interface{}) error
|
|
||||||
Destination() string
|
|
||||||
Path() ObjectPath
|
|
||||||
}
|
|
||||||
|
|
||||||
// Object represents a remote object on which methods can be invoked.
|
|
||||||
type Object struct {
|
|
||||||
conn *Conn
|
|
||||||
dest string
|
|
||||||
path ObjectPath
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call calls a method with (*Object).Go and waits for its reply.
|
|
||||||
func (o *Object) Call(method string, flags Flags, args ...interface{}) *Call {
|
|
||||||
return <-o.createCall(context.Background(), method, flags, make(chan *Call, 1), args...).Done
|
|
||||||
}
|
|
||||||
|
|
||||||
// CallWithContext acts like Call but takes a context
|
|
||||||
func (o *Object) CallWithContext(ctx context.Context, method string, flags Flags, args ...interface{}) *Call {
|
|
||||||
return <-o.createCall(ctx, method, flags, make(chan *Call, 1), args...).Done
|
|
||||||
}
|
|
||||||
|
|
||||||
// MatchOption specifies option for dbus routing match rule. Options can be constructed with WithMatch* helpers.
|
|
||||||
// For full list of available options consult
|
|
||||||
// https://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules
|
|
||||||
type MatchOption struct {
|
|
||||||
key string
|
|
||||||
value string
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithMatchOption creates match option with given key and value
|
|
||||||
func WithMatchOption(key, value string) MatchOption {
|
|
||||||
return MatchOption{key, value}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithMatchObjectPath creates match option that filters events based on given path
|
|
||||||
func WithMatchObjectPath(path ObjectPath) MatchOption {
|
|
||||||
return MatchOption{"path", string(path)}
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatMatchOptions(options []MatchOption) string {
|
|
||||||
items := make([]string, 0, len(options))
|
|
||||||
for _, option := range options {
|
|
||||||
items = append(items, option.key+"='"+option.value+"'")
|
|
||||||
}
|
|
||||||
|
|
||||||
return strings.Join(items, ",")
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddMatchSignal subscribes BusObject to signals from specified interface,
|
|
||||||
// method (member). Additional filter rules can be added via WithMatch* option constructors.
|
|
||||||
// Note: To filter events by object path you have to specify this path via an option.
|
|
||||||
func (o *Object) AddMatchSignal(iface, member string, options ...MatchOption) *Call {
|
|
||||||
base := []MatchOption{
|
|
||||||
{"type", "signal"},
|
|
||||||
{"interface", iface},
|
|
||||||
{"member", member},
|
|
||||||
}
|
|
||||||
|
|
||||||
options = append(base, options...)
|
|
||||||
return o.conn.BusObject().Call(
|
|
||||||
"org.freedesktop.DBus.AddMatch",
|
|
||||||
0,
|
|
||||||
formatMatchOptions(options),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoveMatchSignal unsubscribes BusObject from signals from specified interface,
|
|
||||||
// method (member). Additional filter rules can be added via WithMatch* option constructors
|
|
||||||
func (o *Object) RemoveMatchSignal(iface, member string, options ...MatchOption) *Call {
|
|
||||||
base := []MatchOption{
|
|
||||||
{"type", "signal"},
|
|
||||||
{"interface", iface},
|
|
||||||
{"member", member},
|
|
||||||
}
|
|
||||||
|
|
||||||
options = append(base, options...)
|
|
||||||
return o.conn.BusObject().Call(
|
|
||||||
"org.freedesktop.DBus.RemoveMatch",
|
|
||||||
0,
|
|
||||||
formatMatchOptions(options),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Go calls a method with the given arguments asynchronously. It returns a
|
|
||||||
// Call structure representing this method call. The passed channel will
|
|
||||||
// return the same value once the call is done. If ch is nil, a new channel
|
|
||||||
// will be allocated. Otherwise, ch has to be buffered or Go will panic.
|
|
||||||
//
|
|
||||||
// If the flags include FlagNoReplyExpected, ch is ignored and a Call structure
|
|
||||||
// is returned with any error in Err and a closed channel in Done containing
|
|
||||||
// the returned Call as it's one entry.
|
|
||||||
//
|
|
||||||
// If the method parameter contains a dot ('.'), the part before the last dot
|
|
||||||
// specifies the interface on which the method is called.
|
|
||||||
func (o *Object) Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
|
|
||||||
return o.createCall(context.Background(), method, flags, ch, args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GoWithContext acts like Go but takes a context
|
|
||||||
func (o *Object) GoWithContext(ctx context.Context, method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
|
|
||||||
return o.createCall(ctx, method, flags, ch, args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *Object) createCall(ctx context.Context, method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
|
|
||||||
if ctx == nil {
|
|
||||||
panic("nil context")
|
|
||||||
}
|
|
||||||
iface := ""
|
|
||||||
i := strings.LastIndex(method, ".")
|
|
||||||
if i != -1 {
|
|
||||||
iface = method[:i]
|
|
||||||
}
|
|
||||||
method = method[i+1:]
|
|
||||||
msg := new(Message)
|
|
||||||
msg.Type = TypeMethodCall
|
|
||||||
msg.serial = o.conn.getSerial()
|
|
||||||
msg.Flags = flags & (FlagNoAutoStart | FlagNoReplyExpected)
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
msg.Headers[FieldPath] = MakeVariant(o.path)
|
|
||||||
msg.Headers[FieldDestination] = MakeVariant(o.dest)
|
|
||||||
msg.Headers[FieldMember] = MakeVariant(method)
|
|
||||||
if iface != "" {
|
|
||||||
msg.Headers[FieldInterface] = MakeVariant(iface)
|
|
||||||
}
|
|
||||||
msg.Body = args
|
|
||||||
if len(args) > 0 {
|
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(args...))
|
|
||||||
}
|
|
||||||
if msg.Flags&FlagNoReplyExpected == 0 {
|
|
||||||
if ch == nil {
|
|
||||||
ch = make(chan *Call, 1)
|
|
||||||
} else if cap(ch) == 0 {
|
|
||||||
panic("dbus: unbuffered channel passed to (*Object).Go")
|
|
||||||
}
|
|
||||||
ctx, cancel := context.WithCancel(ctx)
|
|
||||||
call := &Call{
|
|
||||||
Destination: o.dest,
|
|
||||||
Path: o.path,
|
|
||||||
Method: method,
|
|
||||||
Args: args,
|
|
||||||
Done: ch,
|
|
||||||
ctxCanceler: cancel,
|
|
||||||
ctx: ctx,
|
|
||||||
}
|
|
||||||
o.conn.calls.track(msg.serial, call)
|
|
||||||
o.conn.sendMessageAndIfClosed(msg, func() {
|
|
||||||
o.conn.calls.handleSendError(msg, ErrClosed)
|
|
||||||
cancel()
|
|
||||||
})
|
|
||||||
go func() {
|
|
||||||
<-ctx.Done()
|
|
||||||
o.conn.calls.handleSendError(msg, ctx.Err())
|
|
||||||
}()
|
|
||||||
|
|
||||||
return call
|
|
||||||
}
|
|
||||||
done := make(chan *Call, 1)
|
|
||||||
call := &Call{
|
|
||||||
Err: nil,
|
|
||||||
Done: done,
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
call.Done <- call
|
|
||||||
close(done)
|
|
||||||
}()
|
|
||||||
o.conn.sendMessageAndIfClosed(msg, func() {
|
|
||||||
call.Err = ErrClosed
|
|
||||||
})
|
|
||||||
return call
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetProperty calls org.freedesktop.DBus.Properties.Get on the given
|
|
||||||
// object. The property name must be given in interface.member notation.
|
|
||||||
func (o *Object) GetProperty(p string) (Variant, error) {
|
|
||||||
idx := strings.LastIndex(p, ".")
|
|
||||||
if idx == -1 || idx+1 == len(p) {
|
|
||||||
return Variant{}, errors.New("dbus: invalid property " + p)
|
|
||||||
}
|
|
||||||
|
|
||||||
iface := p[:idx]
|
|
||||||
prop := p[idx+1:]
|
|
||||||
|
|
||||||
result := Variant{}
|
|
||||||
err := o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return Variant{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetProperty calls org.freedesktop.DBus.Properties.Set on the given
|
|
||||||
// object. The property name must be given in interface.member notation.
|
|
||||||
func (o *Object) SetProperty(p string, v interface{}) error {
|
|
||||||
idx := strings.LastIndex(p, ".")
|
|
||||||
if idx == -1 || idx+1 == len(p) {
|
|
||||||
return errors.New("dbus: invalid property " + p)
|
|
||||||
}
|
|
||||||
|
|
||||||
iface := p[:idx]
|
|
||||||
prop := p[idx+1:]
|
|
||||||
|
|
||||||
return o.Call("org.freedesktop.DBus.Properties.Set", 0, iface, prop, v).Err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Destination returns the destination that calls on (o *Object) are sent to.
|
|
||||||
func (o *Object) Destination() string {
|
|
||||||
return o.dest
|
|
||||||
}
|
|
||||||
|
|
||||||
// Path returns the path that calls on (o *Object") are sent to.
|
|
||||||
func (o *Object) Path() ObjectPath {
|
|
||||||
return o.path
|
|
||||||
}
|
|
|
@ -1,99 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
// Terminator allows a handler to implement a shutdown mechanism that
|
|
||||||
// is called when the connection terminates.
|
|
||||||
type Terminator interface {
|
|
||||||
Terminate()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handler is the representation of a D-Bus Application.
|
|
||||||
//
|
|
||||||
// The Handler must have a way to lookup objects given
|
|
||||||
// an ObjectPath. The returned object must implement the
|
|
||||||
// ServerObject interface.
|
|
||||||
type Handler interface {
|
|
||||||
LookupObject(path ObjectPath) (ServerObject, bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ServerObject is the representation of an D-Bus Object.
|
|
||||||
//
|
|
||||||
// Objects are registered at a path for a given Handler.
|
|
||||||
// The Objects implement D-Bus interfaces. The semantics
|
|
||||||
// of Interface lookup is up to the implementation of
|
|
||||||
// the ServerObject. The ServerObject implementation may
|
|
||||||
// choose to implement empty string as a valid interface
|
|
||||||
// represeting all methods or not per the D-Bus specification.
|
|
||||||
type ServerObject interface {
|
|
||||||
LookupInterface(name string) (Interface, bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
// An Interface is the representation of a D-Bus Interface.
|
|
||||||
//
|
|
||||||
// Interfaces are a grouping of methods implemented by the Objects.
|
|
||||||
// Interfaces are responsible for routing method calls.
|
|
||||||
type Interface interface {
|
|
||||||
LookupMethod(name string) (Method, bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
// A Method represents the exposed methods on D-Bus.
|
|
||||||
type Method interface {
|
|
||||||
// Call requires that all arguments are decoded before being passed to it.
|
|
||||||
Call(args ...interface{}) ([]interface{}, error)
|
|
||||||
NumArguments() int
|
|
||||||
NumReturns() int
|
|
||||||
// ArgumentValue returns a representative value for the argument at position
|
|
||||||
// it should be of the proper type. reflect.Zero would be a good mechanism
|
|
||||||
// to use for this Value.
|
|
||||||
ArgumentValue(position int) interface{}
|
|
||||||
// ReturnValue returns a representative value for the return at position
|
|
||||||
// it should be of the proper type. reflect.Zero would be a good mechanism
|
|
||||||
// to use for this Value.
|
|
||||||
ReturnValue(position int) interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// An Argument Decoder can decode arguments using the non-standard mechanism
|
|
||||||
//
|
|
||||||
// If a method implements this interface then the non-standard
|
|
||||||
// decoder will be used.
|
|
||||||
//
|
|
||||||
// Method arguments must be decoded from the message.
|
|
||||||
// The mechanism for doing this will vary based on the
|
|
||||||
// implementation of the method. A normal approach is provided
|
|
||||||
// as part of this library, but may be replaced with
|
|
||||||
// any other decoding scheme.
|
|
||||||
type ArgumentDecoder interface {
|
|
||||||
// To decode the arguments of a method the sender and message are
|
|
||||||
// provided incase the semantics of the implementer provides access
|
|
||||||
// to these as part of the method invocation.
|
|
||||||
DecodeArguments(conn *Conn, sender string, msg *Message, args []interface{}) ([]interface{}, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// A SignalHandler is responsible for delivering a signal.
|
|
||||||
//
|
|
||||||
// Signal delivery may be changed from the default channel
|
|
||||||
// based approach by Handlers implementing the SignalHandler
|
|
||||||
// interface.
|
|
||||||
type SignalHandler interface {
|
|
||||||
DeliverSignal(iface, name string, signal *Signal)
|
|
||||||
}
|
|
||||||
|
|
||||||
// A DBusError is used to convert a generic object to a D-Bus error.
|
|
||||||
//
|
|
||||||
// Any custom error mechanism may implement this interface to provide
|
|
||||||
// a custom encoding of the error on D-Bus. By default if a normal
|
|
||||||
// error is returned, it will be encoded as the generic
|
|
||||||
// "org.freedesktop.DBus.Error.Failed" error. By implementing this
|
|
||||||
// interface as well a custom encoding may be provided.
|
|
||||||
type DBusError interface {
|
|
||||||
DBusError() (string, []interface{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// SerialGenerator is responsible for serials generation.
|
|
||||||
//
|
|
||||||
// Different approaches for the serial generation can be used,
|
|
||||||
// maintaining a map guarded with a mutex (the standard way) or
|
|
||||||
// simply increment an atomic counter.
|
|
||||||
type SerialGenerator interface {
|
|
||||||
GetSerial() uint32
|
|
||||||
RetireSerial(serial uint32)
|
|
||||||
}
|
|
|
@ -1,259 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var sigToType = map[byte]reflect.Type{
|
|
||||||
'y': byteType,
|
|
||||||
'b': boolType,
|
|
||||||
'n': int16Type,
|
|
||||||
'q': uint16Type,
|
|
||||||
'i': int32Type,
|
|
||||||
'u': uint32Type,
|
|
||||||
'x': int64Type,
|
|
||||||
't': uint64Type,
|
|
||||||
'd': float64Type,
|
|
||||||
's': stringType,
|
|
||||||
'g': signatureType,
|
|
||||||
'o': objectPathType,
|
|
||||||
'v': variantType,
|
|
||||||
'h': unixFDIndexType,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signature represents a correct type signature as specified by the D-Bus
|
|
||||||
// specification. The zero value represents the empty signature, "".
|
|
||||||
type Signature struct {
|
|
||||||
str string
|
|
||||||
}
|
|
||||||
|
|
||||||
// SignatureOf returns the concatenation of all the signatures of the given
|
|
||||||
// values. It panics if one of them is not representable in D-Bus.
|
|
||||||
func SignatureOf(vs ...interface{}) Signature {
|
|
||||||
var s string
|
|
||||||
for _, v := range vs {
|
|
||||||
s += getSignature(reflect.TypeOf(v))
|
|
||||||
}
|
|
||||||
return Signature{s}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SignatureOfType returns the signature of the given type. It panics if the
|
|
||||||
// type is not representable in D-Bus.
|
|
||||||
func SignatureOfType(t reflect.Type) Signature {
|
|
||||||
return Signature{getSignature(t)}
|
|
||||||
}
|
|
||||||
|
|
||||||
// getSignature returns the signature of the given type and panics on unknown types.
|
|
||||||
func getSignature(t reflect.Type) string {
|
|
||||||
// handle simple types first
|
|
||||||
switch t.Kind() {
|
|
||||||
case reflect.Uint8:
|
|
||||||
return "y"
|
|
||||||
case reflect.Bool:
|
|
||||||
return "b"
|
|
||||||
case reflect.Int16:
|
|
||||||
return "n"
|
|
||||||
case reflect.Uint16:
|
|
||||||
return "q"
|
|
||||||
case reflect.Int, reflect.Int32:
|
|
||||||
if t == unixFDType {
|
|
||||||
return "h"
|
|
||||||
}
|
|
||||||
return "i"
|
|
||||||
case reflect.Uint, reflect.Uint32:
|
|
||||||
if t == unixFDIndexType {
|
|
||||||
return "h"
|
|
||||||
}
|
|
||||||
return "u"
|
|
||||||
case reflect.Int64:
|
|
||||||
return "x"
|
|
||||||
case reflect.Uint64:
|
|
||||||
return "t"
|
|
||||||
case reflect.Float64:
|
|
||||||
return "d"
|
|
||||||
case reflect.Ptr:
|
|
||||||
return getSignature(t.Elem())
|
|
||||||
case reflect.String:
|
|
||||||
if t == objectPathType {
|
|
||||||
return "o"
|
|
||||||
}
|
|
||||||
return "s"
|
|
||||||
case reflect.Struct:
|
|
||||||
if t == variantType {
|
|
||||||
return "v"
|
|
||||||
} else if t == signatureType {
|
|
||||||
return "g"
|
|
||||||
}
|
|
||||||
var s string
|
|
||||||
for i := 0; i < t.NumField(); i++ {
|
|
||||||
field := t.Field(i)
|
|
||||||
if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
|
|
||||||
s += getSignature(t.Field(i).Type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "(" + s + ")"
|
|
||||||
case reflect.Array, reflect.Slice:
|
|
||||||
return "a" + getSignature(t.Elem())
|
|
||||||
case reflect.Map:
|
|
||||||
if !isKeyType(t.Key()) {
|
|
||||||
panic(InvalidTypeError{t})
|
|
||||||
}
|
|
||||||
return "a{" + getSignature(t.Key()) + getSignature(t.Elem()) + "}"
|
|
||||||
case reflect.Interface:
|
|
||||||
return "v"
|
|
||||||
}
|
|
||||||
panic(InvalidTypeError{t})
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseSignature returns the signature represented by this string, or a
|
|
||||||
// SignatureError if the string is not a valid signature.
|
|
||||||
func ParseSignature(s string) (sig Signature, err error) {
|
|
||||||
if len(s) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if len(s) > 255 {
|
|
||||||
return Signature{""}, SignatureError{s, "too long"}
|
|
||||||
}
|
|
||||||
sig.str = s
|
|
||||||
for err == nil && len(s) != 0 {
|
|
||||||
err, s = validSingle(s, 0)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
sig = Signature{""}
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseSignatureMust behaves like ParseSignature, except that it panics if s
|
|
||||||
// is not valid.
|
|
||||||
func ParseSignatureMust(s string) Signature {
|
|
||||||
sig, err := ParseSignature(s)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
return sig
|
|
||||||
}
|
|
||||||
|
|
||||||
// Empty retruns whether the signature is the empty signature.
|
|
||||||
func (s Signature) Empty() bool {
|
|
||||||
return s.str == ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// Single returns whether the signature represents a single, complete type.
|
|
||||||
func (s Signature) Single() bool {
|
|
||||||
err, r := validSingle(s.str, 0)
|
|
||||||
return err != nil && r == ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns the signature's string representation.
|
|
||||||
func (s Signature) String() string {
|
|
||||||
return s.str
|
|
||||||
}
|
|
||||||
|
|
||||||
// A SignatureError indicates that a signature passed to a function or received
|
|
||||||
// on a connection is not a valid signature.
|
|
||||||
type SignatureError struct {
|
|
||||||
Sig string
|
|
||||||
Reason string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e SignatureError) Error() string {
|
|
||||||
return fmt.Sprintf("dbus: invalid signature: %q (%s)", e.Sig, e.Reason)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to read a single type from this string. If it was successful, err is nil
|
|
||||||
// and rem is the remaining unparsed part. Otherwise, err is a non-nil
|
|
||||||
// SignatureError and rem is "". depth is the current recursion depth which may
|
|
||||||
// not be greater than 64 and should be given as 0 on the first call.
|
|
||||||
func validSingle(s string, depth int) (err error, rem string) {
|
|
||||||
if s == "" {
|
|
||||||
return SignatureError{Sig: s, Reason: "empty signature"}, ""
|
|
||||||
}
|
|
||||||
if depth > 64 {
|
|
||||||
return SignatureError{Sig: s, Reason: "container nesting too deep"}, ""
|
|
||||||
}
|
|
||||||
switch s[0] {
|
|
||||||
case 'y', 'b', 'n', 'q', 'i', 'u', 'x', 't', 'd', 's', 'g', 'o', 'v', 'h':
|
|
||||||
return nil, s[1:]
|
|
||||||
case 'a':
|
|
||||||
if len(s) > 1 && s[1] == '{' {
|
|
||||||
i := findMatching(s[1:], '{', '}')
|
|
||||||
if i == -1 {
|
|
||||||
return SignatureError{Sig: s, Reason: "unmatched '{'"}, ""
|
|
||||||
}
|
|
||||||
i++
|
|
||||||
rem = s[i+1:]
|
|
||||||
s = s[2:i]
|
|
||||||
if err, _ = validSingle(s[:1], depth+1); err != nil {
|
|
||||||
return err, ""
|
|
||||||
}
|
|
||||||
err, nr := validSingle(s[1:], depth+1)
|
|
||||||
if err != nil {
|
|
||||||
return err, ""
|
|
||||||
}
|
|
||||||
if nr != "" {
|
|
||||||
return SignatureError{Sig: s, Reason: "too many types in dict"}, ""
|
|
||||||
}
|
|
||||||
return nil, rem
|
|
||||||
}
|
|
||||||
return validSingle(s[1:], depth+1)
|
|
||||||
case '(':
|
|
||||||
i := findMatching(s, '(', ')')
|
|
||||||
if i == -1 {
|
|
||||||
return SignatureError{Sig: s, Reason: "unmatched ')'"}, ""
|
|
||||||
}
|
|
||||||
rem = s[i+1:]
|
|
||||||
s = s[1:i]
|
|
||||||
for err == nil && s != "" {
|
|
||||||
err, s = validSingle(s, depth+1)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
rem = ""
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
return SignatureError{Sig: s, Reason: "invalid type character"}, ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func findMatching(s string, left, right rune) int {
|
|
||||||
n := 0
|
|
||||||
for i, v := range s {
|
|
||||||
if v == left {
|
|
||||||
n++
|
|
||||||
} else if v == right {
|
|
||||||
n--
|
|
||||||
}
|
|
||||||
if n == 0 {
|
|
||||||
return i
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1
|
|
||||||
}
|
|
||||||
|
|
||||||
// typeFor returns the type of the given signature. It ignores any left over
|
|
||||||
// characters and panics if s doesn't start with a valid type signature.
|
|
||||||
func typeFor(s string) (t reflect.Type) {
|
|
||||||
err, _ := validSingle(s, 0)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if t, ok := sigToType[s[0]]; ok {
|
|
||||||
return t
|
|
||||||
}
|
|
||||||
switch s[0] {
|
|
||||||
case 'a':
|
|
||||||
if s[1] == '{' {
|
|
||||||
i := strings.LastIndex(s, "}")
|
|
||||||
t = reflect.MapOf(sigToType[s[2]], typeFor(s[3:i]))
|
|
||||||
} else {
|
|
||||||
t = reflect.SliceOf(typeFor(s[1:]))
|
|
||||||
}
|
|
||||||
case '(':
|
|
||||||
t = interfacesType
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
func (t *unixTransport) SendNullByte() error {
|
|
||||||
_, err := t.Write([]byte{0})
|
|
||||||
return err
|
|
||||||
}
|
|
|
@ -1,50 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/binary"
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"unsafe"
|
|
||||||
)
|
|
||||||
|
|
||||||
var nativeEndian binary.ByteOrder
|
|
||||||
|
|
||||||
func detectEndianness() binary.ByteOrder {
|
|
||||||
var x uint32 = 0x01020304
|
|
||||||
if *(*byte)(unsafe.Pointer(&x)) == 0x01 {
|
|
||||||
return binary.BigEndian
|
|
||||||
}
|
|
||||||
return binary.LittleEndian
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
nativeEndian = detectEndianness()
|
|
||||||
}
|
|
||||||
|
|
||||||
type genericTransport struct {
|
|
||||||
io.ReadWriteCloser
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t genericTransport) SendNullByte() error {
|
|
||||||
_, err := t.Write([]byte{0})
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t genericTransport) SupportsUnixFDs() bool {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t genericTransport) EnableUnixFDs() {}
|
|
||||||
|
|
||||||
func (t genericTransport) ReadMessage() (*Message, error) {
|
|
||||||
return DecodeMessage(t)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t genericTransport) SendMessage(msg *Message) error {
|
|
||||||
for _, v := range msg.Body {
|
|
||||||
if _, ok := v.(UnixFD); ok {
|
|
||||||
return errors.New("dbus: unix fd passing not enabled")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return msg.EncodeTo(t, nativeEndian)
|
|
||||||
}
|
|
|
@ -1,39 +0,0 @@
|
||||||
//+build !windows
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"io/ioutil"
|
|
||||||
"net"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
transports["nonce-tcp"] = newNonceTcpTransport
|
|
||||||
}
|
|
||||||
|
|
||||||
func newNonceTcpTransport(keys string) (transport, error) {
|
|
||||||
host := getKey(keys, "host")
|
|
||||||
port := getKey(keys, "port")
|
|
||||||
noncefile := getKey(keys, "noncefile")
|
|
||||||
if host == "" || port == "" || noncefile == "" {
|
|
||||||
return nil, errors.New("dbus: unsupported address (must set host, port and noncefile)")
|
|
||||||
}
|
|
||||||
protocol, err := tcpFamily(keys)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
socket, err := net.Dial(protocol, net.JoinHostPort(host, port))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
b, err := ioutil.ReadFile(noncefile)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = socket.Write(b)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return NewConn(socket)
|
|
||||||
}
|
|
|
@ -1,41 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"net"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
transports["tcp"] = newTcpTransport
|
|
||||||
}
|
|
||||||
|
|
||||||
func tcpFamily(keys string) (string, error) {
|
|
||||||
switch getKey(keys, "family") {
|
|
||||||
case "":
|
|
||||||
return "tcp", nil
|
|
||||||
case "ipv4":
|
|
||||||
return "tcp4", nil
|
|
||||||
case "ipv6":
|
|
||||||
return "tcp6", nil
|
|
||||||
default:
|
|
||||||
return "", errors.New("dbus: invalid tcp family (must be ipv4 or ipv6)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newTcpTransport(keys string) (transport, error) {
|
|
||||||
host := getKey(keys, "host")
|
|
||||||
port := getKey(keys, "port")
|
|
||||||
if host == "" || port == "" {
|
|
||||||
return nil, errors.New("dbus: unsupported address (must set host and port)")
|
|
||||||
}
|
|
||||||
|
|
||||||
protocol, err := tcpFamily(keys)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
socket, err := net.Dial(protocol, net.JoinHostPort(host, port))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return NewConn(socket)
|
|
||||||
}
|
|
|
@ -1,214 +0,0 @@
|
||||||
//+build !windows,!solaris
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/binary"
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"syscall"
|
|
||||||
)
|
|
||||||
|
|
||||||
type oobReader struct {
|
|
||||||
conn *net.UnixConn
|
|
||||||
oob []byte
|
|
||||||
buf [4096]byte
|
|
||||||
}
|
|
||||||
|
|
||||||
func (o *oobReader) Read(b []byte) (n int, err error) {
|
|
||||||
n, oobn, flags, _, err := o.conn.ReadMsgUnix(b, o.buf[:])
|
|
||||||
if err != nil {
|
|
||||||
return n, err
|
|
||||||
}
|
|
||||||
if flags&syscall.MSG_CTRUNC != 0 {
|
|
||||||
return n, errors.New("dbus: control data truncated (too many fds received)")
|
|
||||||
}
|
|
||||||
o.oob = append(o.oob, o.buf[:oobn]...)
|
|
||||||
return n, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type unixTransport struct {
|
|
||||||
*net.UnixConn
|
|
||||||
rdr *oobReader
|
|
||||||
hasUnixFDs bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func newUnixTransport(keys string) (transport, error) {
|
|
||||||
var err error
|
|
||||||
|
|
||||||
t := new(unixTransport)
|
|
||||||
abstract := getKey(keys, "abstract")
|
|
||||||
path := getKey(keys, "path")
|
|
||||||
switch {
|
|
||||||
case abstract == "" && path == "":
|
|
||||||
return nil, errors.New("dbus: invalid address (neither path nor abstract set)")
|
|
||||||
case abstract != "" && path == "":
|
|
||||||
t.UnixConn, err = net.DialUnix("unix", nil, &net.UnixAddr{Name: "@" + abstract, Net: "unix"})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return t, nil
|
|
||||||
case abstract == "" && path != "":
|
|
||||||
t.UnixConn, err = net.DialUnix("unix", nil, &net.UnixAddr{Name: path, Net: "unix"})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return t, nil
|
|
||||||
default:
|
|
||||||
return nil, errors.New("dbus: invalid address (both path and abstract set)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
transports["unix"] = newUnixTransport
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *unixTransport) EnableUnixFDs() {
|
|
||||||
t.hasUnixFDs = true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *unixTransport) ReadMessage() (*Message, error) {
|
|
||||||
var (
|
|
||||||
blen, hlen uint32
|
|
||||||
csheader [16]byte
|
|
||||||
headers []header
|
|
||||||
order binary.ByteOrder
|
|
||||||
unixfds uint32
|
|
||||||
)
|
|
||||||
// To be sure that all bytes of out-of-band data are read, we use a special
|
|
||||||
// reader that uses ReadUnix on the underlying connection instead of Read
|
|
||||||
// and gathers the out-of-band data in a buffer.
|
|
||||||
if t.rdr == nil {
|
|
||||||
t.rdr = &oobReader{conn: t.UnixConn}
|
|
||||||
} else {
|
|
||||||
t.rdr.oob = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// read the first 16 bytes (the part of the header that has a constant size),
|
|
||||||
// from which we can figure out the length of the rest of the message
|
|
||||||
if _, err := io.ReadFull(t.rdr, csheader[:]); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
switch csheader[0] {
|
|
||||||
case 'l':
|
|
||||||
order = binary.LittleEndian
|
|
||||||
case 'B':
|
|
||||||
order = binary.BigEndian
|
|
||||||
default:
|
|
||||||
return nil, InvalidMessageError("invalid byte order")
|
|
||||||
}
|
|
||||||
// csheader[4:8] -> length of message body, csheader[12:16] -> length of
|
|
||||||
// header fields (without alignment)
|
|
||||||
binary.Read(bytes.NewBuffer(csheader[4:8]), order, &blen)
|
|
||||||
binary.Read(bytes.NewBuffer(csheader[12:]), order, &hlen)
|
|
||||||
if hlen%8 != 0 {
|
|
||||||
hlen += 8 - (hlen % 8)
|
|
||||||
}
|
|
||||||
|
|
||||||
// decode headers and look for unix fds
|
|
||||||
headerdata := make([]byte, hlen+4)
|
|
||||||
copy(headerdata, csheader[12:])
|
|
||||||
if _, err := io.ReadFull(t.rdr, headerdata[4:]); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
dec := newDecoder(bytes.NewBuffer(headerdata), order)
|
|
||||||
dec.pos = 12
|
|
||||||
vs, err := dec.Decode(Signature{"a(yv)"})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
Store(vs, &headers)
|
|
||||||
for _, v := range headers {
|
|
||||||
if v.Field == byte(FieldUnixFDs) {
|
|
||||||
unixfds, _ = v.Variant.value.(uint32)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
all := make([]byte, 16+hlen+blen)
|
|
||||||
copy(all, csheader[:])
|
|
||||||
copy(all[16:], headerdata[4:])
|
|
||||||
if _, err := io.ReadFull(t.rdr, all[16+hlen:]); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if unixfds != 0 {
|
|
||||||
if !t.hasUnixFDs {
|
|
||||||
return nil, errors.New("dbus: got unix fds on unsupported transport")
|
|
||||||
}
|
|
||||||
// read the fds from the OOB data
|
|
||||||
scms, err := syscall.ParseSocketControlMessage(t.rdr.oob)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if len(scms) != 1 {
|
|
||||||
return nil, errors.New("dbus: received more than one socket control message")
|
|
||||||
}
|
|
||||||
fds, err := syscall.ParseUnixRights(&scms[0])
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
msg, err := DecodeMessage(bytes.NewBuffer(all))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
// substitute the values in the message body (which are indices for the
|
|
||||||
// array receiver via OOB) with the actual values
|
|
||||||
for i, v := range msg.Body {
|
|
||||||
switch v.(type) {
|
|
||||||
case UnixFDIndex:
|
|
||||||
j := v.(UnixFDIndex)
|
|
||||||
if uint32(j) >= unixfds {
|
|
||||||
return nil, InvalidMessageError("invalid index for unix fd")
|
|
||||||
}
|
|
||||||
msg.Body[i] = UnixFD(fds[j])
|
|
||||||
case []UnixFDIndex:
|
|
||||||
idxArray := v.([]UnixFDIndex)
|
|
||||||
fdArray := make([]UnixFD, len(idxArray))
|
|
||||||
for k, j := range idxArray {
|
|
||||||
if uint32(j) >= unixfds {
|
|
||||||
return nil, InvalidMessageError("invalid index for unix fd")
|
|
||||||
}
|
|
||||||
fdArray[k] = UnixFD(fds[j])
|
|
||||||
}
|
|
||||||
msg.Body[i] = fdArray
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return msg, nil
|
|
||||||
}
|
|
||||||
return DecodeMessage(bytes.NewBuffer(all))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *unixTransport) SendMessage(msg *Message) error {
|
|
||||||
fds := make([]int, 0)
|
|
||||||
for i, v := range msg.Body {
|
|
||||||
if fd, ok := v.(UnixFD); ok {
|
|
||||||
msg.Body[i] = UnixFDIndex(len(fds))
|
|
||||||
fds = append(fds, int(fd))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(fds) != 0 {
|
|
||||||
if !t.hasUnixFDs {
|
|
||||||
return errors.New("dbus: unix fd passing not enabled")
|
|
||||||
}
|
|
||||||
msg.Headers[FieldUnixFDs] = MakeVariant(uint32(len(fds)))
|
|
||||||
oob := syscall.UnixRights(fds...)
|
|
||||||
buf := new(bytes.Buffer)
|
|
||||||
msg.EncodeTo(buf, nativeEndian)
|
|
||||||
n, oobn, err := t.UnixConn.WriteMsgUnix(buf.Bytes(), oob, nil)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if n != buf.Len() || oobn != len(oob) {
|
|
||||||
return io.ErrShortWrite
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if err := msg.EncodeTo(t, nativeEndian); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *unixTransport) SupportsUnixFDs() bool {
|
|
||||||
return true
|
|
||||||
}
|
|
|
@ -1,95 +0,0 @@
|
||||||
// The UnixCredentials system call is currently only implemented on Linux
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
|
||||||
// https://golang.org/s/go1.4-syscall
|
|
||||||
// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
|
|
||||||
|
|
||||||
// Local implementation of the UnixCredentials system call for DragonFly BSD
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
/*
|
|
||||||
#include <sys/ucred.h>
|
|
||||||
*/
|
|
||||||
import "C"
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"syscall"
|
|
||||||
"unsafe"
|
|
||||||
)
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/ztypes_linux_amd64.go
|
|
||||||
// http://golang.org/src/pkg/syscall/ztypes_dragonfly_amd64.go
|
|
||||||
type Ucred struct {
|
|
||||||
Pid int32
|
|
||||||
Uid uint32
|
|
||||||
Gid uint32
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/types_linux.go
|
|
||||||
// http://golang.org/src/pkg/syscall/types_dragonfly.go
|
|
||||||
// https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/ucred.h
|
|
||||||
const (
|
|
||||||
SizeofUcred = C.sizeof_struct_ucred
|
|
||||||
)
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
|
|
||||||
func cmsgAlignOf(salen int) int {
|
|
||||||
// From http://golang.org/src/pkg/syscall/sockcmsg_unix.go
|
|
||||||
//salign := sizeofPtr
|
|
||||||
// NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels
|
|
||||||
// still require 32-bit aligned access to network subsystem.
|
|
||||||
//if darwin64Bit || dragonfly64Bit {
|
|
||||||
// salign = 4
|
|
||||||
//}
|
|
||||||
salign := 4
|
|
||||||
return (salen + salign - 1) & ^(salign - 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
|
|
||||||
func cmsgData(h *syscall.Cmsghdr) unsafe.Pointer {
|
|
||||||
return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(syscall.SizeofCmsghdr)))
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
|
||||||
// UnixCredentials encodes credentials into a socket control message
|
|
||||||
// for sending to another process. This can be used for
|
|
||||||
// authentication.
|
|
||||||
func UnixCredentials(ucred *Ucred) []byte {
|
|
||||||
b := make([]byte, syscall.CmsgSpace(SizeofUcred))
|
|
||||||
h := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
|
|
||||||
h.Level = syscall.SOL_SOCKET
|
|
||||||
h.Type = syscall.SCM_CREDS
|
|
||||||
h.SetLen(syscall.CmsgLen(SizeofUcred))
|
|
||||||
*((*Ucred)(cmsgData(h))) = *ucred
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
|
||||||
// ParseUnixCredentials decodes a socket control message that contains
|
|
||||||
// credentials in a Ucred structure. To receive such a message, the
|
|
||||||
// SO_PASSCRED option must be enabled on the socket.
|
|
||||||
func ParseUnixCredentials(m *syscall.SocketControlMessage) (*Ucred, error) {
|
|
||||||
if m.Header.Level != syscall.SOL_SOCKET {
|
|
||||||
return nil, syscall.EINVAL
|
|
||||||
}
|
|
||||||
if m.Header.Type != syscall.SCM_CREDS {
|
|
||||||
return nil, syscall.EINVAL
|
|
||||||
}
|
|
||||||
ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
|
|
||||||
return &ucred, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *unixTransport) SendNullByte() error {
|
|
||||||
ucred := &Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
|
|
||||||
b := UnixCredentials(ucred)
|
|
||||||
_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if oobn != len(b) {
|
|
||||||
return io.ErrShortWrite
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,91 +0,0 @@
|
||||||
// The UnixCredentials system call is currently only implemented on Linux
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
|
||||||
// https://golang.org/s/go1.4-syscall
|
|
||||||
// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
|
|
||||||
|
|
||||||
// Local implementation of the UnixCredentials system call for FreeBSD
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
/*
|
|
||||||
const int sizeofPtr = sizeof(void*);
|
|
||||||
#define _WANT_UCRED
|
|
||||||
#include <sys/ucred.h>
|
|
||||||
*/
|
|
||||||
import "C"
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"syscall"
|
|
||||||
"unsafe"
|
|
||||||
)
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/ztypes_linux_amd64.go
|
|
||||||
// https://golang.org/src/syscall/ztypes_freebsd_amd64.go
|
|
||||||
type Ucred struct {
|
|
||||||
Pid int32
|
|
||||||
Uid uint32
|
|
||||||
Gid uint32
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/types_linux.go
|
|
||||||
// https://golang.org/src/syscall/types_freebsd.go
|
|
||||||
// https://github.com/freebsd/freebsd/blob/master/sys/sys/ucred.h
|
|
||||||
const (
|
|
||||||
SizeofUcred = C.sizeof_struct_ucred
|
|
||||||
)
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
|
|
||||||
func cmsgAlignOf(salen int) int {
|
|
||||||
salign := C.sizeofPtr
|
|
||||||
|
|
||||||
return (salen + salign - 1) & ^(salign - 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
|
|
||||||
func cmsgData(h *syscall.Cmsghdr) unsafe.Pointer {
|
|
||||||
return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(syscall.SizeofCmsghdr)))
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
|
||||||
// UnixCredentials encodes credentials into a socket control message
|
|
||||||
// for sending to another process. This can be used for
|
|
||||||
// authentication.
|
|
||||||
func UnixCredentials(ucred *Ucred) []byte {
|
|
||||||
b := make([]byte, syscall.CmsgSpace(SizeofUcred))
|
|
||||||
h := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
|
|
||||||
h.Level = syscall.SOL_SOCKET
|
|
||||||
h.Type = syscall.SCM_CREDS
|
|
||||||
h.SetLen(syscall.CmsgLen(SizeofUcred))
|
|
||||||
*((*Ucred)(cmsgData(h))) = *ucred
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
|
||||||
// ParseUnixCredentials decodes a socket control message that contains
|
|
||||||
// credentials in a Ucred structure. To receive such a message, the
|
|
||||||
// SO_PASSCRED option must be enabled on the socket.
|
|
||||||
func ParseUnixCredentials(m *syscall.SocketControlMessage) (*Ucred, error) {
|
|
||||||
if m.Header.Level != syscall.SOL_SOCKET {
|
|
||||||
return nil, syscall.EINVAL
|
|
||||||
}
|
|
||||||
if m.Header.Type != syscall.SCM_CREDS {
|
|
||||||
return nil, syscall.EINVAL
|
|
||||||
}
|
|
||||||
ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
|
|
||||||
return &ucred, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *unixTransport) SendNullByte() error {
|
|
||||||
ucred := &Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
|
|
||||||
b := UnixCredentials(ucred)
|
|
||||||
_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if oobn != len(b) {
|
|
||||||
return io.ErrShortWrite
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
// The UnixCredentials system call is currently only implemented on Linux
|
|
||||||
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
|
||||||
// https://golang.org/s/go1.4-syscall
|
|
||||||
// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"syscall"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (t *unixTransport) SendNullByte() error {
|
|
||||||
ucred := &syscall.Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
|
|
||||||
b := syscall.UnixCredentials(ucred)
|
|
||||||
_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if oobn != len(b) {
|
|
||||||
return io.ErrShortWrite
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,14 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import "io"
|
|
||||||
|
|
||||||
func (t *unixTransport) SendNullByte() error {
|
|
||||||
n, _, err := t.UnixConn.WriteMsgUnix([]byte{0}, nil, nil)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if n != 1 {
|
|
||||||
return io.ErrShortWrite
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,144 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"sort"
|
|
||||||
"strconv"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Variant represents the D-Bus variant type.
|
|
||||||
type Variant struct {
|
|
||||||
sig Signature
|
|
||||||
value interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MakeVariant converts the given value to a Variant. It panics if v cannot be
|
|
||||||
// represented as a D-Bus type.
|
|
||||||
func MakeVariant(v interface{}) Variant {
|
|
||||||
return MakeVariantWithSignature(v, SignatureOf(v))
|
|
||||||
}
|
|
||||||
|
|
||||||
// MakeVariantWithSignature converts the given value to a Variant.
|
|
||||||
func MakeVariantWithSignature(v interface{}, s Signature) Variant {
|
|
||||||
return Variant{s, v}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseVariant parses the given string as a variant as described at
|
|
||||||
// https://developer.gnome.org/glib/unstable/gvariant-text.html. If sig is not
|
|
||||||
// empty, it is taken to be the expected signature for the variant.
|
|
||||||
func ParseVariant(s string, sig Signature) (Variant, error) {
|
|
||||||
tokens := varLex(s)
|
|
||||||
p := &varParser{tokens: tokens}
|
|
||||||
n, err := varMakeNode(p)
|
|
||||||
if err != nil {
|
|
||||||
return Variant{}, err
|
|
||||||
}
|
|
||||||
if sig.str == "" {
|
|
||||||
sig, err = varInfer(n)
|
|
||||||
if err != nil {
|
|
||||||
return Variant{}, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
v, err := n.Value(sig)
|
|
||||||
if err != nil {
|
|
||||||
return Variant{}, err
|
|
||||||
}
|
|
||||||
return MakeVariant(v), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// format returns a formatted version of v and whether this string can be parsed
|
|
||||||
// unambigously.
|
|
||||||
func (v Variant) format() (string, bool) {
|
|
||||||
switch v.sig.str[0] {
|
|
||||||
case 'b', 'i':
|
|
||||||
return fmt.Sprint(v.value), true
|
|
||||||
case 'n', 'q', 'u', 'x', 't', 'd', 'h':
|
|
||||||
return fmt.Sprint(v.value), false
|
|
||||||
case 's':
|
|
||||||
return strconv.Quote(v.value.(string)), true
|
|
||||||
case 'o':
|
|
||||||
return strconv.Quote(string(v.value.(ObjectPath))), false
|
|
||||||
case 'g':
|
|
||||||
return strconv.Quote(v.value.(Signature).str), false
|
|
||||||
case 'v':
|
|
||||||
s, unamb := v.value.(Variant).format()
|
|
||||||
if !unamb {
|
|
||||||
return "<@" + v.value.(Variant).sig.str + " " + s + ">", true
|
|
||||||
}
|
|
||||||
return "<" + s + ">", true
|
|
||||||
case 'y':
|
|
||||||
return fmt.Sprintf("%#x", v.value.(byte)), false
|
|
||||||
}
|
|
||||||
rv := reflect.ValueOf(v.value)
|
|
||||||
switch rv.Kind() {
|
|
||||||
case reflect.Slice:
|
|
||||||
if rv.Len() == 0 {
|
|
||||||
return "[]", false
|
|
||||||
}
|
|
||||||
unamb := true
|
|
||||||
buf := bytes.NewBuffer([]byte("["))
|
|
||||||
for i := 0; i < rv.Len(); i++ {
|
|
||||||
// TODO: slooow
|
|
||||||
s, b := MakeVariant(rv.Index(i).Interface()).format()
|
|
||||||
unamb = unamb && b
|
|
||||||
buf.WriteString(s)
|
|
||||||
if i != rv.Len()-1 {
|
|
||||||
buf.WriteString(", ")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
buf.WriteByte(']')
|
|
||||||
return buf.String(), unamb
|
|
||||||
case reflect.Map:
|
|
||||||
if rv.Len() == 0 {
|
|
||||||
return "{}", false
|
|
||||||
}
|
|
||||||
unamb := true
|
|
||||||
var buf bytes.Buffer
|
|
||||||
kvs := make([]string, rv.Len())
|
|
||||||
for i, k := range rv.MapKeys() {
|
|
||||||
s, b := MakeVariant(k.Interface()).format()
|
|
||||||
unamb = unamb && b
|
|
||||||
buf.Reset()
|
|
||||||
buf.WriteString(s)
|
|
||||||
buf.WriteString(": ")
|
|
||||||
s, b = MakeVariant(rv.MapIndex(k).Interface()).format()
|
|
||||||
unamb = unamb && b
|
|
||||||
buf.WriteString(s)
|
|
||||||
kvs[i] = buf.String()
|
|
||||||
}
|
|
||||||
buf.Reset()
|
|
||||||
buf.WriteByte('{')
|
|
||||||
sort.Strings(kvs)
|
|
||||||
for i, kv := range kvs {
|
|
||||||
if i > 0 {
|
|
||||||
buf.WriteString(", ")
|
|
||||||
}
|
|
||||||
buf.WriteString(kv)
|
|
||||||
}
|
|
||||||
buf.WriteByte('}')
|
|
||||||
return buf.String(), unamb
|
|
||||||
}
|
|
||||||
return `"INVALID"`, true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signature returns the D-Bus signature of the underlying value of v.
|
|
||||||
func (v Variant) Signature() Signature {
|
|
||||||
return v.sig
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns the string representation of the underlying value of v as
|
|
||||||
// described at https://developer.gnome.org/glib/unstable/gvariant-text.html.
|
|
||||||
func (v Variant) String() string {
|
|
||||||
s, unamb := v.format()
|
|
||||||
if !unamb {
|
|
||||||
return "@" + v.sig.str + " " + s
|
|
||||||
}
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
// Value returns the underlying value of v.
|
|
||||||
func (v Variant) Value() interface{} {
|
|
||||||
return v.value
|
|
||||||
}
|
|
|
@ -1,284 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
"unicode"
|
|
||||||
"unicode/utf8"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Heavily inspired by the lexer from text/template.
|
|
||||||
|
|
||||||
type varToken struct {
|
|
||||||
typ varTokenType
|
|
||||||
val string
|
|
||||||
}
|
|
||||||
|
|
||||||
type varTokenType byte
|
|
||||||
|
|
||||||
const (
|
|
||||||
tokEOF varTokenType = iota
|
|
||||||
tokError
|
|
||||||
tokNumber
|
|
||||||
tokString
|
|
||||||
tokBool
|
|
||||||
tokArrayStart
|
|
||||||
tokArrayEnd
|
|
||||||
tokDictStart
|
|
||||||
tokDictEnd
|
|
||||||
tokVariantStart
|
|
||||||
tokVariantEnd
|
|
||||||
tokComma
|
|
||||||
tokColon
|
|
||||||
tokType
|
|
||||||
tokByteString
|
|
||||||
)
|
|
||||||
|
|
||||||
type varLexer struct {
|
|
||||||
input string
|
|
||||||
start int
|
|
||||||
pos int
|
|
||||||
width int
|
|
||||||
tokens []varToken
|
|
||||||
}
|
|
||||||
|
|
||||||
type lexState func(*varLexer) lexState
|
|
||||||
|
|
||||||
func varLex(s string) []varToken {
|
|
||||||
l := &varLexer{input: s}
|
|
||||||
l.run()
|
|
||||||
return l.tokens
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) accept(valid string) bool {
|
|
||||||
if strings.IndexRune(valid, l.next()) >= 0 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
l.backup()
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) backup() {
|
|
||||||
l.pos -= l.width
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) emit(t varTokenType) {
|
|
||||||
l.tokens = append(l.tokens, varToken{t, l.input[l.start:l.pos]})
|
|
||||||
l.start = l.pos
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) errorf(format string, v ...interface{}) lexState {
|
|
||||||
l.tokens = append(l.tokens, varToken{
|
|
||||||
tokError,
|
|
||||||
fmt.Sprintf(format, v...),
|
|
||||||
})
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) ignore() {
|
|
||||||
l.start = l.pos
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) next() rune {
|
|
||||||
var r rune
|
|
||||||
|
|
||||||
if l.pos >= len(l.input) {
|
|
||||||
l.width = 0
|
|
||||||
return -1
|
|
||||||
}
|
|
||||||
r, l.width = utf8.DecodeRuneInString(l.input[l.pos:])
|
|
||||||
l.pos += l.width
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) run() {
|
|
||||||
for state := varLexNormal; state != nil; {
|
|
||||||
state = state(l)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *varLexer) peek() rune {
|
|
||||||
r := l.next()
|
|
||||||
l.backup()
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
func varLexNormal(l *varLexer) lexState {
|
|
||||||
for {
|
|
||||||
r := l.next()
|
|
||||||
switch {
|
|
||||||
case r == -1:
|
|
||||||
l.emit(tokEOF)
|
|
||||||
return nil
|
|
||||||
case r == '[':
|
|
||||||
l.emit(tokArrayStart)
|
|
||||||
case r == ']':
|
|
||||||
l.emit(tokArrayEnd)
|
|
||||||
case r == '{':
|
|
||||||
l.emit(tokDictStart)
|
|
||||||
case r == '}':
|
|
||||||
l.emit(tokDictEnd)
|
|
||||||
case r == '<':
|
|
||||||
l.emit(tokVariantStart)
|
|
||||||
case r == '>':
|
|
||||||
l.emit(tokVariantEnd)
|
|
||||||
case r == ':':
|
|
||||||
l.emit(tokColon)
|
|
||||||
case r == ',':
|
|
||||||
l.emit(tokComma)
|
|
||||||
case r == '\'' || r == '"':
|
|
||||||
l.backup()
|
|
||||||
return varLexString
|
|
||||||
case r == '@':
|
|
||||||
l.backup()
|
|
||||||
return varLexType
|
|
||||||
case unicode.IsSpace(r):
|
|
||||||
l.ignore()
|
|
||||||
case unicode.IsNumber(r) || r == '+' || r == '-':
|
|
||||||
l.backup()
|
|
||||||
return varLexNumber
|
|
||||||
case r == 'b':
|
|
||||||
pos := l.start
|
|
||||||
if n := l.peek(); n == '"' || n == '\'' {
|
|
||||||
return varLexByteString
|
|
||||||
}
|
|
||||||
// not a byte string; try to parse it as a type or bool below
|
|
||||||
l.pos = pos + 1
|
|
||||||
l.width = 1
|
|
||||||
fallthrough
|
|
||||||
default:
|
|
||||||
// either a bool or a type. Try bools first.
|
|
||||||
l.backup()
|
|
||||||
if l.pos+4 <= len(l.input) {
|
|
||||||
if l.input[l.pos:l.pos+4] == "true" {
|
|
||||||
l.pos += 4
|
|
||||||
l.emit(tokBool)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if l.pos+5 <= len(l.input) {
|
|
||||||
if l.input[l.pos:l.pos+5] == "false" {
|
|
||||||
l.pos += 5
|
|
||||||
l.emit(tokBool)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// must be a type.
|
|
||||||
return varLexType
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var varTypeMap = map[string]string{
|
|
||||||
"boolean": "b",
|
|
||||||
"byte": "y",
|
|
||||||
"int16": "n",
|
|
||||||
"uint16": "q",
|
|
||||||
"int32": "i",
|
|
||||||
"uint32": "u",
|
|
||||||
"int64": "x",
|
|
||||||
"uint64": "t",
|
|
||||||
"double": "f",
|
|
||||||
"string": "s",
|
|
||||||
"objectpath": "o",
|
|
||||||
"signature": "g",
|
|
||||||
}
|
|
||||||
|
|
||||||
func varLexByteString(l *varLexer) lexState {
|
|
||||||
q := l.next()
|
|
||||||
Loop:
|
|
||||||
for {
|
|
||||||
switch l.next() {
|
|
||||||
case '\\':
|
|
||||||
if r := l.next(); r != -1 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
fallthrough
|
|
||||||
case -1:
|
|
||||||
return l.errorf("unterminated bytestring")
|
|
||||||
case q:
|
|
||||||
break Loop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
l.emit(tokByteString)
|
|
||||||
return varLexNormal
|
|
||||||
}
|
|
||||||
|
|
||||||
func varLexNumber(l *varLexer) lexState {
|
|
||||||
l.accept("+-")
|
|
||||||
digits := "0123456789"
|
|
||||||
if l.accept("0") {
|
|
||||||
if l.accept("x") {
|
|
||||||
digits = "0123456789abcdefABCDEF"
|
|
||||||
} else {
|
|
||||||
digits = "01234567"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for strings.IndexRune(digits, l.next()) >= 0 {
|
|
||||||
}
|
|
||||||
l.backup()
|
|
||||||
if l.accept(".") {
|
|
||||||
for strings.IndexRune(digits, l.next()) >= 0 {
|
|
||||||
}
|
|
||||||
l.backup()
|
|
||||||
}
|
|
||||||
if l.accept("eE") {
|
|
||||||
l.accept("+-")
|
|
||||||
for strings.IndexRune("0123456789", l.next()) >= 0 {
|
|
||||||
}
|
|
||||||
l.backup()
|
|
||||||
}
|
|
||||||
if r := l.peek(); unicode.IsLetter(r) {
|
|
||||||
l.next()
|
|
||||||
return l.errorf("bad number syntax: %q", l.input[l.start:l.pos])
|
|
||||||
}
|
|
||||||
l.emit(tokNumber)
|
|
||||||
return varLexNormal
|
|
||||||
}
|
|
||||||
|
|
||||||
func varLexString(l *varLexer) lexState {
|
|
||||||
q := l.next()
|
|
||||||
Loop:
|
|
||||||
for {
|
|
||||||
switch l.next() {
|
|
||||||
case '\\':
|
|
||||||
if r := l.next(); r != -1 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
fallthrough
|
|
||||||
case -1:
|
|
||||||
return l.errorf("unterminated string")
|
|
||||||
case q:
|
|
||||||
break Loop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
l.emit(tokString)
|
|
||||||
return varLexNormal
|
|
||||||
}
|
|
||||||
|
|
||||||
func varLexType(l *varLexer) lexState {
|
|
||||||
at := l.accept("@")
|
|
||||||
for {
|
|
||||||
r := l.next()
|
|
||||||
if r == -1 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if unicode.IsSpace(r) {
|
|
||||||
l.backup()
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if at {
|
|
||||||
if _, err := ParseSignature(l.input[l.start+1 : l.pos]); err != nil {
|
|
||||||
return l.errorf("%s", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if _, ok := varTypeMap[l.input[l.start:l.pos]]; ok {
|
|
||||||
l.emit(tokType)
|
|
||||||
return varLexNormal
|
|
||||||
}
|
|
||||||
return l.errorf("unrecognized type %q", l.input[l.start:l.pos])
|
|
||||||
}
|
|
||||||
l.emit(tokType)
|
|
||||||
return varLexNormal
|
|
||||||
}
|
|
|
@ -1,817 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"reflect"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"unicode/utf8"
|
|
||||||
)
|
|
||||||
|
|
||||||
type varParser struct {
|
|
||||||
tokens []varToken
|
|
||||||
i int
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *varParser) backup() {
|
|
||||||
p.i--
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *varParser) next() varToken {
|
|
||||||
if p.i < len(p.tokens) {
|
|
||||||
t := p.tokens[p.i]
|
|
||||||
p.i++
|
|
||||||
return t
|
|
||||||
}
|
|
||||||
return varToken{typ: tokEOF}
|
|
||||||
}
|
|
||||||
|
|
||||||
type varNode interface {
|
|
||||||
Infer() (Signature, error)
|
|
||||||
String() string
|
|
||||||
Sigs() sigSet
|
|
||||||
Value(Signature) (interface{}, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
func varMakeNode(p *varParser) (varNode, error) {
|
|
||||||
var sig Signature
|
|
||||||
|
|
||||||
for {
|
|
||||||
t := p.next()
|
|
||||||
switch t.typ {
|
|
||||||
case tokEOF:
|
|
||||||
return nil, io.ErrUnexpectedEOF
|
|
||||||
case tokError:
|
|
||||||
return nil, errors.New(t.val)
|
|
||||||
case tokNumber:
|
|
||||||
return varMakeNumNode(t, sig)
|
|
||||||
case tokString:
|
|
||||||
return varMakeStringNode(t, sig)
|
|
||||||
case tokBool:
|
|
||||||
if sig.str != "" && sig.str != "b" {
|
|
||||||
return nil, varTypeError{t.val, sig}
|
|
||||||
}
|
|
||||||
b, err := strconv.ParseBool(t.val)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return boolNode(b), nil
|
|
||||||
case tokArrayStart:
|
|
||||||
return varMakeArrayNode(p, sig)
|
|
||||||
case tokVariantStart:
|
|
||||||
return varMakeVariantNode(p, sig)
|
|
||||||
case tokDictStart:
|
|
||||||
return varMakeDictNode(p, sig)
|
|
||||||
case tokType:
|
|
||||||
if sig.str != "" {
|
|
||||||
return nil, errors.New("unexpected type annotation")
|
|
||||||
}
|
|
||||||
if t.val[0] == '@' {
|
|
||||||
sig.str = t.val[1:]
|
|
||||||
} else {
|
|
||||||
sig.str = varTypeMap[t.val]
|
|
||||||
}
|
|
||||||
case tokByteString:
|
|
||||||
if sig.str != "" && sig.str != "ay" {
|
|
||||||
return nil, varTypeError{t.val, sig}
|
|
||||||
}
|
|
||||||
b, err := varParseByteString(t.val)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return byteStringNode(b), nil
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unexpected %q", t.val)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type varTypeError struct {
|
|
||||||
val string
|
|
||||||
sig Signature
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e varTypeError) Error() string {
|
|
||||||
return fmt.Sprintf("dbus: can't parse %q as type %q", e.val, e.sig.str)
|
|
||||||
}
|
|
||||||
|
|
||||||
type sigSet map[Signature]bool
|
|
||||||
|
|
||||||
func (s sigSet) Empty() bool {
|
|
||||||
return len(s) == 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s sigSet) Intersect(s2 sigSet) sigSet {
|
|
||||||
r := make(sigSet)
|
|
||||||
for k := range s {
|
|
||||||
if s2[k] {
|
|
||||||
r[k] = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s sigSet) Single() (Signature, bool) {
|
|
||||||
if len(s) == 1 {
|
|
||||||
for k := range s {
|
|
||||||
return k, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return Signature{}, false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s sigSet) ToArray() sigSet {
|
|
||||||
r := make(sigSet, len(s))
|
|
||||||
for k := range s {
|
|
||||||
r[Signature{"a" + k.str}] = true
|
|
||||||
}
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
type numNode struct {
|
|
||||||
sig Signature
|
|
||||||
str string
|
|
||||||
val interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
var numSigSet = sigSet{
|
|
||||||
Signature{"y"}: true,
|
|
||||||
Signature{"n"}: true,
|
|
||||||
Signature{"q"}: true,
|
|
||||||
Signature{"i"}: true,
|
|
||||||
Signature{"u"}: true,
|
|
||||||
Signature{"x"}: true,
|
|
||||||
Signature{"t"}: true,
|
|
||||||
Signature{"d"}: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n numNode) Infer() (Signature, error) {
|
|
||||||
if strings.ContainsAny(n.str, ".e") {
|
|
||||||
return Signature{"d"}, nil
|
|
||||||
}
|
|
||||||
return Signature{"i"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n numNode) String() string {
|
|
||||||
return n.str
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n numNode) Sigs() sigSet {
|
|
||||||
if n.sig.str != "" {
|
|
||||||
return sigSet{n.sig: true}
|
|
||||||
}
|
|
||||||
if strings.ContainsAny(n.str, ".e") {
|
|
||||||
return sigSet{Signature{"d"}: true}
|
|
||||||
}
|
|
||||||
return numSigSet
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n numNode) Value(sig Signature) (interface{}, error) {
|
|
||||||
if n.sig.str != "" && n.sig != sig {
|
|
||||||
return nil, varTypeError{n.str, sig}
|
|
||||||
}
|
|
||||||
if n.val != nil {
|
|
||||||
return n.val, nil
|
|
||||||
}
|
|
||||||
return varNumAs(n.str, sig)
|
|
||||||
}
|
|
||||||
|
|
||||||
func varMakeNumNode(tok varToken, sig Signature) (varNode, error) {
|
|
||||||
if sig.str == "" {
|
|
||||||
return numNode{str: tok.val}, nil
|
|
||||||
}
|
|
||||||
num, err := varNumAs(tok.val, sig)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return numNode{sig: sig, val: num}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func varNumAs(s string, sig Signature) (interface{}, error) {
|
|
||||||
isUnsigned := false
|
|
||||||
size := 32
|
|
||||||
switch sig.str {
|
|
||||||
case "n":
|
|
||||||
size = 16
|
|
||||||
case "i":
|
|
||||||
case "x":
|
|
||||||
size = 64
|
|
||||||
case "y":
|
|
||||||
size = 8
|
|
||||||
isUnsigned = true
|
|
||||||
case "q":
|
|
||||||
size = 16
|
|
||||||
isUnsigned = true
|
|
||||||
case "u":
|
|
||||||
isUnsigned = true
|
|
||||||
case "t":
|
|
||||||
size = 64
|
|
||||||
isUnsigned = true
|
|
||||||
case "d":
|
|
||||||
d, err := strconv.ParseFloat(s, 64)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return d, nil
|
|
||||||
default:
|
|
||||||
return nil, varTypeError{s, sig}
|
|
||||||
}
|
|
||||||
base := 10
|
|
||||||
if strings.HasPrefix(s, "0x") {
|
|
||||||
base = 16
|
|
||||||
s = s[2:]
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(s, "0") && len(s) != 1 {
|
|
||||||
base = 8
|
|
||||||
s = s[1:]
|
|
||||||
}
|
|
||||||
if isUnsigned {
|
|
||||||
i, err := strconv.ParseUint(s, base, size)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var v interface{} = i
|
|
||||||
switch sig.str {
|
|
||||||
case "y":
|
|
||||||
v = byte(i)
|
|
||||||
case "q":
|
|
||||||
v = uint16(i)
|
|
||||||
case "u":
|
|
||||||
v = uint32(i)
|
|
||||||
}
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
i, err := strconv.ParseInt(s, base, size)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var v interface{} = i
|
|
||||||
switch sig.str {
|
|
||||||
case "n":
|
|
||||||
v = int16(i)
|
|
||||||
case "i":
|
|
||||||
v = int32(i)
|
|
||||||
}
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type stringNode struct {
|
|
||||||
sig Signature
|
|
||||||
str string // parsed
|
|
||||||
val interface{} // has correct type
|
|
||||||
}
|
|
||||||
|
|
||||||
var stringSigSet = sigSet{
|
|
||||||
Signature{"s"}: true,
|
|
||||||
Signature{"g"}: true,
|
|
||||||
Signature{"o"}: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n stringNode) Infer() (Signature, error) {
|
|
||||||
return Signature{"s"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n stringNode) String() string {
|
|
||||||
return n.str
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n stringNode) Sigs() sigSet {
|
|
||||||
if n.sig.str != "" {
|
|
||||||
return sigSet{n.sig: true}
|
|
||||||
}
|
|
||||||
return stringSigSet
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n stringNode) Value(sig Signature) (interface{}, error) {
|
|
||||||
if n.sig.str != "" && n.sig != sig {
|
|
||||||
return nil, varTypeError{n.str, sig}
|
|
||||||
}
|
|
||||||
if n.val != nil {
|
|
||||||
return n.val, nil
|
|
||||||
}
|
|
||||||
switch {
|
|
||||||
case sig.str == "g":
|
|
||||||
return Signature{n.str}, nil
|
|
||||||
case sig.str == "o":
|
|
||||||
return ObjectPath(n.str), nil
|
|
||||||
case sig.str == "s":
|
|
||||||
return n.str, nil
|
|
||||||
default:
|
|
||||||
return nil, varTypeError{n.str, sig}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func varMakeStringNode(tok varToken, sig Signature) (varNode, error) {
|
|
||||||
if sig.str != "" && sig.str != "s" && sig.str != "g" && sig.str != "o" {
|
|
||||||
return nil, fmt.Errorf("invalid type %q for string", sig.str)
|
|
||||||
}
|
|
||||||
s, err := varParseString(tok.val)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
n := stringNode{str: s}
|
|
||||||
if sig.str == "" {
|
|
||||||
return stringNode{str: s}, nil
|
|
||||||
}
|
|
||||||
n.sig = sig
|
|
||||||
switch sig.str {
|
|
||||||
case "o":
|
|
||||||
n.val = ObjectPath(s)
|
|
||||||
case "g":
|
|
||||||
n.val = Signature{s}
|
|
||||||
case "s":
|
|
||||||
n.val = s
|
|
||||||
}
|
|
||||||
return n, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func varParseString(s string) (string, error) {
|
|
||||||
// quotes are guaranteed to be there
|
|
||||||
s = s[1 : len(s)-1]
|
|
||||||
buf := new(bytes.Buffer)
|
|
||||||
for len(s) != 0 {
|
|
||||||
r, size := utf8.DecodeRuneInString(s)
|
|
||||||
if r == utf8.RuneError && size == 1 {
|
|
||||||
return "", errors.New("invalid UTF-8")
|
|
||||||
}
|
|
||||||
s = s[size:]
|
|
||||||
if r != '\\' {
|
|
||||||
buf.WriteRune(r)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
r, size = utf8.DecodeRuneInString(s)
|
|
||||||
if r == utf8.RuneError && size == 1 {
|
|
||||||
return "", errors.New("invalid UTF-8")
|
|
||||||
}
|
|
||||||
s = s[size:]
|
|
||||||
switch r {
|
|
||||||
case 'a':
|
|
||||||
buf.WriteRune(0x7)
|
|
||||||
case 'b':
|
|
||||||
buf.WriteRune(0x8)
|
|
||||||
case 'f':
|
|
||||||
buf.WriteRune(0xc)
|
|
||||||
case 'n':
|
|
||||||
buf.WriteRune('\n')
|
|
||||||
case 'r':
|
|
||||||
buf.WriteRune('\r')
|
|
||||||
case 't':
|
|
||||||
buf.WriteRune('\t')
|
|
||||||
case '\n':
|
|
||||||
case 'u':
|
|
||||||
if len(s) < 4 {
|
|
||||||
return "", errors.New("short unicode escape")
|
|
||||||
}
|
|
||||||
r, err := strconv.ParseUint(s[:4], 16, 32)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
buf.WriteRune(rune(r))
|
|
||||||
s = s[4:]
|
|
||||||
case 'U':
|
|
||||||
if len(s) < 8 {
|
|
||||||
return "", errors.New("short unicode escape")
|
|
||||||
}
|
|
||||||
r, err := strconv.ParseUint(s[:8], 16, 32)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
buf.WriteRune(rune(r))
|
|
||||||
s = s[8:]
|
|
||||||
default:
|
|
||||||
buf.WriteRune(r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return buf.String(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var boolSigSet = sigSet{Signature{"b"}: true}
|
|
||||||
|
|
||||||
type boolNode bool
|
|
||||||
|
|
||||||
func (boolNode) Infer() (Signature, error) {
|
|
||||||
return Signature{"b"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b boolNode) String() string {
|
|
||||||
if b {
|
|
||||||
return "true"
|
|
||||||
}
|
|
||||||
return "false"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (boolNode) Sigs() sigSet {
|
|
||||||
return boolSigSet
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b boolNode) Value(sig Signature) (interface{}, error) {
|
|
||||||
if sig.str != "b" {
|
|
||||||
return nil, varTypeError{b.String(), sig}
|
|
||||||
}
|
|
||||||
return bool(b), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type arrayNode struct {
|
|
||||||
set sigSet
|
|
||||||
children []varNode
|
|
||||||
val interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n arrayNode) Infer() (Signature, error) {
|
|
||||||
for _, v := range n.children {
|
|
||||||
csig, err := varInfer(v)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return Signature{"a" + csig.str}, nil
|
|
||||||
}
|
|
||||||
return Signature{}, fmt.Errorf("can't infer type for %q", n.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n arrayNode) String() string {
|
|
||||||
s := "["
|
|
||||||
for i, v := range n.children {
|
|
||||||
s += v.String()
|
|
||||||
if i != len(n.children)-1 {
|
|
||||||
s += ", "
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s + "]"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n arrayNode) Sigs() sigSet {
|
|
||||||
return n.set
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n arrayNode) Value(sig Signature) (interface{}, error) {
|
|
||||||
if n.set.Empty() {
|
|
||||||
// no type information whatsoever, so this must be an empty slice
|
|
||||||
return reflect.MakeSlice(typeFor(sig.str), 0, 0).Interface(), nil
|
|
||||||
}
|
|
||||||
if !n.set[sig] {
|
|
||||||
return nil, varTypeError{n.String(), sig}
|
|
||||||
}
|
|
||||||
s := reflect.MakeSlice(typeFor(sig.str), len(n.children), len(n.children))
|
|
||||||
for i, v := range n.children {
|
|
||||||
rv, err := v.Value(Signature{sig.str[1:]})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
s.Index(i).Set(reflect.ValueOf(rv))
|
|
||||||
}
|
|
||||||
return s.Interface(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func varMakeArrayNode(p *varParser, sig Signature) (varNode, error) {
|
|
||||||
var n arrayNode
|
|
||||||
if sig.str != "" {
|
|
||||||
n.set = sigSet{sig: true}
|
|
||||||
}
|
|
||||||
if t := p.next(); t.typ == tokArrayEnd {
|
|
||||||
return n, nil
|
|
||||||
} else {
|
|
||||||
p.backup()
|
|
||||||
}
|
|
||||||
Loop:
|
|
||||||
for {
|
|
||||||
t := p.next()
|
|
||||||
switch t.typ {
|
|
||||||
case tokEOF:
|
|
||||||
return nil, io.ErrUnexpectedEOF
|
|
||||||
case tokError:
|
|
||||||
return nil, errors.New(t.val)
|
|
||||||
}
|
|
||||||
p.backup()
|
|
||||||
cn, err := varMakeNode(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if cset := cn.Sigs(); !cset.Empty() {
|
|
||||||
if n.set.Empty() {
|
|
||||||
n.set = cset.ToArray()
|
|
||||||
} else {
|
|
||||||
nset := cset.ToArray().Intersect(n.set)
|
|
||||||
if nset.Empty() {
|
|
||||||
return nil, fmt.Errorf("can't parse %q with given type information", cn.String())
|
|
||||||
}
|
|
||||||
n.set = nset
|
|
||||||
}
|
|
||||||
}
|
|
||||||
n.children = append(n.children, cn)
|
|
||||||
switch t := p.next(); t.typ {
|
|
||||||
case tokEOF:
|
|
||||||
return nil, io.ErrUnexpectedEOF
|
|
||||||
case tokError:
|
|
||||||
return nil, errors.New(t.val)
|
|
||||||
case tokArrayEnd:
|
|
||||||
break Loop
|
|
||||||
case tokComma:
|
|
||||||
continue
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unexpected %q", t.val)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type variantNode struct {
|
|
||||||
n varNode
|
|
||||||
}
|
|
||||||
|
|
||||||
var variantSet = sigSet{
|
|
||||||
Signature{"v"}: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
func (variantNode) Infer() (Signature, error) {
|
|
||||||
return Signature{"v"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n variantNode) String() string {
|
|
||||||
return "<" + n.n.String() + ">"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (variantNode) Sigs() sigSet {
|
|
||||||
return variantSet
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n variantNode) Value(sig Signature) (interface{}, error) {
|
|
||||||
if sig.str != "v" {
|
|
||||||
return nil, varTypeError{n.String(), sig}
|
|
||||||
}
|
|
||||||
sig, err := varInfer(n.n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
v, err := n.n.Value(sig)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return MakeVariant(v), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func varMakeVariantNode(p *varParser, sig Signature) (varNode, error) {
|
|
||||||
n, err := varMakeNode(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if t := p.next(); t.typ != tokVariantEnd {
|
|
||||||
return nil, fmt.Errorf("unexpected %q", t.val)
|
|
||||||
}
|
|
||||||
vn := variantNode{n}
|
|
||||||
if sig.str != "" && sig.str != "v" {
|
|
||||||
return nil, varTypeError{vn.String(), sig}
|
|
||||||
}
|
|
||||||
return variantNode{n}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type dictEntry struct {
|
|
||||||
key, val varNode
|
|
||||||
}
|
|
||||||
|
|
||||||
type dictNode struct {
|
|
||||||
kset, vset sigSet
|
|
||||||
children []dictEntry
|
|
||||||
val interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n dictNode) Infer() (Signature, error) {
|
|
||||||
for _, v := range n.children {
|
|
||||||
ksig, err := varInfer(v.key)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
vsig, err := varInfer(v.val)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return Signature{"a{" + ksig.str + vsig.str + "}"}, nil
|
|
||||||
}
|
|
||||||
return Signature{}, fmt.Errorf("can't infer type for %q", n.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n dictNode) String() string {
|
|
||||||
s := "{"
|
|
||||||
for i, v := range n.children {
|
|
||||||
s += v.key.String() + ": " + v.val.String()
|
|
||||||
if i != len(n.children)-1 {
|
|
||||||
s += ", "
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s + "}"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n dictNode) Sigs() sigSet {
|
|
||||||
r := sigSet{}
|
|
||||||
for k := range n.kset {
|
|
||||||
for v := range n.vset {
|
|
||||||
sig := "a{" + k.str + v.str + "}"
|
|
||||||
r[Signature{sig}] = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n dictNode) Value(sig Signature) (interface{}, error) {
|
|
||||||
set := n.Sigs()
|
|
||||||
if set.Empty() {
|
|
||||||
// no type information -> empty dict
|
|
||||||
return reflect.MakeMap(typeFor(sig.str)).Interface(), nil
|
|
||||||
}
|
|
||||||
if !set[sig] {
|
|
||||||
return nil, varTypeError{n.String(), sig}
|
|
||||||
}
|
|
||||||
m := reflect.MakeMap(typeFor(sig.str))
|
|
||||||
ksig := Signature{sig.str[2:3]}
|
|
||||||
vsig := Signature{sig.str[3 : len(sig.str)-1]}
|
|
||||||
for _, v := range n.children {
|
|
||||||
kv, err := v.key.Value(ksig)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
vv, err := v.val.Value(vsig)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
m.SetMapIndex(reflect.ValueOf(kv), reflect.ValueOf(vv))
|
|
||||||
}
|
|
||||||
return m.Interface(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func varMakeDictNode(p *varParser, sig Signature) (varNode, error) {
|
|
||||||
var n dictNode
|
|
||||||
|
|
||||||
if sig.str != "" {
|
|
||||||
if len(sig.str) < 5 {
|
|
||||||
return nil, fmt.Errorf("invalid signature %q for dict type", sig)
|
|
||||||
}
|
|
||||||
ksig := Signature{string(sig.str[2])}
|
|
||||||
vsig := Signature{sig.str[3 : len(sig.str)-1]}
|
|
||||||
n.kset = sigSet{ksig: true}
|
|
||||||
n.vset = sigSet{vsig: true}
|
|
||||||
}
|
|
||||||
if t := p.next(); t.typ == tokDictEnd {
|
|
||||||
return n, nil
|
|
||||||
} else {
|
|
||||||
p.backup()
|
|
||||||
}
|
|
||||||
Loop:
|
|
||||||
for {
|
|
||||||
t := p.next()
|
|
||||||
switch t.typ {
|
|
||||||
case tokEOF:
|
|
||||||
return nil, io.ErrUnexpectedEOF
|
|
||||||
case tokError:
|
|
||||||
return nil, errors.New(t.val)
|
|
||||||
}
|
|
||||||
p.backup()
|
|
||||||
kn, err := varMakeNode(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if kset := kn.Sigs(); !kset.Empty() {
|
|
||||||
if n.kset.Empty() {
|
|
||||||
n.kset = kset
|
|
||||||
} else {
|
|
||||||
n.kset = kset.Intersect(n.kset)
|
|
||||||
if n.kset.Empty() {
|
|
||||||
return nil, fmt.Errorf("can't parse %q with given type information", kn.String())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
t = p.next()
|
|
||||||
switch t.typ {
|
|
||||||
case tokEOF:
|
|
||||||
return nil, io.ErrUnexpectedEOF
|
|
||||||
case tokError:
|
|
||||||
return nil, errors.New(t.val)
|
|
||||||
case tokColon:
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unexpected %q", t.val)
|
|
||||||
}
|
|
||||||
t = p.next()
|
|
||||||
switch t.typ {
|
|
||||||
case tokEOF:
|
|
||||||
return nil, io.ErrUnexpectedEOF
|
|
||||||
case tokError:
|
|
||||||
return nil, errors.New(t.val)
|
|
||||||
}
|
|
||||||
p.backup()
|
|
||||||
vn, err := varMakeNode(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if vset := vn.Sigs(); !vset.Empty() {
|
|
||||||
if n.vset.Empty() {
|
|
||||||
n.vset = vset
|
|
||||||
} else {
|
|
||||||
n.vset = n.vset.Intersect(vset)
|
|
||||||
if n.vset.Empty() {
|
|
||||||
return nil, fmt.Errorf("can't parse %q with given type information", vn.String())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
n.children = append(n.children, dictEntry{kn, vn})
|
|
||||||
t = p.next()
|
|
||||||
switch t.typ {
|
|
||||||
case tokEOF:
|
|
||||||
return nil, io.ErrUnexpectedEOF
|
|
||||||
case tokError:
|
|
||||||
return nil, errors.New(t.val)
|
|
||||||
case tokDictEnd:
|
|
||||||
break Loop
|
|
||||||
case tokComma:
|
|
||||||
continue
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unexpected %q", t.val)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type byteStringNode []byte
|
|
||||||
|
|
||||||
var byteStringSet = sigSet{
|
|
||||||
Signature{"ay"}: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
func (byteStringNode) Infer() (Signature, error) {
|
|
||||||
return Signature{"ay"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b byteStringNode) String() string {
|
|
||||||
return string(b)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b byteStringNode) Sigs() sigSet {
|
|
||||||
return byteStringSet
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b byteStringNode) Value(sig Signature) (interface{}, error) {
|
|
||||||
if sig.str != "ay" {
|
|
||||||
return nil, varTypeError{b.String(), sig}
|
|
||||||
}
|
|
||||||
return []byte(b), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func varParseByteString(s string) ([]byte, error) {
|
|
||||||
// quotes and b at start are guaranteed to be there
|
|
||||||
b := make([]byte, 0, 1)
|
|
||||||
s = s[2 : len(s)-1]
|
|
||||||
for len(s) != 0 {
|
|
||||||
c := s[0]
|
|
||||||
s = s[1:]
|
|
||||||
if c != '\\' {
|
|
||||||
b = append(b, c)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
c = s[0]
|
|
||||||
s = s[1:]
|
|
||||||
switch c {
|
|
||||||
case 'a':
|
|
||||||
b = append(b, 0x7)
|
|
||||||
case 'b':
|
|
||||||
b = append(b, 0x8)
|
|
||||||
case 'f':
|
|
||||||
b = append(b, 0xc)
|
|
||||||
case 'n':
|
|
||||||
b = append(b, '\n')
|
|
||||||
case 'r':
|
|
||||||
b = append(b, '\r')
|
|
||||||
case 't':
|
|
||||||
b = append(b, '\t')
|
|
||||||
case 'x':
|
|
||||||
if len(s) < 2 {
|
|
||||||
return nil, errors.New("short escape")
|
|
||||||
}
|
|
||||||
n, err := strconv.ParseUint(s[:2], 16, 8)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
b = append(b, byte(n))
|
|
||||||
s = s[2:]
|
|
||||||
case '0':
|
|
||||||
if len(s) < 3 {
|
|
||||||
return nil, errors.New("short escape")
|
|
||||||
}
|
|
||||||
n, err := strconv.ParseUint(s[:3], 8, 8)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
b = append(b, byte(n))
|
|
||||||
s = s[3:]
|
|
||||||
default:
|
|
||||||
b = append(b, c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return append(b, 0), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func varInfer(n varNode) (Signature, error) {
|
|
||||||
if sig, ok := n.Sigs().Single(); ok {
|
|
||||||
return sig, nil
|
|
||||||
}
|
|
||||||
return n.Infer()
|
|
||||||
}
|
|
|
@ -48,9 +48,8 @@ github.com/containernetworking/cni/pkg/types
|
||||||
github.com/containernetworking/cni/pkg/types/020
|
github.com/containernetworking/cni/pkg/types/020
|
||||||
github.com/containernetworking/cni/pkg/types/current
|
github.com/containernetworking/cni/pkg/types/current
|
||||||
github.com/containernetworking/cni/pkg/version
|
github.com/containernetworking/cni/pkg/version
|
||||||
# github.com/containers/common v0.0.8-0.20200108114752-d87ce6ce296b
|
# github.com/containers/common v0.1.0
|
||||||
github.com/containers/common/pkg/caps
|
github.com/containers/common/pkg/caps
|
||||||
github.com/containers/common/pkg/cgroups
|
|
||||||
github.com/containers/common/pkg/config
|
github.com/containers/common/pkg/config
|
||||||
github.com/containers/common/pkg/unshare
|
github.com/containers/common/pkg/unshare
|
||||||
# github.com/containers/image/v5 v5.1.0
|
# github.com/containers/image/v5 v5.1.0
|
||||||
|
@ -143,8 +142,6 @@ github.com/containers/storage/pkg/stringutils
|
||||||
github.com/containers/storage/pkg/system
|
github.com/containers/storage/pkg/system
|
||||||
github.com/containers/storage/pkg/tarlog
|
github.com/containers/storage/pkg/tarlog
|
||||||
github.com/containers/storage/pkg/truncindex
|
github.com/containers/storage/pkg/truncindex
|
||||||
# github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
|
|
||||||
github.com/coreos/go-systemd/dbus
|
|
||||||
# github.com/cyphar/filepath-securejoin v0.2.2
|
# github.com/cyphar/filepath-securejoin v0.2.2
|
||||||
github.com/cyphar/filepath-securejoin
|
github.com/cyphar/filepath-securejoin
|
||||||
# github.com/davecgh/go-spew v1.1.1
|
# github.com/davecgh/go-spew v1.1.1
|
||||||
|
@ -217,8 +214,6 @@ github.com/fsouza/go-dockerclient
|
||||||
github.com/fullsailor/pkcs7
|
github.com/fullsailor/pkcs7
|
||||||
# github.com/ghodss/yaml v1.0.0
|
# github.com/ghodss/yaml v1.0.0
|
||||||
github.com/ghodss/yaml
|
github.com/ghodss/yaml
|
||||||
# github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e
|
|
||||||
github.com/godbus/dbus
|
|
||||||
# github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d
|
# github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d
|
||||||
github.com/gogo/protobuf/gogoproto
|
github.com/gogo/protobuf/gogoproto
|
||||||
github.com/gogo/protobuf/proto
|
github.com/gogo/protobuf/proto
|
||||||
|
|
Loading…
Reference in New Issue