Skip to content

fixing enterprise ldap issue with execution view #4759

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

Merged
merged 37 commits into from
Aug 9, 2019
Merged

fixing enterprise ldap issue with execution view #4759

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
14b1dc3
Fix and combine integration tests targets.
Kami Jul 30, 2019
2c1d1a5
Try to decrease wait delay, see if that helps.
Kami Jul 30, 2019
8fc1423
Add a work around for two tests which rely on longer retry delay.
Kami Jul 31, 2019
bbebd02
Allow wait_fixed and stop_max_delay to be provided on per method
Kami Jul 31, 2019
9be8199
Merge branch 'master' of github.com:StackStorm/st2 into speed_pr_tests
Kami Jul 31, 2019
f9cd548
WIP: Move slow mistral unit tests and Orquesta integration tests to a
Kami Jul 31, 2019
cd5fb03
Add support for blacklisting hosts to the HTTP runner by adding new
Kami Aug 6, 2019
0abe410
adding additional fields to return to get rbac to work
Aug 6, 2019
8fb27e7
missing comma
Aug 6, 2019
07a5fac
Rename existing runner parameter from "hosts_blacklist" to
Kami Aug 7, 2019
c074677
Add changelog entry.
Kami Aug 7, 2019
0fd85ba
updating CHANGELOG.rst
Aug 7, 2019
c07f6d6
Add a test case which checks behavior when mutually exclusive arguments
Kami Aug 8, 2019
25b43cb
Add some additional test cases for HttpRunner class itself.
Kami Aug 8, 2019
01c20bd
Update Travis config to only run nightly build if a particular task
Kami Aug 8, 2019
5219ca1
Merge branch 'master' of github.com:StackStorm/st2 into move_slow_tes…
Kami Aug 8, 2019
036c680
Use changes from master.
Kami Aug 8, 2019
06f93a4
Orquesta integration tests have been optimized, no need to run them as
Kami Aug 8, 2019
40cffe9
Update script so it knows how to handle scenario where multiple tasks
Kami Aug 8, 2019
6a324b4
Fix typo.
Kami Aug 8, 2019
dc388e2
Move Mistral tests to a nightly build.
Kami Aug 8, 2019
5022139
Add this line back.
Kami Aug 8, 2019
6aeaa0a
Remove dummy / test tasks.
Kami Aug 8, 2019
4347c7b
Enable Slack notifications.
Kami Aug 8, 2019
ea2971f
Remove test change.
Kami Aug 8, 2019
9b5670c
Merge pull request #4757 from StackStorm/http_runner_netloc_blacklist
Kami Aug 8, 2019
3c83472
Merge branch 'master' into move_slow_tests_to_nighly_build
Kami Aug 8, 2019
5db61ab
Merge pull request #4760 from StackStorm/move_slow_tests_to_nighly_build
Kami Aug 8, 2019
9a712d9
Update actionexecutions.py
Kami Aug 9, 2019
48a465a
Merge branch 'bug/enterprise_ldap_view_executions_error' of https://g…
Kami Aug 9, 2019
79ef087
Update APIControllerWithIncludeAndExcludeFilterTestCase class so it also
Kami Aug 9, 2019
c10f512
adding additional fields to return to get rbac to work
Aug 6, 2019
9f621b5
missing comma
Aug 6, 2019
8920e6d
updating CHANGELOG.rst
Aug 7, 2019
c9fafb8
Update actionexecutions.py
Kami Aug 9, 2019
ea5cde1
Update APIControllerWithIncludeAndExcludeFilterTestCase class so it also
Kami Aug 9, 2019
2476a53
Merge branch 'bug/enterprise_ldap_view_executions_error' of github.co…
Kami Aug 9, 2019
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
5 changes: 4 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ Changed

Fixed
~~~~~

* Fix rbac with execution view where the rbac is unable to verify the pack or uid of the execution
because it was not returned from the action execution db. This would result in an internal server
error when trying to view the results of a single execution.
Contributed by Joshua Meyer (@jdmeyer3) #4758
* Fixed logging middleware to output a ``content_length`` of ``0`` instead of ``Infinity``
when the type of data being returned is not supported. Previously, when the value was
set to ``Infinity`` this would result in invalid JSON being output into structured
Expand Down
5 changes: 4 additions & 1 deletion st2api/st2api/controllers/v1/actionexecutions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ class ActionExecutionsControllerMixin(BaseRestControllerMixin):
mandatory_include_fields_retrieve = [
'action.parameters',
'runner.runner_parameters',
'parameters'
'parameters',
# necessary for ActionExecutionDB to determine permissions in enterprise ldap
Copy link
Member

@Kami Kami Aug 9, 2019

Choose a reason for hiding this comment

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

In theory, we could only include that if rbac is enabled, but since those attributes are quite small, it doesn't hurt to include them in all the responses...

'action.pack',
'action.uid'
]

# A list of attributes which can be specified using ?exclude_attributes filter
Expand Down