Skip to content

Commit

Permalink
run pre-commit with new version
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanvg committed Jan 14, 2021
1 parent 0b2af0a commit 427e5ad
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 27 deletions.
2 changes: 1 addition & 1 deletion css/bootstrap.min.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@
print("Relationship Type: " + obj.relationship_type)
print("Source Ref: " + obj.source_ref)
print("Target Ref: " + obj.target_ref)

Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,3 @@
print("Relationship Type: " + obj.relationship_type)
print("Source Ref: " + obj.source_ref)
print("Target Ref: " + obj.target_ref)

Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,4 @@
"target_ref": "attack-pattern--f6050ea6-a9a3-4524-93ed-c27858d6cb3c"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
"target_ref": "identity--733c5838-34d9-4fbf-949c-62aba761184c"
}
]
}
}
2 changes: 1 addition & 1 deletion examples/example_json/indicator-for-malicious-url.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
"target_ref": "malware--162d917e-766f-4611-b5d6-652791454fca"
}
]
}
}
2 changes: 1 addition & 1 deletion examples/example_json/malware-indicator-for-file-hash.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
"target_ref": "malware--fdd60b30-b67c-41e3-b0b9-f01faf20d111"
}
]
}
}
2 changes: 1 addition & 1 deletion examples/example_json/sighting-of-an-indicator.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@
]
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@
"target_ref": "identity--1621d4d4-b67d-41e3-9670-f01faf20d111"
}
]
}
}
2 changes: 1 addition & 1 deletion examples/example_json/using-granular-markings.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@
]
}
]
}
}
8 changes: 4 additions & 4 deletions examples/producer_python/sighting-of-an-indicator-producer.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
identity_class="organization",
contact_information="[email protected]",
roles=["Cyber Security"],
sectors=["technology"],
sectors=["technology"],
spec_version="2.1",
type="identity"
)
Expand All @@ -21,7 +21,7 @@
identity_class="organization",
contact_information="[email protected]",
roles=["Cyber Security"],
sectors=["technology"],
sectors=["technology"],
spec_version="2.1",
type="identity"
)
Expand All @@ -36,7 +36,7 @@
indicator_types=["malicious-activity"],
pattern="[url:value = 'http://paypa1.banking.com']",
pattern_type="stix",
valid_from="2015-06-29T09:10:15.915Z",
valid_from="2015-06-29T09:10:15.915Z",
spec_version="2.1",
type="indicator"
)
Expand All @@ -50,7 +50,7 @@
last_seen="2017-02-27T21:37:11.214Z",
count=1,
sighting_of_ref="indicator--9299f726-ce06-492e-8472-2b52ccb53191",
where_sighted_refs=["identity--5206ba14-478f-4b0b-9a48-395f690c20a2"],
where_sighted_refs=["identity--5206ba14-478f-4b0b-9a48-395f690c20a2"],
spec_version="2.1",
type="sighting"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
modified="2015-05-07T14:22:14.760Z",
name="Adversary Bravo",
description="Adversary Bravo is known to use phishing attacks to deliver remote access malware to the targets.",
threat_actor_types=["spy", "criminal"],
threat_actor_types=["spy", "criminal"],
spec_version="2.1",
type="threat-actor"
)
Expand All @@ -17,7 +17,7 @@
modified="2015-05-10T16:27:17.760Z",
name="Adversary Bravo",
description="Adversary Bravo is a threat actor that utilizes phishing attacks.",
identity_class="unknown",
identity_class="unknown",
spec_version="2.1",
type="identity"
)
Expand All @@ -33,7 +33,7 @@
modified="2015-04-23T11:12:34.760Z",
name="Poison Ivy Variant d1c6",
malware_types=["remote-access-trojan"],
kill_chain_phases=[init_comp],
kill_chain_phases=[init_comp],
spec_version="2.1",
type="malware",
is_family="false"
Expand All @@ -53,7 +53,7 @@
name="Phishing",
description="Spear phishing used as a delivery mechanism for malware.",
kill_chain_phases=[init_comp],
external_references=[ref],
external_references=[ref],
spec_version="2.1",
type="attack-pattern"
)
Expand Down
8 changes: 4 additions & 4 deletions examples/producer_python/using-granular-markings-producer.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
name="Gotham National Bank",
contact_information="[email protected]",
identity_class="organization",
sectors=["financial-services"],
sectors=["financial-services"],
spec_version="2.1",
type="identity"
)
Expand All @@ -38,7 +38,7 @@
roles=["director"],
resource_level="team",
primary_motivation="personal-satisfaction",
object_marking_refs=[TLP_RED],
object_marking_refs=[TLP_RED],
spec_version="2.1",
type="threat-actor"
)
Expand All @@ -54,7 +54,7 @@
pattern="[email-message:from_ref.value MATCHES '.+\\\\banking@g0thamnatl\\\\.com$']",
pattern_type="stix",
valid_from="2017-04-27T16:18:24.318Z",
granular_markings=[granular_red, granular_amber, granular_green],
granular_markings=[granular_red, granular_amber, granular_green],
spec_version="2.1",
type="indicator"
)
Expand All @@ -66,7 +66,7 @@
relationship_type='indicates',
source_ref="indicator--1ed8caa7-a708-4706-b651-f1186ede6ca1",
target_ref="threat-actor--8b6297fe-cae7-47c6-9256-5584b417849c",
object_marking_refs=[TLP_RED],
object_marking_refs=[TLP_RED],
spec_version="2.1",
type="relationship"
)
Expand Down
4 changes: 2 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ layout: default
<div class="panel-heading">
<div markdown="span">[![STIX Logo]({{ site.baseurl }}/img/LOGO_STIX.svg){: .panel-logo}]({{site.baseurl}}/stix/intro)</div>
<div class="panel-title text-center">A structured language for cyber threat intelligence</div>
</div>
</div>
<div class="panel-body">
<p>
Structured Threat Information Expression (STIX™) is a language and serialization format used to exchange cyber threat intelligence (CTI).
Expand Down Expand Up @@ -60,7 +60,7 @@ layout: default
![TAXII Collections]({{ site.baseurl }}/img/taxii_diagram.png){: .figure-img .img-fluid}
**TAXII Collections**
</div>
<div style="margin-top: -2px;" class="panel-heading">
<div style="margin-top: -2px;" class="panel-heading">
<a style="width: 250px;" class="btn btn-primary btn-spec" data-toggle="tooltip" title="TAXII Home" href="{{site.baseurl}}/taxii/intro">
<span class="glyphicon glyphicon-home"></span> Learn More
</a>
Expand Down
4 changes: 2 additions & 2 deletions stix/compare.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ The generic TTP (tactics, techniques, procedures) and Exploit Target types from
```json
{
"type": "attack-pattern",

"id": "attack-pattern--01",
"spec_version": "2.1",
"created": "2015-05-15T09:11:12.515Z",
"modified": "2015-05-15T09:11:12.515Z",
"name": "Initial Compromise",
"name": "Initial Compromise",
"external_references": [
{
"source_name": "capec",
Expand Down
2 changes: 1 addition & 1 deletion taxii/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TAXII design principles include minimizing operational changes needed for adopti

## What's New in TAXII 2.1
TAXII 2.1 differs from TAXII 2.0 in the following ways:

* The DNS SRV record was changed from taxii to taxii2
* The discovery URL was changed from /taxii/ to /taxii2/
* The Manifest Resource was changed to represent individual versions of an object, instead of an object with all of its versions
Expand Down

0 comments on commit 427e5ad

Please sign in to comment.