Dummy PR to test jar hell fix. DO NOT REVIEW #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
* Rough draft of IOC data model. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Changed IOC value from a list to a string. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added validation for IOC type, value, and feedId fields. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Refactored IocType to for ipv4, and ipv6. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Refactored IocType. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added unit tests. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
* create tif source config api implementation Signed-off-by: Joanne Wang <jowg@amazon.com> * clean up Signed-off-by: Joanne Wang <jowg@amazon.com> * tif/source Signed-off-by: Joanne Wang <jowg@amazon.com> * fix uri Signed-off-by: Joanne Wang <jowg@amazon.com> * comments Signed-off-by: Joanne Wang <jowg@amazon.com> * fix error message Signed-off-by: Joanne Wang <jowg@amazon.com> * moved createIndex invocation and other comments Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
* create tif source config api implementation Signed-off-by: Joanne Wang <jowg@amazon.com> * clean up Signed-off-by: Joanne Wang <jowg@amazon.com> * getTIFSourceConfig API Signed-off-by: Joanne Wang <jowg@amazon.com> * clean up Signed-off-by: Joanne Wang <jowg@amazon.com> * more cleanup Signed-off-by: Joanne Wang <jowg@amazon.com> * remove runner Signed-off-by: Joanne Wang <jowg@amazon.com> * add unit serialization tests Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
opensearch-project#1052) Signed-off-by: Joanne Wang <jowg@amazon.com>
* index threat intel monitor api Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> * address review comments Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> --------- Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
* search threat intel monitor api Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> * delete threat intel monitor api Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> --------- Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
* job scheduler Signed-off-by: Joanne Wang <jowg@amazon.com> * remove refresh policy from request Signed-off-by: Joanne Wang <jowg@amazon.com> * comments Signed-off-by: Joanne Wang <jowg@amazon.com> * added security analytics runner Signed-off-by: Joanne Wang <jowg@amazon.com> * changes to js test and lock Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
* Removed unused imports. Removed redundant helper function. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added note about system index refactoring. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented draft of IocService. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Made changes based on PR feedback. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed test helper function. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unused imports. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Adjusted mappings based on PR feedback. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
…#1073) * wip index monitor still fails * fix remote monitor setup in security-analytics Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> * wip threat intel trigger * add remote monitor triggers Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> --------- Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
* source and store Signed-off-by: Joanne Wang <jowg@amazon.com> * search feeds api Signed-off-by: Joanne Wang <jowg@amazon.com> * cleanup Signed-off-by: Joanne Wang <jowg@amazon.com> * address comments Signed-off-by: Joanne Wang <jowg@amazon.com> * rest of comments --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
* delete api Signed-off-by: Joanne Wang <jowg@amazon.com> * clean up Signed-off-by: Joanne Wang <jowg@amazon.com> * delete api integ test Signed-off-by: Joanne Wang <jowg@amazon.com> * added validation logic Signed-off-by: Joanne Wang <jowg@amazon.com> * respond to comments Signed-off-by: Joanne Wang <jowg@amazon.com> * fix merge conflicts Signed-off-by: Joanne Wang <jowg@amazon.com> * fix merge conflicts Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
* Removed unused imports. Removed redundant helper function. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added note about system index refactoring. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented draft of IocService. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Made changes based on PR feedback. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed test helper function. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unused imports. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Adjusted mappings based on PR feedback. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Continuation of fetch IOC service implementation. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Continuation of fetch IOC service implementation. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented ListtIOCs API. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed "enabled" field from ListIOCs API as that will not be configured at the IOC level. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Renamed response keys. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed "enabled" field mapping as that will not be configured at the IOC level. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Updated fetch service. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed ListIOCs API assets. Those will be included in separate PR. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Updated IOC mappings. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unused import. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Refactored NO_VERSION. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed dev logs. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed TODO. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added junit-jupiter dependency so EnabledIfSystemProperty annotation can be used to disable S3-related integ tests. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed dev code. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added bug fix TODO. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added support for generating test IOCs of a specific type. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Refactored factory used for connecting to S3. Added duration to fetchIOC response. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added integ test for fetching from s3. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed indexExists check. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
* Removed unused imports. Removed redundant helper function. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added note about system index refactoring. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented draft of IocService. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Made changes based on PR feedback. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed test helper function. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unused imports. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Adjusted mappings based on PR feedback. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Continuation of fetch IOC service implementation. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented ListtIOCs API. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed "enabled" field from ListIOCs API as that will not be configured at the IOC level. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Renamed response keys. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed "enabled" field mapping as that will not be configured at the IOC level. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added feedId as a filter for LiistIOCs API. Added handling for IndexNotFoundException when calling ListIOCs API. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented ListtIOCs API. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed "enabled" field from ListIOCs API as that will not be configured at the IOC level. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Renamed response keys. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unused test suite. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added feedId as a filter for LiistIOCs API. Added handling for IndexNotFoundException when calling ListIOCs API. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added feedId as a filter for ListIOCs API. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed merge conflict. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unused test suite. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed test case. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed test index mappings. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
…ct#1078) * refresh and update Signed-off-by: Joanne Wang <jowg@amazon.com> * clean up Signed-off-by: Joanne Wang <jowg@amazon.com> * change ID generation Signed-off-by: Joanne Wang <jowg@amazon.com> * comments Signed-off-by: Joanne Wang <jowg@amazon.com> * index create state and other comments Signed-off-by: Joanne Wang <jowg@amazon.com> * set states outside func Signed-off-by: Joanne Wang <jowg@amazon.com> * renamed model fields Signed-off-by: Joanne Wang <jowg@amazon.com> * lowercase s Signed-off-by: Joanne Wang <jowg@amazon.com> * added TODOs Signed-off-by: Joanne Wang <jowg@amazon.com> * respond to TODOs Signed-off-by: Joanne Wang <jowg@amazon.com> * remove file Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
… names (opensearch-project#1080) * Implemented logic to update the IocStoreConfig with the saTifSourceConfig ID and IOC index names. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unused test suite. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Added configId to error logs. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
* fix mappings Signed-off-by: Joanne Wang <jowg@amazon.com> * comment Signed-off-by: Joanne Wang <jowg@amazon.com> * fix comment Signed-off-by: Joanne Wang <jowg@amazon.com> * added java doc and todo Signed-off-by: Joanne Wang <jowg@amazon.com> * remove duplicate index names from mapping Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
* fix integ test Signed-off-by: Joanne Wang <jowg@amazon.com> * fix mapping Signed-off-by: Joanne Wang <jowg@amazon.com> * add todo Signed-off-by: Joanne Wang <jowg@amazon.com> * change user type Signed-off-by: Joanne Wang <jowg@amazon.com> * change state and type to keyword Signed-off-by: Joanne Wang <jowg@amazon.com> * minor refactoring Signed-off-by: Joanne Wang <jowg@amazon.com> * fix existing tests Signed-off-by: Joanne Wang <jowg@amazon.com> * add serialization tests for tifsource config object Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
* Moved "feed" variables from generic STIX2 model in SA-commons to STIX2IOC model as those variables are specific to security analytics functionality. Added feedName variables to STIX2IOC. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Moved "feedId" variables back to generic STIX2 model in SA-commons. Moved "feedName" variables to generic STIX2 model in SA-commons. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
…#1085) * Addressing PR comments. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed IOC type from the search bar param since we will offer a filter for it. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Made feedId, and type params of ListIOCsActionRequest support lists of strings. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Addressed PR feedback. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented DetailedSTIX2IOCDto for ListIOCs API. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * DetailedSTIX2IOCDto no longer extends STIX2IOCDto. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented basic unit tests for DetailedSTIX2IOCDto data model. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
* Implemented API to test s3 connection. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed comment. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Updated permissions for communication with S3. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Refactored TestS3ConnectionRequest to parse from an S3Source. Improved error message handling for failed connection attempts. Implemented integ tests. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Removed unnecessary permissions from policy file. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Revised S3 connection URI, and ListIOC API URI. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
…ct#1094) * wip Signed-off-by: Joanne Wang <jowg@amazon.com> * comments Signed-off-by: Joanne Wang <jowg@amazon.com> * working Signed-off-by: Joanne Wang <jowg@amazon.com> * delete ioc indices for delete api Signed-off-by: Joanne Wang <jowg@amazon.com> * working rn Signed-off-by: Joanne Wang <jowg@amazon.com> * cleanup Signed-off-by: Joanne Wang <jowg@amazon.com> * comments Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
* add search ioc findings api Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> add search ioc findings api Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> add search ioc findings api Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> add search ioc findings api Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> * fix review comments for ioc findings api Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> --------- Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
* ioc scan business logic * add search ioc findings api Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> * refactor iocFinding model and service to pull out CRUD operations to generic entity to re-use for threat intel alert Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> * threat intel alert model and crud operations Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> * threat intel trigger execution logic * wire in ioc findings * get threat intel monitor alerts API Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> * revert commented out code Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> --------- Signed-off-by: Chase Engelbrecht <engechas@amazon.com> Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com> Signed-off-by: Riya Saxena <riysaxen@amazon.com> Signed-off-by: Subhobrata Dey <sbcd90@gmail.com> Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> Co-authored-by: Chase <62891993+engechas@users.noreply.github.com> Co-authored-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com> Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
* fix list iocs api Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> * fix list iocs api Signed-off-by: Surya Sashank Nistala <snistala@amazon.com> --------- Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
* ioc_upload Signed-off-by: Joanne Wang <jowg@amazon.com> * todos Signed-off-by: Joanne Wang <jowg@amazon.com> * fix upload to save then delete Signed-off-by: Joanne Wang <jowg@amazon.com> * fix the rollover name Signed-off-by: Joanne Wang <jowg@amazon.com> * fix response Signed-off-by: Joanne Wang <jowg@amazon.com> * fix background delete Signed-off-by: Joanne Wang <jowg@amazon.com> * wip Signed-off-by: Joanne Wang <jowg@amazon.com> * move iocs inside source Signed-off-by: Joanne Wang <jowg@amazon.com> * wip Signed-off-by: Joanne Wang <jowg@amazon.com> * change IntervalSchedule to schedule Signed-off-by: Joanne Wang <jowg@amazon.com> * add last refreshed time Signed-off-by: Joanne Wang <jowg@amazon.com> * comments and add listener to delete Signed-off-by: Joanne Wang <jowg@amazon.com> * remove extra version field Signed-off-by: Joanne Wang <jowg@amazon.com> * fix build after merge Signed-off-by: Joanne Wang <jowg@amazon.com> * add integ test Signed-off-by: Joanne Wang <jowg@amazon.com> * fix ioc created and mdoified parsing Signed-off-by: Joanne Wang <jowg@amazon.com> * add file name to source Signed-off-by: Joanne Wang <jowg@amazon.com> * fix state on update Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
…ted States (opensearch-project#1104) Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
…-project#1106) Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
* fix action names Signed-off-by: Joanne Wang <jowg@amazon.com> * lowercase threatintel for consistency Signed-off-by: Joanne Wang <jowg@amazon.com> * revert old tifjob name Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
* fix validation Signed-off-by: Joanne Wang <jowg@amazon.com> * switch case Signed-off-by: Joanne Wang <jowg@amazon.com> --------- Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
…operation (opensearch-project#1111) Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
…s commons directly from project rootDir. (opensearch-project#1114) * Fixed validation bug. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Fixed comment. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Implemented support for making calls to S3 using either S3Client, or AmazonS3. Dependency on S3Client will eventually be removed. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Refactored build.gradle to consume SA commons from jar in root directory. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> * Updated jar. Signed-off-by: AWSHurneyt <hurneyt@amazon.com> --------- Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
[Describe what this change achieves]
Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.