mirror of
https://github.com/ansible/awx.git
synced 2026-03-10 05:59:28 -02:30
Add a new setting, DISABLE_LOCAL_AUTH
and expose it in the settings UI.
This commit is contained in:
@@ -27,6 +27,17 @@ register(
|
|||||||
category=_('Authentication'),
|
category=_('Authentication'),
|
||||||
category_slug='authentication',
|
category_slug='authentication',
|
||||||
)
|
)
|
||||||
|
register(
|
||||||
|
'DISABLE_LOCAL_AUTH',
|
||||||
|
field_class=fields.BooleanField,
|
||||||
|
label=_('Disable the built-in authentication system'),
|
||||||
|
help_text=_(
|
||||||
|
"Controls whether users are prevented from using the built-in authentication system. "
|
||||||
|
"You probably want to do this if you are using an LDAP or SAML integration."
|
||||||
|
),
|
||||||
|
category=_('Authentication'),
|
||||||
|
category_slug='authentication',
|
||||||
|
)
|
||||||
register(
|
register(
|
||||||
'AUTH_BASIC_ENABLED',
|
'AUTH_BASIC_ENABLED',
|
||||||
field_class=fields.BooleanField,
|
field_class=fields.BooleanField,
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ register(
|
|||||||
'ORG_ADMINS_CAN_SEE_ALL_USERS',
|
'ORG_ADMINS_CAN_SEE_ALL_USERS',
|
||||||
field_class=fields.BooleanField,
|
field_class=fields.BooleanField,
|
||||||
label=_('All Users Visible to Organization Admins'),
|
label=_('All Users Visible to Organization Admins'),
|
||||||
help_text=_('Controls whether any Organization Admin can view all users and teams, ' 'even those not associated with their Organization.'),
|
help_text=_('Controls whether any Organization Admin can view all users and teams, even those not associated with their Organization.'),
|
||||||
category=_('System'),
|
category=_('System'),
|
||||||
category_slug='system',
|
category_slug='system',
|
||||||
)
|
)
|
||||||
@@ -59,7 +59,7 @@ register(
|
|||||||
schemes=('http', 'https'),
|
schemes=('http', 'https'),
|
||||||
allow_plain_hostname=True, # Allow hostname only without TLD.
|
allow_plain_hostname=True, # Allow hostname only without TLD.
|
||||||
label=_('Base URL of the service'),
|
label=_('Base URL of the service'),
|
||||||
help_text=_('This setting is used by services like notifications to render ' 'a valid url to the service.'),
|
help_text=_('This setting is used by services like notifications to render a valid url to the service.'),
|
||||||
category=_('System'),
|
category=_('System'),
|
||||||
category_slug='system',
|
category_slug='system',
|
||||||
)
|
)
|
||||||
@@ -94,13 +94,12 @@ register(
|
|||||||
category_slug='system',
|
category_slug='system',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
register(
|
register(
|
||||||
'LICENSE',
|
'LICENSE',
|
||||||
field_class=fields.DictField,
|
field_class=fields.DictField,
|
||||||
default=lambda: {},
|
default=lambda: {},
|
||||||
label=_('License'),
|
label=_('License'),
|
||||||
help_text=_('The license controls which features and functionality are ' 'enabled. Use /api/v2/config/ to update or change ' 'the license.'),
|
help_text=_('The license controls which features and functionality are enabled. Use /api/v2/config/ to update or change the license.'),
|
||||||
category=_('System'),
|
category=_('System'),
|
||||||
category_slug='system',
|
category_slug='system',
|
||||||
)
|
)
|
||||||
@@ -194,7 +193,7 @@ register(
|
|||||||
'CUSTOM_VENV_PATHS',
|
'CUSTOM_VENV_PATHS',
|
||||||
field_class=fields.StringListPathField,
|
field_class=fields.StringListPathField,
|
||||||
label=_('Custom virtual environment paths'),
|
label=_('Custom virtual environment paths'),
|
||||||
help_text=_('Paths where Tower will look for custom virtual environments ' '(in addition to /var/lib/awx/venv/). Enter one path per line.'),
|
help_text=_('Paths where Tower will look for custom virtual environments (in addition to /var/lib/awx/venv/). Enter one path per line.'),
|
||||||
category=_('System'),
|
category=_('System'),
|
||||||
category_slug='system',
|
category_slug='system',
|
||||||
default=[],
|
default=[],
|
||||||
@@ -318,7 +317,7 @@ register(
|
|||||||
field_class=fields.BooleanField,
|
field_class=fields.BooleanField,
|
||||||
default=False,
|
default=False,
|
||||||
label=_('Ignore Ansible Galaxy SSL Certificate Verification'),
|
label=_('Ignore Ansible Galaxy SSL Certificate Verification'),
|
||||||
help_text=_('If set to true, certificate validation will not be done when ' 'installing content from any Galaxy server.'),
|
help_text=_('If set to true, certificate validation will not be done when installing content from any Galaxy server.'),
|
||||||
category=_('Jobs'),
|
category=_('Jobs'),
|
||||||
category_slug='jobs',
|
category_slug='jobs',
|
||||||
)
|
)
|
||||||
@@ -433,7 +432,7 @@ register(
|
|||||||
allow_null=False,
|
allow_null=False,
|
||||||
default=200,
|
default=200,
|
||||||
label=_('Maximum number of forks per job'),
|
label=_('Maximum number of forks per job'),
|
||||||
help_text=_('Saving a Job Template with more than this number of forks will result in an error. ' 'When set to 0, no limit is applied.'),
|
help_text=_('Saving a Job Template with more than this number of forks will result in an error. When set to 0, no limit is applied.'),
|
||||||
category=_('Jobs'),
|
category=_('Jobs'),
|
||||||
category_slug='jobs',
|
category_slug='jobs',
|
||||||
)
|
)
|
||||||
@@ -454,7 +453,7 @@ register(
|
|||||||
allow_null=True,
|
allow_null=True,
|
||||||
default=None,
|
default=None,
|
||||||
label=_('Logging Aggregator Port'),
|
label=_('Logging Aggregator Port'),
|
||||||
help_text=_('Port on Logging Aggregator to send logs to (if required and not' ' provided in Logging Aggregator).'),
|
help_text=_('Port on Logging Aggregator to send logs to (if required and not provided in Logging Aggregator).'),
|
||||||
category=_('Logging'),
|
category=_('Logging'),
|
||||||
category_slug='logging',
|
category_slug='logging',
|
||||||
required=False,
|
required=False,
|
||||||
@@ -561,7 +560,7 @@ register(
|
|||||||
field_class=fields.IntegerField,
|
field_class=fields.IntegerField,
|
||||||
default=5,
|
default=5,
|
||||||
label=_('TCP Connection Timeout'),
|
label=_('TCP Connection Timeout'),
|
||||||
help_text=_('Number of seconds for a TCP connection to external log ' 'aggregator to timeout. Applies to HTTPS and TCP log ' 'aggregator protocols.'),
|
help_text=_('Number of seconds for a TCP connection to external log aggregator to timeout. Applies to HTTPS and TCP log aggregator protocols.'),
|
||||||
category=_('Logging'),
|
category=_('Logging'),
|
||||||
category_slug='logging',
|
category_slug='logging',
|
||||||
unit=_('seconds'),
|
unit=_('seconds'),
|
||||||
@@ -627,7 +626,7 @@ register(
|
|||||||
field_class=fields.BooleanField,
|
field_class=fields.BooleanField,
|
||||||
default=False,
|
default=False,
|
||||||
label=_('Enable rsyslogd debugging'),
|
label=_('Enable rsyslogd debugging'),
|
||||||
help_text=_('Enabled high verbosity debugging for rsyslogd. ' 'Useful for debugging connection issues for external log aggregation.'),
|
help_text=_('Enabled high verbosity debugging for rsyslogd. Useful for debugging connection issues for external log aggregation.'),
|
||||||
category=_('Logging'),
|
category=_('Logging'),
|
||||||
category_slug='logging',
|
category_slug='logging',
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -716,6 +716,7 @@ CALLBACK_QUEUE = "callback_tasks"
|
|||||||
# Note: This setting may be overridden by database settings.
|
# Note: This setting may be overridden by database settings.
|
||||||
ORG_ADMINS_CAN_SEE_ALL_USERS = True
|
ORG_ADMINS_CAN_SEE_ALL_USERS = True
|
||||||
MANAGE_ORGANIZATION_AUTH = True
|
MANAGE_ORGANIZATION_AUTH = True
|
||||||
|
DISABLE_LOCAL_AUTH = False
|
||||||
|
|
||||||
# Note: This setting may be overridden by database settings.
|
# Note: This setting may be overridden by database settings.
|
||||||
TOWER_URL_BASE = "https://towerhost"
|
TOWER_URL_BASE = "https://towerhost"
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ function MiscSystemDetail() {
|
|||||||
'INSIGHTS_TRACKING_STATE',
|
'INSIGHTS_TRACKING_STATE',
|
||||||
'LOGIN_REDIRECT_OVERRIDE',
|
'LOGIN_REDIRECT_OVERRIDE',
|
||||||
'MANAGE_ORGANIZATION_AUTH',
|
'MANAGE_ORGANIZATION_AUTH',
|
||||||
|
'DISABLE_LOCAL_AUTH',
|
||||||
'OAUTH2_PROVIDER',
|
'OAUTH2_PROVIDER',
|
||||||
'ORG_ADMINS_CAN_SEE_ALL_USERS',
|
'ORG_ADMINS_CAN_SEE_ALL_USERS',
|
||||||
'REDHAT_PASSWORD',
|
'REDHAT_PASSWORD',
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ describe('<MiscSystemDetail />', () => {
|
|||||||
INSIGHTS_TRACKING_STATE: false,
|
INSIGHTS_TRACKING_STATE: false,
|
||||||
LOGIN_REDIRECT_OVERRIDE: 'https://redirect.com',
|
LOGIN_REDIRECT_OVERRIDE: 'https://redirect.com',
|
||||||
MANAGE_ORGANIZATION_AUTH: true,
|
MANAGE_ORGANIZATION_AUTH: true,
|
||||||
|
DISABLE_LOCAL_AUTH: false,
|
||||||
OAUTH2_PROVIDER: {
|
OAUTH2_PROVIDER: {
|
||||||
ACCESS_TOKEN_EXPIRE_SECONDS: 1,
|
ACCESS_TOKEN_EXPIRE_SECONDS: 1,
|
||||||
AUTHORIZATION_CODE_EXPIRE_SECONDS: 2,
|
AUTHORIZATION_CODE_EXPIRE_SECONDS: 2,
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ function MiscSystemEdit() {
|
|||||||
'INSIGHTS_TRACKING_STATE',
|
'INSIGHTS_TRACKING_STATE',
|
||||||
'LOGIN_REDIRECT_OVERRIDE',
|
'LOGIN_REDIRECT_OVERRIDE',
|
||||||
'MANAGE_ORGANIZATION_AUTH',
|
'MANAGE_ORGANIZATION_AUTH',
|
||||||
|
'DISABLE_LOCAL_AUTH',
|
||||||
'OAUTH2_PROVIDER',
|
'OAUTH2_PROVIDER',
|
||||||
'ORG_ADMINS_CAN_SEE_ALL_USERS',
|
'ORG_ADMINS_CAN_SEE_ALL_USERS',
|
||||||
'REDHAT_PASSWORD',
|
'REDHAT_PASSWORD',
|
||||||
@@ -261,6 +262,10 @@ function MiscSystemEdit() {
|
|||||||
name="MANAGE_ORGANIZATION_AUTH"
|
name="MANAGE_ORGANIZATION_AUTH"
|
||||||
config={system.MANAGE_ORGANIZATION_AUTH}
|
config={system.MANAGE_ORGANIZATION_AUTH}
|
||||||
/>
|
/>
|
||||||
|
<BooleanField
|
||||||
|
name="DISABLE_LOCAL_AUTH"
|
||||||
|
config={system.DISABLE_LOCAL_AUTH}
|
||||||
|
/>
|
||||||
<InputField
|
<InputField
|
||||||
name="SESSION_COOKIE_AGE"
|
name="SESSION_COOKIE_AGE"
|
||||||
config={system.SESSION_COOKIE_AGE}
|
config={system.SESSION_COOKIE_AGE}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ const systemData = {
|
|||||||
INSIGHTS_TRACKING_STATE: false,
|
INSIGHTS_TRACKING_STATE: false,
|
||||||
LOGIN_REDIRECT_OVERRIDE: '',
|
LOGIN_REDIRECT_OVERRIDE: '',
|
||||||
MANAGE_ORGANIZATION_AUTH: true,
|
MANAGE_ORGANIZATION_AUTH: true,
|
||||||
|
DISABLE_LOCAL_AUTH: false,
|
||||||
OAUTH2_PROVIDER: {
|
OAUTH2_PROVIDER: {
|
||||||
ACCESS_TOKEN_EXPIRE_SECONDS: 31536000000,
|
ACCESS_TOKEN_EXPIRE_SECONDS: 31536000000,
|
||||||
AUTHORIZATION_CODE_EXPIRE_SECONDS: 600,
|
AUTHORIZATION_CODE_EXPIRE_SECONDS: 600,
|
||||||
|
|||||||
@@ -34,6 +34,14 @@
|
|||||||
"category_slug": "system",
|
"category_slug": "system",
|
||||||
"defined_in_file": false
|
"defined_in_file": false
|
||||||
},
|
},
|
||||||
|
"DISABLE_LOCAL_AUTH": {
|
||||||
|
"type": "boolean",
|
||||||
|
"label": "Disable the built-in authentication system",
|
||||||
|
"help_text": "Controls whether users are prevented from using the built-in authentication system. You probably want to do this if you are using an LDAP or SAML integration.",
|
||||||
|
"category": "Authentication",
|
||||||
|
"category_slug": "authentication",
|
||||||
|
"defined_in_file": false
|
||||||
|
},
|
||||||
"TOWER_URL_BASE": {
|
"TOWER_URL_BASE": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"label": "Base URL of the service",
|
"label": "Base URL of the service",
|
||||||
@@ -2959,6 +2967,15 @@
|
|||||||
"category_slug": "system",
|
"category_slug": "system",
|
||||||
"default": true
|
"default": true
|
||||||
},
|
},
|
||||||
|
"DISABLE_LOCAL_AUTH": {
|
||||||
|
"type": "boolean",
|
||||||
|
"required": true,
|
||||||
|
"label": "Disable the built-in authentication system",
|
||||||
|
"help_text": "Controls whether users are prevented from using the built-in authentication system. You probably want to do this if you are using an LDAP or SAML integration.",
|
||||||
|
"category": "Authentication",
|
||||||
|
"category_slug": "authentication",
|
||||||
|
"default": false
|
||||||
|
},
|
||||||
"TOWER_URL_BASE": {
|
"TOWER_URL_BASE": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"required": true,
|
"required": true,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC":false,
|
"ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC":false,
|
||||||
"ORG_ADMINS_CAN_SEE_ALL_USERS":true,
|
"ORG_ADMINS_CAN_SEE_ALL_USERS":true,
|
||||||
"MANAGE_ORGANIZATION_AUTH":true,
|
"MANAGE_ORGANIZATION_AUTH":true,
|
||||||
|
"DISABLE_LOCAL_AUTH":false,
|
||||||
"TOWER_URL_BASE":"https://localhost:3000",
|
"TOWER_URL_BASE":"https://localhost:3000",
|
||||||
"REMOTE_HOST_HEADERS":["REMOTE_ADDR","REMOTE_HOST"],
|
"REMOTE_HOST_HEADERS":["REMOTE_ADDR","REMOTE_HOST"],
|
||||||
"PROXY_IP_ALLOWED_LIST":[],
|
"PROXY_IP_ALLOWED_LIST":[],
|
||||||
|
|||||||
Reference in New Issue
Block a user