c2cgeoportal-geoportal 2.9.0.317__py3-none-any.whl → 2.9.0.320__py3-none-any.whl

c2cgeoportal_geoportal/lib/oidc.py

@@ -32,7 +32,6 @@ import string
 from typing import TYPE_CHECKING, Any, NamedTuple, Optional, TypedDict, Union
 
 import pyramid.request
-import pyramid.response
 import simple_openid_connect.client
 import simple_openid_connect.data
 from pyramid.httpexceptions import HTTPBadRequest, HTTPInternalServerError, HTTPUnauthorized
@@ -171,62 +170,66 @@ def get_user_from_remember(
     assert models.DBSession is not None
 
     user: static.User | DynamicUser | None
-    username = remember_object["username"]
-    assert username is not None
-    email = remember_object["email"]
-    assert email is not None
-    display_name = remember_object["display_name"] or email
-
-    openid_connect_configuration = request.registry.settings.get("authentication", {}).get(
-        "openid_connect", {}
-    )
-    provide_roles = openid_connect_configuration.get("provide_roles", False)
-    if provide_roles is False:
-        user_query = models.DBSession.query(static.User)
-        match_field = openid_connect_configuration.get("match_field", "username")
-        if match_field == "username":
-            user_query = user_query.filter_by(username=username)
-        elif match_field == "email":
-            user_query = user_query.filter_by(email=email)
+    try:
+        username = remember_object["username"]
+        assert username is not None
+        email = remember_object["email"]
+        assert email is not None
+        display_name = remember_object["display_name"] or email
+
+        openid_connect_configuration = request.registry.settings.get("authentication", {}).get(
+            "openid_connect", {}
+        )
+        provide_roles = openid_connect_configuration.get("provide_roles", False)
+        if provide_roles is False:
+            user_query = models.DBSession.query(static.User)
+            match_field = openid_connect_configuration.get("match_field", "username")
+            if match_field == "username":
+                user_query = user_query.filter_by(username=username)
+            elif match_field == "email":
+                user_query = user_query.filter_by(email=email)
+            else:
+                raise HTTPInternalServerError(
+                    f"Unknown match_field: '{match_field}', allowed values are 'username' and 'email'"
+                )
+            user = user_query.one_or_none()
+            if update_create_user is True:
+                if user is not None:
+                    for field in openid_connect_configuration.get("update_fields", []):
+                        if field == "username":
+                            user.username = username
+                        elif field == "display_name":
+                            user.display_name = display_name
+                        elif field == "email":
+                            user.email = email
+                        else:
+                            raise HTTPInternalServerError(
+                                f"Unknown update_field: '{field}', allowed values are 'username', 'display_name' and 'email'"
+                            )
+                elif openid_connect_configuration.get("create_user", False) is True:
+                    user = static.User(username=username, email=email, display_name=display_name)
+                    models.DBSession.add(user)
         else:
-            raise HTTPInternalServerError(
-                f"Unknown match_field: '{match_field}', allowed values are 'username' and 'email'"
+            roles = []
+            role_names = remember_object.get("roles", [])
+            if role_names:
+                query = models.DBSession.query(main.Role).filter(main.Role.name.in_(role_names))
+                roles = query.all()
+            user = DynamicUser(
+                id=-1,
+                username=username,
+                display_name=display_name,
+                email=email,
+                settings_role=(
+                    models.DBSession.query(main.Role).filter_by(name=remember_object["settings_role"]).first()
+                    if remember_object.get("settings_role") is not None
+                    else None
+                ),
+                roles=roles,
             )
-        user = user_query.one_or_none()
-        if update_create_user is True:
-            if user is not None:
-                for field in openid_connect_configuration.get("update_fields", []):
-                    if field == "username":
-                        user.username = username
-                    elif field == "display_name":
-                        user.display_name = display_name
-                    elif field == "email":
-                        user.email = email
-                    else:
-                        raise HTTPInternalServerError(
-                            f"Unknown update_field: '{field}', allowed values are 'username', 'display_name' and 'email'"
-                        )
-            elif openid_connect_configuration.get("create_user", False) is True:
-                user = static.User(username=username, email=email, display_name=display_name)
-                models.DBSession.add(user)
-    else:
-        roles = []
-        role_names = remember_object.get("roles", [])
-        if role_names:
-            query = models.DBSession.query(main.Role).filter(main.Role.name.in_(role_names))
-            roles = query.all()
-        user = DynamicUser(
-            id=-1,
-            username=username,
-            display_name=display_name,
-            email=email,
-            settings_role=(
-                models.DBSession.query(main.Role).filter_by(name=remember_object["settings_role"]).first()
-                if remember_object.get("settings_role") is not None
-                else None
-            ),
-            roles=roles,
-        )
+    except KeyError:
+        _LOG.exception("Missing field in remember object")
+        return None
     return user
 
 

{c2cgeoportal_geoportal-2.9.0.317.dist-info → c2cgeoportal_geoportal-2.9.0.320.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.9.0.317
+Version: 2.9.0.320
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.9.0.317.dist-info → c2cgeoportal_geoportal-2.9.0.320.dist-info}/RECORD

@@ -20,7 +20,7 @@ c2cgeoportal_geoportal/lib/lingva_extractor.py,sha256=pS-B5oTcEkW__XUop6rWKdpJhn
 c2cgeoportal_geoportal/lib/loader.py,sha256=oN76GhbLbdmCWp3DFTq16HJSylnDApuS1Ea8D-DQA3o,2613
 c2cgeoportal_geoportal/lib/metrics.py,sha256=dAPdJtrtTPbwVuULZZ5dJC1JJCDbC0rJA7dtvsqIo40,4847
 c2cgeoportal_geoportal/lib/oauth2.py,sha256=03nV635IkGyu0EckvUc_0akG9YzpG3PSZ2ILt2TVieI,41107
-c2cgeoportal_geoportal/lib/oidc.py,sha256=Uo6JAnKrWTaUY4_Kdl23cJFIP2C_OZjh8wWTsMB2Y-w,13095
+c2cgeoportal_geoportal/lib/oidc.py,sha256=h6mRllroNhp076q0pRGSnFoLDHO61zXLTfR1T6DfEK0,13400
 c2cgeoportal_geoportal/lib/wmstparsing.py,sha256=KFMEv7Skqc9HFA1m7x2xQMu4Bk2gJsyp5XTGwLLXb7w,12379
 c2cgeoportal_geoportal/lib/xsd.py,sha256=_JDDlMIsvThb9DGmHS3XMazlRYG3AQK8kHQ4pq6sH8s,7031
 c2cgeoportal_geoportal/scaffolds/advance_create/cookiecutter.json,sha256=1LVOM-j_nd00J89q0EI3bQUvIysbidApaVHDibA2ydk,524
@@ -187,8 +187,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=aH5r5MliqE5RF4J7Q-luQQ6sgOcM
 tests/test_raster.py,sha256=IzwJMGti82B51aVfy2QbeNeJXn3B6bM-JnbYpt5KqB4,11948
 tests/test_wmstparsing.py,sha256=DMUFSrJAyRfOhosD8Ap5251NCxfaX7vmkWmexdc6CDU,9054
 tests/xmlstr.py,sha256=vozYRYG4sBPhasl4PemLUZxg-jAtQxUY5ntp1uDoxik,5985
-c2cgeoportal_geoportal-2.9.0.317.dist-info/METADATA,sha256=k1QwNgFh0F1AYb_RE8-A48_i3fxb08LA5QaWmSAjNbA,2049
-c2cgeoportal_geoportal-2.9.0.317.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.317.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.317.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.317.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.320.dist-info/METADATA,sha256=hX-KG-7lIyZYDjwernaddSbs5jHpIjYJ2Qttt2wqvYw,2049
+c2cgeoportal_geoportal-2.9.0.320.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.320.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.320.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.320.dist-info/RECORD,,