Skip to content
This repository was archived by the owner on Jan 10, 2019. It is now read-only.

Commit 8e8f52d

Browse files
committed
Merge branch 'idp_metadata_attribute_store' of github.com:skoranda/satosa_microservices into idp_metadata_attribute_store
2 parents bb8689b + 791b561 commit 8e8f52d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

example/plugins/microservices/idp_metadata_attribute_store.yaml.example

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,3 @@ config:
2727
# The microservice may be configured to ignore a particular IdP.
2828
https://login.other.org.edu/idp/shibboleth:
2929
ignore: true
30-
31-

src/satosa/micro_services/idp_metadata_attribute_store.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,18 @@ def process(self, context, data):
162162

163163
satosa_logging(logger, logging.DEBUG, "Using config {}".format(config), context.state)
164164

165+
<<<<<<< HEAD
165166
# Log the entityID of the authenticating IdP.
166167
satosa_logging(logger, logging.INFO, "entityID for authenticating IdP is {}".format(idp_entity_id), context.state)
167168

169+
=======
170+
>>>>>>> 791b561fd5b6ab56b996f44030318a6b5ceb3c49
168171
# Ignore this IdP if so configured.
169172
if config['ignore']:
170173
satosa_logging(logger, logging.INFO, "Ignoring IdP {}".format(idp_entity_id), context.state)
171174
return super().process(context, data)
172175

176+
<<<<<<< HEAD
173177
# Set the entityID attribute if so configured.
174178
if 'entity_id' in config:
175179
data.attributes[config['entity_id']['internal_attribute_name']] = idp_entity_id
@@ -178,6 +182,12 @@ def process(self, context, data):
178182
# will be an instance of the class MetadataStore from mdstore.py
179183
# in pysaml2.
180184
metadata_store = context.get_decoration(Context.KEY_BACKEND_METADATA_STORE)
185+
=======
186+
# Get the metadata store the SP for the proxy is using. This
187+
# will be an instance of the class MetadataStore from mdstore.py
188+
# in pysaml2.
189+
metadata_store = context.internal_data['metadata_store']
190+
>>>>>>> 791b561fd5b6ab56b996f44030318a6b5ceb3c49
181191

182192
# Get the metadata for the IdP.
183193
try:

0 commit comments

Comments
 (0)