Module: wine Branch: master Commit: 3c51b2c64521cebfc7a03fe96b74974bf94f94b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c51b2c64521cebfc7a03fe96b...
Author: Mikolaj Zalewski mikolajz@google.com Date: Thu Sep 27 10:34:53 2007 -0700
advapi32/ntdll: MakeRelativeSD should preserve NULL pointers (with testcase).
---
dlls/advapi32/tests/security.c | 46 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/sec.c | 36 +++++++++++++++++++++--------- 2 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c4b9ed4..2e671df 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -35,6 +35,8 @@
#include "wine/test.h"
+#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } + typedef VOID (WINAPI *fnBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid ); typedef VOID (WINAPI *fnBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName ); typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndNameA)( PTRUSTEEA pTrustee, @@ -49,6 +51,7 @@ typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndSidA)( PTRUSTEEA pTrustee, GUID* pInheritedObjectGuid, PSID pSid ); typedef LPSTR (WINAPI *fnGetTrusteeNameA)( PTRUSTEEA pTrustee ); +typedef BOOL (WINAPI *fnMakeSelfRelativeSD)( PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR, LPDWORD ); typedef BOOL (WINAPI *fnConvertSidToStringSidA)( PSID pSid, LPSTR *str ); typedef BOOL (WINAPI *fnConvertStringSidToSidA)( LPCSTR str, PSID pSid ); static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, @@ -81,6 +84,7 @@ fnBuildTrusteeWithNameA pBuildTrusteeWithNameA; fnBuildTrusteeWithObjectsAndNameA pBuildTrusteeWithObjectsAndNameA; fnBuildTrusteeWithObjectsAndSidA pBuildTrusteeWithObjectsAndSidA; fnGetTrusteeNameA pGetTrusteeNameA; +fnMakeSelfRelativeSD pMakeSelfRelativeSD; fnConvertSidToStringSidA pConvertSidToStringSidA; fnConvertStringSidToSidA pConvertStringSidToSidA; fnGetFileSecurityA pGetFileSecurityA; @@ -110,6 +114,7 @@ static void init(void) (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); pConvertSecurityDescriptorToStringSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertSecurityDescriptorToStringSecurityDescriptorA" ); + pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD"); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW");
@@ -1443,6 +1448,46 @@ static void test_LookupAccountName(void) HeapFree(GetProcessHeap(), 0, domain); }
+static void test_security_descriptor(void) +{ + SECURITY_DESCRIPTOR sd; + char buf[8192]; + DWORD size; + BOOL isDefault, isPresent; + PACL pacl; + PSID psid; + + InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); + ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(psid, NULL, PSID, "%p"); + todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + sd.Control |= SE_DACL_PRESENT | SE_SACL_PRESENT; + + SetLastError(0xdeadbeef); + size = 5; + expect_eq(MakeSelfRelativeSD(&sd, buf, &size), FALSE, BOOL, "%d"); + expect_eq(GetLastError(), ERROR_INSUFFICIENT_BUFFER, DWORD, "%u"); + ok(size > 5, "Size not increased\n"); + if (size <= 8192) + { + expect_eq(MakeSelfRelativeSD(&sd, buf, &size), TRUE, BOOL, "%d"); + ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(psid, NULL, PSID, "%p"); + todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(psid, NULL, PSID, "%p"); + todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(isPresent, TRUE, BOOL, "%d"); + expect_eq(psid, NULL, PSID, "%p"); + expect_eq(isDefault, FALSE, BOOL, "%d"); + ok(GetSecurityDescriptorSacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(isPresent, TRUE, BOOL, "%d"); + expect_eq(psid, NULL, PSID, "%p"); + expect_eq(isDefault, FALSE, BOOL, "%d"); + } +} + #define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) { @@ -2017,6 +2062,7 @@ START_TEST(security) test_token_attr(); test_LookupAccountSid(); test_LookupAccountName(); + test_security_descriptor(); test_process_security(); test_impersonation_level(); test_SetEntriesInAcl(); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 0eaa9fe..38ab402 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -848,30 +848,44 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD( pRel->Control = pAbs->Control | SE_SELF_RELATIVE;
offsetRel = sizeof(SECURITY_DESCRIPTOR); - pRel->Owner = (PSID) offsetRel; - length = RtlLengthSid(pAbs->Owner); - memcpy((LPBYTE)pRel + offsetRel, pAbs->Owner, length); - - offsetRel += length; - pRel->Group = (PSID) offsetRel; - length = RtlLengthSid(pAbs->Group); - memcpy((LPBYTE)pRel + offsetRel, pAbs->Group, length); + if (pAbs->Owner) + { + pRel->Owner = (PSID) offsetRel; + length = RtlLengthSid(pAbs->Owner); + memcpy((LPBYTE)pRel + offsetRel, pAbs->Owner, length); + offsetRel += length; + } + else + { + pRel->Owner = NULL; + }
- if (pRel->Control & SE_SACL_PRESENT) + if (pAbs->Group) { + pRel->Group = (PSID) offsetRel; + length = RtlLengthSid(pAbs->Group); + memcpy((LPBYTE)pRel + offsetRel, pAbs->Group, length); offsetRel += length; + } + else + { + pRel->Group = NULL; + } + + if (pAbs->Sacl) + { pRel->Sacl = (PACL) offsetRel; length = pAbs->Sacl->AclSize; memcpy((LPBYTE)pRel + offsetRel, pAbs->Sacl, length); + offsetRel += length; } else { pRel->Sacl = NULL; }
- if (pRel->Control & SE_DACL_PRESENT) + if (pAbs->Dacl) { - offsetRel += length; pRel->Dacl = (PACL) offsetRel; length = pAbs->Dacl->AclSize; memcpy((LPBYTE)pRel + offsetRel, pAbs->Dacl, length);