Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scope remover processor #132

Merged
merged 4 commits into from
Sep 7, 2017
+18 −0
Merged

Add scope remover processor #132

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d3d40d
Add scope remover processor
jkakavas Aug 8, 2017
3b324b9
Changes according to @c00kiemon5ter comments
jkakavas Aug 23, 2017
ad0f240
Addressing @c00kiemon5ter's comments
jkakavas Aug 23, 2017
ebca2e4
Fixed bug that caused TypeError
jkakavas Sep 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/satosa/micro_services/processors/scope_remover_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from ..attribute_processor import AttributeProcessorError
from .base_processor import BaseProcessor

class ScopeRemoverProcessor(BaseProcessor):
"""
Removes the scope from a given attribute

"""
def process(self, internal_data, attribute, **kwargs):
attributes = internal_data.attributes
new_values = []
for value in attributes.get(attribute, [None]):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If attribute is not found, [None] will be returned and value will be set to None. Then value.split() will fail. We should probably check if the attribute is there, and then process the values. If attribute is not there, I would raise an AttributeProcessorWarning.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

if '@' in value:
new_values.append(value.split('@')[0])
attributes[attribute] = new_values
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will remove any attribute values without a @, and leave only values that had a scope (but with the scope-part removed). This is not clear from the class name.

If this was not intentional you only need to remove the if '@' in value clause (I'm ignoring the problem described in the comment above)

for value in attributes.get(attribute, [None]):
  value_with_no_scope = value.split('@')[0]
  new_values.append(value_with_no_scope)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea is that the deployer uses this microservice for attributes that are scoped. I agree though that removing the attribute entirely in case it is not scoped, doesn't make much sense and will just add to confusion. I will revisit this