Skip to content

Commit a678bc9

Browse files
authored
Fix Cisco ASA and FTD parsing of unexpected domain names (#14035)
This patch makes the Cisco ASA and FTD ingest pipeline handle the case where a domain name is found for a field where an IP is expected according to the documentation. To do so it follows ECS guidelines, setting .address to be the raw value and .ip or .domain from it, depending if it's a valid IP address or not. Fixes #14034
1 parent f20aee7 commit a678bc9

17 files changed

+646
-79
lines changed

CHANGELOG.next.asciidoc

+1
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
166166
- Fix merging of fields specified in global scope with fields specified under an input's scope. {issue}3628[3628] {pull}13909[13909]
167167
- Fix delay in enforcing close_renamed and close_removed options. {issue}13488[13488] {pull}13907[13907]
168168
- Fix missing netflow fields in index template. {issue}13768[13768] {pull}13914[13914]
169+
- Fix cisco module's asa and ftd filesets parsing of domain names where an IP address is expected. {issue}14034[14034]
169170

170171
*Heartbeat*
171172

filebeat/docs/modules/cisco.asciidoc

+7-7
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Mappings for Intrusion events fields:
124124
|====================================
125125
| FTD Field | Mapped fields
126126
| ApplicationProtocol | network.protocol
127-
| DstIP | destination.ip
127+
| DstIP | destination.address
128128
| DstPort | destination.port
129129
| EgressInterface | cisco.ftd.destination_interface
130130
| GID | service.id
@@ -134,7 +134,7 @@ Mappings for Intrusion events fields:
134134
| IntrusionPolicy | cisco.ftd.rule_name
135135
| Message | message
136136
| Protocol | network.transport
137-
| SrcIP | source.ip
137+
| SrcIP | source.address
138138
| SrcPort | source.port
139139
| User | user.id, user.name
140140
| WebApplication | network.application
@@ -152,7 +152,7 @@ Mappings for Connection and Security Intelligence events fields:
152152
| DNSQuery | dns.question.name
153153
| DNSRecordType | dns.question.type
154154
| DNSResponseType | dns.response_code
155-
| DstIP | destination.ip
155+
| DstIP | destination.address
156156
| DstPort | destination.port
157157
| EgressInterface | cisco.ftd.destination_interface
158158
| HTTPReferer | http.request.referrer
@@ -167,13 +167,13 @@ Mappings for Connection and Security Intelligence events fields:
167167
| ResponderPackets | destination.packets
168168
| SSLActualAction | event.outcome
169169
| SSLServerName | server.domain
170-
| SrcIP | source.ip
170+
| SrcIP | source.address
171171
| SrcPort | source.port
172172
| URL | url.original
173173
| User | user.name
174174
| UserAgent | user_agent.original
175175
| WebApplication | network.application
176-
| originalClientSrcIP | client.ip
176+
| originalClientSrcIP | client.address
177177
|====================================
178178

179179
Mappings for File and Malware events fields:
@@ -184,15 +184,15 @@ Mappings for File and Malware events fields:
184184
| ArchiveFileName | file.name
185185
| ArchiveSHA256 | file.hash.sha256
186186
| Client | network.application
187-
| DstIP | destination.ip
187+
| DstIP | destination.address
188188
| DstPort | destination.port
189189
| FileName | file.name
190190
| FilePolicy | cisco.ftd.rule_name
191191
| FileSHA256 | file.hash.sha256
192192
| FileSize | file.size
193193
| FirstPacketSecond | event.start
194194
| Protocol | network.transport
195-
| SrcIP | source.ip
195+
| SrcIP | source.address
196196
| SrcPort | source.port
197197
| URI | url.original
198198
| User | user.name

x-pack/filebeat/module/cisco/_meta/docs.asciidoc

+7-7
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Mappings for Intrusion events fields:
119119
|====================================
120120
| FTD Field | Mapped fields
121121
| ApplicationProtocol | network.protocol
122-
| DstIP | destination.ip
122+
| DstIP | destination.address
123123
| DstPort | destination.port
124124
| EgressInterface | cisco.ftd.destination_interface
125125
| GID | service.id
@@ -129,7 +129,7 @@ Mappings for Intrusion events fields:
129129
| IntrusionPolicy | cisco.ftd.rule_name
130130
| Message | message
131131
| Protocol | network.transport
132-
| SrcIP | source.ip
132+
| SrcIP | source.address
133133
| SrcPort | source.port
134134
| User | user.id, user.name
135135
| WebApplication | network.application
@@ -147,7 +147,7 @@ Mappings for Connection and Security Intelligence events fields:
147147
| DNSQuery | dns.question.name
148148
| DNSRecordType | dns.question.type
149149
| DNSResponseType | dns.response_code
150-
| DstIP | destination.ip
150+
| DstIP | destination.address
151151
| DstPort | destination.port
152152
| EgressInterface | cisco.ftd.destination_interface
153153
| HTTPReferer | http.request.referrer
@@ -162,13 +162,13 @@ Mappings for Connection and Security Intelligence events fields:
162162
| ResponderPackets | destination.packets
163163
| SSLActualAction | event.outcome
164164
| SSLServerName | server.domain
165-
| SrcIP | source.ip
165+
| SrcIP | source.address
166166
| SrcPort | source.port
167167
| URL | url.original
168168
| User | user.name
169169
| UserAgent | user_agent.original
170170
| WebApplication | network.application
171-
| originalClientSrcIP | client.ip
171+
| originalClientSrcIP | client.address
172172
|====================================
173173

174174
Mappings for File and Malware events fields:
@@ -179,15 +179,15 @@ Mappings for File and Malware events fields:
179179
| ArchiveFileName | file.name
180180
| ArchiveSHA256 | file.hash.sha256
181181
| Client | network.application
182-
| DstIP | destination.ip
182+
| DstIP | destination.address
183183
| DstPort | destination.port
184184
| FileName | file.name
185185
| FilePolicy | cisco.ftd.rule_name
186186
| FileSHA256 | file.hash.sha256
187187
| FileSize | file.size
188188
| FirstPacketSecond | event.start
189189
| Protocol | network.transport
190-
| SrcIP | source.ip
190+
| SrcIP | source.address
191191
| SrcPort | source.port
192192
| URI | url.original
193193
| User | user.name

0 commit comments

Comments
 (0)