5582d8370c
There was at least one user who hit the earlier 1 second timeout. Raise to 10 seconds which ought to be enough for anyone. Fixes https://github.com/rfjakob/gocryptfs/issues/683
66 lines
1.5 KiB
Go
66 lines
1.5 KiB
Go
// Package ctlsock is a Go library that can be used to query the
|
|
// gocryptfs control socket interface. This interface can be
|
|
// activated by passing `-ctlsock /tmp/my.sock` to gocryptfs on the
|
|
// command line.
|
|
// See gocryptfs-xray for a usage example.
|
|
package ctlsock
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net"
|
|
"time"
|
|
)
|
|
|
|
func (r *ResponseStruct) Error() string {
|
|
return fmt.Sprintf("errno %d: %s", r.ErrNo, r.ErrText)
|
|
}
|
|
|
|
// CtlSock encapsulates a control socket
|
|
type CtlSock struct {
|
|
Conn net.Conn
|
|
}
|
|
|
|
// There was at least one user who hit the earlier 1 second timeout. Raise to 10
|
|
// seconds which ought to be enough for anyone.
|
|
const ctlsockTimeout = 10 * time.Second
|
|
|
|
// New opens the socket at `socketPath` and stores it in a `CtlSock` object.
|
|
func New(socketPath string) (*CtlSock, error) {
|
|
conn, err := net.DialTimeout("unix", socketPath, ctlsockTimeout)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &CtlSock{Conn: conn}, nil
|
|
}
|
|
|
|
// Query sends a request to the control socket returns the response.
|
|
func (c *CtlSock) Query(req *RequestStruct) (*ResponseStruct, error) {
|
|
c.Conn.SetDeadline(time.Now().Add(ctlsockTimeout))
|
|
msg, err := json.Marshal(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
_, err = c.Conn.Write(msg)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
buf := make([]byte, 5000)
|
|
n, err := c.Conn.Read(buf)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
buf = buf[:n]
|
|
var resp ResponseStruct
|
|
json.Unmarshal(buf, &resp)
|
|
if resp.ErrNo != 0 {
|
|
return nil, &resp
|
|
}
|
|
return &resp, nil
|
|
}
|
|
|
|
// Close closes the socket
|
|
func (c *CtlSock) Close() {
|
|
c.Conn.Close()
|
|
}
|