libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-27 19:17:18 +08:00
Code Issues Projects Releases Wiki Activity

* cygheap.h (cygheap_user::curr_imp_token): Rename from current_token.

Browse Source 
Accommodate changge throughout Cygwin.
	(cygheap_user::imp_token): Rename from token.  Accommodate changge
	throughout Cygwin.
	(rcygheap_user::eimpersonate): Use primary token for impersonation.
	* grp.cc (internal_getgroups): Use primary impersonation token when
	impersonated.
	* security.h (_push_thread_privilege): Use primary impersonation token
	when impersonated.
This commit is contained in:
Corinna Vinschen 2007-07-16 20:01:15 +00:00
parent 6f76c68713
commit 77ee880504
7 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,15 @@
2007-07-16 Corinna Vinschen <corinna@vinschen.de>
* cygheap.h (cygheap_user::curr_imp_token): Rename from current_token.
Accommodate changge throughout Cygwin.
(cygheap_user::imp_token): Rename from token. Accommodate changge
throughout Cygwin.
(rcygheap_user::eimpersonate): Use primary token for impersonation.
* grp.cc (internal_getgroups): Use primary impersonation token when
impersonated.
* security.h (_push_thread_privilege): Use primary impersonation token
when impersonated.
2007-07-14 Christopher Faylor <me+cygwin@cgf.cx> 2007-07-14 Christopher Faylor <me+cygwin@cgf.cx>
* init.cc (in_dllentry): Delete. * init.cc (in_dllentry): Delete.

12
winsup/cygwin/cygheap.h
View File

@ -128,7 +128,7 @@ public:
HANDLE external_token; HANDLE external_token;
HANDLE internal_token; HANDLE internal_token;
HANDLE curr_primary_token; HANDLE curr_primary_token;
HANDLE current_token; HANDLE curr_imp_token;
/* CGF 2002-06-27. I removed the initializaton from this constructor /* CGF 2002-06-27. I removed the initializaton from this constructor
since this class is always allocated statically. That means that everything since this class is always allocated statically. That means that everything
@ -176,9 +176,9 @@ public:
PSID saved_sid () { return saved_cygsid; } PSID saved_sid () { return saved_cygsid; }
const char *ontherange (homebodies what, struct passwd * = NULL); const char *ontherange (homebodies what, struct passwd * = NULL);
#define NO_IMPERSONATION NULL #define NO_IMPERSONATION NULL
bool issetuid () const { return current_token != NO_IMPERSONATION; } bool issetuid () const { return curr_imp_token != NO_IMPERSONATION; }
HANDLE primary_token () { return curr_primary_token; } HANDLE primary_token () { return curr_primary_token; }
HANDLE token () { return current_token; } HANDLE imp_token () { return curr_imp_token; }
void deimpersonate () void deimpersonate ()
{ {
RevertToSelf (); RevertToSelf ();
@ -186,7 +186,7 @@ public:
bool reimpersonate () bool reimpersonate ()
{ {
if (issetuid ()) if (issetuid ())
return ImpersonateLoggedOnUser (token ()); return ImpersonateLoggedOnUser (primary_token ());
return true; return true;
} }
bool has_impersonation_tokens () bool has_impersonation_tokens ()
@ -195,8 +195,8 @@ public:
|| curr_primary_token != NO_IMPERSONATION; } || curr_primary_token != NO_IMPERSONATION; }
void close_impersonation_tokens () void close_impersonation_tokens ()
{ {
if (current_token != NO_IMPERSONATION) if (curr_imp_token != NO_IMPERSONATION)
CloseHandle (current_token); CloseHandle (curr_imp_token);
if (curr_primary_token != NO_IMPERSONATION if (curr_primary_token != NO_IMPERSONATION
&& curr_primary_token != external_token && curr_primary_token != external_token
&& curr_primary_token != internal_token) && curr_primary_token != internal_token)

2
winsup/cygwin/grp.cc
View File

@ -360,7 +360,7 @@ internal_getgroups (int gidsetsize, __gid32_t *grouplist, cygpsid * srchsid)
/* If impersonated, use impersonation token. */ /* If impersonated, use impersonation token. */
if (cygheap->user.issetuid ()) if (cygheap->user.issetuid ())
hToken = cygheap->user.token (); hToken = cygheap->user.primary_token ();
else else
hToken = hProcToken; hToken = hProcToken;

2
winsup/cygwin/security.cc
View File

@ -1943,7 +1943,7 @@ check_access (security_descriptor &sd, GENERIC_MAPPING &mapping,
DWORD granted; DWORD granted;
DWORD plen = sizeof (PRIVILEGE_SET) + 3 * sizeof (LUID_AND_ATTRIBUTES); DWORD plen = sizeof (PRIVILEGE_SET) + 3 * sizeof (LUID_AND_ATTRIBUTES);
PPRIVILEGE_SET pset = (PPRIVILEGE_SET) alloca (plen); PPRIVILEGE_SET pset = (PPRIVILEGE_SET) alloca (plen);
HANDLE tok = cygheap->user.issetuid () ? cygheap->user.token () HANDLE tok = cygheap->user.issetuid () ? cygheap->user.imp_token ()
: hProcImpToken; : hProcImpToken;
if (!tok && !DuplicateTokenEx (hProcToken, MAXIMUM_ALLOWED, NULL, if (!tok && !DuplicateTokenEx (hProcToken, MAXIMUM_ALLOWED, NULL,

2
winsup/cygwin/security.h
View File

@ -388,7 +388,7 @@ void set_cygwin_privileges (HANDLE token);
#define _push_thread_privilege(_priv, _val, _check) { \ #define _push_thread_privilege(_priv, _val, _check) { \
HANDLE _dup_token = NULL; \ HANDLE _dup_token = NULL; \
HANDLE _token = (cygheap->user.issetuid () && (_check)) \ HANDLE _token = (cygheap->user.issetuid () && (_check)) \
? cygheap->user.token () : hProcToken; \ ? cygheap->user.primary_token () : hProcToken; \
if (!DuplicateTokenEx (_token, MAXIMUM_ALLOWED, NULL, \ if (!DuplicateTokenEx (_token, MAXIMUM_ALLOWED, NULL, \
SecurityImpersonation, TokenImpersonation, \ SecurityImpersonation, TokenImpersonation, \
&_dup_token)) \ &_dup_token)) \

12
winsup/cygwin/syscalls.cc
View File

@ -2228,22 +2228,22 @@ seteuid32 (__uid32_t uid)
cygheap->user.set_sid (usersid); cygheap->user.set_sid (usersid);
cygheap->user.curr_primary_token = new_token == hProcToken ? NO_IMPERSONATION cygheap->user.curr_primary_token = new_token == hProcToken ? NO_IMPERSONATION
: new_token; : new_token;
if (cygheap->user.current_token != NO_IMPERSONATION) if (cygheap->user.curr_imp_token != NO_IMPERSONATION)
{ {
CloseHandle (cygheap->user.current_token); CloseHandle (cygheap->user.curr_imp_token);
cygheap->user.current_token = NO_IMPERSONATION; cygheap->user.curr_imp_token = NO_IMPERSONATION;
} }
if (cygheap->user.curr_primary_token != NO_IMPERSONATION) if (cygheap->user.curr_primary_token != NO_IMPERSONATION)
{ {
if (!DuplicateTokenEx (cygheap->user.curr_primary_token, MAXIMUM_ALLOWED, if (!DuplicateTokenEx (cygheap->user.curr_primary_token, MAXIMUM_ALLOWED,
&sec_none, SecurityImpersonation, &sec_none, SecurityImpersonation,
TokenImpersonation, &cygheap->user.current_token)) TokenImpersonation, &cygheap->user.curr_imp_token))
{ {
__seterrno (); __seterrno ();
cygheap->user.curr_primary_token = NO_IMPERSONATION; cygheap->user.curr_primary_token = NO_IMPERSONATION;
return -1; return -1;
} }
set_cygwin_privileges (cygheap->user.current_token); set_cygwin_privileges (cygheap->user.curr_imp_token);
} }
if (!cygheap->user.reimpersonate ()) if (!cygheap->user.reimpersonate ())
{ {
@ -2338,7 +2338,7 @@ setegid32 (__gid32_t gid)
TokenPrimaryGroup, &gsid, sizeof gsid)) TokenPrimaryGroup, &gsid, sizeof gsid))
debug_printf ("SetTokenInformation(primary_token, " debug_printf ("SetTokenInformation(primary_token, "
"TokenPrimaryGroup), %E"); "TokenPrimaryGroup), %E");
if (!SetTokenInformation (cygheap->user.token (), TokenPrimaryGroup, if (!SetTokenInformation (cygheap->user.imp_token (), TokenPrimaryGroup,
&gsid, sizeof gsid)) &gsid, sizeof gsid))
debug_printf ("SetTokenInformation(token, TokenPrimaryGroup), %E"); debug_printf ("SetTokenInformation(token, TokenPrimaryGroup), %E");
} }

2
winsup/cygwin/uinfo.cc
View File

@ -146,7 +146,7 @@ uinfo_init ()
cygheap->user.external_token = NO_IMPERSONATION; cygheap->user.external_token = NO_IMPERSONATION;
cygheap->user.internal_token = NO_IMPERSONATION; cygheap->user.internal_token = NO_IMPERSONATION;
cygheap->user.curr_primary_token = NO_IMPERSONATION; cygheap->user.curr_primary_token = NO_IMPERSONATION;
cygheap->user.current_token = NO_IMPERSONATION; cygheap->user.curr_imp_token = NO_IMPERSONATION;
cygheap->user.set_saved_sid (); /* Update the original sid */ cygheap->user.set_saved_sid (); /* Update the original sid */
cygheap->user.reimpersonate (); cygheap->user.reimpersonate ();
} }