Skip to content

Commit

Permalink
fix instances of reserved STIX 2.1 id property (#819)
Browse files Browse the repository at this point in the history
Co-authored-by: Md Azam <mdazam@ca.ibm.com>
  • Loading branch information
delliott90 and mdazam1942 committed Feb 23, 2022
1 parent 190e736 commit a696708
Show file tree
Hide file tree
Showing 5 changed files with 198 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"ipv4-addr": {
"fields": {
"value": ["a.dstIp", "a.srcIp"]
}
},
"network-traffic": {
"fields": {
"src_port": ["a.srcPort"],
"dst_port": ["a.dstPort"],
"src_ref": ["a.srcIp"],
"dst_ref": ["a.dstIp"]
}
},
"file": {
"fields": {
"name": ["a.fileName"],
"hashes.'SHA-256'": ["a.hashSha256"],
"hashes.'SHA-1'": ["a.hashSha1"],
"hashes.MD5": ["a.hashMd5"]
}
},
"process": {
"fields": {
"name": ["a.processName"],
"pid": ["a.processId"]
}
},
"user-account":{
"fields": {
"user_id": ["a.userName"]
}
},
"x_org_alertflex" : {
"fields": {
"agent": ["a.agentName"],
"node": ["a.nodeId"],
"source": ["a.alertSource"],
"type": ["a.alertType"],
"event_id": ["a.eventId"],
"severity": ["a.alertSeverity"]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
{
"create_time": [
{
"key": "first_observed",
"transformer": "EpochToTimestamp",
"cybox": false
},
{
"key": "last_observed",
"transformer": "EpochToTimestamp",
"cybox": false
}
],
"srcip":
[
{
"key": "ipv4-addr.value",
"object": "src_ip"
},
{
"key": "ipv6-addr.value",
"object": "src_ip"
},
{
"key": "network-traffic.src_ref",
"object": "nt",
"references": "src_ip"
}
],
"dstip": [
{
"key": "ipv4-addr.value",
"object": "dst_ip"
},
{
"key": "ipv6-addr.value",
"object": "dst_ip"
},
{
"key": "network-traffic.dst_ref",
"object": "nt",
"references": "dst_ip"
}
],
"srcport": {
"key": "network-traffic.src_port",
"object": "nt",
"transformer": "ToInteger"
},
"dstport": {
"key": "network-traffic.dst_port",
"object": "nt",
"transformer": "ToInteger"
},
"protocol": {
"key": "network-traffic.protocols",
"object": "nt",
"transformer": "ToLowercaseArray"
},
"domain-name": {
"fields": {
"value": ["url.domain"]
}
},
"user": {
"key": "user-account.user_id"
},
"file": {
"key": "file.name"
},
"process": {
"key": "process.name",
"object": "process"
},
"sha1": {
"key": "file.hashes.SHA-1",
"object": "file"
},
"sha256": {
"key": "file.hashes.SHA-256",
"object": "file"
},
"md5": {
"key": "file.hashes.MD5",
"object": "file"
},
"event": {
"key": "x-org-alertflex.event",
"object": "x_org_alertflex"
},
"severity": {
"key": "x-org-alertflex.severity",
"object": "x_org_alertflex"
},
"category": {
"key": "x-org-alertflex.category",
"object": "x_org_alertflex"
},
"description": {
"key": "x-org-alertflex.description",
"object": "x_org_alertflex"
},
"info": {
"key": "x-org-alertflex.info",
"object": "x_org_alertflex"
},
"agent": {
"key": "x-org-alertflex.agent",
"object": "x_org_alertflex"
},
"source": {
"key": "x-org-alertflex.source",
"object": "x_org_alertflex"
},
"type": {
"key": "x-org-alertflex.finding_type",
"object": "x_org_alertflex"
},
"node": {
"key": "x-org-alertflex.node",
"object": "x_org_alertflex"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"hostStates.os": ["hostStates.os"],
"hostStates.privateIpAddress": ["hostStates.privateIpAddress"],
"hostStates.riskScore": ["hostStates.riskScore"],
"id": ["id"],
"alert_id": ["id"],
"incidentIds": ["incidentIds"],
"lastModifiedDateTime": ["lastModifiedDateTime"],
"malwareStates.category": ["malwareStates.category"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"x-ecs-network": {
"fields": {
"inner.vlan.id": ["network.inner.vlan.id"],
"inner.vlan.vlan_id": ["network.inner.vlan.id"],
"inner.vlan.name": ["network.inner.vlan.name"],
"name": ["network.name"],
"application": ["network.application"],
Expand Down Expand Up @@ -102,7 +102,7 @@
"domain": ["user.domain"],
"full_name": ["user.full_name"],
"hash": ["user.hash"],
"id": ["user.id"],
"user_id": ["user.id"],
"group_domain": ["user.group.domain"],
"group_id": ["user.group.id"],
"group_name": ["user.group.name"]
Expand All @@ -127,7 +127,7 @@
"executable": ["process.executable"],
"entity_id": ["process.entity_id"],
"exit_code": ["process.exit_code"],
"thread.id": ["process.thread.id"],
"thread.thread_id": ["process.thread.id"],
"thread.name": ["process.thread.name"],
"title": ["process.title"],
"uptime": ["process.uptime"],
Expand All @@ -137,7 +137,7 @@
"parent.entity_id": ["process.parent.entity_id"],
"parent.exit_code": ["process.parent.exit_code"],
"parent.pgid": ["process.parent.pgid"],
"parent.thread.id": ["process.parent.thread.id"],
"parent.thread.thread_id": ["process.parent.thread.id"],
"parent.thread.name": ["process.parent.thread.name"],
"parent.title": ["process.parent.title"],
"parent.uptime": ["process.parent.uptime"],
Expand Down Expand Up @@ -193,7 +193,7 @@
"x-oca-event": {
"fields": {
"action": ["event.action"],
"id": ["event.id"],
"event_id": ["event.id"],
"category": ["event.category"],
"code": ["event.code"],
"created": ["event.created"],
Expand Down Expand Up @@ -233,9 +233,9 @@
},
"x-ecs-cloud": {
"fields": {
"account.id": ["cloud.account.id"],
"account.account_id": ["cloud.account.id"],
"availability_zone": ["cloud.availability_zone"],
"instance.id": ["cloud.instance.id"],
"instance.instance_id": ["cloud.instance.id"],
"instance.name": ["cloud.instance.name"],
"machine.type": ["cloud.machine.type"],
"provider": ["cloud.provider"],
Expand All @@ -244,7 +244,7 @@
},
"x-ecs-container": {
"fields": {
"id": ["container.id"],
"container_id": ["container.id"],
"image.name": ["container.image.name"],
"image.tag": ["container.image.tag"],
"labels": ["container.labels"],
Expand Down Expand Up @@ -276,7 +276,7 @@
"answers_ttl": ["dns.answers.ttl"],
"answers_type": ["dns.answers.type"],
"header_flags": ["dns.header_flags"],
"id": ["dns.id"],
"dns_id": ["dns.id"],
"op_code": ["dns.op_code"],
"question_class": ["dns.question.class"],
"question_name": ["dns.question.name"],
Expand All @@ -297,7 +297,7 @@
"x-ecs-error": {
"fields": {
"code": ["error.code"],
"id": ["error.id"],
"error_id": ["error.id"],
"message": ["error.message"],
"stack_trace": ["error.stack_trace"],
"type": ["error.type"]
Expand All @@ -306,7 +306,7 @@
"x-ecs-group": {
"fields": {
"domain": ["group.domain"],
"id": ["group.id"],
"group_id": ["group.id"],
"name": ["group.name"]
}
},
Expand All @@ -315,7 +315,7 @@
"architecture": ["host.architecture"],
"domain": ["host.domain"],
"hostname": ["host.hostname"],
"id": ["host.id"],
"asset_id": ["host.id"],
"ip": ["host.ip"],
"mac": ["host.mac"],
"name": ["host.name"],
Expand Down Expand Up @@ -381,7 +381,7 @@
},
"x-ecs-organization": {
"fields": {
"id": ["organization.id"],
"organization_id": ["organization.id"],
"name": ["organization.name"]
}
},
Expand All @@ -406,7 +406,7 @@
"author": ["rule.author"],
"category": ["rule.category"],
"description": ["rule.description"],
"id": ["rule.id"],
"rule_id": ["rule.id"],
"license": ["rule.license"],
"name": ["rule.name"],
"reference": ["rule.reference"],
Expand All @@ -417,7 +417,7 @@
},
"x-ecs-service": {
"fields": {
"id": ["service.id"],
"service_id": ["service.id"],
"name": ["service.name"],
"state": ["service.state"],
"type": ["service.type"],
Expand All @@ -437,12 +437,12 @@
},
"x-ecs-trace": {
"fields": {
"id": ["trace.id"]
"trace_id": ["trace.id"]
}
},
"x-ecs-transaction": {
"fields": {
"id": ["transaction.id"]
"transaction_id": ["transaction.id"]
}
},
"x-ecs-user-agent": {
Expand All @@ -459,7 +459,7 @@
"classification": ["vulnerability.classification"],
"description": ["vulnerability.description"],
"enumeration": ["vulnerability.enumeration"],
"id": ["vulnerability.id"],
"vulnerability_id": ["vulnerability.id"],
"reference": ["vulnerability.reference"],
"report_id": ["vulnerability.report_id"],
"severity": ["vulnerability.severity"],
Expand Down
Loading

0 comments on commit a696708

Please sign in to comment.