marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: impersonation_level should be an int since we store -1 in it. 

Make sure we don't check the impersonation level for primary tokens.
oldstable
Alexandre Julliard 2008-03-26 14:38:49 +01:00
parent 6cb602c6db
commit f6d871eecf
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/security.h
View File

@ -48,7 +48,7 @@ extern const PSID security_local_system_sid;
extern struct token *token_create_admin(void); extern struct token *token_create_admin(void);
extern struct token *token_duplicate( struct token *src_token, unsigned primary, extern struct token *token_duplicate( struct token *src_token, unsigned primary,
SECURITY_IMPERSONATION_LEVEL impersonation_level ); int impersonation_level );
extern int token_check_privileges( struct token *token, int all_required, extern int token_check_privileges( struct token *token, int all_required,
const LUID_AND_ATTRIBUTES *reqprivs, const LUID_AND_ATTRIBUTES *reqprivs,
unsigned int count, LUID_AND_ATTRIBUTES *usedprivs); unsigned int count, LUID_AND_ATTRIBUTES *usedprivs);

25
server/token.c
View File

@ -90,7 +90,7 @@ struct token
unsigned primary; /* is this a primary or impersonation token? */ unsigned primary; /* is this a primary or impersonation token? */
ACL *default_dacl; /* the default DACL to assign to objects created by this user */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */
TOKEN_SOURCE source; /* source of the token */ TOKEN_SOURCE source; /* source of the token */
SECURITY_IMPERSONATION_LEVEL impersonation_level; /* impersonation level this token is capable of if non-primary token */ int impersonation_level; /* impersonation level this token is capable of if non-primary token */
}; };
struct privilege struct privilege
@ -421,7 +421,7 @@ static struct token *create_token( unsigned primary, const SID *user,
const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count,
const ACL *default_dacl, TOKEN_SOURCE source, const ACL *default_dacl, TOKEN_SOURCE source,
const luid_t *modified_id, const luid_t *modified_id,
SECURITY_IMPERSONATION_LEVEL impersonation_level ) int impersonation_level )
{ {
struct token *token = alloc_object( &token_ops ); struct token *token = alloc_object( &token_ops );
if (token) if (token)
@ -506,7 +506,7 @@ static struct token *create_token( unsigned primary, const SID *user,
} }
struct token *token_duplicate( struct token *src_token, unsigned primary, struct token *token_duplicate( struct token *src_token, unsigned primary,
SECURITY_IMPERSONATION_LEVEL impersonation_level ) int impersonation_level )
{ {
const luid_t *modified_id = const luid_t *modified_id =
primary || (impersonation_level == src_token->impersonation_level) ? primary || (impersonation_level == src_token->impersonation_level) ?
@ -515,20 +515,19 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
struct privilege *privilege; struct privilege *privilege;
struct group *group; struct group *group;
if ((impersonation_level < SecurityAnonymous) || if (!primary &&
(impersonation_level > SecurityDelegation)) (impersonation_level < SecurityAnonymous ||
impersonation_level > SecurityDelegation ||
(!src_token->primary && (impersonation_level > src_token->impersonation_level))))
{ {
set_error( STATUS_BAD_IMPERSONATION_LEVEL ); set_error( STATUS_BAD_IMPERSONATION_LEVEL );
return NULL; return NULL;
} }
if (primary || (impersonation_level <= src_token->impersonation_level)) token = create_token( primary, src_token->user, NULL, 0,
token = create_token( primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl,
NULL, 0, src_token->default_dacl, src_token->source, modified_id,
src_token->source, modified_id, impersonation_level );
impersonation_level );
else set_error( STATUS_BAD_IMPERSONATION_LEVEL );
if (!token) return token; if (!token) return token;
/* copy groups */ /* copy groups */
@ -1013,7 +1012,7 @@ DECL_HANDLER(open_token)
{ {
if (thread->token) if (thread->token)
{ {
if (thread->token->impersonation_level <= SecurityAnonymous) if (!thread->token->primary && thread->token->impersonation_level <= SecurityAnonymous)
set_error( STATUS_CANT_OPEN_ANONYMOUS ); set_error( STATUS_CANT_OPEN_ANONYMOUS );
else else
reply->token = alloc_handle( current->process, thread->token, reply->token = alloc_handle( current->process, thread->token,