-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Fix GH-22167: reject out-of-range SOAP schema integers #22178
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+161
−3
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5427a74
Fix GH-22167: reject out-of-range SOAP schema integers
LamentXU123 16d949d
Reject Negative values
LamentXU123 234c53a
optimization
LamentXU123 ca978bc
[skip ci] The UPGRADING entry should be in the BC break section
LamentXU123 cb8ddd6
[skip ci] Change description in NEWS since this is not a bug fix
LamentXU123 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,6 +53,28 @@ static bool node_is_equal_xsd(xmlNodePtr node, const char *name) | |
| return node_is_equal_ex_one_of(node, name, ns); | ||
| } | ||
|
|
||
| static int schema_parse_int(const xmlChar *value, const char *name, bool allow_negative) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. workflow correct, can be possibly optimised/simplified like this static int schema_parse_int(const xmlChar *value, const char *name, bool allow_negative)
{
const char *str = (const char *) value;
zend_long lval = 0;
int oflow_info = 0;
uint8_t type = is_numeric_string_ex(str, strlen(str), &lval, NULL, true, &oflow_info, NULL);
if (type != IS_LONG) {
errno = 0;
lval = ZEND_STRTOL(str, NULL, 10);
if (oflow_info || (errno == ERANGE && lval != 0)) {
soap_error1(E_ERROR, "Parsing Schema: %s value is out of range", name);
}
}
if (ZEND_LONG_EXCEEDS_INT(lval) || (!allow_negative && lval < 0)) {
soap_error1(E_ERROR, "Parsing Schema: %s value is out of range", name);
}
return (int) lval;
}wdyt ?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks good to me :) |
||
| { | ||
| const char *str = (const char *) value; | ||
| zend_long lval = 0; | ||
| int oflow_info = 0; | ||
| uint8_t type = is_numeric_string_ex(str, strlen(str), &lval, NULL, true, &oflow_info, NULL); | ||
|
|
||
| if (type != IS_LONG) { | ||
| errno = 0; | ||
| lval = ZEND_STRTOL(str, NULL, 10); | ||
| if (oflow_info || (errno == ERANGE && lval != 0)) { | ||
| soap_error1(E_ERROR, "Parsing Schema: %s value is out of range", name); | ||
| } | ||
| } | ||
|
|
||
| if (ZEND_LONG_EXCEEDS_INT(lval) || (!allow_negative && lval < 0)) { | ||
| soap_error1(E_ERROR, "Parsing Schema: %s value is out of range", name); | ||
| } | ||
|
|
||
| return (int) lval; | ||
| } | ||
|
|
||
| static encodePtr create_encoder(sdlPtr sdl, sdlTypePtr cur_type, const xmlChar *ns, const xmlChar *type) | ||
| { | ||
| smart_str nscat = {0}; | ||
|
|
@@ -854,7 +876,7 @@ static int schema_restriction_var_int(xmlNodePtr val, sdlRestrictionIntPtr *valp | |
| soap_error0(E_ERROR, "Parsing Schema: missing restriction value"); | ||
| } | ||
|
|
||
| (*valptr)->value = atoi((char*)value->children->content); | ||
| (*valptr)->value = schema_parse_int(value->children->content, (const char *) val->name, true); | ||
|
|
||
| return TRUE; | ||
| } | ||
|
|
@@ -1016,7 +1038,7 @@ void schema_min_max(xmlNodePtr node, sdlContentModelPtr model) | |
| xmlAttrPtr attr = get_attribute(node->properties, "minOccurs"); | ||
|
|
||
| if (attr) { | ||
| model->min_occurs = atoi((char*)attr->children->content); | ||
| model->min_occurs = schema_parse_int(attr->children->content, "minOccurs", false); | ||
| } else { | ||
| model->min_occurs = 1; | ||
| } | ||
|
|
@@ -1026,7 +1048,7 @@ void schema_min_max(xmlNodePtr node, sdlContentModelPtr model) | |
| if (!strncmp((char*)attr->children->content, "unbounded", sizeof("unbounded"))) { | ||
| model->max_occurs = -1; | ||
| } else { | ||
| model->max_occurs = atoi((char*)attr->children->content); | ||
| model->max_occurs = schema_parse_int(attr->children->content, "maxOccurs", false); | ||
| } | ||
| } else { | ||
| model->max_occurs = 1; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| --TEST-- | ||
| GH-22167 (Out-of-range XML Schema integer values in SOAP WSDL) | ||
| --EXTENSIONS-- | ||
| soap | ||
| --INI-- | ||
| soap.wsdl_cache_enabled=0 | ||
| --FILE-- | ||
| <?php | ||
| function wsdl_with_schema(string $schema): string { | ||
| return <<<XML | ||
| <?xml version="1.0"?> | ||
| <definitions | ||
| xmlns:xsd="http://www.w3.org/2001/XMLSchema" | ||
| xmlns:tns="http://test-uri/" | ||
| xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" | ||
| xmlns="http://schemas.xmlsoap.org/wsdl/" | ||
| targetNamespace="http://test-uri/"> | ||
| <types> | ||
| <xsd:schema targetNamespace="http://test-uri/"> | ||
| $schema | ||
| </xsd:schema> | ||
| </types> | ||
| <message name="m"><part name="p" type="tns:T"/></message> | ||
| <portType name="p"><operation name="op"><input message="tns:m"/></operation></portType> | ||
| <binding name="b" type="tns:p"> | ||
| <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> | ||
| <operation name="op"> | ||
| <soap:operation soapAction="#op"/> | ||
| <input> | ||
| <soap:body use="encoded" | ||
| namespace="http://test-uri/" | ||
| encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> | ||
| </input> | ||
| </operation> | ||
| </binding> | ||
| <service name="s"><port name="p" binding="tns:b"><soap:address location="test://"/></port></service> | ||
| </definitions> | ||
| XML; | ||
| } | ||
|
|
||
| function occurrence_schema(string $attribute, string $value = "2147483648"): string { | ||
| return <<<XML | ||
| <xsd:complexType name="T"> | ||
| <xsd:sequence> | ||
| <xsd:element name="x" type="xsd:string" $attribute="$value"/> | ||
| </xsd:sequence> | ||
| </xsd:complexType> | ||
| XML; | ||
| } | ||
|
|
||
| function restriction_schema(string $facet, string $value = "2147483648"): string { | ||
| return <<<XML | ||
| <xsd:simpleType name="T"> | ||
| <xsd:restriction base="xsd:int"> | ||
| <xsd:$facet value="$value"/> | ||
| </xsd:restriction> | ||
| </xsd:simpleType> | ||
| XML; | ||
| } | ||
|
|
||
| $cases = [ | ||
| "minOccurs" => occurrence_schema("minOccurs"), | ||
| "maxOccurs" => occurrence_schema("maxOccurs"), | ||
| "negative minOccurs" => occurrence_schema("minOccurs", "-1"), | ||
| "negative maxOccurs" => occurrence_schema("maxOccurs", "-1"), | ||
| "minExclusive" => restriction_schema("minExclusive"), | ||
| "minInclusive" => restriction_schema("minInclusive"), | ||
| "maxExclusive" => restriction_schema("maxExclusive"), | ||
| "maxInclusive" => restriction_schema("maxInclusive"), | ||
| "totalDigits" => restriction_schema("totalDigits"), | ||
| "fractionDigits" => restriction_schema("fractionDigits"), | ||
| "length" => restriction_schema("length"), | ||
| "minLength" => restriction_schema("minLength"), | ||
| "maxLength" => restriction_schema("maxLength"), | ||
| ]; | ||
|
|
||
| $numeric_string_cases = [ | ||
| "leading whitespace numeric-string" => " 2147483648", | ||
| "leading plus numeric-string" => "+2147483648", | ||
| "leading zero numeric-string" => "00000000002147483648", | ||
| "leading numeric-string with trailing data" => "2147483648abc", | ||
| "negative out-of-range numeric-string" => "-2147483649", | ||
| "decimal numeric-string" => "2147483648.0", | ||
| "exponent numeric-string" => "2147483648e0", | ||
|
LamentXU123 marked this conversation as resolved.
|
||
| ]; | ||
|
|
||
| foreach ($numeric_string_cases as $name => $value) { | ||
| $cases[$name] = occurrence_schema("maxOccurs", $value); | ||
| } | ||
|
|
||
| $cases["fractional numeric-string within int range"] = occurrence_schema("maxOccurs", "3.141"); | ||
|
|
||
| foreach ($cases as $name => $schema) { | ||
| $file = tempnam(sys_get_temp_dir(), "wsdl"); | ||
| file_put_contents($file, wsdl_with_schema($schema)); | ||
|
|
||
| try { | ||
| new SoapClient($file, ["cache_wsdl" => WSDL_CACHE_NONE]); | ||
| echo "$name: parsed\n"; | ||
| } catch (SoapFault $e) { | ||
| echo "$name: {$e->getMessage()}\n"; | ||
| } finally { | ||
| unlink($file); | ||
| } | ||
| } | ||
| ?> | ||
| --EXPECT-- | ||
| minOccurs: SOAP-ERROR: Parsing Schema: minOccurs value is out of range | ||
| maxOccurs: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| negative minOccurs: SOAP-ERROR: Parsing Schema: minOccurs value is out of range | ||
| negative maxOccurs: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| minExclusive: SOAP-ERROR: Parsing Schema: minExclusive value is out of range | ||
| minInclusive: SOAP-ERROR: Parsing Schema: minInclusive value is out of range | ||
| maxExclusive: SOAP-ERROR: Parsing Schema: maxExclusive value is out of range | ||
| maxInclusive: SOAP-ERROR: Parsing Schema: maxInclusive value is out of range | ||
| totalDigits: SOAP-ERROR: Parsing Schema: totalDigits value is out of range | ||
| fractionDigits: SOAP-ERROR: Parsing Schema: fractionDigits value is out of range | ||
| length: SOAP-ERROR: Parsing Schema: length value is out of range | ||
| minLength: SOAP-ERROR: Parsing Schema: minLength value is out of range | ||
| maxLength: SOAP-ERROR: Parsing Schema: maxLength value is out of range | ||
| leading whitespace numeric-string: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| leading plus numeric-string: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| leading zero numeric-string: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| leading numeric-string with trailing data: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| negative out-of-range numeric-string: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| decimal numeric-string: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| exponent numeric-string: SOAP-ERROR: Parsing Schema: maxOccurs value is out of range | ||
| fractional numeric-string within int range: parsed | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small note. You should reference the bug in NEWS (but not UPGRADING). See other occurences of "Fixed bug GH-" in this file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was aware. I do this intentionally because I want to treat this as feature requests (stricter parsing) instead of bug fix. Shell I push a [skip ci] commit to fix this?