Compare commits
1 Commits
v2023.4.1-
...
v2023.3.31
Author | SHA1 | Date | |
---|---|---|---|
5fc5f5fd5d |
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,7 +4,7 @@ dist/
|
|||||||
/tools
|
/tools
|
||||||
/tmp
|
/tmp
|
||||||
/state.json
|
/state.json
|
||||||
/emissary.sqlite*
|
/emissary.sqlite
|
||||||
/.gitea-release
|
/.gitea-release
|
||||||
/agent-key.json
|
/agent-key.json
|
||||||
/apps
|
/apps
|
||||||
|
1
Jenkinsfile
vendored
1
Jenkinsfile
vendored
@ -23,7 +23,6 @@ pipeline {
|
|||||||
sh '''
|
sh '''
|
||||||
git config --global credential.https://forge.cadoles.com.username "$GIT_USERNAME"
|
git config --global credential.https://forge.cadoles.com.username "$GIT_USERNAME"
|
||||||
git config --global credential.https://forge.cadoles.com.helper '!f() { test "$1" = get && echo "password=$GIT_PASSWORD"; }; f'
|
git config --global credential.https://forge.cadoles.com.helper '!f() { test "$1" = get && echo "password=$GIT_PASSWORD"; }; f'
|
||||||
|
|
||||||
export GOPRIVATE=forge.cadoles.com/arcad/edge
|
export GOPRIVATE=forge.cadoles.com/arcad/edge
|
||||||
make test
|
make test
|
||||||
'''
|
'''
|
||||||
|
@ -7,7 +7,6 @@ import (
|
|||||||
"forge.cadoles.com/Cadoles/emissary/internal/command/agent"
|
"forge.cadoles.com/Cadoles/emissary/internal/command/agent"
|
||||||
"forge.cadoles.com/Cadoles/emissary/internal/command/api"
|
"forge.cadoles.com/Cadoles/emissary/internal/command/api"
|
||||||
|
|
||||||
_ "forge.cadoles.com/Cadoles/emissary/internal/imports/format"
|
|
||||||
_ "forge.cadoles.com/Cadoles/emissary/internal/imports/spec"
|
_ "forge.cadoles.com/Cadoles/emissary/internal/imports/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -28,8 +28,6 @@ import (
|
|||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
const defaultSQLiteParams = "?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate"
|
|
||||||
|
|
||||||
func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs *spec.Spec) ([]edgeHTTP.HandlerOptionFunc, error) {
|
func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs *spec.Spec) ([]edgeHTTP.HandlerOptionFunc, error) {
|
||||||
dataDir, err := c.ensureAppDataDir(ctx, appKey)
|
dataDir, err := c.ensureAppDataDir(ctx, appKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -37,7 +35,7 @@ func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs
|
|||||||
}
|
}
|
||||||
|
|
||||||
dbFile := filepath.Join(dataDir, appKey+".sqlite")
|
dbFile := filepath.Join(dataDir, appKey+".sqlite")
|
||||||
db, err := sqlite.Open(dbFile + defaultSQLiteParams)
|
db, err := sqlite.Open(dbFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(err, "could not open database file '%s'", dbFile)
|
return nil, errors.Wrapf(err, "could not open database file '%s'", dbFile)
|
||||||
}
|
}
|
||||||
|
@ -35,15 +35,12 @@ type Server struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) Start(ctx context.Context, addr string) (err error) {
|
func (s *Server) Start(ctx context.Context, addr string) (err error) {
|
||||||
if s.Running() {
|
if s.server != nil {
|
||||||
if err := s.Stop(); err != nil {
|
if err := s.Stop(); err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
s.serverMutex.Lock()
|
|
||||||
defer s.serverMutex.Unlock()
|
|
||||||
|
|
||||||
router := chi.NewRouter()
|
router := chi.NewRouter()
|
||||||
|
|
||||||
router.Use(middleware.Logger)
|
router.Use(middleware.Logger)
|
||||||
@ -88,7 +85,9 @@ func (s *Server) Start(ctx context.Context, addr string) (err error) {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
s.serverMutex.Lock()
|
||||||
s.server = server
|
s.server = server
|
||||||
|
s.serverMutex.Unlock()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -101,25 +100,20 @@ func (s *Server) Running() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) Stop() error {
|
func (s *Server) Stop() error {
|
||||||
if !s.Running() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
s.serverMutex.Lock()
|
|
||||||
defer s.serverMutex.Unlock()
|
|
||||||
|
|
||||||
if s.server == nil {
|
if s.server == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := s.server.Close(); err != nil {
|
defer func() {
|
||||||
|
s.serverMutex.Lock()
|
||||||
s.server = nil
|
s.server = nil
|
||||||
|
s.serverMutex.Unlock()
|
||||||
|
}()
|
||||||
|
|
||||||
|
if err := s.server.Close(); err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
s.server = nil
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ import (
|
|||||||
|
|
||||||
type UpdateAgentOptions struct {
|
type UpdateAgentOptions struct {
|
||||||
Status *int
|
Status *int
|
||||||
Label *string
|
|
||||||
Options []OptionFunc
|
Options []OptionFunc
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -22,12 +21,6 @@ func WithAgentStatus(status int) UpdateAgentOptionFunc {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func WithAgentLabel(label string) UpdateAgentOptionFunc {
|
|
||||||
return func(opts *UpdateAgentOptions) {
|
|
||||||
opts.Label = &label
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func WithUpdateAgentsOptions(funcs ...OptionFunc) UpdateAgentOptionFunc {
|
func WithUpdateAgentsOptions(funcs ...OptionFunc) UpdateAgentOptionFunc {
|
||||||
return func(opts *UpdateAgentOptions) {
|
return func(opts *UpdateAgentOptions) {
|
||||||
opts.Options = funcs
|
opts.Options = funcs
|
||||||
@ -46,10 +39,6 @@ func (c *Client) UpdateAgent(ctx context.Context, agentID datastore.AgentID, fun
|
|||||||
payload["status"] = *opts.Status
|
payload["status"] = *opts.Status
|
||||||
}
|
}
|
||||||
|
|
||||||
if opts.Label != nil {
|
|
||||||
payload["label"] = *opts.Label
|
|
||||||
}
|
|
||||||
|
|
||||||
response := withResponse[struct {
|
response := withResponse[struct {
|
||||||
Agent *datastore.Agent `json:"agent"`
|
Agent *datastore.Agent `json:"agent"`
|
||||||
}]()
|
}]()
|
||||||
|
@ -49,6 +49,10 @@ func RunCommand() *cli.Command {
|
|||||||
controllers = append(controllers, spec.NewController())
|
controllers = append(controllers, spec.NewController())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ctrlConf.Proxy.Enabled {
|
||||||
|
controllers = append(controllers, proxy.NewController())
|
||||||
|
}
|
||||||
|
|
||||||
if ctrlConf.UCI.Enabled {
|
if ctrlConf.UCI.Enabled {
|
||||||
controllers = append(controllers, openwrt.NewUCIController(
|
controllers = append(controllers, openwrt.NewUCIController(
|
||||||
string(ctrlConf.UCI.BinPath),
|
string(ctrlConf.UCI.BinPath),
|
||||||
@ -62,10 +66,6 @@ func RunCommand() *cli.Command {
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
if ctrlConf.Proxy.Enabled {
|
|
||||||
controllers = append(controllers, proxy.NewController())
|
|
||||||
}
|
|
||||||
|
|
||||||
if ctrlConf.SysUpgrade.Enabled {
|
if ctrlConf.SysUpgrade.Enabled {
|
||||||
sysUpgradeArgs := make([]string, 0)
|
sysUpgradeArgs := make([]string, 0)
|
||||||
if len(ctrlConf.SysUpgrade.SysUpgradeCommand) > 1 {
|
if len(ctrlConf.SysUpgrade.SysUpgradeCommand) > 1 {
|
||||||
|
@ -22,11 +22,6 @@ func UpdateCommand() *cli.Command {
|
|||||||
Usage: "Set `STATUS` to selected agent",
|
Usage: "Set `STATUS` to selected agent",
|
||||||
Value: -1,
|
Value: -1,
|
||||||
},
|
},
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "label",
|
|
||||||
Usage: "Set `LABEL` to selected agent",
|
|
||||||
Value: "",
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
Action: func(ctx *cli.Context) error {
|
Action: func(ctx *cli.Context) error {
|
||||||
baseFlags := clientFlag.GetBaseFlags(ctx)
|
baseFlags := clientFlag.GetBaseFlags(ctx)
|
||||||
@ -48,11 +43,6 @@ func UpdateCommand() *cli.Command {
|
|||||||
options = append(options, client.WithAgentStatus(status))
|
options = append(options, client.WithAgentStatus(status))
|
||||||
}
|
}
|
||||||
|
|
||||||
label := ctx.String("label")
|
|
||||||
if label != "" {
|
|
||||||
options = append(options, client.WithAgentLabel(label))
|
|
||||||
}
|
|
||||||
|
|
||||||
client := client.New(baseFlags.ServerURL, client.WithToken(token))
|
client := client.New(baseFlags.ServerURL, client.WithToken(token))
|
||||||
|
|
||||||
agent, err := client.UpdateAgent(ctx.Context, agentID, options...)
|
agent, err := client.UpdateAgent(ctx.Context, agentID, options...)
|
||||||
|
@ -7,7 +7,6 @@ func agentHints(outputMode format.OutputMode) format.Hints {
|
|||||||
OutputMode: outputMode,
|
OutputMode: outputMode,
|
||||||
Props: []format.Prop{
|
Props: []format.Prop{
|
||||||
format.NewProp("ID", "ID"),
|
format.NewProp("ID", "ID"),
|
||||||
format.NewProp("Label", "Label"),
|
|
||||||
format.NewProp("Thumbprint", "Thumbprint"),
|
format.NewProp("Thumbprint", "Thumbprint"),
|
||||||
format.NewProp("Status", "Status"),
|
format.NewProp("Status", "Status"),
|
||||||
format.NewProp("CreatedAt", "CreatedAt"),
|
format.NewProp("CreatedAt", "CreatedAt"),
|
||||||
|
@ -15,6 +15,6 @@ type DatabaseConfig struct {
|
|||||||
func NewDefaultDatabaseConfig() DatabaseConfig {
|
func NewDefaultDatabaseConfig() DatabaseConfig {
|
||||||
return DatabaseConfig{
|
return DatabaseConfig{
|
||||||
Driver: "sqlite",
|
Driver: "sqlite",
|
||||||
DSN: "sqlite://emissary.sqlite?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate",
|
DSN: "sqlite://emissary.sqlite?_fk=true&_journal=WAL",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,6 @@ const (
|
|||||||
|
|
||||||
type Agent struct {
|
type Agent struct {
|
||||||
ID AgentID `json:"id"`
|
ID AgentID `json:"id"`
|
||||||
Label string `json:"label"`
|
|
||||||
Thumbprint string `json:"thumbprint"`
|
Thumbprint string `json:"thumbprint"`
|
||||||
KeySet *SerializableKeySet `json:"keyset,omitempty"`
|
KeySet *SerializableKeySet `json:"keyset,omitempty"`
|
||||||
Metadata map[string]any `json:"metadata,omitempty"`
|
Metadata map[string]any `json:"metadata,omitempty"`
|
||||||
|
@ -68,7 +68,6 @@ func WithAgentQueryThumbprints(thumbprints ...string) AgentQueryOptionFunc {
|
|||||||
type AgentUpdateOptionFunc func(*AgentUpdateOptions)
|
type AgentUpdateOptionFunc func(*AgentUpdateOptions)
|
||||||
|
|
||||||
type AgentUpdateOptions struct {
|
type AgentUpdateOptions struct {
|
||||||
Label *string
|
|
||||||
Status *AgentStatus
|
Status *AgentStatus
|
||||||
Metadata *map[string]any
|
Metadata *map[string]any
|
||||||
KeySet *jwk.Set
|
KeySet *jwk.Set
|
||||||
@ -98,9 +97,3 @@ func WithAgentUpdateThumbprint(thumbprint string) AgentUpdateOptionFunc {
|
|||||||
opts.Thumbprint = &thumbprint
|
opts.Thumbprint = &thumbprint
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func WithAgentUpdateLabel(label string) AgentUpdateOptionFunc {
|
|
||||||
return func(opts *AgentUpdateOptions) {
|
|
||||||
opts.Label = &label
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -127,7 +127,7 @@ func (r *AgentRepository) Query(ctx context.Context, opts ...datastore.AgentQuer
|
|||||||
count := 0
|
count := 0
|
||||||
|
|
||||||
err := r.withTx(ctx, func(tx *sql.Tx) error {
|
err := r.withTx(ctx, func(tx *sql.Tx) error {
|
||||||
query := `SELECT id, label, thumbprint, status, created_at, updated_at FROM agents`
|
query := `SELECT id, thumbprint, status, created_at, updated_at FROM agents`
|
||||||
|
|
||||||
limit := 10
|
limit := 10
|
||||||
if options.Limit != nil {
|
if options.Limit != nil {
|
||||||
@ -195,7 +195,7 @@ func (r *AgentRepository) Query(ctx context.Context, opts ...datastore.AgentQuer
|
|||||||
|
|
||||||
metadata := JSONMap{}
|
metadata := JSONMap{}
|
||||||
|
|
||||||
if err := rows.Scan(&agent.ID, &agent.Label, &agent.Thumbprint, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
|
if err := rows.Scan(&agent.ID, &agent.Thumbprint, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -315,7 +315,7 @@ func (r *AgentRepository) Get(ctx context.Context, id datastore.AgentID) (*datas
|
|||||||
|
|
||||||
err := r.withTx(ctx, func(tx *sql.Tx) error {
|
err := r.withTx(ctx, func(tx *sql.Tx) error {
|
||||||
query := `
|
query := `
|
||||||
SELECT "id", "label", "thumbprint", "keyset", "metadata", "status", "created_at", "updated_at"
|
SELECT "id", "thumbprint", "keyset", "metadata", "status", "created_at", "updated_at"
|
||||||
FROM agents
|
FROM agents
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
`
|
`
|
||||||
@ -325,7 +325,7 @@ func (r *AgentRepository) Get(ctx context.Context, id datastore.AgentID) (*datas
|
|||||||
metadata := JSONMap{}
|
metadata := JSONMap{}
|
||||||
var rawKeySet []byte
|
var rawKeySet []byte
|
||||||
|
|
||||||
if err := row.Scan(&agent.ID, &agent.Label, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
|
if err := row.Scan(&agent.ID, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
return datastore.ErrNotFound
|
return datastore.ErrNotFound
|
||||||
}
|
}
|
||||||
@ -395,12 +395,6 @@ func (r *AgentRepository) Update(ctx context.Context, id datastore.AgentID, opts
|
|||||||
index++
|
index++
|
||||||
}
|
}
|
||||||
|
|
||||||
if options.Label != nil {
|
|
||||||
query += fmt.Sprintf(`, label = $%d`, index)
|
|
||||||
args = append(args, *options.Label)
|
|
||||||
index++
|
|
||||||
}
|
|
||||||
|
|
||||||
if options.Metadata != nil {
|
if options.Metadata != nil {
|
||||||
query += fmt.Sprintf(`, metadata = $%d`, index)
|
query += fmt.Sprintf(`, metadata = $%d`, index)
|
||||||
args = append(args, JSONMap(*options.Metadata))
|
args = append(args, JSONMap(*options.Metadata))
|
||||||
@ -409,7 +403,7 @@ func (r *AgentRepository) Update(ctx context.Context, id datastore.AgentID, opts
|
|||||||
|
|
||||||
query += `
|
query += `
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
RETURNING "id", "label", "thumbprint", "keyset", "metadata", "status", "created_at", "updated_at"
|
RETURNING "id", "thumbprint", "keyset", "metadata", "status", "created_at", "updated_at"
|
||||||
`
|
`
|
||||||
|
|
||||||
row := tx.QueryRowContext(ctx, query, args...)
|
row := tx.QueryRowContext(ctx, query, args...)
|
||||||
@ -417,7 +411,7 @@ func (r *AgentRepository) Update(ctx context.Context, id datastore.AgentID, opts
|
|||||||
metadata := JSONMap{}
|
metadata := JSONMap{}
|
||||||
var rawKeySet []byte
|
var rawKeySet []byte
|
||||||
|
|
||||||
if err := row.Scan(&agent.ID, &agent.Label, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
|
if err := row.Scan(&agent.ID, &agent.Thumbprint, &rawKeySet, &metadata, &agent.Status, &agent.CreatedAt, &agent.UpdatedAt); err != nil {
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
return datastore.ErrNotFound
|
return datastore.ErrNotFound
|
||||||
}
|
}
|
||||||
|
@ -145,7 +145,6 @@ func (s *Server) registerAgent(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
type updateAgentRequest struct {
|
type updateAgentRequest struct {
|
||||||
Status *datastore.AgentStatus `json:"status" validate:"omitempty,oneof=0 1 2 3"`
|
Status *datastore.AgentStatus `json:"status" validate:"omitempty,oneof=0 1 2 3"`
|
||||||
Label *string `json:"label" validate:"omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) updateAgent(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) updateAgent(w http.ResponseWriter, r *http.Request) {
|
||||||
@ -167,10 +166,6 @@ func (s *Server) updateAgent(w http.ResponseWriter, r *http.Request) {
|
|||||||
options = append(options, datastore.WithAgentUpdateStatus(*updateAgentReq.Status))
|
options = append(options, datastore.WithAgentUpdateStatus(*updateAgentReq.Status))
|
||||||
}
|
}
|
||||||
|
|
||||||
if updateAgentReq.Label != nil {
|
|
||||||
options = append(options, datastore.WithAgentUpdateLabel(*updateAgentReq.Label))
|
|
||||||
}
|
|
||||||
|
|
||||||
agent, err := s.agentRepo.Update(
|
agent, err := s.agentRepo.Update(
|
||||||
ctx,
|
ctx,
|
||||||
datastore.AgentID(agentID),
|
datastore.AgentID(agentID),
|
||||||
|
@ -1 +0,0 @@
|
|||||||
ALTER TABLE agents DROP COLUMN label;
|
|
@ -1 +0,0 @@
|
|||||||
ALTER TABLE agents ADD COLUMN label TEXT DEFAULT "";
|
|
@ -9,7 +9,7 @@ server:
|
|||||||
port: 3000
|
port: 3000
|
||||||
database:
|
database:
|
||||||
driver: sqlite
|
driver: sqlite
|
||||||
dsn: sqlite:///var/lib/emissary/data.sqlite?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate
|
dsn: sqlite:///var/lib/emissary/data.sqlite?_fk=true&_journal=WAL
|
||||||
cors:
|
cors:
|
||||||
allowedOrigins: []
|
allowedOrigins: []
|
||||||
allowCredentials: true
|
allowCredentials: true
|
||||||
|
Reference in New Issue
Block a user