External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity
5,519 Commits 54 Branches 19 Tags
Commit Graph

5519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones
98965d4792 Fix typo in AnonymousUser 2015-11-17 12:46:50 -05:00
Matthew Jones
564f9e2c58 Fix an issue reauthing as a social auth user 
If a social auth user is deleted and then attemnpts to relogin after the
old user object has been removed then it can cause an error.  So here
we'll add an extra lookup for the user just to verify
 2015-11-17 12:42:33 -05:00
John Mitchell
4fa06bacd8 fixed organization rest call from happening 2015-11-17 11:11:08 -05:00
John Mitchell
a698dae53f fixed messing up add user form w social auth pw hide earlier 2015-11-16 16:26:21 -05:00
Jared Tabor
01b77168b5 Update response object nesting for pendo service 2015-11-16 12:46:11 -08:00
John Mitchell
9bf0b8be4c hide un and pw fields when user is social auth based 2015-11-16 11:18:34 -05:00
Matthew Jones
dfb056d200 Disallow changing a users password for social auth 2015-11-16 10:09:22 -05:00
Chris Meyers
5142732f59 Merge pull request #505 from chrismeyersfsu/fix-django-radius 
bump django-radius to include new license
 2015-11-16 10:05:49 -05:00
Chris Meyers
693a4412c8 bump django-radius to include new license 2015-11-16 09:59:41 -05:00
James Laska
c9c4f16319 Merge pull request #502 from ghjm/jenkins-ip_2.4.0 
Change Jenkins server references from IP to DNS name
 2015-11-13 12:47:16 -05:00
Chris Church
89c6a7a9d1 Merge pull request #499 from cchurch/social_auth_updates 
Social Auth and SSO Updates
 2015-11-13 11:56:39 -05:00
Graham Mainwaring
c836e3415a Change Jenkins server references from IP to DNS name 2015-11-13 11:47:28 -05:00
Chris Church
cd447bed96 Social auth and SSO updates: 
* Move auth backends into sso app.
* Add support for mapping social auth users into organizations and teams.
* Return social auth backends in a consistent order in the API.
* Remove custom SAML attribute mapping and use options provided by PSA.
* Add pipeline function to raise an exception if no user has been found or created; added comments on how to disable new user creation.
* Add comments for defining a custom social auth pipeline function.
 2015-11-13 11:30:55 -05:00
Chris Meyers
9829d83839 Merge pull request #498 from chrismeyersfsu/fix-delete_when_license_expired 
allow multi-org expired licenses to delete orgs
 2015-11-13 10:12:44 -05:00
Chris Meyers
97c56d451e allow multi-org expired licenses to delete orgs 2015-11-12 15:33:00 -05:00
Matthew Jones
4832f48e06 Add social log messages to tower's log on error 2015-11-12 13:47:17 -05:00
Chris Church
908b1b4094 Update default scopes requested for github social auth. 2015-11-12 12:27:19 -05:00
Matthew Jones
7f276b03fb Switch to matburt's fork for python social auth 
This picks up the change needed for python 2.6 to work
 2015-11-11 16:06:37 -05:00
Matthew Jones
5f321ecab6 Emit a warning for unmapped SAML paramters 2015-11-11 16:05:53 -05:00
Matthew Jones
fdc9979595 Fix up some SAML issues 
* Fix an issue I created overriding authenticate
* Fix up attribute mapping using an identity provider class.  The
  methods built into django-social-auth for saml are probably not going
  to work.  We also now expose those mappings in a settings attrs map
  that the user can override.
 2015-11-10 11:58:42 -05:00
James Laska
60a2787468 Use correct aw_repo_url when building packer 2015-11-06 15:19:35 -05:00
Chris Meyers
c52c7c2f9f Merge pull request #494 from chrismeyersfsu/feature-socket_tests 
adds socket tests
 2015-11-06 14:39:03 -05:00
Chris Meyers
e928aa40a5 Merge pull request #493 from chrismeyersfsu/feature-git_hook 
added git pre commit hook to run flake8
 2015-11-06 10:48:38 -05:00
Chris Meyers
3f4913f5ab adds socket tests 2015-11-06 10:30:56 -05:00
Chris Meyers
014419f6ca Merge pull request #492 from chrismeyersfsu/fix-ha_remove 
fixes remove_instance error
 2015-11-06 07:56:50 -05:00
Chris Meyers
0b4efa3fcd added git pre commit hook to run flake8 2015-11-06 07:38:29 -05:00
Chris Meyers
dbbfde0d25 fixes remove_instance error 
* Initialize object attribute to None so a later if check that depends
on that attributes succeeds. The attribute is related to unifying the
command line args to the *_instance command set.
* Added regression test case
 2015-11-06 07:19:09 -05:00
Jared Tabor
d8aff34f63 null pointer exception 2015-11-05 11:17:17 -08:00
James Laska
cc0f78102e Merge pull request #489 from jlaska/release_2.4.0 
Attach handlers to django_auth_ldap
 2015-11-05 12:55:55 -05:00
James Laska
fc8f8811af Resolve issue on precise keeping old debs around 
Upgrades on precise kept installing the oldest 2.4.0 package in the pool.  The
following fix appears to correct that problem.
 2015-11-05 12:53:15 -05:00
James Laska
4060370fad Attach handlers to django_auth_ldap 
To assist with debugging LDAP authentication, associate the 'django_auth_ldap'
handler with the 'tower_warnings' logger.  To enable debugging, set the
following in a tower settings file:

> LOGGING['handlers']['tower_warnings']['level'] =  'DEBUG'

Also uses the proper `filename` for the tower_warnings log file.
 2015-11-05 12:53:15 -05:00
James Laska
9ea8dc845e Merge pull request #488 from wenottingham/release_2.4.0 
Add PowerShell version of request_tower_configuration. From @nitzmahone.
 2015-11-05 12:18:40 -05:00
James Laska
eb95ba94fb Attach handlers to django_auth_ldap 
To assist with debugging LDAP authentication, associate the 'django_auth_ldap'
handler with the 'tower_warnings' logger.  To enable debugging, set the
following in a tower settings file:

> LOGGING['handlers']['tower_warnings']['level'] =  'DEBUG'

Also uses the proper `filename` for the tower_warnings log file.
 2015-11-05 12:09:39 -05:00
Chris Meyers
5845730cf6 Merge pull request #485 from chrismeyersfsu/fix-openstack_jt 
add openstack cred file to env for jt launch
 2015-11-05 11:28:26 -05:00
Bill Nottingham
1bd6ffa3c9 Add PowerShell version of request_tower_configuration. From @nitzmahone. 2015-11-05 10:15:37 -05:00
James Laska
abed41d390 Reword log msgs for enterprise_auth failures 2015-11-05 09:50:08 -05:00
Matthew Jones
b2cfd38a1c Update dm.xmlsec.bindings requirement to point to a version with updated cflags 2015-11-04 16:43:06 -05:00
James Laska
71e9ce61e4 Revert "Add CFLAGS when building rhel6 site-packages" 
To make this work, we'll also need:

    CFLAGS=-Qunused-arguments

For now, we'll explore forking dm.xmlsec.bindings.

This reverts commit be83561bfe996d5e5b2e291787f2e863fa5b9203.
 2015-11-04 16:13:34 -05:00
James Laska
8a97a26aba Add CFLAGS when building rhel6 site-packages 
Attempts to resolves https://trello.com/c/DL7MgYyO
 2015-11-04 15:58:10 -05:00
jlmitch5
e827963415 Merge pull request #486 from jlmitch5/promiseConfig 
Promise config
 2015-11-04 15:09:35 -05:00
James Laska
5f3f830232 Fix broken coverage import with older django-jenkins 2015-11-04 10:47:26 -05:00
Matthew Jones
f78f69159d Fix up pyflakes indentation issues 2015-11-04 09:50:50 -05:00
Matthew Jones
ec6ef4974a Update GCE Region Choices per Google 2015-11-03 23:34:46 -05:00
John Mitchell
ecb445e688 dont resolve a promise that hasnt been set up 2015-11-03 22:39:39 -05:00
John Mitchell
e05988ff5d resolve config with a promise on the login route 2015-11-03 21:58:01 -05:00
John Mitchell
688d933df7 fixed admin organization association text 2015-11-03 16:39:54 -05:00
John Mitchell
cf99179015 fixed urls for credentials going to api 2015-11-03 15:48:25 -05:00
Jared Tabor
095f8d349d adding default value for idle modal 2015-11-03 07:45:31 -08:00
Chris Meyers
a0f327e6c5 Merge pull request #484 from chrismeyersfsu/feature-stdout_format 
add content encoding for json to stdout
 2015-11-03 10:11:24 -05:00
Matthew Jones
a6b2e25680 Merge pull request #483 from ansible/license_warning_and_auth_license_validation 
Add logging and improve validation for certain auth backends
 2015-11-03 09:54:45 -05:00