Skip to content

3167 UI credentials collectors #3258

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

Jump to bottom
Merged
merged 28 commits into from
Apr 27, 2023
Merged

3167 UI credentials collectors #3258

merged 28 commits into from
Apr 27, 2023

Conversation

ilija-lazoroski
Copy link
Contributor

@ilija-lazoroski ilija-lazoroski commented Apr 26, 2023 •
edited
Loading

What does this PR do?

Fixes part of #3167 .

Things left to do:

  • Fix credentials collectors ui readonly if plugin not selected
  • Fix BB test configurations that adds credentials collectors

PR Checklist

  • Have you added an explanation of what your changes do and why you'd like to include them?
  • Is the TravisCI build passing?
  • Was the CHANGELOG.md updated to reflect the changes?
  • Was the documentation framework updated to reflect the changes?
  • Have you checked that you haven't introduced any duplicate code?

Testing Checklist

  • Added relevant unit tests?
  • Do all unit tests pass?
  • Do all end-to-end tests pass?
  • Any other testing performed?

    Tested by {Running the Monkey locally with relevant config/running Island/...}

  • If applicable, add screenshots or log transcripts of the feature working
Screen.Recording.2023-04-26.at.6.01.13.PM.mov

mssalvatore
mssalvatore reviewed Apr 26, 2023
View reviewed changes
@ilija-lazoroski ilija-lazoroski changed the base branch from develop to 3167-mock-credential-collector April 26, 2023 16:21
@ilija-lazoroski ilija-lazoroski marked this pull request as ready for review April 26, 2023 20:42
@ilija-lazoroski ilija-lazoroski force-pushed the 3167-mock-credential-collector branch from 8e83fb8 to fe230be Compare April 27, 2023 08:33
@ilija-lazoroski
Common: Add CredentialsCollectorConfiguration to AgentConfiguration
1aa93fd
@ilija-lazoroski
Island: Fix CREDENTIALS_COLLECTOR path in the schema compiler
5d67cf7
@ilija-lazoroski
UI: Implement PluginSelectorTemplateGeneral which will be used for al…
97ed711 
…l plugins

It will replace PluginSelectorTemplate and take its name when done.
@ilija-lazoroski
UI: Add PluginSelectorTemplateGeneral for Credentials Collector
2eea163
@ilija-lazoroski
UI: Implement FormConfig which will keep state of the plugin UiSchema
1df3feb 
Needed so we can disable options if the plugins are not selected
@ilija-lazoroski
UI: Generalize plugin form in ConfigurePage
61b7315 
Exploiters will be also used as part of selectedPlugins in a later
commit
@ilija-lazoroski
UI: Move credentials collectors to plugins in SafeOptionValidator
fb46f78
@ilija-lazoroski
UI: Use PluginSelectorTemplateGeneral for Exploiters plugins
c13e5f9
@ilija-lazoroski
UI: Remove exploiter specific PluginSelectorTemplate
7f72f2c
@ilija-lazoroski
UI: Rename PluginSelectorTemplateGeneral to PluginSelectorTemplate
f9527d5
@ilija-lazoroski
UI: Fix plugin schema path TODO in PluginSelectorTemplate
4e77e85
@ilija-lazoroski
Common: Remove CredentialsCollectorsConfiguration and use dictionary
6a7b2c3
@ilija-lazoroski
Island: Fix Credentials Collectors path in schema
0b5d5c4
@ilija-lazoroski
UT: Fix Schema for Credentials Collectors
cd690fb
@ilija-lazoroski
UI: Fix credentials collectors plugin path
0ea0218
@ilija-lazoroski
UI: Fix top level set of UiSchema
e56e2cf
@ilija-lazoroski
BB: Adjust BB test configurations to new credentials collectors config
8dedccb
@ilija-lazoroski ilija-lazoroski force-pushed the 3167-ui-credentials-collectors branch from d50d8a2 to 8dedccb Compare April 27, 2023 08:36
shreyamalviya
shreyamalviya requested changes Apr 27, 2023
View reviewed changes
monkey/monkey_island/cc/ui/src/components/utils/SafeOptionValidator.js
Comment on lines +19 to +21
name: 'CredentialsCollectors',
allPlugins: schema.properties.credentials_collectors.properties,
selectedPlugins: Object.keys(config.credentials_collectors)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we change the configuration path of something, we'll need to update to here as well as PluginSelectorTemplate.tsx.

I see that the way we access the configuration is different in both places, but we should have the paths at one place and create a utility method that accepts the path as a parameter which we can use in this file. Maybe in a different PR.

@mssalvatore mssalvatore merged commit 5763477 into 3167-mock-credential-collector Apr 27, 2023
mssalvatore added a commit that referenced this pull request Apr 27, 2023
@mssalvatore
Merge branch '3167-ui-credentials-collectors' into 3167-mock-credenti…
2466ffb 
…al-collector

Issue #3167
PR #3258
@mssalvatore mssalvatore deleted the 3167-ui-credentials-collectors branch April 27, 2023 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mssalvatore mssalvatore mssalvatore approved these changes

@shreyamalviya shreyamalviya shreyamalviya approved these changes

@cakekoa cakekoa Awaiting requested review from cakekoa

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ilija-lazoroski @mssalvatore @shreyamalviya