Merge branch 'main' into meta_updates

Author: tonybaloney

libraries/botbuilder-applicationinsights/setup.py

@@ -12,7 +12,7 @@
 ]
 TESTS_REQUIRES = [
     "aiounittest==1.3.0",
-    "django==3.2.14",  # For samples
+    "django==3.2.16",  # For samples
     "djangorestframework==3.10.3",  # For samples
     "flask==1.1.1",  # For samples
 ]

libraries/botbuilder-core/requirements.txt

@@ -3,6 +3,6 @@ botframework-connector==4.15.0
 botbuilder-schema==4.15.0
 botframework-streaming==4.15.0
 requests==2.27.1
-PyJWT==1.5.3
+PyJWT==2.4.0
 cryptography==3.3.2
 aiounittest==1.3.0

libraries/botbuilder-dialogs/botbuilder/dialogs/memory/dialog_state_manager.py

@@ -290,7 +290,10 @@ def try_get_value(
         # TODO: HACK to support .First() retrieval on turn.recognized.entities.foo, replace with Expressions once
         #  expressions ship
         first = ".FIRST()"
-        i_first = path.upper().rindex(first)
+        try:
+            i_first = path.upper().rindex(first)
+        except ValueError:
+            i_first = -1
         if i_first >= 0:
             remaining_path = path[i_first + len(first) :]
             path = path[0:i_first]

libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/prompt_culture_models.py

@@ -174,6 +174,7 @@ def get_supported_cultures(cls) -> List[PromptCultureModel]:
         """
         return [
             cls.Chinese,
+            cls.German,
             cls.Dutch,
             cls.English,
             cls.French,

libraries/botbuilder-dialogs/requirements.txt

@@ -3,6 +3,6 @@ botframework-connector==4.15.0
 botbuilder-schema==4.15.0
 botbuilder-core==4.15.0
 requests==2.27.1
-PyJWT==1.5.3
+PyJWT==2.4.0
 cryptography==3.3.2
 aiounittest==1.3.0

libraries/botframework-connector/botframework/connector/auth/emulator_validation.py

@@ -63,7 +63,7 @@ def is_token_from_emulator(auth_header: str) -> bool:
         bearer_token = auth_header.split(" ")[1]
 
         # Parse the Big Long String into an actual token.
-        token = jwt.decode(bearer_token, verify=False)
+        token = jwt.decode(bearer_token, options={"verify_signature": False})
         if not token:
             return False
 

libraries/botframework-connector/botframework/connector/auth/jwt_token_extractor.py

@@ -68,7 +68,7 @@ async def get_identity(
             raise error
 
     def _has_allowed_issuer(self, jwt_token: str) -> bool:
-        decoded = jwt.decode(jwt_token, verify=False)
+        decoded = jwt.decode(jwt_token, options={"verify_signature": False})
         issuer = decoded.get("iss", None)
         if issuer in self.validation_parameters.issuer:
             return True
@@ -111,6 +111,7 @@ async def _validate_token(
             metadata.public_key,
             leeway=self.validation_parameters.clock_tolerance,
             options=options,
+            algorithms=["RS256"],
         )
 
         claims = ClaimsIdentity(decoded_payload, True)

libraries/botframework-connector/botframework/connector/auth/skill_validation.py

@@ -55,7 +55,7 @@ def is_skill_token(auth_header: str) -> bool:
         bearer_token = auth_header.split(" ")[1]
 
         # Parse the Big Long String into an actual token.
-        token = jwt.decode(bearer_token, verify=False)
+        token = jwt.decode(bearer_token, options={"verify_signature": False})
         return SkillValidation.is_skill_claim(token)
 
     @staticmethod

libraries/botframework-connector/requirements.txt

@@ -1,6 +1,6 @@
 msrest==0.6.*
 botbuilder-schema==4.15.0
 requests==2.27.1
-PyJWT==1.5.3
+PyJWT==2.4.0
 cryptography==3.3.2
 msal==1.*

libraries/botframework-connector/setup.py

@@ -8,8 +8,8 @@
 VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0"
 REQUIRES = [
     "msrest==0.6.*",
-    "requests>=2.23.0,<2.26",
-    "PyJWT>=1.5.3,<2.0.0",
+    # "requests>=2.23.0,<2.26",
+    "PyJWT>=2.4.0",
     "botbuilder-schema==4.15.0",
     "msal==1.*",
 ]

libraries/botframework-streaming/setup.py

@@ -6,8 +6,8 @@
 
 VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0"
 REQUIRES = [
-    "botbuilder-schema>=4.12.0",
-    "botframework-connector>=4.12.0",
+    "botbuilder-schema==4.15.0",
+    "botframework-connector==4.15.0",
 ]
 
 root = os.path.abspath(os.path.dirname(__file__))