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

Id contributing properties from json to py #1093

Merged
merged 2 commits into from
Aug 29, 2022
Merged

Id contributing properties from json to py #1093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14e8667
Id contributing properties from json to py
Aug 29, 2022
3a30bdc
Added StixObjectIdEncoder usage for result translation in README
Aug 29, 2022
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
2 changes: 1 addition & 1 deletion ...n_to_stix/id_contributing_properties.json → ...son_to_stix/id_contributing_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
properties = {
"artifact": [[ "MD5", "SHA-1", "SHA-256", "SHA-512" ], "payload_bin"],
"autonomous-system": ["number"],
"directory": ["path"],
Expand Down
7 changes: 2 additions & 5 deletions stix_shifter_utils/stix_translation/src/json_to_stix/json_to_stix_translator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import json

from stix_shifter_utils.utils.helpers import dict_merge
from stix_shifter_utils.stix_translation.src.json_to_stix import observable
from stix_shifter_utils.stix_translation.src.json_to_stix import observable, id_contributing_properties
from stix2validator import validate_instance, print_results, ValidationOptions
from datetime import datetime
from stix_shifter_utils.utils import logger
Expand Down Expand Up @@ -73,10 +73,7 @@ def __init__(self, data_source, ds_to_stix_map, transformers, options, callback=

if options.get("stix_2.1"):
self.spec_version = "2.1"
current_dir = path.abspath(path.dirname(__file__))
contributing_properties_definitions_path = path.abspath(path.join(current_dir, "id_contributing_properties.json"))
with open(contributing_properties_definitions_path, 'r') as f:
self.contributing_properties_definitions = json.load(f)
self.contributing_properties_definitions = id_contributing_properties.properties
else:
self.spec_version = "2.0"
self.bundle["spec_version"] = "2.0"
Expand Down