From 10c399bf24e3d3f460764736d41d15409b58a8c0 Mon Sep 17 00:00:00 2001 From: blackbeam Date: Sat, 26 Jan 2019 14:38:25 +0300 Subject: [PATCH 01/27] Update travis.yml --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00f9eacc..2afbd004 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,16 @@ rust: - nightly - beta - stable +services: + - mysql env: global: - DATABASE_URL=mysql://root:password@127.0.0.1:3306/mysql before_install: - sudo bash -c "echo '[mysqld]' >> /usr/share/mysql/my-default.cnf" - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - - sudo mysql_upgrade -u root -ppassword + - sudo mysql -e -h127.0.0.1 "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" + - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart before_script: - export PATH="$PATH:$HOME/.cargo/bin" From a054011f6c17986e9757f6ea98de614bc2ad0420 Mon Sep 17 00:00:00 2001 From: blackbeam Date: Sat, 26 Jan 2019 14:43:05 +0300 Subject: [PATCH 02/27] Update travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2afbd004..0fb9677e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: before_install: - sudo bash -c "echo '[mysqld]' >> /usr/share/mysql/my-default.cnf" - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - - sudo mysql -e -h127.0.0.1 "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" + - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart before_script: From edb405ba70be951e3e5aa88100485cb2674b446b Mon Sep 17 00:00:00 2001 From: blackbeam Date: Sat, 26 Jan 2019 14:51:15 +0300 Subject: [PATCH 03/27] Update travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0fb9677e..cbf3d196 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ before_install: - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart + - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" before_script: - export PATH="$PATH:$HOME/.cargo/bin" - rustup component add rustfmt From 8a2b87e6dbeca42e6040dfe0b90faa32630d5cab Mon Sep 17 00:00:00 2001 From: blackbeam Date: Sat, 26 Jan 2019 14:58:57 +0300 Subject: [PATCH 04/27] cargo fmt --- src/conn/pool/mod.rs | 2 +- src/lib.rs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/conn/pool/mod.rs b/src/conn/pool/mod.rs index 5a20365d..6151efce 100644 --- a/src/conn/pool/mod.rs +++ b/src/conn/pool/mod.rs @@ -304,7 +304,7 @@ impl Pool { Err(_) => { Ok(()) }, }); - // Handle connecting connections. + // Handle connecting connections. handle!(new { Ok(Ready(conn)) => { if inner.closed { diff --git a/src/lib.rs b/src/lib.rs index 9d0d5c88..4ebd067a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -119,7 +119,10 @@ //! ``` #![recursion_limit = "1024"] -#![cfg_attr(feature = "nightly", feature(test, const_fn, extern_crate_item_prelude))] +#![cfg_attr( + feature = "nightly", + feature(test, const_fn, extern_crate_item_prelude) +)] #[cfg(feature = "nightly")] extern crate test; From 7f489034f6048c0b25d4b93a27cfb11b88f231ff Mon Sep 17 00:00:00 2001 From: blackbeam Date: Sat, 26 Jan 2019 15:22:59 +0300 Subject: [PATCH 05/27] Implement SslOpts::set_danger_accept_invalid_certs(bool) --- src/conn/mod.rs | 8 +------- src/io/mod.rs | 1 + src/opts.rs | 13 +++++++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/conn/mod.rs b/src/conn/mod.rs index a09320d2..94868997 100644 --- a/src/conn/mod.rs +++ b/src/conn/mod.rs @@ -591,14 +591,8 @@ mod test { #[cfg(feature = "ssl")] { let mut ssl_opts = SslOpts::new(); - ssl_opts.set_pkcs12_path(Some(AsRef::<::std::path::Path>::as_ref( - "./test/client.p12", - ))); - ssl_opts.set_root_cert_path(Some(AsRef::<::std::path::Path>::as_ref( - "./test/ca-cert.der", - ))); - ssl_opts.set_password(Some("pass")); ssl_opts.set_danger_skip_domain_validation(true); + ssl_opts.set_danger_accept_invalid_certs(true); builder.ssl_opts(ssl_opts); } builder diff --git a/src/io/mod.rs b/src/io/mod.rs index ca4e0e2f..0ef728ad 100644 --- a/src/io/mod.rs +++ b/src/io/mod.rs @@ -98,6 +98,7 @@ impl Endpoint { builder.identity(identity); } builder.danger_accept_invalid_hostnames(ssl_opts.skip_domain_validation()); + builder.danger_accept_invalid_certs(ssl_opts.accept_invalid_certs()); builder.build().map_err(Error::from) })() .into_future() diff --git a/src/opts.rs b/src/opts.rs index 4c4c9b78..3df251fd 100644 --- a/src/opts.rs +++ b/src/opts.rs @@ -36,6 +36,7 @@ pub struct SslOpts { password: Option>, root_cert_path: Option>, skip_domain_validation: bool, + accept_invalid_certs: bool, } impl SslOpts { @@ -45,6 +46,7 @@ impl SslOpts { password: None, root_cert_path: None, skip_domain_validation: false, + accept_invalid_certs: false, } } @@ -79,6 +81,13 @@ impl SslOpts { self } + /// If `true` then client will accept invalid certificate (expired, not trusted, ..) + /// (defaults to `false`). + pub fn set_danger_accept_invalid_certs(&mut self, value: bool) -> &mut Self { + self.accept_invalid_certs = value; + self + } + pub fn pkcs12_path(&self) -> Option<&Path> { self.pkcs12_path.as_ref().map(|x| x.as_ref()) } @@ -94,6 +103,10 @@ impl SslOpts { pub fn skip_domain_validation(&self) -> bool { self.skip_domain_validation } + + pub fn accept_invalid_certs(&self) -> bool { + self.accept_invalid_certs + } } /// Mysql connection options. From 522dda5e9f9618245fc0202abcbe0d8d99ad1959 Mon Sep 17 00:00:00 2001 From: AIkorsky Date: Sat, 26 Jan 2019 20:23:40 +0300 Subject: [PATCH 06/27] Update travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cbf3d196..e543b180 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ before_install: - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" + - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" before_script: - export PATH="$PATH:$HOME/.cargo/bin" - rustup component add rustfmt From 37758d7dea12386b97563f55dd218b189ac0645d Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sat, 26 Jan 2019 20:32:28 +0300 Subject: [PATCH 07/27] Update .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e543b180..dac72bfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,10 @@ before_install: - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" + - cat /etc/my.cnf + - cat /etc/mysql/my.cnf + - cat ~/.my.cnf + - mysqld --help --verbose - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" before_script: - export PATH="$PATH:$HOME/.cargo/bin" From f31d21f2e1ed442e99bf5d9a9656cab643db9d37 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sat, 26 Jan 2019 20:35:18 +0300 Subject: [PATCH 08/27] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dac72bfe..00c3c624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ before_install: - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" - - cat /etc/my.cnf - - cat /etc/mysql/my.cnf - - cat ~/.my.cnf + - cat /etc/mysql/my.cnf || true + - cat ~/.my.cnf || true + - cat /usr/share/mysql/my-default.cnf || true - mysqld --help --verbose - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" before_script: From ff6c28064c49a4bbda20622c717c256094822fb5 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sat, 26 Jan 2019 20:47:41 +0300 Subject: [PATCH 09/27] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 00c3c624..f8edac93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ before_install: - sudo bash -c "echo '[mysqld]' >> /usr/share/mysql/my-default.cnf" - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" + - sudo mysql_ssl_rsa_setup --verbose - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" From 1acec2f127cc4404908a4ae392ec2ab6374a8076 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sat, 26 Jan 2019 20:56:01 +0300 Subject: [PATCH 10/27] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f8edac93..f1ba4340 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ before_install: - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" + - ls -la /etc/mysql/conf.d || true + - ls -la /etc/mysql/mysql.conf.d || true - cat /etc/mysql/my.cnf || true - cat ~/.my.cnf || true - cat /usr/share/mysql/my-default.cnf || true From a09a5d1792edfc7eea80ec8ded6ad2c619b38658 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sat, 26 Jan 2019 21:00:11 +0300 Subject: [PATCH 11/27] Update .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index f1ba4340..57e5c893 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,13 @@ before_install: - sudo service mysql restart - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" - ls -la /etc/mysql/conf.d || true + - cat /etc/mysql/conf.d/innodb_flush_log_at_trx_commit.cnf + - cat /etc/mysql/conf.d/mysql.cnf + - cat /etc/mysql/conf.d/mysqldump.cnf + - cat /etc/mysql/conf.d/performance-schema.cnf - ls -la /etc/mysql/mysql.conf.d || true + - cat /etc/mysql/mysql.conf.d/mysqld.cnf + - cat /etc/mysql/mysql.conf.d/mysqld_safe_syslog.cnf - cat /etc/mysql/my.cnf || true - cat ~/.my.cnf || true - cat /usr/share/mysql/my-default.cnf || true From 0f50323885acc56da469d73ed79673866741d480 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sat, 26 Jan 2019 21:08:55 +0300 Subject: [PATCH 12/27] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 57e5c893..fe7ca320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ before_install: - sudo mysql_ssl_rsa_setup --verbose - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart + - cat /usr/lib/systemd/system/*mysql* - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" - ls -la /etc/mysql/conf.d || true - cat /etc/mysql/conf.d/innodb_flush_log_at_trx_commit.cnf From 34b8d76d608f4a677aeb2c93b9a3449c0118bb64 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sat, 26 Jan 2019 21:19:47 +0300 Subject: [PATCH 13/27] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe7ca320..f481fe6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - sudo mysql_ssl_rsa_setup --verbose - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart - - cat /usr/lib/systemd/system/*mysql* + - sudo mysqld --print-defaults - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" - ls -la /etc/mysql/conf.d || true - cat /etc/mysql/conf.d/innodb_flush_log_at_trx_commit.cnf From d1ceb6e59176e952f0162c37066e0469ca5ae759 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 14:00:40 +0300 Subject: [PATCH 14/27] Update .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index f481fe6a..30ff6162 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: global: - DATABASE_URL=mysql://root:password@127.0.0.1:3306/mysql before_install: + - sudo apt-get remove apparmor - sudo bash -c "echo '[mysqld]' >> /usr/share/mysql/my-default.cnf" - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" @@ -20,6 +21,9 @@ before_install: - sudo mysqld --print-defaults - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" - ls -la /etc/mysql/conf.d || true + - sudo cat /etc/init.d/mysql || true + - sudo cat /etc/init/mysql.conf || true + - sudo cat /lib/systemd/system/mysql.service || true - cat /etc/mysql/conf.d/innodb_flush_log_at_trx_commit.cnf - cat /etc/mysql/conf.d/mysql.cnf - cat /etc/mysql/conf.d/mysqldump.cnf @@ -35,6 +39,7 @@ before_install: before_script: - export PATH="$PATH:$HOME/.cargo/bin" - rustup component add rustfmt + - sudo cat /var/log/mysql/error.log || true script: - cargo test - cargo test --features ssl From 1935c2bcf178a249f31f113f56e3949b20364875 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 14:03:18 +0300 Subject: [PATCH 15/27] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 30ff6162..e4a653f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ env: global: - DATABASE_URL=mysql://root:password@127.0.0.1:3306/mysql before_install: - - sudo apt-get remove apparmor - sudo bash -c "echo '[mysqld]' >> /usr/share/mysql/my-default.cnf" - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" From 0cc5e40e7e66c51bceaf9a27420f40eb9c9ac4ad Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 14:08:38 +0300 Subject: [PATCH 16/27] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e4a653f3..cc8cb447 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_install: - sudo cat /etc/init.d/mysql || true - sudo cat /etc/init/mysql.conf || true - sudo cat /lib/systemd/system/mysql.service || true + - sudo cat /etc/apparmor.d/usr.sbin.mysqld || true - cat /etc/mysql/conf.d/innodb_flush_log_at_trx_commit.cnf - cat /etc/mysql/conf.d/mysql.cnf - cat /etc/mysql/conf.d/mysqldump.cnf From 301482b09bdb5df24c64d7f8105810dc5462ab90 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 14:13:40 +0300 Subject: [PATCH 17/27] Update .travis.yml --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cc8cb447..ff2e5395 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,10 @@ before_install: - sudo bash -c "echo '[mysqld]' >> /usr/share/mysql/my-default.cnf" - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - - sudo mysql_ssl_rsa_setup --verbose + - sudo mysql_ssl_rsa_setup --verbose --datadir=/etc/mysql + - sudo bash -c "echo 'ssl-ca=/etc/mysql/cacert.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" + - sudo bash -c "echo 'ssl-cert=/etc/mysql/server-cert.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" + - sudo bash -c "echo 'ssl-key=/etc/mysql/server-key.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart - sudo mysqld --print-defaults From 8d3ed0f5d2cd79b7a4c0a09f0e58506379c32214 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 14:19:19 +0300 Subject: [PATCH 18/27] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff2e5395..926b6ac4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,8 @@ before_install: - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - sudo mysql_ssl_rsa_setup --verbose --datadir=/etc/mysql - - sudo bash -c "echo 'ssl-ca=/etc/mysql/cacert.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" + - sudo ls -la /etc/mysql || true + - sudo bash -c "echo 'ssl-ca=/etc/mysql/ca.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - sudo bash -c "echo 'ssl-cert=/etc/mysql/server-cert.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - sudo bash -c "echo 'ssl-key=/etc/mysql/server-key.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword From 1c32ede7d69eab2bea3154e0d0b00f2a9ef5e202 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 14:22:33 +0300 Subject: [PATCH 19/27] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 926b6ac4..69cc29fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ before_install: - sudo bash -c "echo 'ssl-key=/etc/mysql/server-key.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - sudo service mysql restart + - sudo mysql --ssl --help + - sudo mysqld --ssl --help - sudo mysqld --print-defaults - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" - ls -la /etc/mysql/conf.d || true From e8e09b3e2ccf22a3400d643fb8fd9f7f204898f5 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 14:43:30 +0300 Subject: [PATCH 20/27] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 69cc29fb..b6e90ba3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_install: - sudo bash -c "echo 'ssl-cert=/etc/mysql/server-cert.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - sudo bash -c "echo 'ssl-key=/etc/mysql/server-key.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword + - sudo sed -i 's/mysqld/mysqld --ssl/' /lib/systemd/system/mysql.service - sudo service mysql restart - sudo mysql --ssl --help - sudo mysqld --ssl --help @@ -28,6 +29,7 @@ before_install: - ls -la /etc/mysql/conf.d || true - sudo cat /etc/init.d/mysql || true - sudo cat /etc/init/mysql.conf || true + - sudo cat /usr/share/mysql/mysql-systemd-start || true - sudo cat /lib/systemd/system/mysql.service || true - sudo cat /etc/apparmor.d/usr.sbin.mysqld || true - cat /etc/mysql/conf.d/innodb_flush_log_at_trx_commit.cnf From 2815739306ddcad0c5a1d44fcfe374efd4f31005 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Sun, 27 Jan 2019 23:58:56 +0300 Subject: [PATCH 21/27] Update .travis.yml --- .travis.yml | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6e90ba3..00153ef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,45 +11,16 @@ env: global: - DATABASE_URL=mysql://root:password@127.0.0.1:3306/mysql before_install: - - sudo bash -c "echo '[mysqld]' >> /usr/share/mysql/my-default.cnf" - - sudo bash -c "echo 'sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES' >> /usr/share/mysql/my-default.cnf" - - sudo mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - - sudo mysql_ssl_rsa_setup --verbose --datadir=/etc/mysql - - sudo ls -la /etc/mysql || true - - sudo bash -c "echo 'ssl-ca=/etc/mysql/ca.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - - sudo bash -c "echo 'ssl-cert=/etc/mysql/server-cert.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - - sudo bash -c "echo 'ssl-key=/etc/mysql/server-key.pem' >> /etc/mysql/mysql.conf.d/mysqld.cnf" - - sudo mysql_upgrade --protocol=tcp -P 3306 -u root -ppassword - - sudo sed -i 's/mysqld/mysqld --ssl/' /lib/systemd/system/mysql.service - - sudo service mysql restart - - sudo mysql --ssl --help - - sudo mysqld --ssl --help - - sudo mysqld --print-defaults - - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=33554432;" - - ls -la /etc/mysql/conf.d || true - - sudo cat /etc/init.d/mysql || true - - sudo cat /etc/init/mysql.conf || true - - sudo cat /usr/share/mysql/mysql-systemd-start || true - - sudo cat /lib/systemd/system/mysql.service || true - - sudo cat /etc/apparmor.d/usr.sbin.mysqld || true - - cat /etc/mysql/conf.d/innodb_flush_log_at_trx_commit.cnf - - cat /etc/mysql/conf.d/mysql.cnf - - cat /etc/mysql/conf.d/mysqldump.cnf - - cat /etc/mysql/conf.d/performance-schema.cnf - - ls -la /etc/mysql/mysql.conf.d || true - - cat /etc/mysql/mysql.conf.d/mysqld.cnf - - cat /etc/mysql/mysql.conf.d/mysqld_safe_syslog.cnf - - cat /etc/mysql/my.cnf || true - - cat ~/.my.cnf || true - - cat /usr/share/mysql/my-default.cnf || true - - mysqld --help --verbose - - sudo mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" + - sudo service mysql stop + - mysql_ssl_rsa_setup --verbose --datadir=/tmp/ + - mysqld --initialize-insecure --datadir=/tmp/db + - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES --datadir=/tmp/db --socket=/tmp/mysql.sock --max_allowed_packet=32M --ssl --ssl-ca=/tmp/ca.pem --ssl-cert=/tmp/server-cert.pem --ssl-key=/tmp/server-key.pem & + - mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" + - mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" before_script: - export PATH="$PATH:$HOME/.cargo/bin" - rustup component add rustfmt - - sudo cat /var/log/mysql/error.log || true script: - cargo test - cargo test --features ssl - cargo fmt -- --check - From bdf4a942cab771864b0f69d351a84fca150590cd Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Mon, 28 Jan 2019 00:01:27 +0300 Subject: [PATCH 22/27] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00153ef3..b046af65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: - sudo service mysql stop - mysql_ssl_rsa_setup --verbose --datadir=/tmp/ - mysqld --initialize-insecure --datadir=/tmp/db - - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES --datadir=/tmp/db --socket=/tmp/mysql.sock --max_allowed_packet=32M --ssl --ssl-ca=/tmp/ca.pem --ssl-cert=/tmp/server-cert.pem --ssl-key=/tmp/server-key.pem & + - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES --datadir=/tmp/db --socket=/tmp/mysql.sock --max_allowed_packet=32M --ssl --ssl-ca=/tmp/ca.pem --ssl-cert=/tmp/server-cert.pem --ssl-key=/tmp/server-key.pem --log_error=/tmp/error.log & - mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" before_script: From 7384173833a643d2a65b7cb63468c5abcc6b4103 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Mon, 28 Jan 2019 00:03:47 +0300 Subject: [PATCH 23/27] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b046af65..0c29dd02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: before_install: - sudo service mysql stop - mysql_ssl_rsa_setup --verbose --datadir=/tmp/ - - mysqld --initialize-insecure --datadir=/tmp/db + - mysqld --initialize-insecure --datadir=/tmp/db --log_error=/tmp/error.log - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES --datadir=/tmp/db --socket=/tmp/mysql.sock --max_allowed_packet=32M --ssl --ssl-ca=/tmp/ca.pem --ssl-cert=/tmp/server-cert.pem --ssl-key=/tmp/server-key.pem --log_error=/tmp/error.log & - mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" From f3fcbe49704330fd908a00a4d94ca2339eeffe95 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Mon, 28 Jan 2019 00:06:08 +0300 Subject: [PATCH 24/27] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0c29dd02..14ec1a05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ before_install: - mysql_ssl_rsa_setup --verbose --datadir=/tmp/ - mysqld --initialize-insecure --datadir=/tmp/db --log_error=/tmp/error.log - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES --datadir=/tmp/db --socket=/tmp/mysql.sock --max_allowed_packet=32M --ssl --ssl-ca=/tmp/ca.pem --ssl-cert=/tmp/server-cert.pem --ssl-key=/tmp/server-key.pem --log_error=/tmp/error.log & + - sleep 20 + - cat /tmp/error.log || true - mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" before_script: From 3336d2b3ae184177f4d968293cdc0cac856d07c2 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Mon, 28 Jan 2019 07:41:06 +0300 Subject: [PATCH 25/27] Update .travis.yml --- .travis.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14ec1a05..e25e4910 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,18 @@ env: before_install: - sudo service mysql stop - mysql_ssl_rsa_setup --verbose --datadir=/tmp/ - - mysqld --initialize-insecure --datadir=/tmp/db --log_error=/tmp/error.log - - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES --datadir=/tmp/db --socket=/tmp/mysql.sock --max_allowed_packet=32M --ssl --ssl-ca=/tmp/ca.pem --ssl-cert=/tmp/server-cert.pem --ssl-key=/tmp/server-key.pem --log_error=/tmp/error.log & + - mysqld --initialize-insecure --datadir=/tmp/db --log_error=/tmp/error.log --pid-file=/tmp/mysql.pid + >- + mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + --datadir=/tmp/db + --socket=/tmp/mysql.sock + --max_allowed_packet=32M + --ssl + --ssl-ca=/tmp/ca.pem + --ssl-cert=/tmp/server-cert.pem + --ssl-key=/tmp/server-key.pem + --log_error=/tmp/error.log + --pid-file=/tmp/mysql.pid & - sleep 20 - cat /tmp/error.log || true - mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" From 62d34bf452044980bc1385aacbc44cd389a9133f Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Mon, 28 Jan 2019 07:45:02 +0300 Subject: [PATCH 26/27] Update .travis.yml --- .travis.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index e25e4910..8ab95d1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,17 +14,7 @@ before_install: - sudo service mysql stop - mysql_ssl_rsa_setup --verbose --datadir=/tmp/ - mysqld --initialize-insecure --datadir=/tmp/db --log_error=/tmp/error.log --pid-file=/tmp/mysql.pid - >- - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - --datadir=/tmp/db - --socket=/tmp/mysql.sock - --max_allowed_packet=32M - --ssl - --ssl-ca=/tmp/ca.pem - --ssl-cert=/tmp/server-cert.pem - --ssl-key=/tmp/server-key.pem - --log_error=/tmp/error.log - --pid-file=/tmp/mysql.pid & + - mysqld --sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES --datadir=/tmp/db --socket=/tmp/mysql.sock --max_allowed_packet=32M --ssl --ssl-ca=/tmp/ca.pem --ssl-cert=/tmp/server-cert.pem --ssl-key=/tmp/server-key.pem --log_error=/tmp/error.log --pid-file=/tmp/mysql.pid & - sleep 20 - cat /tmp/error.log || true - mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" From 9b6c45c6eb754d1fa48b71dbaff7e8ace08cc1e7 Mon Sep 17 00:00:00 2001 From: Anatoly I Date: Mon, 28 Jan 2019 08:11:24 +0300 Subject: [PATCH 27/27] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ab95d1f..6a72fd11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ before_install: - sleep 20 - cat /tmp/error.log || true - mysql -h127.0.0.1 -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; FLUSH PRIVILEGES;" - - mysql -h127.0.0.1 -uroot -ppassword -e "SHOW VARIABLES LIKE '%ssl%';" before_script: - export PATH="$PATH:$HOME/.cargo/bin" - rustup component add rustfmt