mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 18:08:16 +00:00
Code Issues Releases Wiki Activity

[#2353] hammer.py: try both ALTER and GRANT for REQUIRE X509

Browse Source
This commit is contained in:
Andrei Pavel 2022-04-07 11:14:12 +03:00
parent 6516762fa5
commit 0da22b377f
No known key found for this signature in database
GPG Key ID: 86E9385BC2203766
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hammer.py
View File

@ -1219,14 +1219,18 @@ ssl_key = {cert_dir}/kea-client.key
cmd += "CREATE USER 'keatest_secure'@'localhost' IDENTIFIED BY 'keatest';\n" cmd += "CREATE USER 'keatest_secure'@'localhost' IDENTIFIED BY 'keatest';\n"
cmd += "GRANT ALL ON keatest.* TO 'keatest'@'localhost';\n" cmd += "GRANT ALL ON keatest.* TO 'keatest'@'localhost';\n"
cmd += "GRANT SELECT ON keatest.* TO 'keatest_readonly'@'localhost';\n" cmd += "GRANT SELECT ON keatest.* TO 'keatest_readonly'@'localhost';\n"
if 'tls' in features:
# ALTER USER is the best place to put the REQUIRE but it is not
# supported by old versions so downgrade to GRANT.
# X509 is weak too but enough for testing purpose.
cmd += "GRANT ALL ON keatest.* TO 'keatest_secure'@'localhost' REQUIRE X509;\n"
cmd += "SET @@global.log_bin_trust_function_creators = 1;\n"
cmd += "EOF\n\"" cmd += "EOF\n\""
execute(cmd) execute(cmd)
if 'tls' in features:
# ALTER USER is the best place to put the REQUIRE but, if it is not
# supported, then downgrade to GRANT.
exit_code = execute('''sudo mysql -u root -e "ALTER USER 'keatest_secure'@'localhost' REQUIRE X509;"''', raise_error=False)
if exit_code == 0:
# If ALTER succeeds, then we still have to GRANT without REQUIRE.
execute('''sudo mysql -u root -e "GRANT ALL ON keatest.* TO 'keatest_secure'@'localhost';"''')
else:
execute('''sudo mysql -u root -e "GRANT ALL ON keatest.* TO 'keatest_secure'@'localhost' REQUIRE X509;"''')
execute('sudo mysql -u root -e "SET @@global.log_bin_trust_function_creators = 1;"')
if 'forge' in features: if 'forge' in features:
cmd = "echo 'DROP DATABASE IF EXISTS keadb;' | sudo mysql -u root" cmd = "echo 'DROP DATABASE IF EXISTS keadb;' | sudo mysql -u root"