November 2009 - Wine-commits

Juan Lang : crypt32: Remove an unnecessary if.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: f8044948bad5507fecdd0a3bdd5e409f010e3fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8044948bad5507fecdd0a3bd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 18:12:16 2009 -0800 crypt32: Remove an unnecessary if. --- dlls/crypt32/chain.c | 71 ++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 39 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 11010d5..89ce807 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -778,50 +778,43 @@ static void CRYPT_CheckNameConstraints( const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, DWORD *trustErrorStatus) { - /* If there aren't any existing constraints, don't bother checking */ - if (nameConstraints->cPermittedSubtree || nameConstraints->cExcludedSubtree) + CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + + if (ext) { - CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + CERT_ALT_NAME_INFO *subjectName; + DWORD size; - if (ext) + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &subjectName, &size)) { - CERT_ALT_NAME_INFO *subjectName; - DWORD size; - - if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, - ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - &subjectName, &size)) - { - DWORD i; + DWORD i; - for (i = 0; i < nameConstraints->cExcludedSubtree; i++) - CRYPT_FindMatchingNameEntry( - &nameConstraints->rgExcludedSubtree[i].Base, subjectName, - trustErrorStatus, - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0); - for (i = 0; i < nameConstraints->cPermittedSubtree; i++) - CRYPT_FindMatchingNameEntry( - &nameConstraints->rgPermittedSubtree[i].Base, subjectName, - trustErrorStatus, 0, - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); - LocalFree(subjectName); - } - else - *trustErrorStatus |= - CERT_TRUST_INVALID_EXTENSION | - CERT_TRUST_INVALID_NAME_CONSTRAINTS; + for (i = 0; i < nameConstraints->cExcludedSubtree; i++) + CRYPT_FindMatchingNameEntry( + &nameConstraints->rgExcludedSubtree[i].Base, subjectName, + trustErrorStatus, CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0); + for (i = 0; i < nameConstraints->cPermittedSubtree; i++) + CRYPT_FindMatchingNameEntry( + &nameConstraints->rgPermittedSubtree[i].Base, subjectName, + trustErrorStatus, 0, + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); + LocalFree(subjectName); } else - { - if (nameConstraints->cPermittedSubtree) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; - if (nameConstraints->cExcludedSubtree) - *trustErrorStatus |= - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - } + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; + } + else + { + if (nameConstraints->cPermittedSubtree) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + if (nameConstraints->cExcludedSubtree) + *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; } }

1 0

Juan Lang : crypt32: Let caller set error codes when name constraints aren' t met.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 9a40de08dec33cf1cba0ed2b508300d8286060a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a40de08dec33cf1cba0ed2b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 18:16:34 2009 -0800 crypt32: Let caller set error codes when name constraints aren't met. --- dlls/crypt32/chain.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 89ce807..f92b906 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -720,9 +720,8 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, return match; } -static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, - const CERT_ALT_NAME_INFO *subjectName, DWORD *trustErrorStatus, - DWORD errorIfFound, DWORD errorIfNotFound) +static BOOL CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, + const CERT_ALT_NAME_INFO *subjectName, DWORD *trustErrorStatus) { DWORD i; BOOL match = FALSE; @@ -759,7 +758,7 @@ static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, } } } - *trustErrorStatus |= match ? errorIfFound : errorIfNotFound; + return match; } static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) @@ -793,14 +792,21 @@ static void CRYPT_CheckNameConstraints( DWORD i; for (i = 0; i < nameConstraints->cExcludedSubtree; i++) - CRYPT_FindMatchingNameEntry( + { + if (CRYPT_FindMatchingNameEntry( &nameConstraints->rgExcludedSubtree[i].Base, subjectName, - trustErrorStatus, CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0); + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } for (i = 0; i < nameConstraints->cPermittedSubtree; i++) - CRYPT_FindMatchingNameEntry( + { + if (!CRYPT_FindMatchingNameEntry( &nameConstraints->rgPermittedSubtree[i].Base, subjectName, - trustErrorStatus, 0, - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } LocalFree(subjectName); } else

1 0

Juan Lang : crypt32: Use helper functions to match excluded and permitted subtrees of name constraints .
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 7c44544a6d36e89cf62f3e7a848468632e349abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c44544a6d36e89cf62f3e7a8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 11:51:31 2009 -0800 crypt32: Use helper functions to match excluded and permitted subtrees of name constraints. --- dlls/crypt32/chain.c | 94 +++++++++++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f92b906..2965a56 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -720,47 +720,66 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, return match; } -static BOOL CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, - const CERT_ALT_NAME_INFO *subjectName, DWORD *trustErrorStatus) +static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, + const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus) { - DWORD i; BOOL match = FALSE; - for (i = 0; i < subjectName->cAltEntry; i++) + if (name->dwAltNameChoice == constraint->dwAltNameChoice) { - if (subjectName->rgAltEntry[i].dwAltNameChoice == - constraint->dwAltNameChoice) + switch (constraint->dwAltNameChoice) { - switch (constraint->dwAltNameChoice) - { - case CERT_ALT_NAME_RFC822_NAME: - match = rfc822_name_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_DNS_NAME: - match = dns_name_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_URL: - match = url_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_IP_ADDRESS: - match = ip_address_matches(&constraint->u.IPAddress, - &subjectName->rgAltEntry[i].u.IPAddress, trustErrorStatus); - break; - case CERT_ALT_NAME_DIRECTORY_NAME: - default: - ERR("name choice %d unsupported in this context\n", - constraint->dwAltNameChoice); - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; - } + case CERT_ALT_NAME_RFC822_NAME: + match = rfc822_name_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_DNS_NAME: + match = dns_name_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_URL: + match = url_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_IP_ADDRESS: + match = ip_address_matches(&constraint->u.IPAddress, + &name->u.IPAddress, trustErrorStatus); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + default: + ERR("name choice %d unsupported in this context\n", + constraint->dwAltNameChoice); + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; } } return match; } +static BOOL alt_name_matches_excluded_name(const CERT_ALT_NAME_ENTRY *name, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) + match = alt_name_matches(name, + &nameConstraints->rgExcludedSubtree[i].Base, trustErrorStatus); + return match; +} + +static BOOL alt_name_matches_permitted_name(const CERT_ALT_NAME_ENTRY *name, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) + match = alt_name_matches(name, + &nameConstraints->rgPermittedSubtree[i].Base, trustErrorStatus); + return match; +} + static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) { PCERT_EXTENSION ext; @@ -791,18 +810,15 @@ static void CRYPT_CheckNameConstraints( { DWORD i; - for (i = 0; i < nameConstraints->cExcludedSubtree; i++) + for (i = 0; i < subjectName->cAltEntry; i++) { - if (CRYPT_FindMatchingNameEntry( - &nameConstraints->rgExcludedSubtree[i].Base, subjectName, + if (alt_name_matches_excluded_name( + &subjectName->rgAltEntry[i], nameConstraints, trustErrorStatus)) *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - } - for (i = 0; i < nameConstraints->cPermittedSubtree; i++) - { - if (!CRYPT_FindMatchingNameEntry( - &nameConstraints->rgPermittedSubtree[i].Base, subjectName, + if (!alt_name_matches_permitted_name( + &subjectName->rgAltEntry[i], nameConstraints, trustErrorStatus)) *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT;

1 0

Juan Lang : crypt32: Partially implement checking name constraints with directory names.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: f6d3348b7c52cb00f1d21bdbe4241296eb0ba2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d3348b7c52cb00f1d21bdbe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 11:25:13 2009 -0800 crypt32: Partially implement checking name constraints with directory names. --- dlls/crypt32/chain.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 2965a56..704d974 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -720,6 +720,28 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, return match; } +static BOOL directory_name_matches(const CERT_NAME_BLOB *constraint, + const CERT_NAME_BLOB *name) +{ + CERT_NAME_INFO *constraintName; + DWORD size; + BOOL match = FALSE; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_NAME, constraint->pbData, + constraint->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &constraintName, &size)) + { + DWORD i; + + match = TRUE; + for (i = 0; match && i < constraintName->cRDN; i++) + match = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, + CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, + (CERT_NAME_BLOB *)name, &constraintName->rgRDN[i]); + LocalFree(constraintName); + } + return match; +} + static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus) { @@ -746,6 +768,9 @@ static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, &name->u.IPAddress, trustErrorStatus); break; case CERT_ALT_NAME_DIRECTORY_NAME: + match = directory_name_matches(&constraint->u.DirectoryName, + &name->u.DirectoryName); + break; default: ERR("name choice %d unsupported in this context\n", constraint->dwAltNameChoice);

1 0

Juan Lang : crypt32: Only apply a name constraint if the name form is present.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: a98dad4f93daf1bb8a10fbe7e776bd4c8b7b381d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98dad4f93daf1bb8a10fbe7e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 12:06:18 2009 -0800 crypt32: Only apply a name constraint if the name form is present. --- dlls/crypt32/chain.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 704d974..8c7ad5b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -743,12 +743,14 @@ static BOOL directory_name_matches(const CERT_NAME_BLOB *constraint, } static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, - const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus) + const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus, BOOL *present) { BOOL match = FALSE; if (name->dwAltNameChoice == constraint->dwAltNameChoice) { + if (present) + *present = TRUE; switch (constraint->dwAltNameChoice) { case CERT_ALT_NAME_RFC822_NAME: @@ -778,6 +780,8 @@ static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; } } + else if (present) + *present = FALSE; return match; } @@ -789,19 +793,21 @@ static BOOL alt_name_matches_excluded_name(const CERT_ALT_NAME_ENTRY *name, for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) match = alt_name_matches(name, - &nameConstraints->rgExcludedSubtree[i].Base, trustErrorStatus); + &nameConstraints->rgExcludedSubtree[i].Base, trustErrorStatus, NULL); return match; } static BOOL alt_name_matches_permitted_name(const CERT_ALT_NAME_ENTRY *name, - const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus, + BOOL *present) { DWORD i; BOOL match = FALSE; for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) match = alt_name_matches(name, - &nameConstraints->rgPermittedSubtree[i].Base, trustErrorStatus); + &nameConstraints->rgPermittedSubtree[i].Base, trustErrorStatus, + present); return match; } @@ -837,14 +843,23 @@ static void CRYPT_CheckNameConstraints( for (i = 0; i < subjectName->cAltEntry; i++) { + BOOL nameFormPresent; + + /* A name constraint only applies if the name form is present. + * From RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is + * present. If no name of the type is in the certificate, + * the certificate is acceptable." + */ if (alt_name_matches_excluded_name( &subjectName->rgAltEntry[i], nameConstraints, trustErrorStatus)) *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + nameFormPresent = FALSE; if (!alt_name_matches_permitted_name( &subjectName->rgAltEntry[i], nameConstraints, - trustErrorStatus)) + trustErrorStatus, &nameFormPresent) && nameFormPresent) *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; }

1 0

Juan Lang : crypt32: Use helper function to compare a subject alternate name with name constraints .
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 6f35ae25b8043b0b6200b347847d05ee1b0d7c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f35ae25b8043b0b6200b3478… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 12:19:46 2009 -0800 crypt32: Use helper function to compare a subject alternate name with name constraints. --- dlls/crypt32/chain.c | 83 ++++++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8c7ad5b..14e716a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -823,53 +823,58 @@ static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) return ext; } -static void CRYPT_CheckNameConstraints( - const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, - DWORD *trustErrorStatus) +static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) { - CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + CERT_ALT_NAME_INFO *subjectAltName; + DWORD size; - if (ext) + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + altNameExt->Value.pbData, altNameExt->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &subjectAltName, &size)) { - CERT_ALT_NAME_INFO *subjectName; - DWORD size; + DWORD i; - if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, - ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - &subjectName, &size)) + for (i = 0; i < subjectAltName->cAltEntry; i++) { - DWORD i; - - for (i = 0; i < subjectName->cAltEntry; i++) - { - BOOL nameFormPresent; - - /* A name constraint only applies if the name form is present. - * From RFC 5280, section 4.2.1.10: - * "Restrictions apply only when the specified name form is - * present. If no name of the type is in the certificate, - * the certificate is acceptable." - */ - if (alt_name_matches_excluded_name( - &subjectName->rgAltEntry[i], nameConstraints, - trustErrorStatus)) - *trustErrorStatus |= - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - nameFormPresent = FALSE; - if (!alt_name_matches_permitted_name( - &subjectName->rgAltEntry[i], nameConstraints, - trustErrorStatus, &nameFormPresent) && nameFormPresent) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; - } - LocalFree(subjectName); + BOOL nameFormPresent; + + /* A name constraint only applies if the name form is present. + * From RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is + * present. If no name of the type is in the certificate, + * the certificate is acceptable." + */ + if (alt_name_matches_excluded_name( + &subjectAltName->rgAltEntry[i], nameConstraints, + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + nameFormPresent = FALSE; + if (!alt_name_matches_permitted_name( + &subjectAltName->rgAltEntry[i], nameConstraints, + trustErrorStatus, &nameFormPresent) && nameFormPresent) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; } - else - *trustErrorStatus |= - CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; + LocalFree(subjectAltName); } else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; +} + +static void CRYPT_CheckNameConstraints( + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, + DWORD *trustErrorStatus) +{ + CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + + if (ext) + compare_alt_name_with_constraints(ext, nameConstraints, + trustErrorStatus); + else { if (nameConstraints->cPermittedSubtree) *trustErrorStatus |=

1 0

Alexander Nicolaysen Sørnes : testData: Allow admins to only show entries for versions they maintain
by Alexander Nicolaysen Sørnes 17 Nov '09

17 Nov '09

Module: appdb Branch: master Commit: 038a0da4cf575be3d7da6addf27451c021705e76 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=038a0da4cf575be3d7da6add… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 19:45:17 2009 +0100 testData: Allow admins to only show entries for versions they maintain --- include/testData.php | 57 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 12 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1a6762f..879e363 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1175,27 +1175,46 @@ class testData{ { $oFilter = new FilterInterface(); $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show test data for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + + /* Allow admins to only show entries for apps they maintain */ + if($_SESSION['current']->hasPriv('admin')) + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show test data for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; } function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oTest = new testData(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oTest->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appVersion'; $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; } - $oTest = new testData(); - - if($sState != 'accepted' && !$oTest->canEdit()) + if($bOnlyMyMaintainedEntries) { - if($sState == 'rejected') + if(!$oTest->canEdit() && $sState == 'rejected') { $sQuery = "SELECT COUNT(testingId) AS count FROM testResults$sExtraTables WHERE @@ -1255,18 +1274,32 @@ class testData{ function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oTest = new testData(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oTest->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } + + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appVersion'; $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; } - $oTest = new testData(); - $sLimit = ""; /* Should we add a limit clause to the query? */ @@ -1280,9 +1313,9 @@ class testData{ $iRows = testData::objectGetEntriesCount($sState); } - if($sState != 'accepted' && !$oTest->canEdit()) + if($bOnlyMyMaintainedEntries) { - if($sState == 'rejected') + if(!$oTest->canEdit() && $sState == 'rejected') { $sQuery = "SELECT testResults.* FROM testResults$sExtraTables WHERE testResults.submitterId = '?'

1 0

Alexander Nicolaysen Sørnes : testData: Don't show non-admins the option of showing unmaintained entries, as it has no effect for them
by Alexander Nicolaysen Sørnes 17 Nov '09

17 Nov '09

Module: appdb Branch: master Commit: 03ac68731c1305bdd786184bb6472c20669be1e8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=03ac68731c1305bdd786184b… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 20:00:56 2009 +0100 testData: Don't show non-admins the option of showing unmaintained entries, as it has no effect for them --- include/testData.php | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/testData.php b/include/testData.php index 879e363..e565bee 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1174,11 +1174,14 @@ class testData{ public function objectGetFilterInfo() { $oFilter = new FilterInterface(); + + /* The following filters are only useful for admins */ + if(!$_SESSION['current']->hasPriv('admin')) + return null; + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show test data for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); - /* Allow admins to only show entries for apps they maintain */ - if($_SESSION['current']->hasPriv('admin')) - $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show test data for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show test data for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter; }

1 0

Alexander Nicolaysen Sørnes : Emails especially for admins should be sent regardless of global emails setting
by Alexander Nicolaysen Sørnes 17 Nov '09

17 Nov '09

Module: appdb Branch: master Commit: d3491d916c5378a1de136459065ed26d7a472c49 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d3491d916c5378a1de136459… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 20:06:19 2009 +0100 Emails especially for admins should be sent regardless of global emails setting --- include/user.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/user.php b/include/user.php index 36101af..a3b3426 100644 --- a/include/user.php +++ b/include/user.php @@ -580,9 +580,12 @@ class User { // if we didn't find this entry in the $aUserId // array then we should add it if the admin has - // enabled global emails + // enabled global emails. + // If both appId and versionId are null we are especially + // requesting to email admins, so the mail should be sent + // regardless of global emails setting $oAdmin = new user($oRow->userid); - if($i === false && ($oAdmin->getPref('disable_global_emails','no') == 'no')) + if($i === false && ($oAdmin->getPref('disable_global_emails','no') == 'no' && ($iAppId || $iVersionId))) $aUserId[] = $oRow->userid; } }

1 0

Alexander Nicolaysen Sørnes : testData: Add Installs? option of 'No, but has workaround'
by Alexander Nicolaysen Sørnes 17 Nov '09

17 Nov '09

Module: appdb Branch: master Commit: 0df84bdc05fc5fad39304bda89a8450f88b083e0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0df84bdc05fc5fad39304bda… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 20:26:53 2009 +0100 testData: Add Installs? option of 'No, but has workaround' --- include/testData.php | 8 ++++---- tables/testResults.sql | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/testData.php b/include/testData.php index e565bee..5b6f1cb 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1012,16 +1012,16 @@ class testData{ if (($aValues['sRuns'] != "Yes") && ($aValues['sTestedRating'] != GARBAGE_RATING)) $errors .= "<li>Applications that do not run should be rated ‘Garbage’.</li>\n"; - if (($aValues['sInstalls'] == "No") && ($aValues['sTestedRating'] == PLATINUM_RATING)) + if (($aValues['sInstalls'] == "No" || $aValues['sInstalls'] == 'No, but has workaround') && ($aValues['sTestedRating'] == PLATINUM_RATING)) $errors .= "<li>An application can only get a Platinum rating if it installs and runs ‘out of the box’.</li>\n"; // Basic checking of logic. Runs? can obviously only be 'Not Installable' // if the application does not install if (($aValues['sInstalls'] != "No") && ($aValues['sRuns'] == "Not installable")) - $errors .= "<li>You can only set Runs? to ‘Not installable’ if the application's installer does not work</li>\n"; + $errors .= "<li>You can only set Runs? to ‘Not installable’ if Installs? is set ‘No’</li>\n"; if (($aValues['sInstalls'] == "No") && ($aValues['sRuns'] != "Not installable")) - $errors .= "<li>You can only set Runs? to ‘Not installable’' if the application's installer does not work</li>\n"; + $errors .= "<li>Runs? must be set to ‘Not installable’ if there is no way to install the app</li>\n"; return $errors; @@ -1053,7 +1053,7 @@ class testData{ { echo "<select name='$sVarname'>\n"; echo "<option value=\"\">Choose ...</option>\n"; - $aRating = array("Yes", "No", "N/A"); + $aRating = array('Yes', 'No', 'No, but has workaround', 'N/A'); $iMax = count($aRating); for($i=0; $i < $iMax; $i++) diff --git a/tables/testResults.sql b/tables/testResults.sql index dd0d899..7f88a54 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -14,7 +14,7 @@ create table testResults ( testedDate datetime not null, distributionId int not null, testedRelease tinytext, - installs enum('Yes','No','N/A') NOT NULL default 'Yes', + installs enum('Yes','No','No, but has workaround','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL, comments text,

1 0