June 2017 - Wine-Commits - list.winehq.org

Michael Müller : server: Implement setting a security descriptor when duplicating tokens.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 7c08e787b1a0381a4741cd8710834bfbae29e32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c08e787b1a0381a4741cd871… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:43 2017 +0200 server: Implement setting a security descriptor when duplicating tokens. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 7 ++++++- include/wine/server_protocol.h | 5 +++-- server/process.c | 2 +- server/protocol.def | 2 +- server/request.h | 5 ++--- server/security.h | 2 +- server/token.c | 14 +++++++++++--- server/trace.c | 2 +- 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 86beb03..8938d5d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -83,11 +83,15 @@ NTSTATUS WINAPI NtDuplicateToken( OUT PHANDLE NewToken) { NTSTATUS status; + data_size_t len; + struct object_attributes *objattr; TRACE("(%p,0x%08x,%s,0x%08x,0x%08x,%p)\n", ExistingToken, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes), ImpersonationLevel, TokenType, NewToken); + if ((status = alloc_object_attributes( ObjectAttributes, &objattr, &len ))) return status; + if (ObjectAttributes && ObjectAttributes->SecurityQualityOfService) { SECURITY_QUALITY_OF_SERVICE *SecurityQOS = ObjectAttributes->SecurityQualityOfService; @@ -102,14 +106,15 @@ NTSTATUS WINAPI NtDuplicateToken( { req->handle = wine_server_obj_handle( ExistingToken ); req->access = DesiredAccess; - req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; req->primary = (TokenType == TokenPrimary); req->impersonation_level = ImpersonationLevel; + wine_server_add_data( req, objattr, len ); status = wine_server_call( req ); if (!status) *NewToken = wine_server_ptr_handle( reply->new_handle ); } SERVER_END_REQ; + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d7a7cd..d31579c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4732,9 +4732,10 @@ struct duplicate_token_request struct request_header __header; obj_handle_t handle; unsigned int access; - unsigned int attributes; int primary; int impersonation_level; + /* VARARG(objattr,object_attributes); */ + char __pad_28[4]; }; struct duplicate_token_reply { @@ -6418,6 +6419,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 532 +#define SERVER_PROTOCOL_VERSION 533 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 5eabbbe..4f38ae1 100644 --- a/server/process.c +++ b/server/process.c @@ -565,7 +565,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ - process->token = token_duplicate( parent->token, TRUE, 0 ); + process->token = token_duplicate( parent->token, TRUE, 0, NULL ); process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; diff --git a/server/protocol.def b/server/protocol.def index 7eaaec2..1f88c6a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3316,9 +3316,9 @@ enum caret_state @REQ(duplicate_token) obj_handle_t handle; /* handle to the token to duplicate */ unsigned int access; /* access rights to the new token */ - unsigned int attributes; /* object attributes */ int primary; /* is the new token to be a primary one? */ int impersonation_level; /* impersonation level of the new token */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t new_handle; /* duplicated handle */ @END diff --git a/server/request.h b/server/request.h index ad89f30..30d2234 100644 --- a/server/request.h +++ b/server/request.h @@ -2113,9 +2113,8 @@ C_ASSERT( FIELD_OFFSET(struct check_token_privileges_reply, has_privileges) == 8 C_ASSERT( sizeof(struct check_token_privileges_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, attributes) == 20 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, primary) == 24 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, impersonation_level) == 28 ); +C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, primary) == 20 ); +C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, impersonation_level) == 24 ); C_ASSERT( sizeof(struct duplicate_token_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_reply, new_handle) == 8 ); C_ASSERT( sizeof(struct duplicate_token_reply) == 16 ); diff --git a/server/security.h b/server/security.h index 5c76821..3cbfcb9 100644 --- a/server/security.h +++ b/server/security.h @@ -53,7 +53,7 @@ extern const PSID security_builtin_admins_sid; extern struct token *token_create_admin(void); extern struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level ); + int impersonation_level, const struct security_descriptor *sd ); extern int token_check_privileges( struct token *token, int all_required, const LUID_AND_ATTRIBUTES *reqprivs, unsigned int count, LUID_AND_ATTRIBUTES *usedprivs); diff --git a/server/token.c b/server/token.c index 9183595..f518544 100644 --- a/server/token.c +++ b/server/token.c @@ -622,7 +622,7 @@ static struct token *create_token( unsigned primary, const SID *user, } struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level ) + int impersonation_level, const struct security_descriptor *sd ) { const luid_t *modified_id = primary || (impersonation_level == src_token->impersonation_level) ? @@ -672,6 +672,9 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } + if (sd) default_set_sd( &token->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + return token; } @@ -1240,15 +1243,20 @@ DECL_HANDLER(get_token_privileges) DECL_HANDLER(duplicate_token) { struct token *src_token; + struct unicode_str name; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); + + if (!objattr) return; if ((src_token = (struct token *)get_handle_obj( current->process, req->handle, TOKEN_DUPLICATE, &token_ops ))) { - struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level ); + struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd ); if (token) { - reply->new_handle = alloc_handle( current->process, token, req->access, req->attributes); + reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes ); release_object( token ); } release_object( src_token ); diff --git a/server/trace.c b/server/trace.c index 6e23184..962b122 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3927,9 +3927,9 @@ static void dump_duplicate_token_request( const struct duplicate_token_request * { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", primary=%d", req->primary ); fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_duplicate_token_reply( const struct duplicate_token_reply *req )

1 0

Hugh McMaster : regedit/tests: Output "(Default)" when referring to the default registry value.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: c414b2b570973a6e448219163f93bd98631b94d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c414b2b570973a6e448219163… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:38 2017 +0000 regedit/tests: Output "(Default)" when referring to the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b7d6de3..6800380 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -154,13 +154,10 @@ static void r_verify_reg_wsz(unsigned line, HKEY key, const char *value_name, co static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_name) { LONG lr; - DWORD fnd_type, fnd_len; - char fnd_value[32]; - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len); - lok(lr == ERROR_FILE_NOT_FOUND, "Reg value shouldn't exist: %s\n", - value_name); + lr = RegQueryValueExA(key, value_name, NULL, NULL, NULL, NULL); + lok(lr == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", + (value_name && *value_name) ? value_name : "(Default)", lr); } #define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s)

1 0

Hugh McMaster : regedit/tests: Test whether "" is interpreted as the default registry value.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 06b0a6d94d1428dce9714cebe2092cf4e72e1c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b0a6d94d1428dce9714cebe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:46 2017 +0000 regedit/tests: Test whether "" is interpreted as the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 6800380..c470414 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -264,8 +264,10 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n"); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default registry value\"\n\n"); verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "Default registry value", 23, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

André Hentschel : include: Remove duplicate declaration of PFXVerifyPassword.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 0d6906bf21a77fb17abcb972ada9da2cf4b12c10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6906bf21a77fb17abcb972a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 14 23:33:16 2017 +0200 include: Remove duplicate declaration of PFXVerifyPassword. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 2af6a57..abbe99f 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4584,8 +4584,6 @@ BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, void *pvReserved, DWORD dwFlags); BOOL WINAPI PFXExportCertStore(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags); -BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, - DWORD dwFlags); /* cryptnet.dll functions */ BOOL WINAPI CryptCancelAsyncRetrieval(HCRYPTASYNC hAsyncRetrieval);

1 0

Hugh McMaster : regedit: Perform value name operations in the state machine.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: d60c31eadb121e834c44e4e8ff8cba663effc3e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60c31eadb121e834c44e4e8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 12:01:26 2017 +0000 regedit: Perform value name operations in the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 146 +++++++++++++++++++++++++++------------ programs/regedit/tests/regedit.c | 2 +- 2 files changed, 101 insertions(+), 47 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e1352a7..ad3c5d5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -138,6 +138,10 @@ enum parser_state LINE_START, /* at the beginning of a registry line */ KEY_NAME, /* parsing a key name */ DELETE_KEY, /* deleting a registry key */ + DEFAULT_VALUE_NAME, /* parsing a default value name */ + QUOTED_VALUE_NAME, /* parsing a double-quoted value name */ + DATA_START, /* preparing for data parsing operations */ + DELETE_VALUE, /* deleting a registry value */ SET_VALUE, /* adding a value to the registry */ NB_PARSER_STATES }; @@ -163,6 +167,10 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos); static WCHAR *line_start_state(struct parser *parser, WCHAR *pos); static WCHAR *key_name_state(struct parser *parser, WCHAR *pos); static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos); +static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *data_start_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos); static WCHAR *set_value_state(struct parser *parser, WCHAR *pos); static const parser_state_func parser_funcs[NB_PARSER_STATES] = @@ -172,6 +180,10 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = line_start_state, /* LINE_START */ key_name_state, /* KEY_NAME */ delete_key_state, /* DELETE_KEY */ + default_value_name_state, /* DEFAULT_VALUE_NAME */ + quoted_value_name_state, /* QUOTED_VALUE_NAME */ + data_start_state, /* DATA_START */ + delete_value_state, /* DELETE_VALUE */ set_value_state, /* SET_VALUE */ }; @@ -435,7 +447,7 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) DWORD dwData, dwLen; WCHAR del[] = {'-',0}; - if ( (val_name == NULL) || (val_data == NULL) ) + if (!val_data) return ERROR_INVALID_PARAMETER; if (lstrcmpW(val_data, del) == 0) @@ -549,49 +561,6 @@ static LONG openKeyW(WCHAR* stdInput) } -/****************************************************************************** - * This function is a wrapper for the setValue function. It prepares the - * land and cleans the area once completed. - * Note: this function modifies the line parameter. - * - * line - registry file unwrapped line. Should have the registry value name and - * complete registry value data. - */ -static void processSetValue(WCHAR* line, BOOL is_unicode) -{ - WCHAR *val_name; - int len = 0; - LONG res; - - /* get value name */ - val_name = line; - - if (*line == '@') - *line++ = 0; - else if (!REGPROC_unescape_string(++val_name, &line)) - goto error; - - while (*line == ' ' || *line == '\t') line++; - if (*line != '=') - goto error; - line++; - while (*line == ' ' || *line == '\t') line++; - - /* trim trailing blanks */ - len = strlenW(line); - while (len > 0 && (line[len - 1] == ' ' || line[len - 1] == '\t')) len--; - line[len] = 0; - - res = setValue(val_name, line, is_unicode); - if ( res != ERROR_SUCCESS ) - output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName); - return; - -error: - output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName); - output_message(STRING_INVALID_LINE_SYNTAX); -} - enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -728,9 +697,11 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) set_state(parser, KEY_NAME); return p + 1; case '@': - case '"': - processSetValue(p, parser->is_unicode); + set_state(parser, DEFAULT_VALUE_NAME); return p; + case '"': + set_state(parser, QUOTED_VALUE_NAME); + return p + 1; case ' ': case '\t': break; @@ -778,6 +749,86 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) return p; } +/* handler for parser DEFAULT_VALUE_NAME state */ +static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) +{ + parser->value_name = NULL; + + set_state(parser, DATA_START); + return pos + 1; +} + +/* handler for parser QUOTED_VALUE_NAME state */ +static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *val_name = pos, *p; + + if (parser->value_name) + { + HeapFree(GetProcessHeap(), 0, parser->value_name); + parser->value_name = NULL; + } + + if (!REGPROC_unescape_string(val_name, &p)) + goto invalid; + + /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ + parser->value_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(val_name) + 1) * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(parser->value_name); + lstrcpyW(parser->value_name, val_name); + + set_state(parser, DATA_START); + return p; + +invalid: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DATA_START state */ +static WCHAR *data_start_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + unsigned int len; + + while (*p == ' ' || *p == '\t') p++; + if (*p != '=') goto done; + p++; + while (*p == ' ' || *p == '\t') p++; + + /* trim trailing whitespace */ + len = strlenW(p); + while (len > 0 && (p[len - 1] == ' ' || p[len - 1] == '\t')) len--; + p[len] = 0; + + if (*p == '-') + { + set_state(parser, DELETE_VALUE); + return p; + } + else if (setValue(parser->value_name, p, parser->is_unicode) != ERROR_SUCCESS) + output_message(STRING_SETVALUE_FAILED, parser->value_name, currentKeyName); + +done: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DELETE_VALUE state */ +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos + 1; + + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto done; + + RegDeleteValueW(currentKeyHandle, parser->value_name); + +done: + set_state(parser, LINE_START); + return p; +} + /* handler for parser SET_VALUE state */ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) { @@ -1432,6 +1483,9 @@ BOOL import_registry_file(FILE *reg_file) if (parser.reg_version == REG_VERSION_FUZZY || parser.reg_version == REG_VERSION_INVALID) return parser.reg_version == REG_VERSION_FUZZY; + if (parser.value_name) + HeapFree(GetProcessHeap(), 0, parser.value_name); + closeKey(); return TRUE; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 32d190c..c7465d8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1289,7 +1289,7 @@ static void test_value_deletion(void) verify_reg_nonexist(hkey, "Wine46b"); verify_reg_nonexist(hkey, "Wine46c"); verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg_nonexist(hkey, "Wine46e"); + verify_reg_nonexist(hkey, "Wine46e"); verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); lr = RegCloseKey(hkey);

1 0

Hugh McMaster : regedit: Perform key operations in the state machine.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: ca98e234518ac0fd61ffd95090dbd20763690fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca98e234518ac0fd61ffd9509… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 12:00:55 2017 +0000 regedit: Perform key operations in the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 150 ++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 77 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 15ad04e..e1352a7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -136,6 +136,8 @@ enum parser_state HEADER, /* parsing the registry file version header */ PARSE_WIN31_LINE, /* parsing a Windows 3.1 registry line */ LINE_START, /* at the beginning of a registry line */ + KEY_NAME, /* parsing a key name */ + DELETE_KEY, /* deleting a registry key */ SET_VALUE, /* adding a value to the registry */ NB_PARSER_STATES }; @@ -159,6 +161,8 @@ typedef WCHAR *(*parser_state_func)(struct parser *parser, WCHAR *pos); static WCHAR *header_state(struct parser *parser, WCHAR *pos); static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos); static WCHAR *line_start_state(struct parser *parser, WCHAR *pos); +static WCHAR *key_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos); static WCHAR *set_value_state(struct parser *parser, WCHAR *pos); static const parser_state_func parser_funcs[NB_PARSER_STATES] = @@ -166,6 +170,8 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = header_state, /* HEADER */ parse_win31_line_state, /* PARSE_WIN31_LINE */ line_start_state, /* LINE_START */ + key_name_state, /* KEY_NAME */ + delete_key_state, /* DELETE_KEY */ set_value_state, /* SET_VALUE */ }; @@ -348,21 +354,20 @@ static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed) return ret; } -static HKEY parseKeyName(LPWSTR lpKeyName, LPWSTR *lpKeyPath) +static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) { unsigned int i; - if (lpKeyName == NULL) - return 0; + if (!key_name) return 0; - *lpKeyPath = strchrW(lpKeyName, '\\'); - if (*lpKeyPath) (*lpKeyPath)++; + *key_path = strchrW(key_name, '\\'); + if (*key_path) (*key_path)++; for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { int len = lstrlenW(reg_class_namesW[i]); - if (!strncmpW(lpKeyName, reg_class_namesW[i], len) && - (lpKeyName[len] == 0 || lpKeyName[len] == '\\')) + if (!strncmpW(key_name, reg_class_namesW[i], len) && + (key_name[len] == 0 || key_name[len] == '\\')) { return reg_class_keys[i]; } @@ -500,36 +505,36 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) return res; } +static void closeKey(void) +{ + if (currentKeyHandle) + { + HeapFree(GetProcessHeap(), 0, currentKeyName); + currentKeyName = NULL; + + RegCloseKey(currentKeyHandle); + currentKeyHandle = NULL; + } +} + /****************************************************************************** - * A helper function for processRegEntry() that opens the current key. - * That key must be closed by calling closeKey(). + * Opens the registry key given by the input path. + * This key must be closed by calling close_key(). */ static LONG openKeyW(WCHAR* stdInput) { - HKEY keyClass; - WCHAR* keyPath; - DWORD dwDisp; + HKEY key_class; + WCHAR *key_path; LONG res; - /* Sanity checks */ - if (stdInput == NULL) - return ERROR_INVALID_PARAMETER; + closeKey(); /* Get the registry class */ - if (!(keyClass = parseKeyName(stdInput, &keyPath))) + if (!stdInput || !(key_class = parse_key_name(stdInput, &key_path))) return ERROR_INVALID_PARAMETER; - res = RegCreateKeyExW( - keyClass, /* Class */ - keyPath, /* Sub Key */ - 0, /* MUST BE 0 */ - NULL, /* object type */ - REG_OPTION_NON_VOLATILE, /* option, REG_OPTION_NON_VOLATILE ... */ - KEY_ALL_ACCESS, /* access mask, KEY_ALL_ACCESS */ - NULL, /* security attribute */ - &currentKeyHandle, /* result */ - &dwDisp); /* disposition, REG_CREATED_NEW_KEY or - REG_OPENED_EXISTING_KEY */ + res = RegCreateKeyExW(key_class, key_path, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &currentKeyHandle, NULL); if (res == ERROR_SUCCESS) { @@ -545,19 +550,6 @@ static LONG openKeyW(WCHAR* stdInput) } /****************************************************************************** - * Close the currently opened key. - */ -static void closeKey(void) -{ - if (currentKeyHandle) - { - HeapFree(GetProcessHeap(), 0, currentKeyName); - RegCloseKey(currentKeyHandle); - currentKeyHandle = NULL; - } -} - -/****************************************************************************** * This function is a wrapper for the setValue function. It prepares the * land and cleans the area once completed. * Note: this function modifies the line parameter. @@ -600,38 +592,6 @@ error: output_message(STRING_INVALID_LINE_SYNTAX); } -/****************************************************************************** - * This function receives the currently read entry and performs the - * corresponding action. - * isUnicode affects parsing of REG_MULTI_SZ values - */ -static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) -{ - if ( stdInput[0] == '[') /* We are reading a new key */ - { - WCHAR* keyEnd; - closeKey(); /* Close the previous key */ - - /* Get rid of the square brackets */ - stdInput++; - keyEnd = strrchrW(stdInput, ']'); - if (keyEnd) - *keyEnd='\0'; - else return; - - /* delete the key if we encounter '-' at the start of reg key */ - if (stdInput[0] == '-') - delete_registry_key(stdInput + 1); - else if (openKeyW(stdInput) != ERROR_SUCCESS) - output_message(STRING_OPEN_KEY_FAILED, stdInput); - } else if( currentKeyHandle && - (( stdInput[0] == '@') || /* reading a default @=data pair */ - ( stdInput[0] == '\"'))) /* reading a new value=data pair */ - { - processSetValue(stdInput, isUnicode); - } -} - enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -765,11 +725,12 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) switch (*p) { case '[': + set_state(parser, KEY_NAME); + return p + 1; case '@': case '"': - processRegEntry(p, parser->is_unicode); - set_state(parser, LINE_START); - return line; + processSetValue(p, parser->is_unicode); + return p; case ' ': case '\t': break; @@ -782,6 +743,41 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) return p; } +/* handler for parser KEY_NAME state */ +static WCHAR *key_name_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos, *key_end; + + if (*p == ' ' || *p == '\t' || !(key_end = strrchrW(p, ']'))) + goto done; + + *key_end = 0; + + if (*p == '-') + { + set_state(parser, DELETE_KEY); + return p + 1; + } + else if (openKeyW(p) != ERROR_SUCCESS) + output_message(STRING_OPEN_KEY_FAILED, p); + +done: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DELETE_KEY state */ +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + + if (*p == 'H') + delete_registry_key(p); + + set_state(parser, LINE_START); + return p; +} + /* handler for parser SET_VALUE state */ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) { @@ -1348,7 +1344,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) lstrcpyW(reg_key_name_buf, reg_key_name); /* open the specified key */ - if (!(reg_key_class = parseKeyName(reg_key_name, &branch_name))) { + if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); } @@ -1455,7 +1451,7 @@ void delete_registry_key(WCHAR *reg_key_name) if (!reg_key_name || !reg_key_name[0]) return; - if (!(key_class = parseKeyName(reg_key_name, &key_name))) { + if (!(key_class = parse_key_name(reg_key_name, &key_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); }

1 0

Hugh McMaster : regedit: Introduce a partial state machine for importing registry data.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: ec87800856c20b90a73924e05ab442a6bae0eec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec87800856c20b90a73924e05… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 12:00:31 2017 +0000 regedit: Introduce a partial state machine for importing registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 265 ++++++++++++++++++++++++++++----------- programs/regedit/tests/regedit.c | 16 +-- 2 files changed, 201 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec87800856c20b90a7392…

1 0

Michael Müller : server: Do not set SE_{D, S}ACL_PRESENT if no {D, S}ACL was set.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 187b53e5a5b13b85356a3b564565c45a101690ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=187b53e5a5b13b85356a3b564… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:42 2017 +0200 server: Do not set SE_{D, S}ACL_PRESENT if no {D, S}ACL was set. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- server/handle.c | 2 -- server/object.c | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dfc0a23..7842d0e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6207,8 +6207,8 @@ static void test_AddMandatoryAce(void) present = TRUE; ret = GetSecurityDescriptorSacl(sd2, &present, &sacl, &defaulted); ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); - todo_wine ok(!present, "SACL is present\n"); - todo_wine ok(sacl == (void *)0xdeadbeef, "SACL is set\n"); + ok(!present, "SACL is present\n"); + ok(sacl == (void *)0xdeadbeef, "SACL is set\n"); HeapFree(GetProcessHeap(), 0, sd2); CloseHandle(handle); diff --git a/server/handle.c b/server/handle.c index faa3a9f..35ab860 100644 --- a/server/handle.c +++ b/server/handle.c @@ -734,7 +734,6 @@ DECL_HANDLER(get_security_object) else req_sd.group_len = 0; - req_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); if (req->security_info & SACL_SECURITY_INFORMATION && present) req_sd.sacl_len = sd->sacl_len; @@ -747,7 +746,6 @@ DECL_HANDLER(get_security_object) else req_sd.sacl_len = 0; - req_sd.control |= SE_DACL_PRESENT; dacl = sd_get_dacl( sd, &present ); if (req->security_info & DACL_SECURITY_INFORMATION && present) req_sd.dacl_len = sd->dacl_len; diff --git a/server/object.c b/server/object.c index 70872e8..4455718 100644 --- a/server/object.c +++ b/server/object.c @@ -583,15 +583,18 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri } else new_sd.group_len = 0; - new_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); if (set_info & SACL_SECURITY_INFORMATION && present) + { + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = sd->sacl_len; + } else if (set_info & LABEL_SECURITY_INFORMATION && present) { const ACL *old_sacl = NULL; if (obj->sd && obj->sd->control & SE_SACL_PRESENT) old_sacl = sd_get_sacl( obj->sd, &present ); if (!(replaced_sacl = replace_security_labels( old_sacl, sacl ))) return 0; + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = replaced_sacl->AclSize; sacl = replaced_sacl; } @@ -600,24 +603,33 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri if (obj->sd) sacl = sd_get_sacl( obj->sd, &present ); if (obj->sd && present) + { + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = obj->sd->sacl_len; + } else new_sd.sacl_len = 0; } - new_sd.control |= SE_DACL_PRESENT; dacl = sd_get_dacl( sd, &present ); if (set_info & DACL_SECURITY_INFORMATION && present) + { + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = sd->dacl_len; + } else { if (obj->sd) dacl = sd_get_dacl( obj->sd, &present ); if (obj->sd && present) + { + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = obj->sd->dacl_len; + } else if (token) { dacl = token_get_default_dacl( token ); + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = dacl->AclSize; } else new_sd.dacl_len = 0;

1 0

Michael Müller : server: Implement changing the label of a security descriptor.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: af2d01c2fac1065382d162cdc7c6b2390e0b4b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2d01c2fac1065382d162cdc… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:41 2017 +0200 server: Implement changing the label of a security descriptor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 151 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/sec.c | 3 +- server/handle.c | 3 +- server/object.c | 16 ++++- server/security.h | 1 + server/token.c | 69 +++++++++++++++++++ 6 files changed, 239 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af2d01c2fac1065382d16…

1 0

Michael Müller : server: Implement querying the security label of a security descriptor.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 2ebe67963803d46cce77c770696f3b733a627fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe67963803d46cce77c7706… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:40 2017 +0200 server: Implement querying the security label of a security descriptor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 84 ++++++++++++++++++++++++++++++++++++++---- include/winnt.h | 35 +++++++++--------- server/handle.c | 9 +++++ server/security.h | 1 + server/token.c | 41 +++++++++++++++++++++ 5 files changed, 146 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebe67963803d46cce77c…

1 0