Merge code changes from upstream r431

Author: daviddrysdale

python/phonenumbers/phonenumberutil.py

@@ -71,6 +71,9 @@
 _MAX_LENGTH_FOR_NSN = 16
 # The maximum length of the country calling code.
 _MAX_LENGTH_COUNTRY_CODE = 3
+# We don't allow input strings for parsing to be longer than 250 chars. This
+# prevents malicious input from overflowing the regular-expression engine.
+_MAX_INPUT_STRING_LENGTH = 250
 # Region-code for the unknown region.
 UNKNOWN_REGION = u"ZZ"
 # The set of regions that share country calling code 1.
@@ -2234,6 +2237,9 @@ def parse(number, region=None, keep_raw_input=False,
     if number is None:
         raise NumberParseException(NumberParseException.NOT_A_NUMBER,
                                    "The phone number supplied was None.")
+    elif len(number) > _MAX_INPUT_STRING_LENGTH:
+        raise NumberParseException(NumberParseException.TOO_LONG,
+                                   "The string supplied was too long to parse.")
     raw_number = number
     # Extract a possible number from the string passed in (this strips leading
     # characters that could not be the start of a phone number.)

python/tests/asyoutypetest.py

@@ -16,30 +16,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import unittest
-
 from phonenumbers import AsYouTypeFormatter
 from phonenumbers import PhoneMetadata, PhoneNumberDesc, NumberFormat
 # Access internal functions of phonenumberutil.py
 from phonenumbers import phonenumberutil
-from .phonenumberutiltest import insert_test_metadata, reinstate_real_metadata
+from .testmetadatatest import TestMetadataTestCase
 
 
-class AsYouTypeFormatterTest(unittest.TestCase):
+class AsYouTypeFormatterTest(TestMetadataTestCase):
     """Unit tests for AsYouTypeFormatter.java
 
-    Note that these tests use the metadata contained in the files in
-    tests/data, not the normal metadata files, so should not be used for
-    regression test purposes - these tests are illustrative only and test
-    functionality.
+    Note that these tests use the test metadata, not the normal metadata file,
+    so should not be used for regression test purposes - these tests are
+    illustrative only and test functionality.
     """
 
-    def setUp(self):
-        insert_test_metadata()
-
-    def tearDown(self):
-        reinstate_real_metadata()
-
     def testInvalidRegion(self):
         formatter = AsYouTypeFormatter("ZZ")
         self.assertEqual("+", formatter.input_digit('+'))

python/tests/phonenumbermatchertest.py

@@ -22,7 +22,7 @@
 
 from phonenumbers import PhoneNumberMatch, PhoneNumberMatcher, Leniency
 from phonenumbers import PhoneNumber, phonenumberutil
-from .phonenumberutiltest import insert_test_metadata, reinstate_real_metadata
+from .testmetadatatest import TestMetadataTestCase
 
 
 class PhoneNumberMatchTest(unittest.TestCase):
@@ -196,19 +196,13 @@ def __str__(self):
                         ]
 
 
-class PhoneNumberMatcherTest(unittest.TestCase):
+class PhoneNumberMatcherTest(TestMetadataTestCase):
     """Tests for PhoneNumberMatcher.
 
     This only tests basic functionality based on test metadata.  See
     testphonenumberutil.py for the origin of the test data.
     """
 
-    def setUp(self):
-        insert_test_metadata()
-
-    def tearDown(self):
-        reinstate_real_metadata()
-
     # See PhoneNumberUtilTest.testParseNationalNumber().
     def testFindNationalNumber(self):
         # same cases as in testParseNationalNumber
@@ -679,6 +673,18 @@ def testMaxMatchesMixed(self):
 
         self.assertEqual(expected, actual)
 
+    def testNonPlusPrefixedNumbersNotFoundForInvalidRegion(self):
+        # Does not start with a "+", we won't match it.
+        matcher = PhoneNumberMatcher("1 456 764 156", "ZZ")
+        self.assertFalse(matcher.has_next())
+        try:
+            matcher.next()
+            self.fail("Violation of the Iterator contract.")
+        except Exception:
+            # Success
+            pass
+        self.assertFalse(matcher.has_next())
+
     def testEmptyIteration(self):
         matcher = PhoneNumberMatcher("", "ZZ")
         self.assertFalse(matcher.has_next())

python/tests/phonenumberutiltest.py

@@ -17,7 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-import unittest
 
 import phonenumbers
 from phonenumbers import PhoneNumber, PhoneMetadata
@@ -26,18 +25,8 @@
 from phonenumbers import ValidationResult, NumberFormat, CountryCodeSource
 # Access internal functions of phonenumberutil.py
 from phonenumbers import phonenumberutil
+from .testmetadatatest import TestMetadataTestCase
 
-# Override library metadata with the test metadata.
-REAL_REGION_METADATA = PhoneMetadata.region_metadata
-REAL_CC_TO_RC = phonenumberutil.COUNTRY_CODE_TO_REGION_CODE
-
-PhoneMetadata.region_metadata = {}
-phonenumberutil.COUNTRY_CODE_TO_REGION_CODE = {}
-
-# Import the test data; this will re-populate the
-# PhoneMetadata.region_metadata map
-from .testdata import _COUNTRY_CODE_TO_REGION_CODE as TEST_CC_TO_RC
-TEST_REGION_METADATA = PhoneMetadata.region_metadata
 
 if sys.version_info >= (3, 0):
     # Python 3 has unlimited-precision int, so no 'L' suffix
@@ -49,20 +38,6 @@
     _UP = 'u'
 
 
-def reinstate_real_metadata():
-    """Reinstate real phone number metadata"""
-    phonenumberutil.COUNTRY_CODE_TO_REGION_CODE = REAL_CC_TO_RC
-    PhoneMetadata.region_metadata = REAL_REGION_METADATA
-
-
-def insert_test_metadata():
-    """Insert test metadata into library"""
-    phonenumberutil.COUNTRY_CODE_TO_REGION_CODE = TEST_CC_TO_RC
-    PhoneMetadata.region_metadata = TEST_REGION_METADATA
-
-# Reinstate the real metadata so any importers of this module are not affected
-reinstate_real_metadata()
-
 # Set up some test numbers to re-use.
 ALPHA_NUMERIC_NUMBER = FrozenPhoneNumber(country_code=1, national_number=80074935247L)
 AR_MOBILE = FrozenPhoneNumber(country_code=54, national_number=91187654321L)
@@ -101,20 +76,13 @@ def insert_test_metadata():
 XY_NUMBER = FrozenPhoneNumber(country_code=999, national_number=1234567890L)
 
 
-class PhoneNumberUtilTest(unittest.TestCase):
+class PhoneNumberUtilTest(TestMetadataTestCase):
     """Unit tests for phonenumbers/__init__.py
 
-    Note that these tests use the metadata contained in the files in
-    tests/data, not the normal metadata files, so should not be used for
-    regression test purposes - these tests are illustrative only and test
-    functionality.
+    Note that these tests use the test metadata, not the normal metadata file,
+    so should not be used for regression test purposes - these tests are
+    illustrative only and test functionality.
     """
-    def setUp(self):
-        insert_test_metadata()
-
-    def tearDown(self):
-        reinstate_real_metadata()
-
     def testSupportedRegions(self):
         self.assertTrue(len(phonenumbers.SUPPORTED_REGIONS) > 0)
         # Python version extra test
@@ -1015,13 +983,9 @@ def testIsValidForRegion(self):
         invalidNumber.country_code = 3923
         invalidNumber.national_number = 2366L
         self.assertFalse(phonenumbers.is_valid_number_for_region(invalidNumber, "ZZ"))
-        invalidNumber.country_code = 3923
-        invalidNumber.national_number = 2366L
         self.assertFalse(phonenumbers.is_valid_number_for_region(invalidNumber, "001"))
         invalidNumber.country_code = 0
-        invalidNumber.national_number = 2366L
         self.assertFalse(phonenumbers.is_valid_number_for_region(invalidNumber, "001"))
-        invalidNumber.country_code = 0
         self.assertFalse(phonenumbers.is_valid_number_for_region(invalidNumber, "ZZ"))
 
         # Python version extra test
@@ -1550,6 +1514,28 @@ def testParseNumberWithAlphaCharacters(self):
         self.assertEqual(premiumNumber, phonenumbers.parse("0900 332 600A5", "NZ"))
         self.assertEqual(premiumNumber, phonenumbers.parse("0900 a332 600A5", "NZ"))
 
+    def testParseMaliciousInput(self):
+        # Lots of leading + signs before the possible number.
+        maliciousNumber = '+' * 6000 + "12222-33-244 extensioB 343+"
+        try:
+            phonenumbers.parse(maliciousNumber, "US")
+            self.fail("This should not parse without throwing an exception %s" % maliciousNumber)
+        except NumberParseException, e:
+            # Expected this exception.
+            self.assertEqual(e.error_type,
+                             NumberParseException.TOO_LONG,
+                             msg="Wrong error type stored in exception.")
+
+        maliciousNumberWithAlmostExt = "200" * 350 + " extensiOB 345"
+        try:
+            phonenumbers.parse(maliciousNumberWithAlmostExt, "US")
+            self.fail("This should not parse without throwing an exception %s" % maliciousNumberWithAlmostExt)
+        except NumberParseException, e:
+            # Expected this exception.
+            self.assertEqual(e.error_type,
+                             NumberParseException.TOO_LONG,
+                             msg="Wrong error type stored in exception.")
+
     def testParseWithInternationalPrefixes(self):
         self.assertEqual(US_NUMBER, phonenumbers.parse("+1 (650) 253-0000", "NZ"))
         self.assertEqual(INTERNATIONAL_TOLL_FREE, phonenumbers.parse("011 800 1234 5678", "US"))

python/tests/shortnumberutiltest.py

@@ -17,21 +17,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
-
 from phonenumbers import connects_to_emergency_number, is_emergency_number
-from .phonenumberutiltest import insert_test_metadata, reinstate_real_metadata
+from .testmetadatatest import TestMetadataTestCase
 
 
-class ShortNumberUtilTest(unittest.TestCase):
+class ShortNumberUtilTest(TestMetadataTestCase):
     """Unit tests for shortnumberutil.py"""
 
-    def setUp(self):
-        insert_test_metadata()
-
-    def tearDown(self):
-        reinstate_real_metadata()
-
     def testConnectsToEmergencyNumber_US(self):
         self.assertTrue(connects_to_emergency_number("911", "US"))
         self.assertTrue(connects_to_emergency_number("119", "US"))

python/tests/testmetadatatest.py

@@ -0,0 +1,39 @@
+import unittest
+
+from phonenumbers import PhoneMetadata
+from phonenumbers import phonenumberutil
+
+# Override library metadata with the test metadata.
+REAL_REGION_METADATA = PhoneMetadata.region_metadata
+REAL_CC_TO_RC = phonenumberutil.COUNTRY_CODE_TO_REGION_CODE
+
+PhoneMetadata.region_metadata = {}
+phonenumberutil.COUNTRY_CODE_TO_REGION_CODE = {}
+
+# Import the test data; this will re-populate the
+# PhoneMetadata.region_metadata map
+from .testdata import _COUNTRY_CODE_TO_REGION_CODE as TEST_CC_TO_RC
+TEST_REGION_METADATA = PhoneMetadata.region_metadata
+
+
+def reinstate_real_metadata():
+    """Reinstate real phone number metadata"""
+    phonenumberutil.COUNTRY_CODE_TO_REGION_CODE = REAL_CC_TO_RC
+    PhoneMetadata.region_metadata = REAL_REGION_METADATA
+
+
+def insert_test_metadata():
+    """Insert test metadata into library"""
+    phonenumberutil.COUNTRY_CODE_TO_REGION_CODE = TEST_CC_TO_RC
+    PhoneMetadata.region_metadata = TEST_REGION_METADATA
+
+# Reinstate the real metadata so any importers of this module are not affected
+reinstate_real_metadata()
+
+
+class TestMetadataTestCase(unittest.TestCase):
+    def setUp(self):
+        insert_test_metadata()
+
+    def tearDown(self):
+        reinstate_real_metadata()