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

Jump to bottom

Control Redis memory usage: limit stix_ids array length in redis stream entries to 1000 ids #6774

Closed
wants to merge 2 commits into from
Closed

Control Redis memory usage: limit stix_ids array length in redis stream entries to 1000 ids #6774

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d82aae
[backend] Upper limit on stix_ids array length in redis entries to 10…
ckane Apr 21, 2024
92e7351
[graphql] fix call to array .slice() to properly return tail of array
ckane Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 20 additions & 1 deletion opencti-platform/opencti-graphql/src/database/redis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,12 @@
const message = generateMergeMessage(instance, sourceEntities);
const previousStix = convertStoreToStix(previous) as StixCoreObject;
const currentStix = convertStoreToStix(instance) as StixCoreObject;
if ('extensions' in currentStix
&& 'extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba' in currentStix.extensions
&& 'stix_ids' in currentStix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba']
&& currentStix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids.length > 1000) {
currentStix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids = currentStix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids.slice(-1000, 0);
ckane marked this conversation as resolved.
Show resolved Hide resolved
}

Check warning on line 449 in opencti-platform/opencti-graphql/src/database/redis.ts

View check run for this annotation

Codecov / codecov/patch

opencti-platform/opencti-graphql/src/database/redis.ts#L448-L449 

Added lines #L448 - L449 were not covered by tests
return {
version: EVENT_CURRENT_VERSION,
type: EVENT_TYPE_MERGE,
Expand Down Expand Up @@ -476,19 +482,26 @@
// Build and send the event
const patch = jsonpatch.compare(previousStix, stix);
const previousPatch = jsonpatch.compare(stix, previousStix);
const stixCopy = stix;
if (patch.length === 0 || previousPatch.length === 0) {
throw UnsupportedError('Update event must contains a valid previous patch');
}
if (patch.length === 1 && patch[0].path === '/modified') {
throw UnsupportedError('Update event must contains more operation than just modified/updated_at value');
}
if ('extensions' in stixCopy
&& 'extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba' in stixCopy.extensions
&& 'stix_ids' in stixCopy.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba']
&& stixCopy.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids.length > 1000) {
stixCopy.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids = stixCopy.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids.slice(-1000, 0);
}

Check warning on line 497 in opencti-platform/opencti-graphql/src/database/redis.ts

View check run for this annotation

Codecov / codecov/patch

opencti-platform/opencti-graphql/src/database/redis.ts#L496-L497 

Added lines #L496 - L497 were not covered by tests
return {
version: EVENT_CURRENT_VERSION,
type: EVENT_TYPE_UPDATE,
scope: 'external',
message,
origin: user.origin,
data: stix,
data: stixCopy,
commit: opts.commit,
context: {
patch,
Expand Down Expand Up @@ -520,6 +533,12 @@
// Create
export const buildCreateEvent = (user: AuthUser, instance: StoreObject, message: string): StreamDataEvent => {
const stix = convertStoreToStix(instance) as StixCoreObject;
if ('extensions' in stix
&& 'extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba' in stix.extensions
&& 'stix_ids' in stix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba']
&& stix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids.length > 1000) {
stix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids = stix.extensions['extension-definition--ea279b3e-5c71-4632-ac08-831c66a786ba'].stix_ids.slice(-1000, 0);
}

Check warning on line 541 in opencti-platform/opencti-graphql/src/database/redis.ts

View check run for this annotation

Codecov / codecov/patch

opencti-platform/opencti-graphql/src/database/redis.ts#L540-L541 

Added lines #L540 - L541 were not covered by tests
return {
version: EVENT_CURRENT_VERSION,
type: EVENT_TYPE_CREATE,
Expand Down