Skip to content

Some minor schema fixes + exporting global const ATTACK_SPEC_VERSION #48

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

Merged
merged 5 commits into from
Sep 18, 2025
Merged

Some minor schema fixes + exporting global const ATTACK_SPEC_VERSION #48

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
0095e7d
feat: add ts module that exports global constant ATTACK_SPEC_VERSION
seansica Sep 18, 2025
7bdd941
fix(software.schema): set object_marking_refs optional, x_mitre_contr…
seansica Sep 18, 2025
f191ccf
fix(objectMarkingRefsSchema): enforce .nonempty() on object marking r…
seansica Sep 18, 2025
832b863
fix(group.schema): validate x_mitre_contributors using xMitreContribu…
seansica Sep 18, 2025
5d02f27
style: apply formatting
seansica Sep 18, 2025
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
1 change: 1 addition & 0 deletions src/attack-spec-version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const ATTACK_SPEC_VERSION = '3.3.0' as const;
5 changes: 3 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export { ATTACK_SPEC_VERSION } from '@/attack-spec-version.js';
export * from '@/classes/index.js';
export * from '@/data-sources/index.js';
export * from '@/schemas/index.js';
export * from '@/refinements/index.js';
export * from '@/main.js';
export * from '@/refinements/index.js';
export * from '@/schemas/index.js';
1 change: 1 addition & 0 deletions src/schemas/common/common-properties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ export const objectMarkingRefsSchema = z
'Identifier must start with "marking-definition--"',
),
)
.nonempty()
.meta({
description: 'The list of marking-definition objects to be applied to this object.',
});
Expand Down
3 changes: 2 additions & 1 deletion src/schemas/sdo/group.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
createAttackExternalReferencesSchema,
createStixIdValidator,
stixTimestampSchema,
xMitreContributorsSchema,
xMitreDomainsSchema,
xMitreModifiedByRefSchema,
} from '../common/index.js';
Expand All @@ -30,7 +31,7 @@ export const groupSchema = attackBaseDomainObjectSchema

x_mitre_domains: xMitreDomainsSchema,

x_mitre_contributors: z.array(z.string()).optional(),
x_mitre_contributors: xMitreContributorsSchema.optional(),

x_mitre_modified_by_ref: xMitreModifiedByRefSchema.optional(),

Expand Down
6 changes: 2 additions & 4 deletions src/schemas/sdo/software.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
createMultiStixTypeValidator,
descriptionSchema,
externalReferencesSchema,
objectMarkingRefsSchema,
stixCreatedByRefSchema,
xMitreContributorsSchema,
xMitreDomainsSchema,
xMitreModifiedByRefSchema,
xMitrePlatformsSchema,
Expand All @@ -29,13 +29,11 @@ export const softwareSchema = attackBaseDomainObjectSchema.extend({

external_references: externalReferencesSchema,

object_marking_refs: objectMarkingRefsSchema,

// Malware: Required
// Tool: Optional
x_mitre_platforms: xMitrePlatformsSchema.optional(),

x_mitre_contributors: z.array(z.string()).optional(),
x_mitre_contributors: xMitreContributorsSchema.optional(),

x_mitre_aliases: aliasesSchema.optional().meta({
description:
Expand Down