Merge pull request #70 from IDEM-GARR-AAI/OIDCOP_2.x

migration to new OIDCOP ver 2.x
italia · Jul 1, 2023 · 39f2c8a · 39f2c8a
2 parents cbd1d08 + 171ec16
commit 39f2c8a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 40 deletions.
diff --git a/...e/plugins/frontends/oidc_op_frontend.yaml → ...le/plugins/frontends/oidcop_frontend.yaml b/...e/plugins/frontends/oidc_op_frontend.yaml → ...le/plugins/frontends/oidcop_frontend.yaml
@@ -29,7 +29,7 @@ config:
       server_info:
         add_on:
           pkce:
-            function: oidcop.oidc.add_on.pkce.add_pkce_support
+            function: idpyoidc.server.oidc.add_on.pkce.add_pkce_support
             kwargs:
               code_challenge_method: S256 S384 S512
               essential: false
@@ -38,7 +38,7 @@ config:
             acr: urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword
             class: satosa_oidcop.core.user_authn.SatosaAuthnMethod
         authz:
-          class: oidcop.authz.AuthzHandling
+          class: idpyoidc.server.authz.AuthzHandling
           kwargs:
             grant_config:
               expires_in: 43200
@@ -73,24 +73,18 @@ config:
           - email
         endpoint:
           provider_info:
-            class: oidcop.oidc.provider_config.ProviderConfiguration
+            class: idpyoidc.server.oidc.provider_config.ProviderConfiguration
             kwargs:
               client_authn_method: null
             path: .well-known/openid-configuration
           authorization:
-            class: oidcop.oidc.authorization.Authorization
+            class: idpyoidc.server.oidc.authorization.Authorization
             kwargs:
               claims_parameter_supported: true
               client_authn_method: null
               request_object_encryption_alg_values_supported: &id001
               - RSA-OAEP
               - RSA-OAEP-256
-              - A192KW
-              - A256KW
-              - ECDH-ES
-              - ECDH-ES+A128KW
-              - ECDH-ES+A192KW
-              - ECDH-ES+A256KW
               request_parameter_supported: true
               request_uri_parameter_supported: true
               response_modes_supported:
@@ -101,7 +95,7 @@ config:
               - code
             path: OIDC/authorization
           token:
-            class: oidcop.oidc.token.Token
+            class: idpyoidc.server.oidc.token.Token
             kwargs:
               client_authn_method:
               - client_secret_post
@@ -110,7 +104,7 @@ config:
               - private_key_jwt
             path: OIDC/token
           userinfo:
-            class: oidcop.oidc.userinfo.UserInfo
+            class: idpyoidc.server.oidc.userinfo.UserInfo
             kwargs:
               claim_types_supported:
               - normal
@@ -122,11 +116,9 @@ config:
               - RS512
               - ES256
               - ES512
-              - PS256
-              - PS512
             path: OIDC/userinfo
           introspection:
-            class: oidcop.oauth2.introspection.Introspection
+            class: idpyoidc.server.oauth2.introspection.Introspection
             kwargs:
               client_authn_method:
               - client_secret_post
@@ -138,23 +130,23 @@ config:
             path: OIDC/introspection
           # uncomment this for dynamic client registration
           #registration:
-            #class: oidcop.oidc.registration.Registration
+            #class: idpyoidc.server.oidc.registration.Registration
             #kwargs:
               #client_authn_method: null
               #client_id_generator:
-                #class: oidcop.oidc.registration.random_client_id
+                #class: idpyoidc.server.oidc.registration.random_client_id
                 #kwargs: {}
               #client_secret_expiration_time: 432000
             #path: OIDC/registration
           registration_read:
-            class: oidcop.oidc.read_registration.RegistrationRead
+            class: idpyoidc.server.oidc.read_registration.RegistrationRead
             kwargs:
               client_authn_method:
               - bearer_header
             path: OIDC/registration_read
           # TODO - Logout in SATOSA haven't been implemented
           #end_session:
-            #class: oidcop.oidc.session.Session
+            #class: idpyoidc.server.oidc.session.Session
             #kwargs:
               #backchannel_logout_session_supported: true
               #backchannel_logout_supported: true
@@ -181,7 +173,7 @@ config:
           read_only: false
           uri_path: OIDC/jwks.json
         login_hint2acrs:
-          class: oidcop.login_hint.LoginHint2Acrs
+          class: idpyoidc.server.login_hint.LoginHint2Acrs
           kwargs:
             scheme_map:
               email:
@@ -191,11 +183,11 @@ config:
           salt: 'CHANGE_ME salt involved in session sub hash'
           sub_func:
             pairwise:
-              class: oidcop.session.manager.PairWiseID
+              class: idpyoidc.server.session.manager.PairWiseID
               kwargs:
                 salt: CHANGE_ME_OR_LET_IT_BE_RANDOMIC
             public:
-              class: oidcop.session.manager.PublicID
+              class: idpyoidc.server.session.manager.PublicID
               kwargs:
                 salt: CHANGE_ME_OR_LET_IT_BE_RANDOMIC
         template_dir: templates
@@ -204,7 +196,7 @@ config:
             kwargs:
               lifetime: 600
           id_token:
-            class: oidcop.token.id_token.IDToken
+            class: idpyoidc.server.token.id_token.IDToken
             kwargs:
               id_token_encryption_alg_values_supported: *id001
               id_token_encryption_enc_values_supported:
@@ -215,12 +207,31 @@ config:
               - A192GCM
               - A256GCM
               id_token_signing_alg_values_supported: *id002
-          jwks_file: data/oidc_op/private/token_jwks.json
+          #jwks_file: data/oidc_op/private/token_jwks.json
+          # jwks_def:
+            # private_path: data/oidc_op/private/token_jwks.json
+            # read_only: False
+            # key_defs:
+              # - type: oct
+                # bytes: 24
+                # use:
+                  # - enc
+                # kid: code
+              # - type: oct
+                # bytes: 24
+                # use:
+                  # - enc
+                # kid: token
+              # - type: oct
+                # bytes: 24
+                # use:
+                  # - enc
+                # kid: refresh
           refresh:
             kwargs:
               lifetime: 86400
           token:
-            class: oidcop.token.jwt_token.JWTToken
+            class: idpyoidc.server.token.jwt_token.JWTToken
             kwargs:
               lifetime: 3600
         userinfo:
@@ -230,7 +241,7 @@ config:
               #key: value
         # until SATOSA won't support logout the oidcop cookies are quite useless
         #cookie_handler:
-          #class: oidcop.cookie_handler.CookieHandler
+          #class: idpyoidc.server.cookie_handler.CookieHandler
           #kwargs:
             #flags:
               #httponly: true

diff --git a/example/proxy_conf.yaml b/example/proxy_conf.yaml
@@ -30,7 +30,7 @@ BACKEND_MODULES:
   - "plugins/backends/ciesaml2_backend.yaml"
 FRONTEND_MODULES:
   - "plugins/frontends/saml2_frontend.yaml"
-  - "plugins/frontends/oidc_op_frontend.yaml"
+  - "plugins/frontends/oidcop_frontend.yaml"
 MICRO_SERVICES:
   # - "plugins/microservices/spid_unical_account_linking.yaml"
   # - "plugins/microservices/multiple_ldap_attribute_store.yaml"

diff --git a/example/run.sh b/example/run.sh
@@ -136,15 +136,15 @@ update_yaml plugins/backends/saml2_backend.yaml ".config.disco_srv" "$SATOSA_DIS
 update_yaml plugins/backends/spidsaml2_backend.yaml  ".config.disco_srv" "$SATOSA_DISCO_SRV"
 update_yaml plugins/backends/ciesaml2_backend.yaml  ".config.disco_srv" "$SATOSA_DISCO_SRV"
 
-# Set username and password for mongodb in oidc_op_frontend with $SATOSA_MONGODB_USERNAME and $SATOSA_MONGODB_PASSWORD
-update_yaml plugins/frontends/oidc_op_frontend.yaml ".config.storage.kwargs.connection_params.username" "$MONGODB_USERNAME"
-update_yaml plugins/frontends/oidc_op_frontend.yaml ".config.storage.kwargs.connection_params.password" "$MONGODB_PASSWORD"
-
-# Set encrypt password and salt for oidc_op_frontend with $SATOSA_SALT and $
-update_yaml plugins/frontends/oidc_op_frontend.yaml ".config.op.server_info.session_params.password" "$SATOSA_ENCRYPTION_KEY"
-update_yaml plugins/frontends/oidc_op_frontend.yaml ".config.op.server_info.session_params.salt" "$SATOSA_SALT"
-update_yaml plugins/frontends/oidc_op_frontend.yaml ".config.op.server_info.session_params.sub_func.pairwise.kwargs.salt" "$SATOSA_SALT"
-update_yaml plugins/frontends/oidc_op_frontend.yaml ".config.op.server_info.session_params.sub_func.pairwise.kwargs.salt" "$SATOSA_SALT"
+# Set username and password for mongodb in oidcop_frontend with $SATOSA_MONGODB_USERNAME and $SATOSA_MONGODB_PASSWORD
+update_yaml plugins/frontends/oidcop_frontend.yaml ".config.storage.kwargs.connection_params.username" "$MONGODB_USERNAME"
+update_yaml plugins/frontends/oidcop_frontend.yaml ".config.storage.kwargs.connection_params.password" "$MONGODB_PASSWORD"
+
+# Set encrypt password and salt for oidcop_frontend with $SATOSA_SALT and $
+update_yaml plugins/frontends/oidcop_frontend.yaml ".config.op.server_info.session_params.password" "$SATOSA_ENCRYPTION_KEY"
+update_yaml plugins/frontends/oidcop_frontend.yaml ".config.op.server_info.session_params.salt" "$SATOSA_SALT"
+update_yaml plugins/frontends/oidcop_frontend.yaml ".config.op.server_info.session_params.sub_func.pairwise.kwargs.salt" "$SATOSA_SALT"
+update_yaml plugins/frontends/oidcop_frontend.yaml ".config.op.server_info.session_params.sub_func.pairwise.kwargs.salt" "$SATOSA_SALT"
 
 # Update saml2_backend.yaml requested_attributes
 if [[ -v SATOSA_SAML2_REQUESTED_ATTRIBUTES ]]; then

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,5 @@
-git+https://github.com/peppelinux/[email protected]
-git+https://github.com/peppelinux/[email protected]
-
+satosa >= 8.2.0
 pymongo
-satosa_oidcop
+satosa_oidcop >= 2.0.0
 uwsgi
 jinja2