From fb75de47c507caaf8fe5892a6a9f5109bfbd585c Mon Sep 17 00:00:00 2001 From: Richard Piazza Date: Thu, 17 Aug 2017 14:50:42 -0400 Subject: [PATCH 1/4] added TimestampConstant --- stix2/__init__.py | 3 ++- stix2/patterns.py | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/stix2/__init__.py b/stix2/__init__.py index 98697a9..503194c 100644 --- a/stix2/__init__.py +++ b/stix2/__init__.py @@ -37,7 +37,7 @@ from .patterns import (AndBooleanExpression, AndObservationExpression, OrObservationExpression, ParentheticalExpression, QualifiedObservationExpression, ReferenceObjectPathComponent, RepeatQualifier, - StartStopQualifier, StringConstant, WithinQualifier) + StartStopQualifier, StringConstant, TimestampConstant, WithinQualifier) from .sdo import (AttackPattern, Campaign, CourseOfAction, CustomObject, Identity, Indicator, IntrusionSet, Malware, ObservedData, Report, ThreatActor, Tool, Vulnerability) @@ -47,6 +47,7 @@ from .version import __version__ OBJ_MAP = { 'attack-pattern': AttackPattern, + 'bundle': Bundle, 'campaign': Campaign, 'course-of-action': CourseOfAction, 'identity': Identity, diff --git a/stix2/patterns.py b/stix2/patterns.py index d861144..8f0b8c7 100644 --- a/stix2/patterns.py +++ b/stix2/patterns.py @@ -19,6 +19,15 @@ class StringConstant(_Constant): return "'%s'" % escape_quotes_and_backslashes(self.value) +class TimestampConstant(_Constant): + def __init__(self, value): + self.value = value + + def __str__(self): + return "'%s'" % escape_quotes_and_backslashes(self.value) + + + class IntegerConstant(_Constant): def __init__(self, value): try: From ceb88f176e4409524d62ac40c49214b0ebbec777 Mon Sep 17 00:00:00 2001 From: Richard Piazza Date: Thu, 7 Sep 2017 10:35:31 -0400 Subject: [PATCH 2/4] added TimestampConstant --- stix2/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stix2/__init__.py b/stix2/__init__.py index c2aae2e..1ec4e1c 100644 --- a/stix2/__init__.py +++ b/stix2/__init__.py @@ -37,7 +37,7 @@ from .patterns import (AndBooleanExpression, AndObservationExpression, OrObservationExpression, ParentheticalExpression, QualifiedObservationExpression, ReferenceObjectPathComponent, RepeatQualifier, - StartStopQualifier, StringConstant, WithinQualifier) + StartStopQualifier, StringConstant, TimestampConstant, WithinQualifier) from .sdo import (AttackPattern, Campaign, CourseOfAction, CustomObject, Identity, Indicator, IntrusionSet, Malware, ObservedData, Report, ThreatActor, Tool, Vulnerability) From 774acb23ea5004e77b8d8952aa937ff42422c782 Mon Sep 17 00:00:00 2001 From: Greg Back Date: Mon, 11 Sep 2017 11:56:23 +0000 Subject: [PATCH 3/4] Remove extra newline --- stix2/patterns.py | 1 - 1 file changed, 1 deletion(-) diff --git a/stix2/patterns.py b/stix2/patterns.py index 8f0b8c7..7858146 100644 --- a/stix2/patterns.py +++ b/stix2/patterns.py @@ -27,7 +27,6 @@ class TimestampConstant(_Constant): return "'%s'" % escape_quotes_and_backslashes(self.value) - class IntegerConstant(_Constant): def __init__(self, value): try: From f00dcb682a132914c7deeb17d408c6928290b259 Mon Sep 17 00:00:00 2001 From: Greg Back Date: Mon, 11 Sep 2017 13:00:40 +0000 Subject: [PATCH 4/4] Fix imports --- stix2/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stix2/__init__.py b/stix2/__init__.py index 1ec4e1c..e69a5c3 100644 --- a/stix2/__init__.py +++ b/stix2/__init__.py @@ -37,7 +37,8 @@ from .patterns import (AndBooleanExpression, AndObservationExpression, OrObservationExpression, ParentheticalExpression, QualifiedObservationExpression, ReferenceObjectPathComponent, RepeatQualifier, - StartStopQualifier, StringConstant, TimestampConstant, WithinQualifier) + StartStopQualifier, StringConstant, TimestampConstant, + WithinQualifier) from .sdo import (AttackPattern, Campaign, CourseOfAction, CustomObject, Identity, Indicator, IntrusionSet, Malware, ObservedData, Report, ThreatActor, Tool, Vulnerability)