mirror of
https://github.com/cloudflare/cloudflared.git
synced 2025-05-24 02:06:36 +00:00
eb2e4349e8
Combines the tunnelrpc and quic/schema capnp files into the same module. To help reduce future issues with capnp id generation, capnpids are provided in the capnp files from the existing capnp struct ids generated in the go files. Reduces the overall interface of the Capnp methods to the rest of the code by providing an interface that will handle the quic protocol selection. Introduces a new `rpc-timeout` config that will allow all of the SessionManager and ConfigurationManager RPC requests to have a timeout. The timeout for these values is set to 5 seconds as non of these operations for the managers should take a long time to complete. Removed the RPC-specific logger as it never provided good debugging value as the RPC method names were not visible in the logs.
97 lines
2.4 KiB
Go
97 lines
2.4 KiB
Go
package pogs
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
capnp "zombiezen.com/go/capnproto2"
|
|
"zombiezen.com/go/capnproto2/rpc"
|
|
"zombiezen.com/go/capnproto2/server"
|
|
|
|
"github.com/cloudflare/cloudflared/tunnelrpc/proto"
|
|
)
|
|
|
|
type ConfigurationManager interface {
|
|
UpdateConfiguration(ctx context.Context, version int32, config []byte) *UpdateConfigurationResponse
|
|
}
|
|
|
|
type ConfigurationManager_PogsImpl struct {
|
|
impl ConfigurationManager
|
|
}
|
|
|
|
func ConfigurationManager_ServerToClient(c ConfigurationManager) proto.ConfigurationManager {
|
|
return proto.ConfigurationManager_ServerToClient(ConfigurationManager_PogsImpl{c})
|
|
}
|
|
|
|
func (i ConfigurationManager_PogsImpl) UpdateConfiguration(p proto.ConfigurationManager_updateConfiguration) error {
|
|
server.Ack(p.Options)
|
|
|
|
version := p.Params.Version()
|
|
config, err := p.Params.Config()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
result, err := p.Results.NewResult()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
updateResp := i.impl.UpdateConfiguration(p.Ctx, version, config)
|
|
return updateResp.Marshal(result)
|
|
}
|
|
|
|
type ConfigurationManager_PogsClient struct {
|
|
Client capnp.Client
|
|
Conn *rpc.Conn
|
|
}
|
|
|
|
func (c ConfigurationManager_PogsClient) Close() error {
|
|
c.Client.Close()
|
|
return c.Conn.Close()
|
|
}
|
|
|
|
func (c ConfigurationManager_PogsClient) UpdateConfiguration(ctx context.Context, version int32, config []byte) (*UpdateConfigurationResponse, error) {
|
|
client := proto.ConfigurationManager{Client: c.Client}
|
|
promise := client.UpdateConfiguration(ctx, func(p proto.ConfigurationManager_updateConfiguration_Params) error {
|
|
p.SetVersion(version)
|
|
return p.SetConfig(config)
|
|
})
|
|
result, err := promise.Result().Struct()
|
|
if err != nil {
|
|
return nil, wrapRPCError(err)
|
|
}
|
|
response := new(UpdateConfigurationResponse)
|
|
|
|
err = response.Unmarshal(result)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return response, nil
|
|
}
|
|
|
|
type UpdateConfigurationResponse struct {
|
|
LastAppliedVersion int32 `json:"lastAppliedVersion"`
|
|
Err error `json:"err"`
|
|
}
|
|
|
|
func (p *UpdateConfigurationResponse) Marshal(s proto.UpdateConfigurationResponse) error {
|
|
s.SetLatestAppliedVersion(p.LastAppliedVersion)
|
|
if p.Err != nil {
|
|
return s.SetErr(p.Err.Error())
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (p *UpdateConfigurationResponse) Unmarshal(s proto.UpdateConfigurationResponse) error {
|
|
p.LastAppliedVersion = s.LatestAppliedVersion()
|
|
respErr, err := s.Err()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if respErr != "" {
|
|
p.Err = fmt.Errorf(respErr)
|
|
}
|
|
return nil
|
|
}
|