External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 16:30:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
18,525 Commits 63 Branches 102 Tags
9b5cd4aa6254dbb41328dec2cd4a9ab7e7edfb6e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello bd79a5328f Merge pull request #2788 from ryanpetrello/fix-2782 
fix a bug in isolated job launches when there are no controllers online
 2018-08-07 20:16:56 -04:00
Ryan Petrello c4d9b92d79 Merge pull request #2773 from ryanpetrello/openshift-saml 
set the correct X-Forwarded-Port header to fix SAML auth
 2018-08-07 12:26:51 -04:00
Ryan Petrello 9193125cc1 Merge pull request #2764 from ryanpetrello/dot-fork 
pin django-oauth-toolkit to our fork w/ a security fix
 2018-08-06 15:45:42 -04:00
Ryan Petrello 21f29983bb Merge pull request #2762 from ryanpetrello/fix-2759 
check oauth_scopes in _every_ view
 2018-08-06 11:35:36 -04:00
Ryan Petrello fc589389fc Merge pull request #2758 from ryanpetrello/fix-insights 
fix to handle nonexistent system_id
 2018-08-06 09:24:46 -04:00
Ryan Petrello ad38bfbbe5 Merge pull request #2755 from ryanpetrello/fix-2751 
fix up a minor OAuth2 token serializer nit
 2018-08-03 15:01:28 -04:00
Ryan Petrello 082d807007 Merge pull request #2747 from ryanpetrello/isolated-set-stat 
set_stats fails in callback plugin on isolated node #2123
 2018-08-02 15:20:14 -04:00
Ryan Petrello 1cd75cf414 Merge pull request #2742 from ryanpetrello/fix-2738 
simpilfy LDAP GROUP_SEARCH misconfiguration failure handling
 2018-08-02 10:28:27 -04:00
Ryan Petrello a13712074f Merge pull request #2739 from ryanpetrello/fix-2738 
fix a bug in multi-LDAP authentication
 2018-08-02 08:27:13 -04:00
Ryan Petrello 0f66de2de9 Merge pull request #2732 from ryanpetrello/fix-2731 
sprinkle some more i18n love for the credential form
 2018-07-31 22:43:31 -04:00
Ryan Petrello ed79a7fc12 Merge pull request #2726 from ryanpetrello/fix-2690 
prevent host deletion when the related inventory is pending deletion
 2018-07-31 16:49:17 -04:00
Ryan Petrello 0c53a0c0a4 Merge pull request #2717 from ryanpetrello/fix-2180 
allow access to JT labels if you have read access to the JT
 2018-07-31 15:28:24 -04:00
Ryan Petrello f18be1c83a Merge pull request #2724 from ryanpetrello/more-network-ui 
more network UI cleanup (whoops)
 2018-07-31 15:00:35 -04:00
Ryan Petrello ef242483b3 Merge pull request #2716 from ryanpetrello/fix-fail-workflow-on-missing-jt 
set workflow status to failed if we find a node w/ a missing UJT
 2018-07-31 08:19:39 -04:00
Ryan Petrello cc574be657 Merge pull request #2708 from ryanpetrello/remove-network-ui 
remove the network UI
 2018-07-31 08:18:13 -04:00
Ryan Petrello a3040d60d9 Merge pull request #2714 from ryanpetrello/fix-2643 
fail immediately if an isolated host is unreachable at launch time
 2018-07-30 14:34:54 -04:00
Ryan Petrello 2216cd7c83 Merge pull request #2715 from ryanpetrello/fix-2612 
add some additional validation to JT.credentials
 2018-07-30 14:34:20 -04:00
Ryan Petrello 6e3686bfc9 Merge pull request #2709 from ryanpetrello/fix-2671 
redact the license key from settings.LICENSE activity stream entries
 2018-07-30 12:28:48 -04:00
Ryan Petrello 4b0f99ab96 Merge pull request #2704 from ryanpetrello/fix-2465 
fix a bug that causes orphaned auth_user rows when LDAP is misconfigured
 2018-07-30 12:28:20 -04:00
Ryan Petrello 681d64c96f Merge pull request #2703 from ryanpetrello/simplify-dynamic-queues 
simplify dynamic queue binding
 2018-07-30 09:25:44 -04:00
Ryan Petrello 2371d23b7e Merge pull request #2701 from ryanpetrello/openshift-tls-autoredirect 
change openshift edge termination policy to redirect (enforce https)
 2018-07-27 12:31:44 -04:00
Ryan Petrello a211e24c0f Merge pull request #2695 from ryanpetrello/celerywatcher-iso8601 
some celery-watcher tweaks
 2018-07-26 17:44:50 -04:00
Ryan Petrello 7acfe414a6 Merge pull request #2686 from ryanpetrello/non-exclusive-policy-instance-list 
show the manual instance tag based on the correct instance attribute
 2018-07-26 11:32:43 -04:00
Ryan Petrello 57fdbc1853 Merge pull request #2677 from ryanpetrello/non-exclusive-policy-instance-list 
make InstanceGroup.policy_instance_list non-exclusive by default
 2018-07-25 21:10:15 -04:00
Ryan Petrello 27fbfbb62d Merge pull request #2668 from ryanpetrello/verify-csrf-websockets 
prevent cross site request forgery in websockets w/ a CSRF token
 2018-07-25 10:15:36 -04:00
Ryan Petrello 0692b1c5ef Merge pull request #2665 from mabashian/socket-whitelist 
Adds websocket origin whitelist to development.py
 2018-07-24 17:03:47 -04:00
Ryan Petrello 982db88349 Merge pull request #2663 from ryanpetrello/origin-verify-refactor 
slightly refactor origin validity checks
 2018-07-24 15:31:31 -04:00
Ryan Petrello 6d1a8ec6ec Merge pull request #2655 from ryanpetrello/fix-ws-cross-origin 
improve robustness of host comparision for wss:// Origin headers
 2018-07-24 13:43:05 -04:00
Ryan Petrello c0da6f04cd Merge pull request #2648 from ryanpetrello/fix-ws-cross-origin 
[3.3.0] reject ws:// connections w/ origin mismatches
 2018-07-24 10:13:46 -04:00
Ryan Petrello cf478df0e3 Merge pull request #2569 from ryanpetrello/fix-2476 
properly set InventorySource.status for CLI-based inventory_import
 2018-07-17 15:08:49 -04:00
Ryan Petrello b6e246f65a Merge pull request #2554 from ryanpetrello/release_3.3.0 
Makefile update.
 2018-07-16 14:57:16 -04:00
Ryan Petrello 5bb71fc133 Merge pull request #2550 from rooftopcellist/fix_expire_command 
fix expire session command
 2018-07-16 14:53:31 -04:00
Ryan Petrello ca6b6460bb Merge pull request #2522 from ryanpetrello/fix-2509 
awx metavars for job.created_by should be more robust to DoesNotExist
 2018-07-16 12:46:50 -04:00
Ryan Petrello 8e253a9aff Merge pull request #2473 from ryanpetrello/disable-oauth2-for-external-users 
don't allow OAuth2 token creation for "external" users
 2018-07-13 12:55:06 -04:00
Ryan Petrello 3c8a81bcab Merge pull request #2484 from ryanpetrello/spaaaaaaaaaaaaaaaaaaaace 
remove unnecessary spaces
 2018-07-11 10:04:23 -04:00
Ryan Petrello 5fd7badd1b Merge pull request #2483 from ryanpetrello/iso-policy-instance-list 
don't allow isolated instances in IG.policy_instance_list
 2018-07-11 09:43:50 -04:00
Ryan Petrello 68cf80cbca Merge pull request #2479 from ryanpetrello/release_3.3.0 
Revert "enforce JT/Job.timeout >= 0"
 2018-07-10 15:28:57 -04:00
Ryan Petrello ca3a2c752d Merge pull request #2463 from ryanpetrello/fix-2421 
enforce JT/Job.timeout >= 0
 2018-07-10 10:42:46 -04:00
Ryan Petrello 55b6f95b61 Merge pull request #2453 from ryanpetrello/fix-api-login-redirect 
make the API browser direct you to the proper location post-login
 2018-07-09 14:48:47 -04:00
Ryan Petrello df095d9b67 Merge pull request #2449 from ryanpetrello/https-logs 
default HTTP-based log emits to HTTPS
 2018-07-09 12:07:34 -04:00
Ryan Petrello e886311d41 Merge pull request #2439 from ryanpetrello/copy-over-here 
Add a Location header to HTTP 201 for POST to copy endpoints
 2018-07-09 09:28:51 -04:00
Ryan Petrello 2eb09e2fa2 Merge pull request #2435 from ryanpetrello/webpack-ui-external 
add instructions for running the UI webpack server on an external host
 2018-07-09 08:52:54 -04:00
Ryan Petrello da0fe173c9 Merge pull request #2431 from ryanpetrello/fix-201-location 
add a missing Location header on HTTP 201 in a few places
 2018-07-09 08:37:17 -04:00
Ryan Petrello b445e66ffa Merge pull request #2423 from ryanpetrello/multibyte-unicode-isolated 
don't decode stdout on-the-fly as it's processed
 2018-07-06 09:44:11 -04:00
Ryan Petrello 151187f623 Merge pull request #2408 from ryanpetrello/fix-2323 
properly check read permissions in `GET /api/v2/wfjt/N/copy/`
 2018-07-03 15:32:20 -04:00
Ryan Petrello 1c478b5ccb Merge pull request #2399 from ryanpetrello/remove-storage-cruft 
delete some old, dead code
 2018-07-03 11:04:57 -04:00
Ryan Petrello d58411cf07 Merge pull request #2396 from ryanpetrello/fix-pexpect-hang 
support env vars that contain unicode (without hanging)
 2018-07-03 08:44:46 -04:00
Ryan Petrello 380df1b327 Merge pull request #2380 from ryanpetrello/noisy-celery-watcher 
make celery-watcher less noisy
 2018-07-02 11:01:18 -04:00
Ryan Petrello 26bd16b855 Merge pull request #2352 from ryanpetrello/fix-csrf-sessions 
fix a few remaining CSRF nits
 2018-06-28 13:57:13 -04:00
Ryan Petrello 63723013f7 Merge pull request #2345 from ryanpetrello/fix-csrf-sessions 
properly enforce CSRF validation
 2018-06-28 09:14:56 -04:00
Ryan Petrello 39bc64d089 Merge pull request #2332 from ryanpetrello/fix-session-limit 
make settings.SESSIONS_PER_USER work
 2018-06-27 14:34:21 -04:00
Ryan Petrello d73b71d94b Merge pull request #2317 from ryanpetrello/harden-session-expiration 
make `awx-manage expire_sessions --user xyz` more robust
 2018-06-26 10:39:46 -04:00
Ryan Petrello 5c44bf4ef9 Merge pull request #2313 from ryanpetrello/fix-ui-401 
don't send WWW-Authenticate: Basic for AJAX, and properly detect 401
 2018-06-26 10:07:35 -04:00
Ryan Petrello accf586588 Merge pull request #2283 from sangongs/honcho_io_encoding 
Force the python IO encoding to be utf_8 when using honcho
 2018-06-22 10:22:55 -04:00
Ryan Petrello 008a3a0d01 Merge pull request #2269 from ryanpetrello/no-inventory-credentials-v1 
always specify `cloud: True/False` for JT/job credential summary
 2018-06-21 12:07:10 -04:00
Ryan Petrello c944f37637 Merge pull request #2268 from ryanpetrello/no-inventory-credentials-v1 
filter jt.summary_fields.credential.credential_type from /api/v1/
 2018-06-21 11:12:56 -04:00
Ryan Petrello 30e2207960 Merge pull request #2266 from AlanCoding/no_cs_v1 
Do not show create_schedule link in v1
 2018-06-21 10:54:17 -04:00
Ryan Petrello 9994dad55f Merge pull request #2262 from ryanpetrello/no-inventory-credentials-v1 
don't show summary_fields.credential.credential_type_id on /api/v1/
 2018-06-21 10:29:50 -04:00
Ryan Petrello 7dee3c74ef Merge pull request #2259 from ryanpetrello/no-inventory-credentials-v1 
don't show inventory_source.related.credentials in /api/v1/
 2018-06-20 17:37:06 -04:00
Ryan Petrello bb657de6a7 Merge pull request #2231 from ryanpetrello/expedite-isolated-heartbeat 
expedite the heartbeat when an isolated node is registered
 2018-06-19 16:38:56 -04:00
Ryan Petrello 2be8e8d55a Merge pull request #2217 from ryanpetrello/fix-job-reaper 
stop setting celery's hostname dynamically (it's passed via the cli)
 2018-06-19 13:05:14 -04:00
Ryan Petrello b4c30576af Merge pull request #2200 from ryanpetrello/custom_venv_allow_bundled 
allow the bundled `ansible` virtualenv to be selected on JT/Project
 2018-06-18 15:50:16 -04:00
Ryan Petrello a3a9b04416 Merge pull request #2201 from ryanpetrello/release_3.3.0 
fix busted migrations
 2018-06-15 20:48:43 -04:00
Ryan Petrello 6d17954571 Merge pull request #2185 from ryanpetrello/fix-2184 
fix a bug in JobTemplate.extra_credentials summary_fields
 2018-06-15 13:49:01 -04:00
Ryan Petrello d0efa67845 Merge pull request #2161 from ryanpetrello/fix-2038 
enforce `True` or `False` for boolean credential injectors
 2018-06-14 13:29:58 -04:00
Ryan Petrello 07323640bc Merge pull request #2156 from ryanpetrello/fix-iso-dev 
fix a few isolated dev issues
 2018-06-13 15:36:59 -04:00
Ryan Petrello a92c2a2e17 Merge pull request #2141 from ryanpetrello/fix-1979 
properly detect settings.AUTHENTICATION_BACKEND changes for SSO logins
 2018-06-12 15:43:27 -04:00
Ryan Petrello ee6902bbbb Merge pull request #2140 from ryanpetrello/release_3.3.0 
make sdb-listen work for docker-compose-cluster
 2018-06-12 14:20:42 -04:00
Ryan Petrello 1488c737a1 Merge pull request #2123 from ryanpetrello/fix-2118 
more gracefully handle fact cache failures for hosts that contain /
 2018-06-12 07:59:23 -04:00
Ryan Petrello ab4271b36d Merge pull request #2124 from ryanpetrello/for-shaaaaaaame 
fix failing flake8
 2018-06-11 15:38:03 -04:00
Ryan Petrello fa9b7106ff Merge pull request #2102 from ryanpetrello/fix-2085 
WIP: add a background process to spot celery hangs and reload the worker pool
 2018-06-11 12:44:18 -04:00
Ryan Petrello 18e371c0cf Merge pull request #2088 from ryanpetrello/fix-2085 
default instance capacity to zero
 2018-06-07 12:00:07 -04:00
Ryan Petrello 0fd89579e9 Merge pull request #2073 from ryanpetrello/more-i18n 
sprinkle more i18n for certain field labels
 2018-06-06 14:57:58 -04:00
Ryan Petrello bfb8e97a9d Merge pull request #2051 from ryanpetrello/space-for 
fix a setting help text typo
 2018-06-04 16:31:13 -04:00
Ryan Petrello 5ceeb020cf Merge pull request #2048 from ryanpetrello/how-do-you-say-violet-in-french 
fix an i18n-related bug that affects non-English hipchat users
 2018-06-04 15:26:15 -04:00
Ryan Petrello 330691f4a2 Merge pull request #2019 from ryanpetrello/back-to-the-future 
fix a failing timezone test
 2018-06-01 10:14:22 -04:00
Ryan Petrello 8c5f3404bf Merge pull request #2006 from ryanpetrello/port-jinja2-always 
allow Jinja2 in ansible -a when ALLOW_JINJA_IN_EXTRA_VARS is 'always'
 2018-06-01 07:32:48 -04:00
Ryan Petrello 68bfb08b03 Merge pull request #1995 from ryanpetrello/test-tower-inv-source 
add a test for tower inventory syncs
 2018-05-31 09:36:10 -04:00
Ryan Petrello e2a05b14a5 Merge pull request #1993 from ryanpetrello/tower-inv-errors 
clean up Tower inventory error handling
 2018-05-30 15:15:07 -04:00
Ryan Petrello a75da0fd58 Merge branch 'release_3.3.0' into fixTokenScopeAddInUI 2018-05-30 10:18:56 -04:00
Ryan Petrello a3aad31be3 Merge pull request #1964 from ryanpetrello/fix-token-scope 
fix a few minor issues that have broken the User Token creation
 2018-05-29 15:10:17 -04:00
Ryan Petrello b6d450923a Merge pull request #1972 from ryanpetrello/i-am-not-a-smart-man 
use the _correct_ argument to specify poll vs select
 2018-05-29 11:31:51 -04:00
Ryan Petrello 238ffe5e7e Merge pull request #1969 from ryanpetrello/better-pexpect-poll 
upgrade to the latest pexpect
 2018-05-29 10:35:29 -04:00
Ryan Petrello 0fca495792 Merge pull request #1961 from ryanpetrello/fix-1672 
don't allow Accept:application/json on /api/login/
 2018-05-25 16:55:11 -04:00
Ryan Petrello fc1077b9cb Merge pull request #1962 from ryanpetrello/i18n-credentials 
mark dynamic Credential Type labels and help_text for i18n
 2018-05-25 16:31:09 -04:00
Ryan Petrello 960b64f292 Merge pull request #1947 from ryanpetrello/fix-897 
fix a bug in the instance policy algorithm when both min and % are used
 2018-05-25 08:55:51 -04:00
Ryan Petrello f0df747a2f Merge pull request #1943 from ryanpetrello/network-ui-ci 
run network ui tests in shippable and Jenkins
 2018-05-24 09:58:37 -04:00
Ryan Petrello 479a7cd320 Merge pull request #1938 from ryanpetrello/fix-1866 
add help text for the new custom_virtualenv field
 2018-05-24 06:28:20 -04:00
Ryan Petrello 1ea4ef8778 Merge pull request #1942 from ryanpetrello/fix-1939 
allow any authenticated user to access the schedule preview API endpoint
 2018-05-24 06:27:31 -04:00
Ryan Petrello 1564f62c2a Merge pull request #1835 from AlanCoding/network_ui_admin 
Restrict network_ui to inventory admins
 2018-05-23 15:25:55 -04:00
Ryan Petrello ec8d6e2f6b Merge pull request #1929 from ryanpetrello/fix-968 
allow AUTH_LDAP_USER_FLAGS_BY_GROUP to specify an OR'd list for a flag
 2018-05-23 14:58:27 -04:00
Ryan Petrello 8bbc36336e Merge pull request #1906 from ryanpetrello/delete-user-activity-stream 
store metadata about ActivityStream.actor when the User is deleted
 2018-05-23 10:15:01 -04:00
Ryan Petrello ffdd7f162b Merge pull request #1893 from ryanpetrello/fix-broken-cancels 
revert expect(use_poll=True) due to a bug that causes `os.read()` hangs
 2018-05-21 13:05:51 -04:00
Ryan Petrello d7cdfdca2a Merge pull request #1861 from ryanpetrello/safe-queue-name 
prevent unicode in instance hostnames and instance group names
 2018-05-21 12:14:54 -04:00
Ryan Petrello 2e0125037a Merge pull request #1836 from ryanpetrello/hands-off-my-tokens 
filter `/api/v2/users/N/tokens/` to only show tokens for _that_ user
 2018-05-17 15:54:28 -04:00
Ryan Petrello 46add35f98 Merge pull request #1840 from chrismeyersfsu/fix-1_in_maxint_chance_of_collision 
flake8
 2018-05-17 14:15:57 -04:00
Ryan Petrello 1026bc493f Merge pull request #1819 from ryanpetrello/slooooooooooooow-uri-cleaner 
speed up a handful of really slow stdout tests
 2018-05-17 13:38:20 -04:00
Ryan Petrello 5bbbb87fee Merge pull request #1822 from AlanCoding/f8 
fix flake8 introduced by new tests
 2018-05-17 08:59:06 -04:00
Ryan Petrello f287948efe Merge pull request #1804 from ryanpetrello/stdout-format-json 
never convert ANSI codes to HTML for format /stdout/?format=json
 2018-05-16 11:41:20 -04:00
Ryan Petrello f49d52ad8e Merge pull request #1807 from ryanpetrello/polymorphic_created_by_delete 
restore a django-polymorphic workaround to avoid a weird cascade bug
 2018-05-16 11:03:41 -04:00