Changeset 2128 for trunk/src

Timestamp:

Dec 18, 1999, 10:45:13 PM (26 years ago)

Author:

sandervl

Message:

Token api update

Location:

trunk/src/NTDLL

Files:

• nt.cpp (modified) (7 diffs)
• ntdll.cpp (modified) (4 diffs)
• ntdll.h (modified) (2 diffs)

trunk/src/NTDLL/nt.cpp

@@ -1 @@
-/* $Id: nt.cpp,v 1.3 1999-12-18 20:01:13 sandervl Exp $ */
+/* $Id: nt.cpp,v 1.4 1999-12-18 21:45:13 sandervl Exp $ */
 
 
@@ -15 +15 @@
 #include <string.h>
 #include <time.h>
+#include <os2win.h>
+#include <handlemanager.h>
 
 #include "ntdll.h"
@@ -258 +260 @@
                                    PHANDLE TokenHandle)
 {
-  dprintf(("NTDLL: NtOpenProcessToken(%08xh,%08xh,%08xh) not implemented.\n",
+  dprintf(("NTDLL: NtOpenProcessToken(%08xh,%08xh,%08xh) not correctly implemented.\n",
            ProcessHandle,
            DesiredAccess,
            TokenHandle));
 
-  *TokenHandle = 0xcafe;
-  return 0;
+  if(ProcessHandle == GetCurrentProcess()) {
+        HMOpenProcessToken(ProcessHandle, DesiredAccess, (ULONG)&ProcSecInfo, TokenHandle);
+        return STATUS_SUCCESS;
+  }
+  *TokenHandle = 0;
+  return ERROR_INVALID_HANDLE;
 }
 
@@ -282 +288 @@
            TokenHandle));
 
-  *TokenHandle = 0xcafe;
-  return 0;
+  *TokenHandle = 0;
+  return ERROR_INVALID_HANDLE;
 }
 
@@ -321 +327 @@
                                         LPDWORD ReturnLength)
 {
-  dprintf(("NTDLL: NtQueryInformationToken(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented.\n",
+ PROCESSTHREAD_SECURITYINFO *pSecInfo;
+
+  dprintf(("NTDLL: NtQueryInformationToken(%08xh,%08xh,%08xh,%08xh,%08xh) not correctly implemented.\n",
            Token,
            TokenInformationClass,
@@ -328 +336 @@
            ReturnLength));
 
+  pSecInfo = (PROCESSTHREAD_SECURITYINFO*)HMHandleGetUserData(Token);
+  if((ULONG)pSecInfo == -1) {
+        return ERROR_INVALID_HANDLE;
+  }
   switch (TokenInformationClass)
   {
@@ -335 +347 @@
                 return STATUS_BUFFER_TOO_SMALL;
         }
-        memset(TokenInformation, 0, sizeof(TOKEN_GROUPS));
+        memcpy(TokenInformation, (LPVOID)pSecInfo->pTokenGroups, sizeof(TOKEN_GROUPS));
         break;
     case TokenUser:                     /* 1 */

trunk/src/NTDLL/ntdll.cpp

@@ -1 @@
-/* $Id: ntdll.cpp,v 1.4 1999-12-18 20:01:14 sandervl Exp $ */
+/* $Id: ntdll.cpp,v 1.5 1999-12-18 21:45:13 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 #include <string.h>
 #include <ctype.h>
-#include "misc.h"
+#include <misc.h>
 #include "unicode.h"
 
@@ -52 +52 @@
 //SvL: per process heap for NTDLL
 HANDLE NTDLL_hHeap = 0;
+
+PROCESSTHREAD_SECURITYINFO ProcSecInfo = {0};
 
 /*****************************************************************************
@@ -87 +89 @@
     switch (fdwReason) {
     case DLL_PROCESS_ATTACH:
-        NTDLL_hHeap = HeapCreate(0, 0x10000, 0);
+    {
+     SID_IDENTIFIER_AUTHORITY sidIdAuth = {0};
+
+        NTDLL_hHeap = HeapCreate(0, 0x10000, 0);
+
+        ProcSecInfo.dwType = SECTYPE_PROCESS;
+        RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &ProcSecInfo.SidUser.User.Sid);
+        ProcSecInfo.SidUser.User.Attributes = 0; //?????????
+
+        ProcSecInfo.pTokenGroups = (TOKEN_GROUPS*)Heap_Alloc(sizeof(TOKEN_GROUPS));
+        ProcSecInfo.pTokenGroups->GroupCount = 1;
+        RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &ProcSecInfo.PrimaryGroup.PrimaryGroup);
+        ProcSecInfo.pTokenGroups->Groups[0].Sid = ProcSecInfo.PrimaryGroup.PrimaryGroup;
+        ProcSecInfo.pTokenGroups->Groups[0].Attributes = 0; //????
+
+//        pPrivilegeSet   = NULL;
+//        pTokenPrivileges= NULL;
+//        TokenOwner      = {0};
+//        DefaultDACL     = {0};
+//        TokenSource     = {0};
+        ProcSecInfo.TokenType = TokenPrimary;
         break;
+    }
     case DLL_PROCESS_DETACH:
         HeapDestroy(NTDLL_hHeap);

trunk/src/NTDLL/ntdll.h

@@ -1 @@
-/* $Id: ntdll.h,v 1.8 1999-12-18 20:01:14 sandervl Exp $ */
+/* $Id: ntdll.h,v 1.9 1999-12-18 21:45:13 sandervl Exp $ */
 
 /*
@@ -655 +655 @@
 PSID_IDENTIFIER_AUTHORITY WINAPI GetSidIdentifierAuthority(PSID);
 
+//SvL: Security data for win32 process (nothing fancy; just trying to fool apps
+//     into thinking the security subsystem is in perfect shape.
+#define SECTYPE_THREAD          0
+#define SECTYPE_PROCESS         1
+
+typedef struct {
+ DWORD               dwType;
+ TOKEN_USER          SidUser;
+ TOKEN_GROUPS       *pTokenGroups;
+ PRIVILEGE_SET      *pPrivilegeSet;
+ TOKEN_PRIVILEGES   *pTokenPrivileges;
+ TOKEN_OWNER         TokenOwner;
+ TOKEN_PRIMARY_GROUP PrimaryGroup;
+ TOKEN_DEFAULT_DACL  DefaultDACL;
+ TOKEN_SOURCE        TokenSource;
+ TOKEN_TYPE          TokenType;
+} PROCESSTHREAD_SECURITYINFO;
+
+//Per process info; Should probably be stored in process database structure
+extern PROCESSTHREAD_SECURITYINFO ProcSecInfo;
+
 #ifdef __cplusplus
 }