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

Remove incorrect duplicates from config preference migrator #830

Merged
merged 4 commits into from
Oct 25, 2019
Merged

Remove incorrect duplicates from config preference migrator #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edd31a2
Remove incorrect duplicates from migrate_219_to_220_names
mattmundell Oct 24, 2019
e651a0e
Update changelog
mattmundell Oct 24, 2019
db38093
Merge branch 'master' of https://github.com/greenbone/gvmd into pref-…
mattmundell Oct 24, 2019
9b7ee4a
Merge branch 'master' into pref-migrator-duplicates
mattmundell Oct 25, 2019
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Improve performance of GET_REPORTS [#797](https://github.com/greenbone/gvmd/pull/797)
- Consider results_trash when deleting users [#800](https://github.com/greenbone/gvmd/pull/800)
- Update to gvm-portnames-update to use new nomenclature [#802](https://github.com/greenbone/gvmd/pull/802)
- Escaping correctly the percent sign in sql statements [#818](https://github.com/greenbone/gvmd/pull/818)
- Escaping correctly the percent sign in sql statements [#818](https://github.com/greenbone/gvmd/pull/818)
- Remove incorrect duplicates from config preference migrator [#830](https://github.com/greenbone/gvmd/pull/830)

### Removed
- Remove suport for "All SecInfo": removal of "allinfo" for type in get_info [#790](https://github.com/greenbone/gvmd/pull/790)
Expand Down
78 changes: 0 additions & 78 deletions src/manage_migrators_219_to_220_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,40 +34,22 @@ static const gchar *migrate_219_to_220_names[][2]
"1.3.6.1.4.1.25623.1.0.10330:0:entry:timeout" },
{ "1.3.6.1.4.1.25623.1.0.10330:radio:Test SSL based services",
"1.3.6.1.4.1.25623.1.0.10330:1:radio:Test SSL based services" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Number of connections done in parallel :",
"1.3.6.1.4.1.25623.1.0.10330:1:entry:Number of connections done in parallel :" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Network connection timeout :",
"1.3.6.1.4.1.25623.1.0.10330:2:entry:Network connection timeout :" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Number of connections done in parallel :",
"1.3.6.1.4.1.25623.1.0.10330:2:entry:Number of connections done in parallel :" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Network connection timeout :",
"1.3.6.1.4.1.25623.1.0.10330:3:entry:Network connection timeout :" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Network read/write timeout :",
"1.3.6.1.4.1.25623.1.0.10330:3:entry:Network read/write timeout :" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Wrapped service read timeout :",
"1.3.6.1.4.1.25623.1.0.10330:4:entry:Wrapped service read timeout :" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Network read/write timeout :",
"1.3.6.1.4.1.25623.1.0.10330:4:entry:Network read/write timeout :" },
{ "1.3.6.1.4.1.25623.1.0.10330:file:SSL certificate :",
"1.3.6.1.4.1.25623.1.0.10330:5:file:SSL certificate :" },
{ "1.3.6.1.4.1.25623.1.0.10330:entry:Wrapped service read timeout :",
"1.3.6.1.4.1.25623.1.0.10330:5:entry:Wrapped service read timeout :" },
{ "1.3.6.1.4.1.25623.1.0.10330:file:SSL private key :",
"1.3.6.1.4.1.25623.1.0.10330:6:file:SSL private key :" },
{ "1.3.6.1.4.1.25623.1.0.10330:file:SSL certificate :",
"1.3.6.1.4.1.25623.1.0.10330:6:file:SSL certificate :" },
{ "1.3.6.1.4.1.25623.1.0.10330:file:SSL private key :",
"1.3.6.1.4.1.25623.1.0.10330:7:file:SSL private key :" },
{ "1.3.6.1.4.1.25623.1.0.10330:password:PEM password :",
"1.3.6.1.4.1.25623.1.0.10330:7:password:PEM password :" },
{ "1.3.6.1.4.1.25623.1.0.10330:file:CA file :",
"1.3.6.1.4.1.25623.1.0.10330:8:file:CA file :" },
{ "1.3.6.1.4.1.25623.1.0.10330:password:PEM password :",
"1.3.6.1.4.1.25623.1.0.10330:8:password:PEM password :" },
{ "1.3.6.1.4.1.25623.1.0.10330:file:CA file :",
"1.3.6.1.4.1.25623.1.0.10330:9:file:CA file :" },
{ "1.3.6.1.4.1.25623.1.0.10330:radio:Test SSL based services",
"1.3.6.1.4.1.25623.1.0.10330:9:radio:Test SSL based services" },
{ "1.3.6.1.4.1.25623.1.0.10335:entry:timeout",
"1.3.6.1.4.1.25623.1.0.10335:0:entry:timeout" },
{ "1.3.6.1.4.1.25623.1.0.10662:entry:timeout",
Expand All @@ -88,68 +70,36 @@ static const gchar *migrate_219_to_220_names[][2]
"1.3.6.1.4.1.25623.1.0.10747:1:checkbox:Use complete password list (not only vendor specific passwords)" },
{ "1.3.6.1.4.1.25623.1.0.10870:checkbox:NTLMSSP",
"1.3.6.1.4.1.25623.1.0.10870:1:checkbox:NTLMSSP" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:HTTP account :",
"1.3.6.1.4.1.25623.1.0.10870:1:entry:HTTP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:HTTP account :",
"1.3.6.1.4.1.25623.1.0.10870:2:entry:HTTP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:HTTP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:2:password:HTTP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:HTTP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:3:password:HTTP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:NNTP account :",
"1.3.6.1.4.1.25623.1.0.10870:3:entry:NNTP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:NNTP account :",
"1.3.6.1.4.1.25623.1.0.10870:4:entry:NNTP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:NNTP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:4:password:NNTP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:FTP account :",
"1.3.6.1.4.1.25623.1.0.10870:5:entry:FTP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:NNTP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:5:password:NNTP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:FTP account :",
"1.3.6.1.4.1.25623.1.0.10870:6:entry:FTP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:FTP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:6:password:FTP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:FTP writeable directory :",
"1.3.6.1.4.1.25623.1.0.10870:7:entry:FTP writeable directory :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:FTP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:7:password:FTP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:POP2 account :",
"1.3.6.1.4.1.25623.1.0.10870:8:entry:POP2 account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:FTP writeable directory :",
"1.3.6.1.4.1.25623.1.0.10870:8:entry:FTP writeable directory :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:POP2 password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:9:password:POP2 password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:POP2 account :",
"1.3.6.1.4.1.25623.1.0.10870:9:entry:POP2 account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:POP3 account :",
"1.3.6.1.4.1.25623.1.0.10870:10:entry:POP3 account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:POP2 password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:10:password:POP2 password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:POP3 password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:11:password:POP3 password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:POP3 account :",
"1.3.6.1.4.1.25623.1.0.10870:11:entry:POP3 account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:IMAP account :",
"1.3.6.1.4.1.25623.1.0.10870:12:entry:IMAP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:POP3 password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:12:password:POP3 password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:IMAP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:13:password:IMAP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:entry:IMAP account :",
"1.3.6.1.4.1.25623.1.0.10870:13:entry:IMAP account :" },
{ "1.3.6.1.4.1.25623.1.0.10870:password:IMAP password (sent in clear) :",
"1.3.6.1.4.1.25623.1.0.10870:14:password:IMAP password (sent in clear) :" },
{ "1.3.6.1.4.1.25623.1.0.10870:checkbox:Never send SMB credentials in clear text",
"1.3.6.1.4.1.25623.1.0.10870:14:checkbox:Never send SMB credentials in clear text" },
{ "1.3.6.1.4.1.25623.1.0.10870:checkbox:Never send SMB credentials in clear text",
"1.3.6.1.4.1.25623.1.0.10870:15:checkbox:Never send SMB credentials in clear text" },
{ "1.3.6.1.4.1.25623.1.0.10870:checkbox:Only use NTLMv2",
"1.3.6.1.4.1.25623.1.0.10870:15:checkbox:Only use NTLMv2" },
{ "1.3.6.1.4.1.25623.1.0.10870:checkbox:Only use NTLMv2",
"1.3.6.1.4.1.25623.1.0.10870:16:checkbox:Only use NTLMv2" },
{ "1.3.6.1.4.1.25623.1.0.10870:checkbox:NTLMSSP",
"1.3.6.1.4.1.25623.1.0.10870:16:checkbox:NTLMSSP" },
{ "1.3.6.1.4.1.25623.1.0.11032:entry:timeout",
"1.3.6.1.4.1.25623.1.0.11032:0:entry:timeout" },
{ "1.3.6.1.4.1.25623.1.0.11033:entry:From address :",
Expand All @@ -174,48 +124,26 @@ static const gchar *migrate_219_to_220_names[][2]
"1.3.6.1.4.1.25623.1.0.11748:1:checkbox:Check all detected CGI directories:" },
{ "1.3.6.1.4.1.25623.1.0.12241:entry:Exclude PJL printer ports from scan",
"1.3.6.1.4.1.25623.1.0.12241:1:entry:Exclude PJL printer ports from scan" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Enable CGI scanning",
"1.3.6.1.4.1.25623.1.0.12288:1:checkbox:Enable CGI scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Strictly unauthenticated",
"1.3.6.1.4.1.25623.1.0.12288:1:checkbox:Strictly unauthenticated" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Add historic /scripts and /cgi-bin to directories for CGI scanning",
"1.3.6.1.4.1.25623.1.0.12288:2:checkbox:Add historic /scripts and /cgi-bin to directories for CGI scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Enable CGI scanning",
"1.3.6.1.4.1.25623.1.0.12288:2:checkbox:Enable CGI scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Add historic /scripts and /cgi-bin to directories for CGI scanning",
"1.3.6.1.4.1.25623.1.0.12288:3:checkbox:Add historic /scripts and /cgi-bin to directories for CGI scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:entry:Regex pattern to exclude directories from CGI scanning :",
"1.3.6.1.4.1.25623.1.0.12288:3:entry:Regex pattern to exclude directories from CGI scanning :" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Use regex pattern to exclude directories from CGI scanning :",
"1.3.6.1.4.1.25623.1.0.12288:4:checkbox:Use regex pattern to exclude directories from CGI scanning :" },
{ "1.3.6.1.4.1.25623.1.0.12288:entry:Regex pattern to exclude directories from CGI scanning :",
"1.3.6.1.4.1.25623.1.0.12288:4:entry:Regex pattern to exclude directories from CGI scanning :" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Exclude directories containing detected known server manuals from CGI scanning",
"1.3.6.1.4.1.25623.1.0.12288:5:checkbox:Exclude directories containing detected known server manuals from CGI scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Use regex pattern to exclude directories from CGI scanning :",
"1.3.6.1.4.1.25623.1.0.12288:5:checkbox:Use regex pattern to exclude directories from CGI scanning :" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Exclude directories containing detected known server manuals from CGI scanning",
"1.3.6.1.4.1.25623.1.0.12288:6:checkbox:Exclude directories containing detected known server manuals from CGI scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Enable generic web application scanning",
"1.3.6.1.4.1.25623.1.0.12288:6:checkbox:Enable generic web application scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:radio:Network type",
"1.3.6.1.4.1.25623.1.0.12288:7:radio:Network type" },
{ "1.3.6.1.4.1.25623.1.0.12288:checkbox:Enable generic web application scanning",
"1.3.6.1.4.1.25623.1.0.12288:7:checkbox:Enable generic web application scanning" },
{ "1.3.6.1.4.1.25623.1.0.12288:radio:Network type",
"1.3.6.1.4.1.25623.1.0.12288:8:radio:Network type" },
{ "1.3.6.1.4.1.25623.1.0.12288:radio:Report verbosity",
"1.3.6.1.4.1.25623.1.0.12288:8:radio:Report verbosity" },
{ "1.3.6.1.4.1.25623.1.0.12288:radio:Log verbosity",
"1.3.6.1.4.1.25623.1.0.12288:9:radio:Log verbosity" },
{ "1.3.6.1.4.1.25623.1.0.12288:radio:Report verbosity",
"1.3.6.1.4.1.25623.1.0.12288:9:radio:Report verbosity" },
{ "1.3.6.1.4.1.25623.1.0.12288:entry:Debug level",
"1.3.6.1.4.1.25623.1.0.12288:10:entry:Debug level" },
{ "1.3.6.1.4.1.25623.1.0.12288:radio:Log verbosity",
"1.3.6.1.4.1.25623.1.0.12288:10:radio:Log verbosity" },
{ "1.3.6.1.4.1.25623.1.0.12288:entry:HTTP User-Agent",
"1.3.6.1.4.1.25623.1.0.12288:11:entry:HTTP User-Agent" },
{ "1.3.6.1.4.1.25623.1.0.12288:entry:Debug level",
"1.3.6.1.4.1.25623.1.0.12288:11:entry:Debug level" },
{ "1.3.6.1.4.1.25623.1.0.12288:entry:HTTP User-Agent",
Expand Down Expand Up @@ -478,14 +406,10 @@ static const gchar *migrate_219_to_220_names[][2]
"1.3.6.1.4.1.25623.1.0.100315:1:checkbox:Use nmap" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Do a TCP ping",
"1.3.6.1.4.1.25623.1.0.100315:1:checkbox:Do a TCP ping" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Report about unrechable Hosts",
"1.3.6.1.4.1.25623.1.0.100315:2:checkbox:Report about unrechable Hosts" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:TCP ping tries also TCP-SYN ping",
"1.3.6.1.4.1.25623.1.0.100315:2:checkbox:TCP ping tries also TCP-SYN ping" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Do an ICMP ping",
"1.3.6.1.4.1.25623.1.0.100315:3:checkbox:Do an ICMP ping" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Report about reachable Hosts",
"1.3.6.1.4.1.25623.1.0.100315:4:checkbox:Report about reachable Hosts" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Use ARP",
"1.3.6.1.4.1.25623.1.0.100315:4:checkbox:Use ARP" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Mark unrechable Hosts as dead (not scanning)",
Expand All @@ -494,8 +418,6 @@ static const gchar *migrate_219_to_220_names[][2]
"1.3.6.1.4.1.25623.1.0.100315:6:checkbox:Report about unrechable Hosts" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:TCP ping tries only TCP-SYN ping",
"1.3.6.1.4.1.25623.1.0.100315:7:checkbox:TCP ping tries only TCP-SYN ping" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Use nmap",
"1.3.6.1.4.1.25623.1.0.100315:8:checkbox:Use nmap" },
{ "1.3.6.1.4.1.25623.1.0.100315:checkbox:Report about reachable Hosts",
"1.3.6.1.4.1.25623.1.0.100315:9:checkbox:Report about reachable Hosts" },
{ "1.3.6.1.4.1.25623.1.0.100315:entry:nmap additional ports for -PA",
Expand Down