Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: made automated login test flow editable #1857

Merged
merged 5 commits into from
Dec 30, 2024
Merged

feat: made automated login test flow editable #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53a70f1
feat: made automated login test flow editable
TangoBeeAkto Dec 24, 2024
74bbddc
fix: fixed a bug
TangoBeeAkto Dec 24, 2024
fba5ee3
fix: update login test flow data when user clicks on multiple edit au…
TangoBeeAkto Dec 24, 2024
bd8e0b5
fix: fixed dropdown for auth params
TangoBeeAkto Dec 24, 2024
ef671d2
fix: refresh after attacker token test role update
TangoBeeAkto Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/dashboard/src/main/java/com/akto/action/testing/TestRolesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private AuthWithCond makeAuthWithConditionFromParamData(TestRoles role){

for (AuthParamData authParamDataElem : authParamData) {
AuthParam param = null;
if (authAutomationType.equals(LoginFlowEnums.AuthMechanismTypes.HARDCODED.toString())) {
if (authAutomationType.toUpperCase().equals(LoginFlowEnums.AuthMechanismTypes.HARDCODED.toString())) {
param = new HardcodedAuthParam(authParamDataElem.getWhere(), authParamDataElem.getKey(), authParamDataElem.getValue(), true);
} else {
param = new LoginRequestAuthParam(authParamDataElem.getWhere(), authParamDataElem.getKey(), authParamDataElem.getValue(), authParamDataElem.getShowHeader());
Expand Down Expand Up @@ -180,8 +180,8 @@ public String updateTestRoles() {
isAttackerRole = role.getId().equals(attackerRole.getId());
}
if (isAttackerRole) {
addActionError("Unable to update endpoint conditions for attacker role");
return ERROR.toUpperCase();
this.orConditions = null;
this.andConditions = null;
}

Conditions orConditions = null;
Expand Down
2 changes: 1 addition & 1 deletion ...oard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/ParamsCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function ParamsCard({dataObj, handleDelete, showEdit}) {
</VerticalStack>
<HorizontalStack gap={"2"} align="end">
<Button size="slim" onClick={handleDelete} icon={DeleteMajor}><div data-testid="delete_button">Delete</div></Button>
{authMechanism?.type?.toLowerCase() === 'hardcoded' ? <Button size="slim" primary onClick={() => showEdit()}>Edit</Button> : null}
<Button size="slim" primary onClick={() => showEdit()}>Edit</Button>
</HorizontalStack>
</VerticalStack>
</Box>
Expand Down
21 changes: 16 additions & 5 deletions ...eb/polaris_web/web/src/apps/dashboard/pages/testing/TestRoleSettings/TestRoleSettings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ function TestRoleSettings() {
const resetFunc = (newItems) => {
setChange(false);
setRoleName(newItems.name || systemRole || "");
setAuthMechanism(null)
dispatchConditions({type:"replace", conditions:transform.createConditions(newItems.endpoints)})
}
useEffect(() => {
Expand Down Expand Up @@ -130,7 +131,7 @@ function TestRoleSettings() {
const saveAction = async (updatedAuth=false, authWithCondLists = null) => {
let andConditions = transform.filterContainsConditions(conditions, 'AND')
let orConditions = transform.filterContainsConditions(conditions, 'OR')
if (!(andConditions || orConditions) || roleName.length === 0) {
if (roleName !== 'ATTACKER_TOKEN_ALL' && !(andConditions || orConditions) || roleName.length === 0) {
func.setToast(true, true, "Please select valid values for a test role")
} else {
if (isNew) {
Expand Down Expand Up @@ -186,7 +187,7 @@ function TestRoleSettings() {
setAdvancedHeaderSettingsOpen(true)
}
setShowAuthComponent(true)
setHardcodedOpen(true)
setHardcodedOpen(authObj?.authMechanism?.type === "HardCoded")
setEditableDocs(index)
}

Expand Down Expand Up @@ -234,7 +235,7 @@ function TestRoleSettings() {
}
}

const conditionsCard = (
const conditionsCard = roleName !== 'ATTACKER_TOKEN_ALL' ? (
<LegacyCard title="Details" key="condition">
<TestRolesConditionsPicker
title="Role endpoint conditions"
Expand All @@ -244,7 +245,7 @@ function TestRoleSettings() {
selectOptions={selectOptions}
/>
</LegacyCard>
)
) : (<></>)

const deleteModalComp = (
<Modal
Expand Down Expand Up @@ -305,6 +306,9 @@ function TestRoleSettings() {
setHeaderKey('')
setHeaderValue('')
setHardCodeAuthInfo({authParams:[]})
setAuthMechanism(null)
setHardcodedOpen(true)
setEditableDocs(-1)
}

const handleSaveAuthMechanism = async() => {
Expand Down Expand Up @@ -332,8 +336,15 @@ function TestRoleSettings() {
errorFilePath: null,
}
}

if(editableDoc > -1) {
resp = await api.updateAuthInRole(initialItems.name, apiCond, editableDoc, currentInfo.authParams, automationType, currentInfo.steps, recordedLoginFlowInput)
} else {
resp = await api.addAuthToRole(initialItems.name, apiCond, currentInfo.authParams, automationType, currentInfo.steps, recordedLoginFlowInput)
}
} else {
func.setToast(true, true, "Request data cannot be empty!")
}
resp = await api.addAuthToRole(initialItems.name, apiCond, currentInfo.authParams, automationType, currentInfo.steps, recordedLoginFlowInput)
}
handleCancel()
await saveAction(true, resp.selectedRole.authWithCondList)
Expand Down
4 changes: 2 additions & 2 deletions apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@ export default {
data: {roleName, index}
})
},
updateAuthInRole(roleName, apiCond ,index, authParamData, authAutomationType) {
updateAuthInRole(roleName, apiCond ,index, authParamData, authAutomationType, reqData, recordedLoginFlowInput) {
return request({
url: '/api/updateAuthInRole',
method: 'post',
data: {roleName, apiCond, index, authParamData, authAutomationType}
data: {roleName, apiCond, index, authParamData, authAutomationType, reqData, recordedLoginFlowInput}
})
},
deleteTestRuns(testRunIds){
Expand Down
2 changes: 1 addition & 1 deletion ...dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/AuthParams.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function AuthParams({ authParams, setAuthParams, hideTitle }) {
<div style={{ display: "grid", gridTemplateColumns: "auto max-content auto max-content auto max-content", gap: "30px", alignItems: "center"}}>
<Dropdown
id={"auth-param-menu"}
menuItems={authParamOptions} initial={authParam.where === "HEADER" ? "Header": "Body"}
menuItems={authParamOptions} initial={authParam.where}
selected={(authParamLocation) => handleUpdate(index, "where", authParamLocation)} />
<Text variant="bodyMd">Key: </Text>
<TextField id={`auth-param-key-${index}`} value={authParam.key} onChange={(key) => handleUpdate(index, "key", key)} />
Expand Down
4 changes: 2 additions & 2 deletions ...hboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/JsonRecording.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function JsonRecording({extractInformation, showOnlyApi, setStoreData}) {
}])

useEffect(() => {
if (!extractInformation) {
if (extractInformation) {
if (authMechanism && authMechanism.type === "LOGIN_REQUEST" && authMechanism.requestData[0].type === "RECORDED_FLOW") {
setTokenFetchCommand(authMechanism.requestData[0].tokenFetchCommand)
setAuthParams(authMechanism.authParams)
Expand All @@ -35,7 +35,7 @@ function JsonRecording({extractInformation, showOnlyApi, setStoreData}) {
} else {
return;
}
}, [])
}, [authMechanism])

const inputRef = useRef(null);

Expand Down
4 changes: 2 additions & 2 deletions ...ard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/LoginStepBuilder.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function LoginStepBuilder({extractInformation, showOnlyApi, setStoreData}) {

useEffect(() => {

if(!extractInformation){
if(extractInformation){
setIsLoading(true)
if (authMechanism && authMechanism.type === "LOGIN_REQUEST" && authMechanism.requestData[0].type !== "RECORDED_FLOW") {
setSteps(authMechanism.requestData.map((step, index) => ({
Expand All @@ -65,7 +65,7 @@ function LoginStepBuilder({extractInformation, showOnlyApi, setStoreData}) {
}else{
return;
}
}, [])
}, [authMechanism])

const stepOptions = [
{ label: "Call API", value: "LOGIN_FORM" },
Expand Down
Loading