Skip to content

Quote command-line parameters #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2024
Merged

Quote command-line parameters #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions scheduler/app/database/init_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import shlex
import time
import pymysql

Expand Down Expand Up @@ -42,16 +43,16 @@ def wait_for_mysql():

if db_user == "root":
sql = 'mysql -h %s -u%s -p%s -e "CREATE DATABASE IF NOT EXISTS %s;"' % (
DB_HOST,
db_user,
db_passwd,
shlex.quote(DB_HOST),
shlex.quote(db_user),
shlex.quote(db_passwd),
DATABASE_NAME,
)
os.system(sql)
sql = "mysql -h %s -u%s -p%s %s </opt/scheduler/database/initial_tables.sql" % (
DB_HOST,
db_user,
db_passwd,
shlex.quote(DB_HOST),
shlex.quote(db_user),
shlex.quote(db_passwd),
DATABASE_NAME,
)
os.system(sql)
Expand Down
11 changes: 6 additions & 5 deletions scheduler/app/upgrade/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import glob
import os
import shlex
from os.path import basename, join
from sqlalchemy import text
from datetime import datetime
Expand Down Expand Up @@ -79,11 +80,11 @@ def run_script_and_update_version_stamp(script, new_version):
os.system(
"mysql -h %(db_host)s -u%(db_user)s -p%(db_passwd)s %(database)s < %(script)s"
% {
"db_host": DB_HOST,
"db_user": db_user,
"db_passwd": db_passwd,
"database": DATABASE_NAME,
"script": script,
"db_host": shlex.quote(DB_HOST),
"db_user": shlex.quote(db_user),
"db_passwd": shlex.quote(db_passwd),
"database": shlex.quote(DATABASE_NAME),
"script": shlex.quote(script),
}
)
update_version_stamp(new_version)
Expand Down