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.

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

Resolving merge conflict #19

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Resolving merge conflict #19

merged 2 commits into from
Nov 25, 2024

Conversation

mmomin-crest
Copy link
Contributor

Please ensure your pull request (PR) adheres to the following guidelines:

  • Please refer to our contributing documentation for any questions on submitting a pull request, link: Contribution Guide

Pull Request Checklist

Please check if your PR fulfills the following requirements:

  • Testing of all the changes has been performed (for bug fixes / features)
  • The manual_readme_content.md has been reviewed and added / updated if needed (for bug fixes / features)
  • Use the following format for the PR description: <App Name>: <PR Type> - <PR Description>
  • Provide release notes as part of the PR submission which describe high level points about the changes for the upcoming GA release.
  • Verify all checks are passing.
  • Do NOT use the next branch of the forked repo. Create separate feature branch for raising the PR.
  • Do NOT submit updates to dependencies unless it fixes an issue.

Pull Request Type

Please check the type of change your PR introduces:

  • New App
  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Documentation
  • Other (please describe):

Security Considerations (REQUIRED)

  • If you are exposing any endpoints using a REST handler,
    please document them in the manual_readme_content.md.
  • If this is a new connector or you are adding new actions
    • Please document in the manual_readme_content.md all methods (eg, OAuth) used to authenticate
      with the service that the connector is integrating with.
    • If any actions are unable to run on SOAR Cloud, please document this in the manual_readme_content.md.
  • Are you introducing any new cryptography modules? If yes, please elaborate their purpose:
  • Are you are accessing the file system? If yes, please verify that you are only accessing paths returned through
    the Vault API.
  • Are you are marking code to be ignored by Semgrep with nosemgrep?
    If yes, please provide justification in an additional comment next to the ignored code.

Release Notes (REQUIRED)

  • Provide release notes as part of the PR submission which describe high level points about the changes for the upcoming GA release.

What is the current behavior? (OPTIONAL)

  • Describe the current behavior that you are modifying.

What is the new behavior? (OPTIONAL)

  • Describe the behavior or changes that are being added by this PR.

Other information (OPTIONAL)

  • Any other information that is important to this PR such as screenshots of how the component looks before and after the change.

Pay close attention to (OPTIONAL)

  • Any specific code change or test case points which must be addressed/reviewed at the time of GA release.

Screenshots (if relevant)


Thanks for contributing!

* ReversingLabs TitaniumCloud v2: Bugfix - Widget data render (#7)

* Fixed data rendering issue in investigation widget

* Added info in release notes for new version

* Reworked data render for list_user_override to table

* Reworked data display for aggregated user override

* Connector data output adjusted for list_overrides

* Increased version on user agent

* Removed global widget css style

* ReversingLabs logo update

* Updated network_reputation action

* Updated json config for user overrides

* Removed custom views reference

* Highlight associated malware status

* Adjusted code to flake8

* Added minimal_data_paths to json

* Release notes for version 1.2.1

* ReversingLabs-TitaniumCloud v2: Features - Add new dynamic analysis actions (#9)

* Added support for url analysis and contextual actions

* Added support for new url in views and connector

* Validate sha1 provided url and support both url and sha1 for report

* Added contextual actions for advanced search view

* Added merged report field in view

* Added support for color coding in dropped files

* Apply classification to view control

* Adjusted data display on view

* Bumped version to 1.3.0

* Added new version of RL SDK

* Rearrange field for analysis_id classification

* Fixed color coding for dropped files

* Removed yanked pypi version of RL SDK

* Raise phantom version per MR static analysis

* Added required data path to new actions

* Fix ordering of action output parameters

* Pep8 formatting

* Added action_result.status to new functions

* Release notes for version 1.3.0

* ReversingLabs-TitaniumCloud v2: Features - Add new dynamic analysis actions 2 (#11)

* Remove semgrep workflow file

* Merging next to main for release 1.2.1 (#8)

* ReversingLabs TitaniumCloud v2: Bugfix - Widget data render (#7)

* Fixed data rendering issue in investigation widget

* Added info in release notes for new version

* Reworked data render for list_user_override to table

* Reworked data display for aggregated user override

* Connector data output adjusted for list_overrides

* Increased version on user agent

* Removed global widget css style

* ReversingLabs logo update

* Updated network_reputation action

* Updated json config for user overrides

* Removed custom views reference

* Highlight associated malware status

* Adjusted code to flake8

* Added minimal_data_paths to json

* Release notes for version 1.2.1

---------

Co-authored-by: Dinko Jakovljevic <141251667+DinkoReversingLabs@users.noreply.github.com>
Co-authored-by: root <root@splunksoar>

---------

Co-authored-by: mishalp-crest <70274577+mishalp-crest@users.noreply.github.com>
Co-authored-by: splunk-soar-connectors-admin <admin@splunksoar>
Co-authored-by: splunk-soar-connectors-bot <73200433+splunk-soar-connectors-bot@users.noreply.github.com>
Co-authored-by: root <root@splunksoar>

* ReversingLabs-TitaniumCloud v2: Features - Add new Customer Usage Actions (#14)

* Configure appropriate action types based on the API purpose

* Bump user agent version

* Add contextual actions for av_scanners

* Add contextual actions to file analysis

* Added support for contextual and charts on file reputation view

* Added contextual actions on functional similarity

* Add contextual actions to url_downloaded_files

* Add contextual actions to url_analysis_feed

* Adding TCA codes to methods in connector

* Added tooltip info about 90 days feed analysis result

* Added contextual actions for imphash similarity

* Added contextual action and description for network user override api

* Fix typo in method name for reanalyze file api

* Fix issues with schema on generating URL for file upload api

* Added contextual actions on uri to hash search

* Added contextual actions for uri statistics and fix data validation

* Added contextual actions on url reputation and support for charts

* Adding support for File Reputation Override POST

* Bugfix for network user override data display

* Adding contextual actions on file reputation user override

* Adding support for File Reputation Override List

* Adding support for customer daily usage API

* Added support for day range customer usage api

* Added support for Customer usage monthly report

* Removed output medata in JSON for Customer usage dayrange

* Added support for month range in Customer usage API

* Added support for yara api usage in Customer usage API

* Added support for customer quota limits in Customer usage API

* Fixing customer dayrange action call

* Added value_list for time_format properties

* Added value_list for platform parameter

* Fixed chart display on file reputation action

* Added more description label on chart

* Renaming API Codes

* Added support for domain report

* Added support for new domain downloaded files

* Added contextual action on domain report view

* Added support for more fields in response for domain downloaded files

* Added support for extracting urls from domain action

* Added support for resolutions from domain action

* Added paging for get url domains action

* Added paging for domains resolutions action

* Added new action for related domains

* Added contextual actions to json metadata output

* Added new support for get ip report action

* Added new support for get ip downloaded files action

* Added new support for get urls from ip action

* Fix description on resolutions from domain action

* Added new support for get resolutions from ip action

* Added new fields in view on url reputation

* Validate that output parameters exists before iteration

* Linting and formating prep for pull request

* Manual_readme_adjustments

* Added description for list active file reputation user override action

* Added release notes

* pre-commit validation changes

* Version bump and wheel file for rl sdk

* Update version of sdk in pip dependencies

* Release notes for version 1.4.0

* Update README.md

* copy pasted next branch files

---------

Co-authored-by: Dinko Jakovljevic <141251667+DinkoReversingLabs@users.noreply.github.com>
Co-authored-by: root <root@splunksoar>
Co-authored-by: mishalp-crest <70274577+mishalp-crest@users.noreply.github.com>
Co-authored-by: splunk-soar-connectors-admin <admin@splunksoar>
Co-authored-by: Ishan Shah <ishans@splunk.com>
Co-authored-by: dhwanis-crest <72184556+dhwanis-crest@users.noreply.github.com>
Co-authored-by: mishalp-crest <mishalp@splunk.com>
Co-authored-by: Ishan Shah <86037628+ishans-crest@users.noreply.github.com>
@DinkoReversingLabs
Copy link
Collaborator

hi @mmomin-crest ,

do you need something from us to resolve the issues with the conflicts on the repo?

Kind regards
Dinko

@DinkoReversingLabs
Copy link
Collaborator

hi @mmomin-crest

Reminder!

Kind regards
Dinko

@DinkoReversingLabs DinkoReversingLabs merged commit fe72ef4 into next Nov 25, 2024
2 of 8 checks passed
@DinkoReversingLabs DinkoReversingLabs deleted the resolved branch November 25, 2024 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants