zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-22 07:51:52 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,070 Commits 35 Branches 71 Tags
2c917f876fda02f19ceb54bcb74620433ba0d609
Commit Graph

4970 Commits

Author SHA1 Message Date
Alan Rominger
2c917f876f Merge pull request #1455 from AlanCoding/event_of_the_century 
Fix event querysets for non superusers
 2018-04-20 13:02:54 -04:00
AlanCoding
6cb237d5d9 fix event querysets for non superusers 2018-04-20 11:44:52 -04:00
AlanCoding
fb43538333 add relative location to CT schema errors 2018-04-19 14:58:40 -04:00
AlanCoding
9f6a4e135f fix server error with unicode in template 2018-04-19 14:25:59 -04:00
Alan Rominger
3798decafc Merge pull request #1429 from AlanCoding/invalid_dragon 
prevent server error with CT unicode keys
 2018-04-19 13:51:58 -04:00
AlanCoding
f78037c0f3 prevent server error with CT unicode keys 2018-04-19 13:27:25 -04:00
Christian Adams
d08790a5b4 Merge pull request #1420 from rooftopcellist/act_stream_access 
Act stream access
 2018-04-19 11:51:33 -04:00
adamscmRH
b6fcfd43b1 Fix app activity stream permissions 2018-04-19 11:19:19 -04:00
Chris Meyers
df298cec36 Merge pull request #1374 from chrismeyersfsu/fix-proj_update_redact 
redact project update urls when downloading stdout
 2018-04-19 09:09:24 -04:00
Wayne Witzel III
250e036d0b Merge pull request #1412 from AlanCoding/yaml_json_cats_dogs 
Add protection for job-compatible vars
 2018-04-19 04:04:42 -07:00
chris meyers
09d5645b90 redact project update urls when downloading stdout 
* For ProjectUpdate jobs. Redact potentially sensitive urls from the
output.
 2018-04-18 16:45:55 -04:00
Alan Rominger
63b3cc84c4 Merge pull request #1414 from AlanCoding/job_add 
avoid server error adding job
 2018-04-18 12:04:07 -04:00
Christian Adams
87ba56ba67 Merge pull request #1409 from rooftopcellist/validate_scopes 
adds help-text for scopes
 2018-04-18 10:09:59 -04:00
Alan Rominger
18a7e86e0c Merge pull request #1175 from AlanCoding/protect_hosts 
Add deletion protection to hosts
 2018-04-18 10:06:05 -04:00
AlanCoding
13c483e463 avoid server error adding job 2018-04-18 08:27:08 -04:00
AlanCoding
c397cacea5 add protection for job-compatible vars 2018-04-18 07:14:02 -04:00
adamscmRH
50a5a1a9f8 adds help-text for scopes 2018-04-17 14:38:51 -04:00
adamscmRH
0d2f92c364 Fix app json error 2018-04-17 12:02:35 -04:00
AlanCoding
4ff2f3e061 remove setting corresponding to removed tests 2018-04-16 14:49:54 -04:00
Alan Rominger
900ea14883 Merge pull request #1286 from AlanCoding/remove_user_roles 
Remove the "user admin role" entirely
 2018-04-16 07:33:55 -04:00
chris meyers
04693ecb0f remove infinite loop regex 
* Fancy url finding regex can result in infinite loop for malformed ipv6
urls so replace it with a more nieve regex that can overmatch.
* regex's that find malformed ipv6 urls will be passed to urlparse. This
can result in a parsing/ValueError. For these cases we redact the entire
found URI.
 2018-04-13 15:48:06 -04:00
Christian Adams
a1dbd4dd57 Merge pull request #1371 from rooftopcellist/fix_app_change_id 
Fix id in activity_stream
 2018-04-13 15:11:48 -04:00
adamscmRH
dcb6ca33a5 fix id for app in act_stream 2018-04-13 14:37:19 -04:00
AlanCoding
e3984cb89b remove test for behavior going away in Ansible 2.5 2018-04-12 15:34:58 -04:00
AlanCoding
4995ee7a60 remove admin_role for users 2018-04-12 13:18:49 -04:00
Christian Adams
087ac17c90 Merge pull request #1308 from rooftopcellist/fix_censor 
Fix censor
 2018-04-12 11:56:44 -04:00
Christian Adams
a2cc357f21 Merge pull request #1333 from rooftopcellist/app_help_text 
add oauth2 help text
 2018-04-11 16:12:45 -04:00
adamscmRH
d1b8142b94 add oauth2 help text 2018-04-11 15:10:39 -04:00
Alan Rominger
4cc84d020d Merge pull request #1169 from AlanCoding/filterability 
Add tip in OPTIONS for fields that cannot be filtered
 2018-04-11 14:35:37 -04:00
AlanCoding
0a23195a7b always log uncaught task exceptions 2018-04-11 11:03:06 -04:00
AlanCoding
24369572dc expand on fact cache timeout help text 2018-04-11 07:58:37 -04:00
Alan Rominger
ffa61250bb Merge pull request #1312 from AlanCoding/fix_silent_fail 
fix silent traceback tests were causing
 2018-04-10 14:02:36 -04:00
adamscmRH
8529f2b5eb makes censor characters consistent 2018-04-10 14:02:33 -04:00
AlanCoding
69822391b3 fix silent traceback tests were causing 2018-04-10 11:51:05 -04:00
AlanCoding
4f65b283df do not server error if this value is None 2018-04-10 11:00:37 -04:00
Ryan Petrello
b1028a2e0a fix a bug preventing custom credential templates from including unicode 
see: https://github.com/ansible/tower/issues/1266
 2018-04-09 17:08:10 -04:00
Ryan Petrello
18c95bf706 add exception handling to deprecated v1 credential support 
see: https://github.com/ansible/tower/issues/1268
 2018-04-09 14:23:43 -04:00
Alan Rominger
5594bae766 Merge pull request #1247 from AlanCoding/more_v1_yay 
More accurate handling of serializer cred versioning
 2018-04-09 10:39:54 -04:00
AlanCoding
c1f1921995 add test for JT credential summary_fields 2018-04-09 09:56:43 -04:00
Ryan Petrello
ba66996add missing import for celery failure handler 2018-04-09 09:10:50 -04:00
Wayne Witzel III
a088621425 Merge pull request #1250 from wwitzel3/fix-1228 
Update role hierarchy when a JobTemplate moves orgs.
 2018-04-06 15:31:23 -04:00
Wayne Witzel III
99fb0fa4cd Extract update_role_parentage_for_instance 2018-04-06 15:19:41 -04:00
Ryan Petrello
5560dc1da9 Merge pull request #1252 from ryanpetrello/celery-failure-handler 
implement celery failure logging using CELERY_ANNOTATIONS
 2018-04-06 13:40:34 -04:00
Wayne Witzel III
81fe778676 Collect roles and update parentage instead of saving JT 2018-04-06 13:35:24 -04:00
Alan Rominger
a38e6fc882 Merge pull request #1261 from AlanCoding/user_work_items 
More User admin-ing: (2) superuser escalation fix (3) ANY->ALL (4) orphan adoption
 2018-04-06 13:14:40 -04:00
AlanCoding
12979260bb include new org roles in permissions fix 2018-04-06 12:03:43 -04:00
Ryan Petrello
4c0096a524 implement celery failure logging using CELERY_ANNOTATIONS 
see: https://github.com/ansible/awx/issues/1720
see: https://github.com/ansible/tower/issues/1190
 2018-04-06 11:23:23 -04:00
chris meyers
bd7d9db1ce correctly cascade set null 
* It's problematic to delete an instance that is referenced by a foreign
key; where the referening model is one that has a Polymorphic parent.
* Specifically, when Django goes to nullify the relationship it relies
on the related instances[0] class type to issue a query to decide what
to nullify. So if the foreignkey references multiple different types
(i.e. ProjectUpdate, Job) then only 1 of those class types will get
nullified. The end result is an IntegrityError when delete() is called.
* This changeset ensures that the parent Polymorphic class is queried so
that all the foreignkey entries are nullified
* Also remove old Django "hack" that doesn't work with Django 1.11
 2018-04-06 11:10:16 -04:00
AlanCoding
a344ceda0e User editing permission changes 
Only allow administrative action for a user
who is a system admin or auditor if the
the requesting-user is a system admin.

Previously a user could be edited if the
requesting-user was an admin of ANY of the
orgs the user was member of.
This is changed to require admin permission
to ALL orgs the user is member of.

As a special-case, allow org admins to add
a user as a member to their organization if
the following conditions are met:
- the user is not member of any other orgs
- the org admin has permissions to all of
  the roles the user has
 2018-04-06 09:51:08 -04:00
Wayne Witzel III
0bd9919108 Make use of callback explicitly for Project and Inventory 2018-04-05 11:05:48 -04:00