Browse Source

Add single quotes around the MariaDB password (#1017).

Reviewed-on: https://projects.torsion.org/borgmatic-collective/borgmatic/pulls/1017
Dan Helfman 3 months ago
parent
commit
5a8f27d75c

+ 1 - 1
borgmatic/hooks/data_source/mariadb.py

@@ -68,7 +68,7 @@ def make_defaults_file_options(username=None, password=None, defaults_extra_file
     values = '\n'.join(
         (
             (f'user={username}' if username is not None else ''),
-            (f'password={password}' if password is not None else ''),
+            (f"password='{password}'" if password is not None else ''),
         )
     ).strip()
 

+ 3 - 3
tests/unit/hooks/data_source/test_mariadb.py

@@ -36,7 +36,7 @@ def test_make_defaults_file_option_with_username_and_password_writes_them_to_fil
 
     flexmock(module.os).should_receive('pipe').and_return(read_descriptor, write_descriptor)
     flexmock(module.os).should_receive('write').with_args(
-        write_descriptor, b'[client]\nuser=root\npassword=trustsome1'
+        write_descriptor, b"[client]\nuser=root\npassword='trustsome1'"
     ).once()
     flexmock(module.os).should_receive('close')
     flexmock(module.os).should_receive('set_inheritable')
@@ -68,7 +68,7 @@ def test_make_defaults_file_pipe_with_only_password_writes_it_to_file_descriptor
 
     flexmock(module.os).should_receive('pipe').and_return(read_descriptor, write_descriptor)
     flexmock(module.os).should_receive('write').with_args(
-        write_descriptor, b'[client]\npassword=trustsome1'
+        write_descriptor, b"[client]\npassword='trustsome1'"
     ).once()
     flexmock(module.os).should_receive('close')
     flexmock(module.os).should_receive('set_inheritable')
@@ -84,7 +84,7 @@ def test_make_defaults_file_option_with_defaults_extra_filename_includes_it_in_f
 
     flexmock(module.os).should_receive('pipe').and_return(read_descriptor, write_descriptor)
     flexmock(module.os).should_receive('write').with_args(
-        write_descriptor, b'!include extra.cnf\n[client]\nuser=root\npassword=trustsome1'
+        write_descriptor, b"!include extra.cnf\n[client]\nuser=root\npassword='trustsome1'"
     ).once()
     flexmock(module.os).should_receive('close')
     flexmock(module.os).should_receive('set_inheritable')