r00t2/gosecret
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

checking in some work- adding custom errors and low-level compat with SecretService, but it may not be needed.

Browse Source
This commit is contained in:
brent s.
2021-11-28 21:43:30 -05:00
parent cf24035c85
commit 3cab98e584
8 changed files with 416 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
service_funcs.go
View File

@@ -1,42 +1,39 @@
package gosecret
import (
`github.com/godbus/dbus`
"github.com/godbus/dbus"
)
// NewService returns a pointer to a new Service.
// NewService returns a pointer to a new Service connection.
func NewService() (service *Service, err error) {
service = &Service{
Conn: nil,
Dbus: nil,
}
var svc Service = Service{}
if service.Conn, err = dbus.SessionBus(); err != nil {
if svc.Conn, err = dbus.SessionBus(); err != nil {
return
}
service.Dbus = service.Conn.Object(DbusService, dbus.ObjectPath(DbusPath))
svc.Dbus = service.Conn.Object(DbusService, dbus.ObjectPath(DbusPath))
return
}
if svc.Session, err = svc.Open(); err != nil {
return
}
// Path returns the path of the underlying Dbus connection.
func (s Service) Path() (path dbus.ObjectPath) {
// Remove this method in V1. It's bloat since we now have an exported Dbus.
path = s.Dbus.Path()
service = &svc
return
}
// Open returns a pointer to a Session from the Service.
func (s *Service) Open() (session *Session, err error) {
func (s *Service) Open() (session *Session, output dbus.Variant, err error) {
var output dbus.Variant
var path dbus.ObjectPath
// In *theory*, SecretService supports multiple "algorithms" for encryption in-transit, but I don't think it's implemented (yet)?
// TODO: confirm this.
// Possible flags are dbus.Flags consts: https://pkg.go.dev/github.com/godbus/dbus#Flags
// Oddly, there is no "None" flag. So it's explicitly specified as a null byte.
if err = s.Dbus.Call(
"org.freedesktop.Secret.Service.OpenSession", 0, "plain", dbus.MakeVariant(""),
DbusServiceOpenSession, 0x0, "plain", dbus.MakeVariant(""),
).Store(&output, &path); err != nil {
return
}
@@ -46,7 +43,7 @@ func (s *Service) Open() (session *Session, err error) {
return
}
// Collections returns a slice of Collection keyrings accessible to this Service.
// Collections returns a slice of Collection items accessible to this Service.
func (s *Service) Collections() (collections []Collection, err error) {
var paths []dbus.ObjectPath
@@ -67,7 +64,7 @@ func (s *Service) Collections() (collections []Collection, err error) {
return
}
// CreateCollection creates a new Collection (keyring) via a Service with the name specified by label.
// CreateCollection creates a new Collection (keyring) via a Service with the name specified by label and returns the new Collection.
func (s *Service) CreateCollection(label string) (collection *Collection, err error) {
var variant *dbus.Variant