External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 05:47:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Send real client remote address in TACACS+ authentication packet (#14077)

Browse Source 
Co-authored-by: ekougs <ekougs@gmail.com>
This commit is contained in:
John Westcott IV
2023-06-02 10:03:56 -04:00
committed by GitHub
parent 0ae720244c
commit 844666df4c
11 changed files with 128 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/src/screens/Setting/TACACS/TACACS.test.js
View File

@@ -15,6 +15,7 @@ SettingsAPI.readCategory.mockResolvedValue({
TACACSPLUS_SECRET: '$encrypted$',
TACACSPLUS_SESSION_TIMEOUT: 5,
TACACSPLUS_AUTH_PROTOCOL: 'ascii',
TACACSPLUS_REM_ADDR: false,
},
});

1
awx/ui/src/screens/Setting/TACACS/TACACSDetail/TACACSDetail.test.js
View File

@@ -23,6 +23,7 @@ describe('<TACACSDetail />', () => {
TACACSPLUS_SECRET: '$encrypted$',
TACACSPLUS_SESSION_TIMEOUT: 5,
TACACSPLUS_AUTH_PROTOCOL: 'ascii',
TACACSPLUS_REM_ADDR: false,
},
});
});

5
awx/ui/src/screens/Setting/TACACS/TACACSEdit/TACACSEdit.js
View File

@@ -12,6 +12,7 @@ import useModal from 'hooks/useModal';
import useRequest from 'hooks/useRequest';
import { SettingsAPI } from 'api';
import {
BooleanField,
ChoiceField,
EncryptedField,
InputField,
@@ -116,6 +117,10 @@ function TACACSEdit() {
name="TACACSPLUS_AUTH_PROTOCOL"
config={tacacs.TACACSPLUS_AUTH_PROTOCOL}
/>
<BooleanField
name="TACACSPLUS_REM_ADDR"
config={tacacs.TACACSPLUS_REM_ADDR}
/>
{submitError && <FormSubmitError error={submitError} />}
{revertError && <FormSubmitError error={revertError} />}
</FormColumnLayout>

2
awx/ui/src/screens/Setting/TACACS/TACACSEdit/TACACSEdit.test.js
View File

@@ -26,6 +26,7 @@ describe('<TACACSEdit />', () => {
TACACSPLUS_SECRET: '$encrypted$',
TACACSPLUS_SESSION_TIMEOUT: 123,
TACACSPLUS_AUTH_PROTOCOL: 'ascii',
TACACSPLUS_REM_ADDR: false,
},
});
});
@@ -112,6 +113,7 @@ describe('<TACACSEdit />', () => {
TACACSPLUS_SECRET: '',
TACACSPLUS_SESSION_TIMEOUT: 123,
TACACSPLUS_AUTH_PROTOCOL: 'ascii',
TACACSPLUS_REM_ADDR: false,
});
});

18
awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
View File

@@ -2708,6 +2708,15 @@
["pap", "pap"]
]
},
"TACACSPLUS_REM_ADDR": {
"type": "boolean",
"required": false,
"label": "TACACS+ client address sending enabled",
"help_text": "Enable the client address sending by TACACS+ client.",
"category": "TACACS+",
"category_slug": "tacacsplus",
"default": false
},
"SOCIAL_AUTH_GOOGLE_OAUTH2_KEY": {
"type": "string",
"required": false,
@@ -5936,6 +5945,15 @@
["pap", "pap"]
]
},
"TACACSPLUS_REM_ADDR": {
"type": "boolean",
"required": false,
"label": "TACACS+ client address sending enabled",
"help_text": "Enable the client address sending by TACACS+ client.",
"category": "TACACS+",
"category_slug": "tacacsplus",
"defined_in_file": false
},
"SOCIAL_AUTH_GOOGLE_OAUTH2_CALLBACK_URL": {
"type": "string",
"label": "Google OAuth2 Callback URL",

1
awx/ui/src/screens/Setting/shared/data.allSettings.json
View File

@@ -251,6 +251,7 @@
"TACACSPLUS_SECRET": "",
"TACACSPLUS_SESSION_TIMEOUT": 5,
"TACACSPLUS_AUTH_PROTOCOL": "ascii",
"TACACSPLUS_REM_ADDR": false,
"SOCIAL_AUTH_GOOGLE_OAUTH2_CALLBACK_URL": "https://localhost:3000/sso/complete/google-oauth2/",
"SOCIAL_AUTH_GOOGLE_OAUTH2_KEY": "",
"SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET": "",