lukasdotcom/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes neccessity of one of the config files to improve security

Browse Source
This commit is contained in:
Lukasdotcom
2022-02-25 13:03:56 -05:00
parent a96ee3b00a
commit 1ff344d8fe
2 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
python/database.py
View File

@@ -23,10 +23,7 @@ def trueSearch(command): # Will just execute sql command and return result
def connect(database=""):
websiteRoot = readFile(__file__[: __file__.rindex("/") + 1] + "config.json")[
"websiteRoot"
]
dbInfo = readFile(websiteRoot + "config.json")
dbInfo = readFile(__file__[: __file__.rindex("/python/database.py") + 1] + "html/config.json")
if not database:
database = dbInfo["database"]["name"]
try:
@@ -107,10 +104,7 @@ def appendValue(table, value, coulumns=""): # Will add a value to a table
# Will backup a database to a certain location with a name of choosing
def backUp(fileName):
websiteRoot = readFile(__file__[: __file__.rindex("/") + 1] + "config.json")[
"websiteRoot"
]
dbInfo = readFile(websiteRoot + "config.json")
dbInfo = readFile(__file__[: __file__.rindex("/python/database.py") + 1] + "html/config.json")
username = dbInfo["database"]["username"]
password = dbInfo["database"]["password"]
database = dbInfo["database"]["name"]
@@ -121,10 +115,7 @@ def backUp(fileName):
os.system(f"mysqldump -u {username} --password={password} --result-file={locationdata} {database}")
def restore(fileName):
websiteRoot = readFile(__file__[: __file__.rindex("/") + 1] + "config.json")[
"websiteRoot"
]
dbInfo = readFile(websiteRoot + "config.json")
dbInfo = readFile(__file__[: __file__.rindex("/python/database.py") + 1] + "html/config.json")
location = dbInfo["database"]["backupLocation"]
database = dbInfo["database"]["name"]
locationdata = f"{location}/{fileName}"
@@ -149,12 +140,9 @@ def delete(table, where): # deletes values in table
db.close()
def repair(): # Repairs all tables
def repair(): # Repairs all tables or updates them if needed
# Gets Infomation schema database
websiteRoot = readFile(__file__[: __file__.rindex("/") + 1] + "config.json")[
"websiteRoot"
]
dbInfo = readFile(websiteRoot + "config.json")
dbInfo = readFile(__file__[: __file__.rindex("/python/database.py") + 1] + "html/config.json")
db2, cursor2 = connect("INFORMATION_SCHEMA")
updatedVersions = []
databaseDict = {
@@ -224,10 +212,7 @@ def repair(): # Repairs all tables
1
createTable(name, trueValues)
if name == "logType":
websiteRoot = readFile(__file__[: __file__.rindex("/") + 1] + "config.json")[
"websiteRoot"
]
logTypes = readFile(websiteRoot + "logTypes.json")
logTypes = readFile(__file__[: __file__.rindex("/python/database.py") + 1] + "html/logTypes.json")
for x in logTypes:
appendValue(name, [x["type"], x["name"], x["color"]])
else:

10
python/restart.py
View File

@@ -46,16 +46,12 @@ try:
# Looks at the configuration at understands the config
try:
configFilePath = __file__[: __file__.rindex("/") + 1]
# Makes sure the python file area is owned by root and not accessable by www-data
# Makes sure the python file area is owned by root and not accessable by www-data for security reasons
os.system("chmod 750 -R " + configFilePath)
os.system("chown -R root:root " + configFilePath)
configFilePath = configFilePath + "config.json"
# Will check if the config exists otherwise will find what should be in the config anyway.
if os.path.exists(configFilePath):
location = readFile(configFilePath)["websiteRoot"]
else:
location = __file__[: __file__.rindex("/python/restart.py") + 1] + "html/"
writeFile(configFilePath, {"websiteRoot":location}, permission=False)
# Will find the location where the config should be located.
location = __file__[: __file__.rindex("/python/restart.py") + 1] + "html/"
if os.path.exists(location + "/config.json"):
configuration = readFile(location + "/config.json")
else: