lxd: Set context auth method for devlxd requests

Signed-off-by: hamistao <[email protected]>
canonical · Sep 10, 2024 · 4009564 · 4009564
1 parent 6fbb964
commit 4009564
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lxd/api.go b/lxd/api.go
@@ -221,6 +221,9 @@ func restServer(d *Daemon) *http.Server {
 
 func hoistReqVM(f func(*Daemon, instance.Instance, http.ResponseWriter, *http.Request) response.Response, d *Daemon) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+		// Set devlxd auth method to identify this request as coming from the /dev/lxd socket.
+		lxdRequest.SetCtxValue(r, lxdRequest.CtxProtocol, api.AuthenticationMethodDevLxd)
+
 		trusted, inst, err := authenticateAgentCert(d.State(), r)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)

diff --git a/lxd/devlxd.go b/lxd/devlxd.go
@@ -310,6 +310,9 @@ var handlers = []devLxdHandler{
 
 func hoistReq(f func(*Daemon, instance.Instance, http.ResponseWriter, *http.Request) response.Response, d *Daemon) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+		// Set devlxd auth method to identify this request as coming from the /dev/lxd socket.
+		request.SetCtxValue(r, request.CtxProtocol, api.AuthenticationMethodDevLxd)
+
 		conn := ucred.GetConnFromContext(r.Context())
 		cred, ok := pidMapper.m[conn.(*net.UnixConn)]
 		if !ok {