daemon, o/i/apparmorprompting: implement ShutDown for InterfacesRequestsManager #17147
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,7 +52,7 @@ type listenerBackend interface { | |
| // A Manager holds outstanding prompts and mediates their replies, further it | ||
| // stores and applies persistent rules. | ||
| type Manager interface { | ||
| Ask(uid uint32, iface, snap string, pid int32, cgroup string) (prompting.OutcomeType, error) | ||
| Prompts(userID uint32, clientActivity bool) ([]*requestprompts.Prompt, error) | ||
| PromptWithID(userID uint32, promptID prompting.IDType, clientActivity bool) (*requestprompts.Prompt, error) | ||
| HandleReply(userID uint32, promptID prompting.IDType, replyConstraintsJSON prompting.ConstraintsJSON, outcome prompting.OutcomeType, lifespan prompting.LifespanType, duration string, clientActivity bool) ([]prompting.IDType, error) | ||
|
|
@@ -85,6 +85,13 @@ type InterfacesRequestsManager struct { | |
| // listener readiness. | ||
| listenerAlreadySignalled chan struct{} | ||
|
|
||
| // snapdShuttingDown is closed when overlord.ShutDown is called to | ||
| // signal that the daemon is going to be stopped and the | ||
| // InterfacesRequestsManager needs to stop receiving requests and | ||
| // finish handling existing requests. | ||
| snapdShuttingDown chan struct{} | ||
| shutdown bool | ||
|
|
||
| askRequests chan *prompting.Request | ||
| } | ||
|
|
||
|
|
@@ -140,6 +147,7 @@ func New(noticeMgr *notices.NoticeManager) (m *InterfacesRequestsManager, retErr | |
| prompts: promptsBackend, | ||
| rules: rulesBackend, | ||
| listenerAlreadySignalled: make(chan struct{}), | ||
| snapdShuttingDown: make(chan struct{}), | ||
| askRequests: make(chan *prompting.Request), | ||
| } | ||
|
|
||
|
|
@@ -328,21 +336,18 @@ func (m *InterfacesRequestsManager) disconnect() error { | |
| // | ||
| // If the given channel closes or the prompting subsystem is shutting down, | ||
| // then returns [prompting_errors.ErrPromptingClosed]. | ||
| // | ||
| // The given interface must be one for which we expect requests to be created | ||
| // directly, rather than via AppArmor. The requested permissions will include | ||
| // all available permissions for the given interface. | ||
| func (m *InterfacesRequestsManager) Ask(uid uint32, iface, snap string, pid int32, cgroup string) (prompting.OutcomeType, error) { | ||
| replyChan := make(chan []string) | ||
|
|
||
| reply := func(allowedPerms []string) error { | ||
| select { | ||
| case replyChan <- allowedPerms: | ||
| return nil | ||
| case <-m.snapdShuttingDown: | ||
| return prompting_errors.ErrPromptingClosed | ||
| case <-m.tomb.Dying(): | ||
| return prompting_errors.ErrPromptingClosed | ||
|
|
@@ -360,7 +365,7 @@ func (m *InterfacesRequestsManager) Ask(uid uint32, iface, snap string, pid int3 | |
| select { | ||
| case m.askRequests <- req: | ||
| // request received and being processed | ||
| case <-m.snapdShuttingDown: | ||
| return prompting.OutcomeUnset, prompting_errors.ErrPromptingClosed | ||
| case <-m.tomb.Dying(): | ||
| return prompting.OutcomeUnset, prompting_errors.ErrPromptingClosed | ||
|
|
@@ -371,7 +376,7 @@ func (m *InterfacesRequestsManager) Ask(uid uint32, iface, snap string, pid int3 | |
| select { | ||
| case allowedPermissions = <-replyChan: | ||
| // received reply | ||
| case <-m.snapdShuttingDown: | ||
| return prompting.OutcomeUnset, prompting_errors.ErrPromptingClosed | ||
| case <-m.tomb.Dying(): | ||
| return prompting.OutcomeUnset, prompting_errors.ErrPromptingClosed | ||
|
|
@@ -386,6 +391,16 @@ func (m *InterfacesRequestsManager) Ask(uid uint32, iface, snap string, pid int3 | |
| return prompting.OutcomeAllow, nil | ||
| } | ||
|
|
||
| // ShutDown stops the listener, prompt DB, and rule DB from receiving new | ||
| // requests. | ||
| func (m *InterfacesRequestsManager) ShutDown() { | ||
| if m.shutdown { | ||
|
Contributor
There was a problem hiding this comment. seems we might need a lock around this flag? cc @andrewphelpsj
Member
There was a problem hiding this comment. Yeah I don't think we need a dedicated select {
case <-m.snapdShuttingDown:
return
default:
// we're about to shut down for the first time
}But either way Samuele's right and we need some sort of synchronization. I think a m.shutdownOnce.Do(func() {
close(m.snapdShuttingDown)
})then there's no need for a check at all, we can just unconditionally do this and the |
||
| return | ||
| } | ||
| close(m.snapdShuttingDown) | ||
| m.shutdown = true | ||
| } | ||
|
|
||
| // Stop closes the listener, prompt DB, and rule DB. Stop is idempotent, and | ||
| // the receiver cannot be started or used after it has been stopped. | ||
| func (m *InterfacesRequestsManager) Stop() error { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.