bf83ca62b3
Add trailing commas for the pre-commit hook......
2020-02-07 18:58:45 -05:00
19707677c9
Fix STIX version detection from dicts. In particular, 2.1 SCOs
...
without the spec_version property ought to be correctly detected
as 2.1 now.
2020-02-07 18:17:12 -05:00
5aaf07702d
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-02-05 21:18:14 +01:00
c96b74294a
Merge pull request #331 from chisholm/remove_values_workaround
...
Remove workaround for "values" being both a Mapping method name and STIX property name
2020-02-04 10:39:42 -05:00
dece917a68
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-01-31 11:38:26 +01:00
176cb980a2
Remove workaround for "values" being both a Mapping method name
...
and sometimes a STIX property name. It didn't work (caused
crashes under some circumstances). Now, attributes whose names
conflict with Mapping methods will have the Mapping
interpretation. Same-named STIX object properties will not be
accessible as attributes.
2020-01-28 18:13:36 -05:00
5b07887edc
Fixes #303
2020-01-28 15:41:38 -05:00
88426de424
update test suite to include new property present in TLP Markings
2020-01-28 13:20:58 -05:00
6f4e819c73
update check_tlp_marking() to contain new representation for TLP markings
2020-01-28 13:20:20 -05:00
9463884170
add optional "name" StringProperty to MarkingDefinition
...
update TLP_* v21 constants according to spec
2020-01-28 13:19:23 -05:00
96946d956d
fix: Avoid errors with custom object ids in the list of object refs in the Report object
2020-01-17 17:13:43 +01:00
ec1fbb58f6
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-01-17 09:20:06 +01:00
c467f198c8
add encoding to MemorySource load_from_file()
2020-01-15 14:15:08 -05:00
25cfb25ef3
add encoding and propagate accordingly for calls
2020-01-15 14:12:58 -05:00
cbe109d815
fix: Avoiding issues with some extensions that are not dict but defaultdict
2020-01-08 17:00:18 +01:00
36e4b41b9c
fix: Avoiding inconsistency in the id prefixes causing uuid check issues
2020-01-08 16:58:34 +01:00
c8cd84925b
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2020-01-08 14:53:36 +01:00
92f413a2e0
Bump version: 1.2.1 → 1.3.0
2020-01-04 19:40:01 -05:00
3092d88154
Fix trailing comma
2020-01-04 18:02:01 -05:00
e3c2a3a57b
Fix error: dict keys changing during iteration
2020-01-04 14:48:49 -05:00
6c0fba0e67
Add Python3.8 support, fix import
...
Uses try/catch to still support 2.7 too
2020-01-04 13:50:06 -05:00
d50792b4d2
Fix tests. Fixes #307
2020-01-04 10:24:17 -05:00
7a47f348a0
Introduce and relocate version-based pattern checking. Fixes #307
2020-01-04 10:24:17 -05:00
4350680e79
Introduce and relocate version-based pattern checking. Fixes #307
2020-01-04 10:24:17 -05:00
a18612bdfb
Fixes #307
2020-01-04 10:24:17 -05:00
e260dbb716
Fixes #309
2019-12-23 17:30:34 -05:00
32d2a0a4fd
Fixes #309
2019-12-23 17:30:34 -05:00
74eeabab77
Merge branch 'khdesai-change_logging'
...
Close #304 .
2019-12-23 17:20:32 -05:00
62cd4fd33c
Change string semantic comparison algorithm
...
Use `fuzzywuzzy`'s Token Sort Ratio instead of Jaro-Winkler.
2019-12-23 17:00:52 -05:00
457564f2f9
Update SemEq test, use dict for property weights
2019-12-20 17:01:21 -05:00
cde57ce8f7
Merge pull request #315 from khdesai/fix_issue_308
...
Fix issue 308
2019-12-17 12:13:25 -05:00
6df7da65b8
Fixes #308
2019-12-17 11:57:55 -05:00
8719a7206f
Fixes #308
2019-12-16 16:32:55 -05:00
31d944b159
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-12-12 22:59:39 +01:00
77eda29471
Add default weight_dict to documentation
...
for semantic equivalence
2019-12-11 13:13:36 -05:00
f6e75cd8f8
Add debug logging messages and add documentation to equivalence.ipynb
2019-12-06 10:46:27 -05:00
c09bd071d0
Make requested changes, except documentation, which is coming soon
2019-12-06 10:46:27 -05:00
2b180c40b5
Remove unnecessary functions
2019-12-06 10:46:27 -05:00
f5d199bedf
Generalize checking functionality within environment.py and add prop_scores dict so all scoring info is one python object
2019-12-06 10:46:27 -05:00
a350ad01ac
Fixes #310
2019-12-06 09:54:00 -05:00
e9795a945b
Fix long line
2019-12-06 09:40:27 -05:00
54ecba736d
Add docstring for enumerate_types()
2019-12-06 09:35:36 -05:00
f09cf4867d
Remove unnecessary comments
2019-12-06 09:35:36 -05:00
3a46d42aaa
parse() handles observables in 2.1. Change mechanism for (in)valid_types in ReferenceProperty. Fix _custom_observable_builder to include ReferenceProperty instead of ObjectReferenceProperty, and added ID property to custom observables
2019-12-06 09:35:36 -05:00
aee296ea46
Fixes #296
2019-12-06 09:35:36 -05:00
9a56344d92
Forgot to add TLSH to a different regex
2019-11-25 16:14:23 -05:00
806c6c52d9
Added tests for other changes, and moved attribute defaults to an init function
2019-11-25 15:52:50 -05:00
46f1778d04
Fixed all issues brought up in issue #305 by Chris Lenk
2019-11-22 13:24:09 -05:00
e2a4129ad3
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-10-22 01:30:57 +02:00
d4c0115735
Bump version: 1.2.0 → 1.2.1
2019-10-16 17:24:16 -04:00
1d671bd144
Merge branch 'master' into stix2.1
2019-10-16 17:02:21 -04:00
13fda69079
add test for object not present in configuration
2019-10-15 13:25:11 -04:00
024e023967
update semantic equivalence approach to:
...
- add more detailed output via the logging module
- don't fail hard if an object sent to the semantically_equivalent() method
- remove specific exception related to Semantic Equivalence and tests
2019-10-15 12:54:41 -04:00
4f1d68065a
fix: Making python imports happy in travis
2019-10-14 14:41:17 +02:00
bdba2c0a63
fix: Removed comment
2019-10-14 14:27:44 +02:00
bf45f26bfe
fix: Making pep8 happy
2019-10-14 14:15:26 +02:00
8809418dab
fix: Updated interoperability tests with required arguments
2019-10-14 14:14:39 +02:00
f89940ec0e
fix: Added missing param to the id validation function
2019-10-14 12:34:31 +02:00
adbaec1942
Merge branch 'master' of github.com:oasis-open/cti-python-stix2 + fix interoperability param support
2019-10-14 12:30:15 +02:00
edf465bd80
Add a unit test for deterministic ID, with unicode
2019-10-11 18:15:47 -04:00
216b43d49e
Fix determinstic UUID handling when there are high-codepoint
...
unicode characters. Make compatible with both python 2 and 3.
2019-10-11 17:12:44 -04:00
c6936ae7a2
Bump version: 1.1.3 → 1.2.0
2019-09-25 16:04:07 -04:00
de478df687
update test after merge, formatting
2019-09-23 23:27:43 -04:00
88b883c91d
Merge branch 'master' into semantic-equivalence
2019-09-23 23:20:42 -04:00
dc79a1f869
add docstrings for new public methods. add test with disabled spec_version check.
...
fix calculation for distance, using incorrect algorithm. update package settings, tox settings
2019-09-23 23:13:50 -04:00
401c9ad950
Merge branch 'master' into stix2.1
2019-09-23 12:26:27 -04:00
4eaaee89dc
make changes according to feedback. allow for custom objects to be supplied to method
2019-09-23 09:44:09 -04:00
113d481e84
Make SCO deterministic ID namespace a global var for better software hygiene
2019-09-19 10:31:14 -04:00
f241ed5c6c
Remove at_least_one=False from Artifact SCO
2019-09-18 10:56:42 -04:00
3b1c922ba6
Fix observed data property check for at least one property existing
2019-09-18 10:29:07 -04:00
e138753576
add another test
2019-09-17 16:10:54 -04:00
351362ae33
more tests for coverage
2019-09-17 15:55:12 -04:00
09858ba263
create more tests to improve coverage
2019-09-17 15:28:37 -04:00
98ecdf53e3
update timestamp comparison method
2019-09-17 11:08:01 -04:00
e8eb7bcca2
fix logging messages, typos and add tests for the semantic equivalence method
2019-09-16 14:35:14 -04:00
855bc96863
Avoid throwing exceptions when unneeded to avoid problems
2019-09-13 14:54:52 -04:00
4c6519cf43
Changed 'six.text_type' to 'six.string_types', since the former didn't seem to work in python2.7
2019-09-13 12:09:02 -04:00
4753519349
Marking-definitions are now checked for their attribute before being tested and tests were modified to expect the correct value
2019-09-13 10:52:50 -04:00
5f3e41a9ab
Marking-definitions are now checked for their attribute before being tested and tests were modified to expect the correct value
2019-09-13 10:51:28 -04:00
8447c9fcd9
Add few tests to improve some code coverage
2019-09-11 14:21:41 -04:00
afa4af65c6
Fixing pre-commit things
2019-09-11 12:22:55 -04:00
e7a6554395
Fixing pre-commit issues
2019-09-11 12:12:26 -04:00
7c96d991e6
Added a function to ensure precision consistency
2019-09-11 10:55:09 -04:00
9c7128d074
Fix indentation issue
2019-09-11 10:49:11 -04:00
d828e41c78
End of changes
2019-09-11 10:44:14 -04:00
6fa77adfe3
wrote all default weights, actually computing the equivalence score
...
logging for unsupported objects, finished implementing some methods. Missing to implement patterning.
2019-09-10 15:04:07 -04:00
53db47b447
Statement-type definitions will now match the timestamp precision given to them
2019-09-09 21:38:58 -04:00
5b6592e2dc
Some changes. More fixes coming soon, hopefully
2019-09-06 18:08:27 -04:00
8f773fd556
Temp backup of some code changes. More coming soon
2019-09-06 00:25:42 -04:00
abf2980336
Fix tests and ReferenceProperty
2019-09-04 19:08:34 -04:00
a739c1154e
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-09-03 13:47:43 +02:00
44ebd64a16
Some test fixes. More coming soon
2019-08-30 03:47:47 -04:00
f69b13a006
Some more updates, primarily to ReferenceProperty (and related code)
2019-08-29 17:15:51 -04:00
5825118ad4
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-27 17:37:14 -04:00
49077352d7
Updates and corrections for SCO WD 05 updates. Temp backup; testing and more fixes coming soon
2019-08-27 17:36:45 -04:00
94bb76f669
Fix docstring on the unit tests I added. I'd said "partially
...
cleaned" property, but actually, the cleaning algorithm works on
a dict copy, so aborting cleaning partway through doesn't
actually affect the object in that way. It would actually cause
the extensions property to be completely uncleaned, rather than
partially cleaned.
2019-08-26 17:49:55 -04:00
c212c7c678
Fix handling of custom extensions: make sure when
...
allow_custom=True that you never get a half-cleaned property
value.
2019-08-26 17:10:54 -04:00
7c9fc3fd08
Fix deterministic ID tests
2019-08-21 09:33:42 -04:00
364daec40a
Add deterministic ID tests
2019-08-21 09:21:51 -04:00
5e9d6a6a14
Fix small indentation error
2019-08-21 08:49:33 -04:00
bf1b8b567d
Updates to allow existing tests to pass
2019-08-21 02:00:41 -04:00
46359ead69
Modify a few things
2019-08-19 13:35:17 -04:00
ec55463398
Update SCO stuff to WD 05
2019-08-19 09:39:13 -04:00
b0a1bbbc84
Bump version: 1.1.2 → 1.1.3
2019-08-12 13:32:47 -04:00
dee2f1f60c
Merge branch 'stix2.1' of https://github.com/oasis-open/cti-python-stix2 into wd05SCO
2019-08-12 08:16:00 -04:00
b981cdf4fc
Fix tests
...
by removing certain human message assertions from test suites.
(These changes are cherry-picked from commit by @khdesai on a different
branch)
2019-08-09 16:04:29 -04:00
5e5a03c001
Changed emitted deprecation warnings to a custom DeprecationWarning
...
subclass. Changed the unit test to test for that specific
warning category, instead of any DeprecationWarning.
2019-08-07 10:16:18 -04:00
27beec4060
Add a deprecation warning for the "objects" property of
...
observed-data. Add a unit test to ensure we get the warning.
2019-07-29 16:35:38 -04:00
93aa709b68
write down some of the semantic-equivalence work. WIP
2019-07-26 16:01:45 -04:00
9404cf4560
Fix flake8 style error.
2019-07-25 16:58:48 -04:00
423487d65a
Add a unit test for the first/last_seen value co-constraint
...
on ThreatActor.
2019-07-25 16:57:15 -04:00
8362d80206
Change "object_modified" property of LocationContent to be
...
optional. Add a corresponding unit test.
2019-07-25 16:56:34 -04:00
5649559c6d
Removed some more hard-codings of v20 in the workbench test
...
suite.
2019-07-24 17:39:00 -04:00
b0eb518997
Added adaptability to the workbench module, regarding the
...
autogenerated docstrings: v20/v21 is automatically referenced as
appropriate, based on stix2.DEFAULT_VERSION. To avoid
duplication, I also moved _STIX_VID from test_workbench.py to
workbench.py; the former now imports it from the latter.
2019-07-24 17:20:52 -04:00
22face6c1a
Add trailing commas to satisfy pre-commit hooks...
2019-07-24 16:30:18 -04:00
9d08cadcfd
Turn off the workbench test suite's side effects after each test
...
that turns them on. These have the potential to affect subsequent
tests. The side effects include automatically setting
property values, and automatically appending additional values
to list-valued properties.
2019-07-24 16:23:19 -04:00
38103ac6c5
Moved test/v20/test_workbench.py up one directory level since
...
it doesn't make sense to have a test per STIX version. The
workbench only uses the latest supported STIX version. In
order to make this work, the test suite was modified to
dynamically compute some settings like where to get demo data,
based on the value of stix2.DEFAULT_VERSION.
Switched stix2.DEFAULT_VERSION back to "2.0", since I figure it
should be sync'd up with the 'from .vxx import *' import
statement from the top level package.
2019-07-24 15:35:59 -04:00
d69449706f
Revert the docstrings generated for the workbench dynamically
...
created subclasses, to mention v20 instead of v21.
2019-07-22 17:01:52 -04:00
165d87e103
Revert the import in the top-level stix2 package, to v20. This
...
additionally required:
- Removing the v21 workbench test suite and reinstating the v20
test suite
- Fixing up a few v20 unit tests to work with the workbench
monkeypatching.
- I didn't revert the analogous changes I'd previously made to
the v21 unit tests, because I think they make sense even when
the workbench monkeypatching isn't happening.
2019-07-22 16:55:22 -04:00
227383cdcb
Removed _observed_data_init() from workbench.py, part of the old
...
monkeypatching algorithm. It's no longer needed and I forgot to
delete it.
2019-07-19 15:58:15 -04:00
823b67a4fc
Add a few more tests to exercise more complex property presence
...
constraint checking.
2019-07-19 15:40:03 -04:00
5589480980
Improved the exception class hierarchy:
...
- Removed all plain python base classes (e.g. ValueError, TypeError)
- Renamed InvalidPropertyConfigurationError -> PropertyPresenceError,
since incorrect values could be considered a property config error, and
I really just wanted this class to apply to presence (co-)constraint
violations.
- Added ObjectConfigurationError as a superclass of InvalidValueError,
PropertyPresenceError, and any other exception that could be raised
during _STIXBase object init, which is when the spec compliance
checks happen. This class is intended to represent general spec
violations.
- Did some class reordering in exceptions.py, so all the
ObjectConfigurationError subclasses were together.
Changed how property "cleaning" errors were handled:
- Previous docs said they should all be ValueErrors, but that would require
extra exception check-and-replace complexity in the property
implementations, so that requirement is removed. Doc is changed to just
say that cleaning problems should cause exceptions to be raised.
_STIXBase._check_property() now handles most exception types, not just
ValueError.
- Decided to try chaining the original clean error to the InvalidValueError,
in case the extra diagnostics would be helpful in the future. This is
done via 'six' adapter function and only works on python3.
- A small amount of testing was removed, since it was looking at custom
exception properties which became unavailable once the exception was
replaced with InvalidValueError.
Did another pass through unit tests to fix breakage caused by the changed
exception class hierarchy.
Removed unnecessary observable extension handling code from
parse_observable(), since it was all duplicated in ExtensionsProperty.
The redundant code in parse_observable() had different exception behavior
than ExtensionsProperty, which makes the API inconsistent and unit tests
more complicated. (Problems in ExtensionsProperty get replaced with
InvalidValueError, but extensions problems handled directly in
parse_observable() don't get the same replacement, and so the exception
type is different.)
Redid the workbench monkeypatching. The old way was impossible to make
work, and had caused ugly ripple effect hackage in other parts of the
codebase. Now, it replaces the global object maps with factory functions
which behave the same way when called, as real classes. Had to fix up a
few unit tests to get them all passing with this monkeypatching in place.
Also remove all the xfail markings in the workbench test suite, since all
tests now pass.
Since workbench monkeypatching isn't currently affecting any unit tests,
tox.ini was simplified to remove the special-casing for running the
workbench tests.
Removed the v20 workbench test suite, since the workbench currently only
works with the latest stix object version.
2019-07-19 14:50:11 -04:00
4660d5ea28
Update SCO specs per WD 05 specs
2019-07-17 15:48:09 -04:00
cd0c4984fa
Fix most unit tests to pass again. Awaiting feedback regarding
...
possible library bugs, before I fix the remaining unit tests.
2019-07-16 16:10:25 -04:00
1b7abaf228
WIP: updating objects to be compliant with stix2.1 WD05. This
...
includes SDO/SRO class updates, but no unit test updates. The
class updates broke unit tests, so that still needs to be
addressed.
2019-07-14 15:34:31 -04:00
b464a9cc0a
Remove certain human message assertions from test suites
2019-07-09 13:34:19 -04:00
ae35d2ab01
Add and update tests to conform code to WD04 SDO specs
2019-07-02 13:17:43 -04:00
ffbf5fa34c
Fix JSON encoding issue within tests
2019-07-01 15:41:44 -04:00
c98fcafb1a
Update tests to address conformance to WD04 specs
2019-07-01 15:26:30 -04:00
ef408e1971
preliminary changes to make stix2 code conform to WD 04 specs
2019-07-01 11:52:55 -04:00
b204b9fdda
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-07-01 08:51:26 +02:00
953a91ba8e
Merge pull request #273 from chisholm/update_course_of_action
...
Update course of action for stix2.1 (again)
2019-06-28 12:32:14 -04:00
266516ebbc
Merge pull request #272 from chisholm/malware_analysis
...
Add stix2.1 malware-analysis SDO
2019-06-28 09:57:47 -04:00
6aff018695
fix: Avoid issues with custom objects
...
- Custom objects type is dict, which makes it fail
when the attribute 'id' is called
2019-06-27 17:19:05 +02:00
e779cacf3e
Update course of action tests, to include tests with the
...
action_reference property. Also, stylistic changes to hopefully
let it do more testing with less code.
2019-06-26 21:01:41 -04:00
de93a2ee32
Fix stix2.1 course-of-action SDO class properties action_reference
...
and action_bin to have the correct types.
2019-06-26 19:54:28 -04:00
c6132537b8
Changes from add-trailing-comma hook
2019-06-26 17:17:16 -04:00
68f93f4110
Oops, forgot to add the malware-analysis test suite...
2019-06-26 17:10:04 -04:00
5c92db9861
Add stix2.1 malware-analysis SDO
2019-06-26 17:06:26 -04:00
b8c5bec101
Merge branch 'master' into stix2.1
2019-06-26 12:22:40 -04:00
28ac284b84
Remove unnecessary ObservedData constraint
...
first_observed and last_observed are both required, so this co-constraint was removed from WD04.
2019-06-26 11:18:47 -04:00
565acc7618
Merge branch 'master' of github.com:oasis-open/cti-python-stix2
2019-06-25 09:06:50 +02:00
58ff89f112
Update observed-data SDO class, adding the new stix2.1 property
...
"object_refs". Added a couple tests for it.
2019-06-21 15:44:04 -04:00
23d5bef2ec
Change all uses of multi-STIX-version properties (i.e. those
...
with a spec_version constructor argument) in STIX-version-specific
contexts, to explicitly specify the STIX version.
2019-06-21 14:29:08 -04:00
9cc1e6e8c1
Change location of DEFAULT_VERSION definition, to be before
...
the imports. This ensures the attribute will be defined even if
there are import loops.
2019-06-21 14:26:48 -04:00
8bb6c79f1d
Change import order to satisfy style checkers...
2019-06-21 14:25:36 -04:00
f9578313a0
Change stix2.DEFAULT_VERSION to "2.1" on the stix2.1 branch.
2019-06-21 13:20:37 -04:00
ea98a53fae
Change all hard-coded spec_version defaults in property classes
...
to stix2.DEFAULT_VERSION.
2019-06-21 13:18:51 -04:00
d61b543266
Style changes to satisfy the 'style' tox check
2019-06-14 18:10:38 -04:00
a150b0f4aa
Change all uses of IDProperty and ReferenceProperty to specify
...
a particular spec_version.
2019-06-14 17:58:51 -04:00
Michael Chisholm