Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit841b6ca

Browse files
committed
feat: add agentapi endpoint to report connections for audit
This change adds a new `ReportConnection` endpoint to the `agentapi` andbumps the protocol version.This allows the agent to report connection events, for example when theuser connects to the workspace via SSH or VS Code.Updates#15139
1 parent8128b7e commit841b6ca

File tree

12 files changed

+1077
-585
lines changed

12 files changed

+1077
-585
lines changed

‎agent/agent.go

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ type Options struct {
8585
}
8686

8787
typeClientinterface {
88-
ConnectRPC23(ctx context.Context) (
89-
proto.DRPCAgentClient23, tailnetproto.DRPCTailnetClient23,error,
88+
ConnectRPC24(ctx context.Context) (
89+
proto.DRPCAgentClient24, tailnetproto.DRPCTailnetClient24,error,
9090
)
9191
RewriteDERPMap(derpMap*tailcfg.DERPMap)
9292
}
@@ -362,7 +362,6 @@ func (a *agent) collectMetadata(ctx context.Context, md codersdk.WorkspaceAgentM
362362
// Important: if the command times out, we may see a misleading error like
363363
// "exit status 1", so it's important to include the context error.
364364
err=errors.Join(err,ctx.Err())
365-
366365
iferr!=nil {
367366
result.Error=fmt.Sprintf("run cmd: %+v",err)
368367
}
@@ -399,7 +398,7 @@ func (t *trySingleflight) Do(key string, fn func()) {
399398
fn()
400399
}
401400

402-
func (a*agent)reportMetadata(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
401+
func (a*agent)reportMetadata(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
403402
tickerDone:=make(chanstruct{})
404403
collectDone:=make(chanstruct{})
405404
ctx,cancel:=context.WithCancel(ctx)
@@ -615,7 +614,7 @@ func (a *agent) reportMetadata(ctx context.Context, aAPI proto.DRPCAgentClient23
615614

616615
// reportLifecycle reports the current lifecycle state once. All state
617616
// changes are reported in order.
618-
func (a*agent)reportLifecycle(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
617+
func (a*agent)reportLifecycle(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
619618
for {
620619
select {
621620
case<-a.lifecycleUpdate:
@@ -697,7 +696,7 @@ func (a *agent) setLifecycle(state codersdk.WorkspaceAgentLifecycle) {
697696
// fetchServiceBannerLoop fetches the service banner on an interval. It will
698697
// not be fetched immediately; the expectation is that it is primed elsewhere
699698
// (and must be done before the session actually starts).
700-
func (a*agent)fetchServiceBannerLoop(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
699+
func (a*agent)fetchServiceBannerLoop(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
701700
ticker:=time.NewTicker(a.announcementBannersRefreshInterval)
702701
deferticker.Stop()
703702
for {
@@ -733,7 +732,7 @@ func (a *agent) run() (retErr error) {
733732
a.sessionToken.Store(&sessionToken)
734733

735734
// ConnectRPC returns the dRPC connection we use for the Agent and Tailnet v2+ APIs
736-
aAPI,tAPI,err:=a.client.ConnectRPC23(a.hardCtx)
735+
aAPI,tAPI,err:=a.client.ConnectRPC24(a.hardCtx)
737736
iferr!=nil {
738737
returnerr
739738
}
@@ -750,7 +749,7 @@ func (a *agent) run() (retErr error) {
750749
connMan:=newAPIConnRoutineManager(a.gracefulCtx,a.hardCtx,a.logger,aAPI,tAPI)
751750

752751
connMan.startAgentAPI("init notification banners",gracefulShutdownBehaviorStop,
753-
func(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
752+
func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
754753
bannersProto,err:=aAPI.GetAnnouncementBanners(ctx,&proto.GetAnnouncementBannersRequest{})
755754
iferr!=nil {
756755
returnxerrors.Errorf("fetch service banner: %w",err)
@@ -767,7 +766,7 @@ func (a *agent) run() (retErr error) {
767766
// sending logs gets gracefulShutdownBehaviorRemain because we want to send logs generated by
768767
// shutdown scripts.
769768
connMan.startAgentAPI("send logs",gracefulShutdownBehaviorRemain,
770-
func(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
769+
func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
771770
err:=a.logSender.SendLoop(ctx,aAPI)
772771
ifxerrors.Is(err,agentsdk.LogLimitExceededError) {
773772
// we don't want this error to tear down the API connection and propagate to the
@@ -807,7 +806,7 @@ func (a *agent) run() (retErr error) {
807806
connMan.startAgentAPI("handle manifest",gracefulShutdownBehaviorStop,a.handleManifest(manifestOK))
808807

809808
connMan.startAgentAPI("app health reporter",gracefulShutdownBehaviorStop,
810-
func(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
809+
func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
811810
iferr:=manifestOK.wait(ctx);err!=nil {
812811
returnxerrors.Errorf("no manifest: %w",err)
813812
}
@@ -840,7 +839,7 @@ func (a *agent) run() (retErr error) {
840839

841840
connMan.startAgentAPI("fetch service banner loop",gracefulShutdownBehaviorStop,a.fetchServiceBannerLoop)
842841

843-
connMan.startAgentAPI("stats report loop",gracefulShutdownBehaviorStop,func(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
842+
connMan.startAgentAPI("stats report loop",gracefulShutdownBehaviorStop,func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
844843
iferr:=networkOK.wait(ctx);err!=nil {
845844
returnxerrors.Errorf("no network: %w",err)
846845
}
@@ -851,8 +850,8 @@ func (a *agent) run() (retErr error) {
851850
}
852851

853852
// handleManifest returns a function that fetches and processes the manifest
854-
func (a*agent)handleManifest(manifestOK*checkpoint)func(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
855-
returnfunc(ctx context.Context,aAPI proto.DRPCAgentClient23)error {
853+
func (a*agent)handleManifest(manifestOK*checkpoint)func(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
854+
returnfunc(ctx context.Context,aAPI proto.DRPCAgentClient24)error {
856855
var (
857856
sentResult=false
858857
errerror
@@ -961,8 +960,8 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
961960

962961
// createOrUpdateNetwork waits for the manifest to be set using manifestOK, then creates or updates
963962
// the tailnet using the information in the manifest
964-
func (a*agent)createOrUpdateNetwork(manifestOK,networkOK*checkpoint)func(context.Context, proto.DRPCAgentClient23)error {
965-
returnfunc(ctx context.Context,_ proto.DRPCAgentClient23) (retErrerror) {
963+
func (a*agent)createOrUpdateNetwork(manifestOK,networkOK*checkpoint)func(context.Context, proto.DRPCAgentClient24)error {
964+
returnfunc(ctx context.Context,_ proto.DRPCAgentClient24) (retErrerror) {
966965
iferr:=manifestOK.wait(ctx);err!=nil {
967966
returnxerrors.Errorf("no manifest: %w",err)
968967
}
@@ -1683,7 +1682,7 @@ const (
16831682

16841683
typeapiConnRoutineManagerstruct {
16851684
logger slog.Logger
1686-
aAPI proto.DRPCAgentClient23
1685+
aAPI proto.DRPCAgentClient24
16871686
tAPI tailnetproto.DRPCTailnetClient23
16881687
eg*errgroup.Group
16891688
stopCtx context.Context
@@ -1692,7 +1691,7 @@ type apiConnRoutineManager struct {
16921691

16931692
funcnewAPIConnRoutineManager(
16941693
gracefulCtx,hardCtx context.Context,logger slog.Logger,
1695-
aAPI proto.DRPCAgentClient23,tAPI tailnetproto.DRPCTailnetClient23,
1694+
aAPI proto.DRPCAgentClient24,tAPI tailnetproto.DRPCTailnetClient23,
16961695
)*apiConnRoutineManager {
16971696
// routines that remain in operation during graceful shutdown use the remainCtx. They'll still
16981697
// exit if the errgroup hits an error, which usually means a problem with the conn.
@@ -1725,7 +1724,7 @@ func newAPIConnRoutineManager(
17251724
// but for Tailnet.
17261725
func (a*apiConnRoutineManager)startAgentAPI(
17271726
namestring,behaviorgracefulShutdownBehavior,
1728-
ffunc(context.Context, proto.DRPCAgentClient23)error,
1727+
ffunc(context.Context, proto.DRPCAgentClient24)error,
17291728
) {
17301729
logger:=a.logger.With(slog.F("name",name))
17311730
varctx context.Context

‎agent/agenttest/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ func (c *Client) Close() {
9696
c.derpMapOnce.Do(func() {close(c.derpMapUpdates) })
9797
}
9898

99-
func (c*Client)ConnectRPC23(ctx context.Context) (
100-
agentproto.DRPCAgentClient23, proto.DRPCTailnetClient23,error,
99+
func (c*Client)ConnectRPC24(ctx context.Context) (
100+
agentproto.DRPCAgentClient24, proto.DRPCTailnetClient23,error,
101101
) {
102102
conn,lis:=drpcsdk.MemTransportPipe()
103103
c.LastWorkspaceAgent=func() {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp