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.

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

Shadowserver 202207 #2227

Merged
merged 3 commits into from
Aug 3, 2022
Merged

Shadowserver 202207 #2227

merged 3 commits into from
Aug 3, 2022

Conversation

elsif2
Copy link
Collaborator

@elsif2 elsif2 commented Jul 26, 2022

Large set of changes previously submitted as 2143.

Copy link
Member

@sebix sebix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would appreciate if you could squelch the commits together (not necessarily to one, but < 10)

docs/user/bots.rst Show resolved Hide resolved
intelmq/bots/collectors/shadowserver/README.md Outdated Show resolved Hide resolved
This module is maintained by [The Shadowserver Foundation](https://www.shadowserver.org/).

Please contact intelmq@shadowserver.org with any issues or concerns.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

intelmq/lib/test.py Outdated Show resolved Hide resolved
intelmq/lib/test.py Outdated Show resolved Hide resolved
intelmq/lib/test.py Outdated Show resolved Hide resolved
intelmq/lib/test.py Outdated Show resolved Hide resolved
intelmq/tests/bots/parsers/shadowserver/README.md Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Aug 1, 2022

Codecov Report

Merging #2227 (dad59a7) into develop (60b2f07) will increase coverage by 0.21%.
The diff coverage is 97.75%.

@@             Coverage Diff             @@
##           develop    #2227      +/-   ##
===========================================
+ Coverage    76.29%   76.50%   +0.21%     
===========================================
  Files          439      454      +15     
  Lines        23670    23993     +323     
  Branches      3751     3787      +36     
===========================================
+ Hits         18058    18355     +297     
- Misses        4872     4888      +16     
- Partials       740      750      +10     
Impacted Files Coverage Δ
intelmq/bots/parsers/shadowserver/_config.py 97.14% <ø> (-1.61%) ⬇️
intelmq/bots/parsers/shadowserver/parser.py 84.21% <ø> (-9.76%) ⬇️
.../tests/bots/parsers/shadowserver/test_blocklist.py 100.00% <ø> (ø)
...rsers/shadowserver/test_event4_honeypot_darknet.py 100.00% <ø> (ø)
...ers/shadowserver/test_event4_honeypot_http_scan.py 100.00% <ø> (ø)
...ots/parsers/shadowserver/test_event4_ip_spoofer.py 90.47% <ø> (ø)
...ers/shadowserver/test_event4_microsoft_sinkhole.py 100.00% <ø> (ø)
...hadowserver/test_event4_microsoft_sinkhole_http.py 100.00% <ø> (ø)
.../bots/parsers/shadowserver/test_event4_sinkhole.py 100.00% <ø> (ø)
.../parsers/shadowserver/test_event4_sinkhole_http.py 100.00% <ø> (ø)
... and 61 more

@elsif2
Copy link
Collaborator Author

elsif2 commented Aug 1, 2022

I squashed the changes into a small number of commits.

CHANGELOG.md Outdated Show resolved Hide resolved
intelmq/lib/test.py Outdated Show resolved Hide resolved
@sebix
Copy link
Member

sebix commented Aug 2, 2022

I squashed the changes into a small number of commits.

This PR has 95 commits?

@sebix sebix added this to the 3.1.0 milestone Aug 2, 2022
@elsif2
Copy link
Collaborator Author

elsif2 commented Aug 2, 2022

I squashed the changes into a small number of commits.
This PR has 95 commits?

I did a git rebase -i develop and squashed down to three which required a lot of merge repairs.

The git log shows them as follows:

commit 67a52fe8e8d4c965970af8884ae627e272d9002c
Author: elsif2 <elsif@shadowserver.org>
Date:   Wed Jan 26 17:02:51 2022 +0000

    parent 7dc5b7471b952d4fd703c2d8921ea992296194f3
    author elsif2 <elsif@shadowserver.org> 1643216571 +0000
    committer elsif2 <elsif@shadowserver.org> 1659395284 +0000
    
    parent 7dc5b7471b952d4fd703c2d8921ea992296194f3
    author elsif2 <elsif@shadowserver.org> 1643216571 +0000
    committer elsif2 <elsif@shadowserver.org> 1659395281 +0000
    
    parent 7dc5b7471b952d4fd703c2d8921ea992296194f3
    author elsif2 <elsif@shadowserver.org> 1643216571 +0000
    committer elsif2 <elsif@shadowserver.org> 1659395278 +0000
    
    parent 7dc5b7471b952d4fd703c2d8921ea992296194f3
    author elsif2 <elsif@shadowserver.org> 1643216571 +0000
    committer elsif2 <elsif@shadowserver.org> 1659395264 +0000
 .
 .
 .

@sebix
Copy link
Member

sebix commented Aug 2, 2022

GitHub says 95 commits
image
command line says 93:

$ git log --oneline  upstream/pr/2227...develop | wc -l
93

@elsif2
Copy link
Collaborator Author

elsif2 commented Aug 2, 2022

What would you suggest?

@sebix
Copy link
Member

sebix commented Aug 2, 2022

git rebase -i develop

then squash various commit together and

git push -f origin shadowserver-202207

author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659452139 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659452135 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659452132 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659452116 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659452111 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659452106 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659451910 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659451905 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659451900 +0000

parent ba7d24b
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659451775 +0000

Update parser to support all available reports.

Update to existing test cases to match current report types.

New tests for added report types.

pycodestyle fixes

add testdata licenses

pycodestyle fix

Added reports parameter

Suggested changes to the parser

Proposed details for the release

Test script updates for suggested changes

Test input updates

Realign columns

Update compromised_website.csv

Update scan_adb.csv

Update scan_adb.csv

Update scan_ftp.csv

Update scan_ipp.csv

Update scan_snmp.csv

Realign columns

Remove duplicates

Changed malware.name to extra.infection

Updated SPDX-FileCopyrightText

shadowserver api: document and warn on old parameter

document the old parameter `country` and its status
warn if used
adapt the test

DOC: fix NEWS entry of PR#2143

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright and raw field updates

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright updates

Added phish_url and scan_modbus reports.

Update source.url and source.fqdn for phish_url and malware_url reports.  Update classification.taxonomy and classification.type for scan_modbus report.

* additional field type validation changes
* added count, bytes, duration, avg_pps, and max_pps fields to event_honeypot_ddos_amp
* added 'protocol.application': 'https' to scan_ssl, scan_ssl_freak, and scan_ssl_poodle
* added 'extra.tag' to scan_* and device_id

Replaced scan_modbus with scan_ics

Addeed event4_honeypot_ddos, event4_honeypot_ddos_target, scan_dvr_dhcpdiscover, and scan_socks.

Tests for event4_honeypot_ddos.

Tests for event4_honeypot_ddos_target.

Tests for scan_dvr_dhcpdiscover.

Tests for scan_socks.

Rename file

Rename file

update:scan_mdns, scan_smb, and special; add:scan_ddos_middle_box

cleanup renamed license files

updated scan_mdns test files

updated scan_smb test files

updated special test files

add scan_ddos_middlebox test files

add scan_ddos_middlebox test

updated schema

Updated scan_smb tests

Updated scan_ntp tests

Updated scan_snmp tests

New scan_docker test

New scan_kubernetes test

New scan_mysql test

Updated report schema for June 2022

Added scan_epmd test

Revert "Added scan_epmd test"

This reverts commit 01edea1.

Revert: Fix for recover_line method as commited in #2192

Added scan_couchdb

Test case for scan_couchdb

Added scan6_rpd

Added/updated README with maintainer details

Restored feed names and classification.identifiers to minimize upgrade impact.

Merge repair

pycodestyle repairs

codespell fixes

license compliance fixes

pycodestyle fixes

Feed configuration updates for compatibility with the original.

Added scan_postgres test

Added additional IPv6 aliases

Fix for recover_line method as commited in #2192

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392927 +0000

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392915 +0000

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392880 +0000

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392820 +0000

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392766 +0000

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392468 +0000

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392457 +0000

parent 6194014
author elsif2 <elsif@shadowserver.org> 1659389509 +0000
committer elsif2 <elsif@shadowserver.org> 1659392039 +0000

Update parser to support all available reports.

Update to existing test cases to match current report types.

New tests for added report types.

pycodestyle fixes

add testdata licenses

pycodestyle fix

Added reports parameter

Suggested changes to the parser

Proposed details for the release

Test script updates for suggested changes

Test input updates

Realign columns

Update compromised_website.csv

Update scan_adb.csv

Update scan_adb.csv

Update scan_ftp.csv

Update scan_ipp.csv

Update scan_snmp.csv

Realign columns

Remove duplicates

Changed malware.name to extra.infection

Updated SPDX-FileCopyrightText

shadowserver api: document and warn on old parameter

document the old parameter `country` and its status
warn if used
adapt the test

DOC: fix NEWS entry of PR#2143

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright and raw field updates

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright updates

Added phish_url and scan_modbus reports.

Update source.url and source.fqdn for phish_url and malware_url reports.  Update classification.taxonomy and classification.type for scan_modbus report.

* additional field type validation changes
* added count, bytes, duration, avg_pps, and max_pps fields to event_honeypot_ddos_amp
* added 'protocol.application': 'https' to scan_ssl, scan_ssl_freak, and scan_ssl_poodle
* added 'extra.tag' to scan_* and device_id

Replaced scan_modbus with scan_ics

Addeed event4_honeypot_ddos, event4_honeypot_ddos_target, scan_dvr_dhcpdiscover, and scan_socks.

Tests for event4_honeypot_ddos.

Tests for event4_honeypot_ddos_target.

Tests for scan_dvr_dhcpdiscover.

Tests for scan_socks.

Rename file

Rename file

update:scan_mdns, scan_smb, and special; add:scan_ddos_middle_box

cleanup renamed license files

updated scan_mdns test files

updated scan_smb test files

updated special test files

add scan_ddos_middlebox test files

add scan_ddos_middlebox test

updated schema

Updated scan_smb tests

Updated scan_ntp tests

Updated scan_snmp tests

New scan_docker test

New scan_kubernetes test

New scan_mysql test

Updated report schema for June 2022

Added scan_epmd test

Revert "Added scan_epmd test"

This reverts commit 01edea1.

Revert: Fix for recover_line method as commited in #2192

Added scan_couchdb

Test case for scan_couchdb

Added scan6_rpd

Added/updated README with maintainer details

Restored feed names and classification.identifiers to minimize upgrade impact.

Merge repair

pycodestyle repairs

codespell fixes

license compliance fixes

pycodestyle fixes

Feed configuration updates for compatibility with the original.

Added scan_postgres test

Added additional IPv6 aliases

Fix for recover_line method as commited in #2192

Replaced misleading _country_ parameter with _reports_.

Update parser to support all available reports.

Update to existing test cases to match current report types.

pycodestyle fixes

add testdata licenses

pycodestyle fix

Suggested changes to the parser

Proposed details for the release

Test script updates for suggested changes

Test input updates

Realign columns

Update compromised_website.csv

Update scan_adb.csv

Update scan_ftp.csv

Update scan_ipp.csv

Realign columns

Remove duplicates

Changed malware.name to extra.infection

DOC: fix NEWS entry of PR#2143

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright updates

Added phish_url and scan_modbus reports.

Update source.url and source.fqdn for phish_url and malware_url reports.  Update classification.taxonomy and classification.type for scan_modbus report.

* additional field type validation changes
* added count, bytes, duration, avg_pps, and max_pps fields to event_honeypot_ddos_amp
* added 'protocol.application': 'https' to scan_ssl, scan_ssl_freak, and scan_ssl_poodle
* added 'extra.tag' to scan_* and device_id

Replaced scan_modbus with scan_ics

Tests for event4_honeypot_ddos.

Tests for event4_honeypot_ddos_target.

Tests for scan_dvr_dhcpdiscover.

Tests for scan_socks.

Rename file

Rename file

cleanup renamed license files

updated scan_mdns test files

updated scan_smb test files

updated special test files

add scan_ddos_middlebox test files

add scan_ddos_middlebox test

Updated scan_ntp tests

Updated scan_snmp tests

New scan_docker test

New scan_kubernetes test

New scan_mysql test

Added scan_epmd test

Revert "Added scan_epmd test"

This reverts commit 01edea1.

Fix for recover_line method as commited in #2192

Revert: Fix for recover_line method as commited in #2192

Test case for scan_couchdb

Restored feed names and classification.identifiers to minimize upgrade impact.

Added function to notify if any unsupported feeds are configured.

pycodestyle repairs

codespell fixes

license compliance fixes

pycodestyle fixes

Feed configuration updates for compatibility with the original.

Added scan_postgres test

Update intelmq/bots/collectors/shadowserver/collector_reports_api.py

Co-authored-by: Sebastian <sebix@sebix.at>

Update intelmq/bots/collectors/shadowserver/README.md

Co-authored-by: Sebastian <sebix@sebix.at>

Update intelmq/tests/bots/parsers/shadowserver/README.md

Co-authored-by: Sebastian <sebix@sebix.at>

resync to develop

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395284 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395281 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395278 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395264 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395260 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395256 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395141 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395131 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395127 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395122 +0000

parent 7dc5b74
author elsif2 <elsif@shadowserver.org> 1643216571 +0000
committer elsif2 <elsif@shadowserver.org> 1659395058 +0000

Update parser to support all available reports.

Update to existing test cases to match current report types.

New tests for added report types.

pycodestyle fixes

add testdata licenses

pycodestyle fix

Added reports parameter

Suggested changes to the parser

Proposed details for the release

Test script updates for suggested changes

Test input updates

Realign columns

Update compromised_website.csv

Update scan_adb.csv

Update scan_adb.csv

Update scan_ftp.csv

Update scan_ipp.csv

Update scan_snmp.csv

Realign columns

Remove duplicates

Changed malware.name to extra.infection

Updated SPDX-FileCopyrightText

shadowserver api: document and warn on old parameter

document the old parameter `country` and its status
warn if used
adapt the test

DOC: fix NEWS entry of PR#2143

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright and raw field updates

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright updates

Added phish_url and scan_modbus reports.

Update source.url and source.fqdn for phish_url and malware_url reports.  Update classification.taxonomy and classification.type for scan_modbus report.

* additional field type validation changes
* added count, bytes, duration, avg_pps, and max_pps fields to event_honeypot_ddos_amp
* added 'protocol.application': 'https' to scan_ssl, scan_ssl_freak, and scan_ssl_poodle
* added 'extra.tag' to scan_* and device_id

Replaced scan_modbus with scan_ics

Addeed event4_honeypot_ddos, event4_honeypot_ddos_target, scan_dvr_dhcpdiscover, and scan_socks.

Tests for event4_honeypot_ddos.

Tests for event4_honeypot_ddos_target.

Tests for scan_dvr_dhcpdiscover.

Tests for scan_socks.

Rename file

Rename file

update:scan_mdns, scan_smb, and special; add:scan_ddos_middle_box

cleanup renamed license files

updated scan_mdns test files

updated scan_smb test files

updated special test files

add scan_ddos_middlebox test files

add scan_ddos_middlebox test

updated schema

Updated scan_smb tests

Updated scan_ntp tests

Updated scan_snmp tests

New scan_docker test

New scan_kubernetes test

New scan_mysql test

Updated report schema for June 2022

Added scan_epmd test

Revert "Added scan_epmd test"

This reverts commit 01edea1.

Revert: Fix for recover_line method as commited in #2192

Added scan_couchdb

Test case for scan_couchdb

Added scan6_rpd

Added/updated README with maintainer details

Restored feed names and classification.identifiers to minimize upgrade impact.

Merge repair

pycodestyle repairs

codespell fixes

license compliance fixes

pycodestyle fixes

Feed configuration updates for compatibility with the original.

Added scan_postgres test

Added additional IPv6 aliases

Fix for recover_line method as commited in #2192

resolve conflict

Replaced misleading _country_ parameter with _reports_.

Update parser to support all available reports.

Update to existing test cases to match current report types.

New tests for added report types.

pycodestyle fixes

add testdata licenses

pycodestyle fix

Added reports parameter

Suggested changes to the parser

Proposed details for the release

Test script updates for suggested changes

Test input updates

Realign columns

Update compromised_website.csv

Update scan_adb.csv

Update scan_adb.csv

Update scan_ftp.csv

Update scan_ipp.csv

Update scan_snmp.csv

Realign columns

Remove duplicates

Changed malware.name to extra.infection

Updated SPDX-FileCopyrightText

shadowserver api: document and warn on old parameter

document the old parameter `country` and its status
warn if used
adapt the test

DOC: fix NEWS entry of PR#2143

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright and raw field updates

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright updates

Added phish_url and scan_modbus reports.

Update source.url and source.fqdn for phish_url and malware_url reports.  Update classification.taxonomy and classification.type for scan_modbus report.

* additional field type validation changes
* added count, bytes, duration, avg_pps, and max_pps fields to event_honeypot_ddos_amp
* added 'protocol.application': 'https' to scan_ssl, scan_ssl_freak, and scan_ssl_poodle
* added 'extra.tag' to scan_* and device_id

Replaced scan_modbus with scan_ics

Addeed event4_honeypot_ddos, event4_honeypot_ddos_target, scan_dvr_dhcpdiscover, and scan_socks.

Tests for event4_honeypot_ddos.

Tests for event4_honeypot_ddos_target.

Tests for scan_dvr_dhcpdiscover.

Tests for scan_socks.

Rename file

Rename file

update:scan_mdns, scan_smb, and special; add:scan_ddos_middle_box

cleanup renamed license files

updated scan_mdns test files

updated scan_smb test files

updated special test files

add scan_ddos_middlebox test files

add scan_ddos_middlebox test

updated schema

Updated scan_smb tests

Updated scan_ntp tests

Updated scan_snmp tests

New scan_docker test

New scan_kubernetes test

New scan_mysql test

Updated report schema for June 2022

Added scan_epmd test

Revert "Added scan_epmd test"

This reverts commit 01edea1.

Revert: Fix for recover_line method as commited in #2192

Added scan_couchdb

Test case for scan_couchdb

Added scan6_rpd

Added/updated README with maintainer details

Restored feed names and classification.identifiers to minimize upgrade impact.

Merge repair

pycodestyle repairs

codespell fixes

license compliance fixes

pycodestyle fixes

Feed configuration updates for compatibility with the original.

Added scan_postgres test

Added additional IPv6 aliases

Fix for recover_line method as commited in #2192

Update to existing test cases to match current report types.

add testdata licenses

pycodestyle fix

Proposed details for the release

Test script updates for suggested changes

Realign columns

Update compromised_website.csv

Update scan_adb.csv

Update scan_ftp.csv

Update scan_ipp.csv

Realign columns

Remove duplicates

DOC: fix NEWS entry of PR#2143

Added the sector field to scan_amqp, scan_cwmp, and scan_vnc.

Copyright updates

Added phish_url and scan_modbus reports.

Update source.url and source.fqdn for phish_url and malware_url reports.  Update classification.taxonomy and classification.type for scan_modbus report.

* additional field type validation changes
* added count, bytes, duration, avg_pps, and max_pps fields to event_honeypot_ddos_amp
* added 'protocol.application': 'https' to scan_ssl, scan_ssl_freak, and scan_ssl_poodle
* added 'extra.tag' to scan_* and device_id

Replaced scan_modbus with scan_ics

Tests for event4_honeypot_ddos.

Tests for event4_honeypot_ddos_target.

Tests for scan_dvr_dhcpdiscover.

Tests for scan_socks.

Rename file

Rename file

cleanup renamed license files

updated scan_mdns test files

updated special test files

add scan_ddos_middlebox test files

add scan_ddos_middlebox test

New scan_docker test

New scan_kubernetes test

New scan_mysql test

Added scan_epmd test

Revert "Added scan_epmd test"

This reverts commit 01edea1.

Fix for recover_line method as commited in #2192

Revert: Fix for recover_line method as commited in #2192

Test case for scan_couchdb

Restored feed names and classification.identifiers to minimize upgrade impact.

Added function to notify if any unsupported feeds are configured.

pycodestyle repairs

codespell fixes

license compliance fixes

pycodestyle fixes

Feed configuration updates for compatibility with the original.

Added scan_postgres test

Update intelmq/bots/collectors/shadowserver/collector_reports_api.py

Co-authored-by: Sebastian <sebix@sebix.at>

Update intelmq/bots/collectors/shadowserver/README.md

Co-authored-by: Sebastian <sebix@sebix.at>

Update intelmq/tests/bots/parsers/shadowserver/README.md

Co-authored-by: Sebastian <sebix@sebix.at>

resync to develop
@elsif2
Copy link
Collaborator Author

elsif2 commented Aug 2, 2022

git rebase -i develop

then squash various commit together and

git push -f origin shadowserver-202207

Done:

elsif2 wants to merge 3 commits into develop from shadowserver-202207

@sebix
Copy link
Member

sebix commented Aug 2, 2022

Cool, looks tidy now :)

@aaronkaplan
Copy link
Member

Agreement is that I merge it in, if things break, @elsif2 will fix it quickly.
IMHO it is very important to have the new shadowserver code in 3.1. However, please note that we should really test this in a sample environment before tagging the release. Agreed, @sebix ?

Thanks @elsif2 for your enormous heavy lifting and improvements!
Can't over-state how valuable this is.

@aaronkaplan aaronkaplan merged commit 572a36d into develop Aug 3, 2022
@sebix sebix deleted the shadowserver-202207 branch August 8, 2022 12:54
@sebix sebix mentioned this pull request Sep 5, 2022
wagner-intevation added a commit to wagner-intevation/intelmq that referenced this pull request Sep 19, 2022
Add an example configuration for the modify bot.
It reverts the changes of classification.identifier values in the
ShadowServer parser bot effective in IntelMQ 3.1.

see also certtools#2227
wagner-intevation added a commit to wagner-intevation/intelmq that referenced this pull request Sep 20, 2022
Add an example configuration for the modify bot.
It reverts the changes of classification.identifier values in the
ShadowServer parser bot effective in IntelMQ 3.1.

see also certtools#2227
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants