mirror of
https://github.com/MariaDB/server.git
synced 2025-05-28 13:01:41 +03:00
ddf2fac733
compatibility problems Pages that are encrypted contain post encryption checksum on different location that normal checksum fields. Therefore, we should before decryption check this checksum to avoid unencrypting corrupted pages. After decryption we can use traditional checksum check to detect if page is corrupted or unencryption was done using incorrect key. Pages that are page compressed do not contain any checksum, here we need to fist unencrypt, decompress and finally use tradional checksum check to detect page corruption or that we used incorrect key in unencryption. buf0buf.cc: buf_page_is_corrupted() mofified so that compressed pages are skipped. buf0buf.h, buf_block_init(), buf_page_init_low(): removed unnecessary page_encrypted, page_compressed, stored_checksum, valculated_checksum fields from buf_page_t buf_page_get_gen(): use new buf_page_check_corrupt() function to detect corrupted pages. buf_page_check_corrupt(): If page was not yet decrypted check if post encryption checksum still matches. If page is not anymore encrypted, use buf_page_is_corrupted() traditional checksum method. If page is detected as corrupted and it is not encrypted we print corruption message to error log. If page is still encrypted or it was encrypted and now corrupted, we will print message that page is encrypted to error log. buf_page_io_complete(): use new buf_page_check_corrupt() function to detect corrupted pages. buf_page_decrypt_after_read(): Verify post encryption checksum before tring to decrypt. fil0crypt.cc: fil_encrypt_buf() verify post encryption checksum and ind fil_space_decrypt() return true if we really decrypted the page. fil_space_verify_crypt_checksum(): rewrite to use the method used when calculating post encryption checksum. We also check if post encryption checksum matches that traditional checksum check does not match. fil0fil.ic: Add missed page type encrypted and page compressed to fil_get_page_type_name() Note that this change does not yet fix innochecksum tool, that will be done in separate MDEV. Fix test failures caused by buf page corruption injection.
55 lines
2.5 KiB
Plaintext
55 lines
2.5 KiB
Plaintext
call mtr.add_suppression("InnoDB: Block in space_id .* in file test/.* encrypted");
|
|
call mtr.add_suppression("InnoDB: However key management plugin or used key_version .* is not found or used encryption algorithm or method does not match.");
|
|
call mtr.add_suppression("InnoDB: Marking tablespace as missing. You may drop this table or install correct key management plugin and key file.");
|
|
|
|
# Start server with keys2.txt
|
|
CREATE TABLE t1(a int not null primary key auto_increment, b varchar(128)) engine=innodb ENCRYPTED=YES ENCRYPTION_KEY_ID=19;
|
|
CREATE TABLE t2(a int not null primary key auto_increment, b varchar(128)) engine=innodb ENCRYPTED=YES ENCRYPTION_KEY_ID=1;
|
|
CREATE TABLE t3(a int not null primary key auto_increment, b varchar(128)) engine=innodb ENCRYPTED=NO;
|
|
INSERT INTO t1(b) VALUES ('thisissecredmessage');
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t1(b) SELECT b FROM t1;
|
|
INSERT INTO t2 SELECT * FROM t1;
|
|
INSERT INTO t3 SELECT * FROM t1;
|
|
|
|
# Restart server with keys3.txt
|
|
set global innodb_encryption_rotate_key_age = 1;
|
|
use test;
|
|
CREATE TABLE t4(a int not null primary key auto_increment, b varchar(128)) engine=innodb ENCRYPTED=YES ENCRYPTION_KEY_ID=1;
|
|
SELECT SLEEP(5);
|
|
SLEEP(5)
|
|
0
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
2048
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
2048
|
|
SELECT COUNT(1) FROM t2,t1 where t2.a = t1.a;
|
|
ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
|
|
SELECT COUNT(1) FROM t1 where b = 'ab';
|
|
ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
|
|
SELECT COUNT(1) FROM t1;
|
|
ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
|
|
|
|
# Start server with keys2.txt
|
|
SELECT COUNT(1) FROM t1;
|
|
COUNT(1)
|
|
2048
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
2048
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
2048
|
|
DROP TABLE t1, t2, t3;
|