daemon: make ucrednetGet() return *ucrednet #357
Conversation
thp-canonical
force-pushed
the
ucrednet-sync-with-snapd
branch
from
0335bad to
c96bd43
Compare
thp-canonical
force-pushed
the
ucrednet-sync-with-snapd
branch
from
13510f3 to
c658437
Compare
|
|
||
| _ = pid | ||
| _ = uid | ||
| isUntrusted := (ucred != nil && ucred.Socket == c.d.untrustedSocketPath) |
There was a problem hiding this comment.
Not sure if this is the right thing (should it be "untrusted" if ucred == nil?), but this is how the same PR looks in snapd (although there it's not called "untrusted" but rather "isSnap": https://github.com/snapcore/snapd/pull/10126/files#diff-6a5ec84e73a526676a7b1e1f5e730211f009679a8736b7e7cda6a111a986ab4cR158
In any case, this is temporary until #358 removes canAccess().
There was a problem hiding this comment.
I think we can just remove the ucred != nil part, as functions that return error like this are almost always guaranteed to never return a nil pointer if err == nil -- this is true of ucrednetGet as well.
There was a problem hiding this comment.
Oh, oops, I missed the fact that we're only handling the err != errNoID case above, but if err == errNoID it could still end up here with a nil ucred. Yeah, I think what you have now is fine.
|
|
||
| _ = pid | ||
| _ = uid | ||
| isUntrusted := (ucred != nil && ucred.Socket == c.d.untrustedSocketPath) |
There was a problem hiding this comment.
I think we can just remove the ucred != nil part, as functions that return error like this are almost always guaranteed to never return a nil pointer if err == nil -- this is true of ucrednetGet as well.
|
|
||
| _ = pid | ||
| _ = uid | ||
| isUntrusted := (ucred != nil && ucred.Socket == c.d.untrustedSocketPath) |
There was a problem hiding this comment.
Oh, oops, I missed the fact that we're only handling the err != errNoID case above, but if err == errNoID it could still end up here with a nil ucred. Yeah, I think what you have now is fine.
This ports canonical/snapd#10126 from snapd, so that
ucrednetGet()has the same return type.This change is in preparation for porting the
accessCheckerAPI from snapd (canonical/snapd#10127): #358