Skip to content

Commit c3dd382

Browse files
author
Kristofer Pettersson
committed
WL5602 add missing files
1 parent 5bacd8e commit c3dd382

File tree

6 files changed

+206
-0
lines changed

6 files changed

+206
-0
lines changed

‎mysql-test/r/plugin_auth_sha256.result

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
CREATE USER 'kristofer' IDENTIFIED WITH 'sha256_password';
2+
SET GLOBAL old_passwords= 2;
3+
SET SESSION old_passwords= 2;
4+
SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
5+
SELECT user, plugin FROM mysql.user;
6+
user plugin
7+
root
8+
root
9+
root
10+
root
11+
kristofer sha256_password
12+
SELECT USER(),CURRENT_USER();
13+
USER() CURRENT_USER()
14+
kristofer@localhost kristofer@%
15+
DROP USER 'kristofer';
16+
GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
17+
SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('secret2');
18+
SELECT USER(),CURRENT_USER();
19+
USER() CURRENT_USER()
20+
kristofer@localhost kristofer@localhost
21+
SHOW GRANTS FOR 'kristofer'@'localhost';
22+
Grants for kristofer@localhost
23+
GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
24+
user() current_user()
25+
kristofer@localhost kristofer@localhost
26+
user() current_user()
27+
kristofer@localhost kristofer@localhost
28+
user() current_user()
29+
kristofer@localhost kristofer@localhost
30+
DROP USER 'kristofer'@'localhost';
31+
GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
32+
SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('');
33+
SELECT USER(),CURRENT_USER();
34+
USER() CURRENT_USER()
35+
kristofer@localhost kristofer@localhost
36+
SHOW GRANTS FOR 'kristofer'@'localhost';
37+
Grants for kristofer@localhost
38+
GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
39+
DROP USER 'kristofer'@'localhost';
40+
GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED WITH 'sha256_password';
41+
SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
42+
Connection should fail for localhost
43+
ERROR 28000: Access denied for user 'kristofer'@'localhost' (using password: NO)
44+
DROP USER 'kristofer'@'33.33.33.33';
45+
SET GLOBAL old_passwords= default;

‎mysql-test/r/plugin_auth_sha256_2.result

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
CREATE USER 'kristofer' IDENTIFIED BY 'secret';
2+
SELECT user, plugin FROM mysql.user;
3+
user plugin
4+
root
5+
root
6+
root
7+
root
8+
kristofer sha256_password
9+
user() current_user()
10+
kristofer@localhost kristofer@%
11+
user() current_user()
12+
kristofer@localhost kristofer@%
13+
user() current_user()
14+
kristofer@localhost kristofer@%
15+
DROP USER 'kristofer';
16+
GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY 'secret2';
17+
user() current_user()
18+
kristofer@localhost kristofer@localhost
19+
user() current_user()
20+
kristofer@localhost kristofer@localhost
21+
user() current_user()
22+
kristofer@localhost kristofer@localhost
23+
SHOW GRANTS FOR 'kristofer'@'localhost';
24+
Grants for kristofer@localhost
25+
GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
26+
DROP USER 'kristofer'@'localhost';
27+
GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY '';
28+
user() current_user()
29+
kristofer@localhost kristofer@localhost
30+
user() current_user()
31+
kristofer@localhost kristofer@localhost
32+
user() current_user()
33+
kristofer@localhost kristofer@localhost
34+
SHOW GRANTS FOR 'kristofer'@'localhost';
35+
Grants for kristofer@localhost
36+
GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
37+
DROP USER 'kristofer'@'localhost';
38+
GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED BY '';
39+
Connection should fail for localhost
40+
ERROR 28000: Access denied for user 'kristofer'@'localhost' (using password: NO)
41+
DROP USER 'kristofer'@'33.33.33.33';

‎mysql-test/std_data/rsa_private_key.pem

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
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
51+
-----END RSA PRIVATE KEY-----

‎mysql-test/std_data/rsa_public_key.pem

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-----BEGIN PUBLIC KEY-----
2+
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvV2VNbsQPG0Bh0KC8F4z
3+
CGXvMNcSicCiLXxeLWrJsmKZl0ggf2ydymYUUewq+dVxDdh85sdSvxEmtIWvKSRK
4+
+RRCAURztq2Succd+24SF5IZYjlIJE/U0AYUxHzUcOsannfzui60IaTHpcBFHTJK
5+
6myxGx9MORZmhfv580mfvz4yvgLjS5yGOIS6rlxD9YV1Y04Rx3SXQQBnC7rDBL91
6+
ktNWvbclsonfytY19N9p+Gprms30yRT+BmPFB7TqpReeZa3ivg15g/z3BLNyvj3Y
7+
KiQM3cd7ENJC2x2LRxL5pG684cFNStSjT4FvA+oh45UnU45aOSEjrxNkBG8ci0e+
8+
VKX539rK+nDzTE/MHpnvfHp4DB+kSYBPuKHY2Eaw31NwPpfLWwEJPiDrktJJmRZq
9+
ENMHLXksdiqGhvYmI33wZaZAfjbDZFMfPF5yBMBGDZ3aeNz5Le7uqS6g6XMOoiz/
10+
d2S5RzRrCol1yqCBPtODjfFPC4K8GGYVkWZgSCf/PRt/DgDnZOfZSSYIQNeyr21e
11+
mqgqQ+yhXEGKVjcDTKcbSLiWAdA+GkAzLAXXhafM8mrhpnGKdO4Or6ySz7G1vk2J
12+
t2ZSdP740oVSJi59P9NEgXcbd3c4FzjXSOOsxfhPQfobUk3ikt55lN3fBX3mBvUd
13+
uxNhAcQ02ZD5zXrX6+loiV8CAwEAAQ==
14+
-----END PUBLIC KEY-----

‎mysql-test/t/plugin_auth_sha256-master.opt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--sha256_password_private_key_path=$MYSQL_TEST_DIR/std_data/rsa_private_key.pem
2+
--sha256_password_public_key_path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem

‎mysql-test/t/plugin_auth_sha256.test

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
--source include/not_embedded.inc
2+
--source include/mysql_upgrade_preparation.inc
3+
4+
CREATE USER 'kristofer' IDENTIFIED WITH 'sha256_password';
5+
SET GLOBAL old_passwords= 2;
6+
SET SESSION old_passwords= 2;
7+
SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
8+
SELECT user, plugin FROM mysql.user;
9+
connect(con1,localhost,kristofer,secret,,);
10+
connection con1;
11+
SELECT USER(),CURRENT_USER();
12+
connection default;
13+
disconnect con1;
14+
# Make sure authentication also works if client default_auth is changed and that
15+
# it possible to select a local public key fil using client options.
16+
DROP USER 'kristofer';
17+
18+
GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
19+
SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('secret2');
20+
connect(con2,localhost,kristofer,secret2,,);
21+
connection con2;
22+
SELECT USER(),CURRENT_USER();
23+
--replace_regex /PASSWORD .*$/PASSWORD '<non-deterministic-password-hash>'/
24+
SHOW GRANTS FOR 'kristofer'@'localhost';
25+
connection default;
26+
disconnect con2;
27+
--exec $MYSQL -ukristofer -psecret2 --port=$MYSQL_PORT --default_auth=sha256_password -e "select user(), current_user()"
28+
--exec $MYSQL -ukristofer -psecret2 --port=$MYSQL_PORT --default_auth=mysql_native_password -e "select user(), current_user()"
29+
--exec $MYSQL -ukristofer -psecret2 --port=$MYSQL_PORT --default_auth=sha256_password --server_public_key=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "select user(), current_user()"
30+
DROP USER 'kristofer'@'localhost';
31+
32+
GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
33+
SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('');
34+
connect(con3,localhost,kristofer,,,);
35+
connection con3;
36+
SELECT USER(),CURRENT_USER();
37+
--replace_regex /PASSWORD .*$/PASSWORD '<non-deterministic-password-hash>'/
38+
SHOW GRANTS FOR 'kristofer'@'localhost';
39+
connection default;
40+
disconnect con3;
41+
DROP USER 'kristofer'@'localhost';
42+
43+
GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED WITH 'sha256_password';
44+
SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
45+
--echo Connection should fail for localhost
46+
--replace_result $MASTER_MYSOCK MASTER_MYSOCK
47+
--disable_query_log
48+
--error ER_ACCESS_DENIED_ERROR
49+
connect(con4,127.0.0.1,kristofer,,,);
50+
--enable_query_log
51+
DROP USER 'kristofer'@'33.33.33.33';
52+
# Restore default value for old_passwords
53+
SET GLOBAL old_passwords= default;

0 commit comments

Comments
 (0)