|
 |
374605 |
From 1c179e67d0366ed400611f47ad2d0b9db3d0513d Mon Sep 17 00:00:00 2001
|
|
|
374605 |
From: Cathy Avery <cavery@redhat.com>
|
|
|
374605 |
Date: Mon, 29 Aug 2022 15:34:45 -0400
|
|
|
374605 |
Subject: [PATCH] Properly check authorization on incoming guestOps requests.
|
|
|
374605 |
|
|
|
374605 |
RH-Author: Cathy Avery <cavery@redhat.com>
|
|
|
374605 |
RH-MergeRequest: 7: Properly check authorization on incoming guestOps requests.
|
|
|
374605 |
RH-Bugzilla: 2119310
|
|
|
374605 |
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
|
|
374605 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
374605 |
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
374605 |
RH-Commit: [1/1] 06b962ec503a1a646e21745b130a8db6981cd19f
|
|
|
374605 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2119310
|
|
|
374605 |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=47449116
|
|
|
374605 |
Tested: Tested by QE
|
|
|
374605 |
Upstream Status: origin/master
|
|
|
374605 |
Conflicts: Copyright date
|
|
|
374605 |
|
|
|
374605 |
commit 70a74758bfe0042c27f15ce590fb21a2bc54d745
|
|
|
374605 |
Author: John Wolfe <jwolfe@vmware.com>
|
|
|
374605 |
Date: Sun Aug 21 07:56:49 2022 -0700
|
|
|
374605 |
|
|
|
374605 |
Properly check authorization on incoming guestOps requests.
|
|
|
374605 |
|
|
|
374605 |
Fix public pipe request checks. Only a SessionRequest type should
|
|
|
374605 |
be accepted on the public pipe.
|
|
|
374605 |
|
|
|
374605 |
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
|
|
374605 |
---
|
|
|
374605 |
open-vm-tools/vgauth/serviceImpl/proto.c | 6 +++++-
|
|
|
374605 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
374605 |
|
|
|
374605 |
diff --git a/open-vm-tools/vgauth/serviceImpl/proto.c b/open-vm-tools/vgauth/serviceImpl/proto.c
|
|
|
374605 |
index f097fb65..b45da620 100644
|
|
|
374605 |
--- a/open-vm-tools/vgauth/serviceImpl/proto.c
|
|
|
374605 |
+++ b/open-vm-tools/vgauth/serviceImpl/proto.c
|
|
|
374605 |
@@ -1,5 +1,5 @@
|
|
|
374605 |
/*********************************************************
|
|
|
374605 |
- * Copyright (C) 2011-2016,2019 VMware, Inc. All rights reserved.
|
|
|
374605 |
+ * Copyright (C) 2011-2016,2022 VMware, Inc. All rights reserved.
|
|
|
374605 |
*
|
|
|
374605 |
* This program is free software; you can redistribute it and/or modify it
|
|
|
374605 |
* under the terms of the GNU Lesser General Public License as published
|
|
|
374605 |
@@ -1202,6 +1202,10 @@ Proto_SecurityCheckRequest(ServiceConnection *conn,
|
|
|
374605 |
VGAuthError err;
|
|
|
374605 |
gboolean isSecure = ServiceNetworkIsConnectionPrivateSuperUser(conn);
|
|
|
374605 |
|
|
|
374605 |
+ if (conn->isPublic && req->reqType != PROTO_REQUEST_SESSION_REQ) {
|
|
|
374605 |
+ return VGAUTH_E_PERMISSION_DENIED;
|
|
|
374605 |
+ }
|
|
|
374605 |
+
|
|
|
374605 |
switch (req->reqType) {
|
|
|
374605 |
/*
|
|
|
374605 |
* This comes over the public connection; alwsys let it through.
|
|
|
374605 |
--
|
|
|
374605 |
2.35.3
|
|
|
374605 |
|