Compare commits

..

1 Commits

Author SHA1 Message Date
DarioGii
3c54046dc2 reverted path in oauth 2 redirectUri 2025-02-26 09:55:35 +00:00
3 changed files with 15 additions and 16 deletions

View File

@@ -164,7 +164,7 @@ def update_missing_keys(reference_file, file_list, branch=""):
if current_entry["type"] == "entry": if current_entry["type"] == "entry":
if ref_entry_copy["type"] != "entry": if ref_entry_copy["type"] != "entry":
continue continue
if ref_entry_copy["key"].lower() == current_entry["key"].lower(): if ref_entry_copy["key"] == current_entry["key"]:
ref_entry_copy["value"] = current_entry["value"] ref_entry_copy["value"] = current_entry["value"]
updated_properties.append(ref_entry_copy) updated_properties.append(ref_entry_copy)
write_json_file(os.path.join(branch, file_path), updated_properties) write_json_file(os.path.join(branch, file_path), updated_properties)
@@ -199,30 +199,29 @@ def check_for_differences(reference_file, file_list, branch, actor):
base_dir = os.path.abspath(os.path.join(os.getcwd(), "src", "main", "resources")) base_dir = os.path.abspath(os.path.join(os.getcwd(), "src", "main", "resources"))
for file_path in file_arr: for file_path in file_arr:
file_normpath = os.path.normpath(file_path) absolute_path = os.path.abspath(file_path)
absolute_path = os.path.abspath(file_normpath)
# Verify that file is within the expected directory # Verify that file is within the expected directory
if not absolute_path.startswith(base_dir): if not absolute_path.startswith(base_dir):
raise ValueError(f"Unsafe file found: {file_normpath}") raise ValueError(f"Unsafe file found: {file_path}")
# Verify file size before processing # Verify file size before processing
if os.path.getsize(os.path.join(branch, file_normpath)) > MAX_FILE_SIZE: if os.path.getsize(os.path.join(branch, file_path)) > MAX_FILE_SIZE:
raise ValueError( raise ValueError(
f"The file {file_normpath} is too large and could pose a security risk." f"The file {file_path} is too large and could pose a security risk."
) )
basename_current_file = os.path.basename(os.path.join(branch, file_normpath)) basename_current_file = os.path.basename(os.path.join(branch, file_path))
if ( if (
basename_current_file == basename_reference_file basename_current_file == basename_reference_file
or ( or (
# only local windows command # only local windows command
not file_normpath.startswith( not file_path.startswith(
os.path.join("", "src", "main", "resources", "messages_") os.path.join("", "src", "main", "resources", "messages_")
) )
and not file_normpath.startswith( and not file_path.startswith(
os.path.join(os.getcwd(), "src", "main", "resources", "messages_") os.path.join(os.getcwd(), "src", "main", "resources", "messages_")
) )
) )
or not file_normpath.endswith(".properties") or not file_path.endswith(".properties")
or not basename_current_file.startswith("messages_") or not basename_current_file.startswith("messages_")
): ):
continue continue
@@ -293,13 +292,13 @@ def check_for_differences(reference_file, file_list, branch, actor):
else: else:
report.append("2. **Test Status:** ✅ **_Passed_**") report.append("2. **Test Status:** ✅ **_Passed_**")
if find_duplicate_keys(os.path.join(branch, file_normpath)): if find_duplicate_keys(os.path.join(branch, file_path)):
has_differences = True has_differences = True
output = "\n".join( output = "\n".join(
[ [
f" - `{key}`: first at line {first}, duplicate at `line {duplicate}`" f" - `{key}`: first at line {first}, duplicate at `line {duplicate}`"
for key, first, duplicate in find_duplicate_keys( for key, first, duplicate in find_duplicate_keys(
os.path.join(branch, file_normpath) os.path.join(branch, file_path)
) )
] ]
) )

View File

@@ -294,8 +294,8 @@ configurations.all {
dependencies { dependencies {
//tmp for security bumps //tmp for security bumps
implementation 'ch.qos.logback:logback-core:1.5.17' implementation 'ch.qos.logback:logback-core:1.5.16'
implementation 'ch.qos.logback:logback-classic:1.5.17' implementation 'ch.qos.logback:logback-classic:1.5.16'
// Exclude vulnerable BouncyCastle version used in tableau // Exclude vulnerable BouncyCastle version used in tableau

View File

@@ -3,14 +3,14 @@
{ {
"moduleName": "ch.qos.logback:logback-classic", "moduleName": "ch.qos.logback:logback-classic",
"moduleUrl": "http://www.qos.ch", "moduleUrl": "http://www.qos.ch",
"moduleVersion": "1.5.17", "moduleVersion": "1.5.16",
"moduleLicense": "GNU Lesser General Public License", "moduleLicense": "GNU Lesser General Public License",
"moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
}, },
{ {
"moduleName": "ch.qos.logback:logback-core", "moduleName": "ch.qos.logback:logback-core",
"moduleUrl": "http://www.qos.ch", "moduleUrl": "http://www.qos.ch",
"moduleVersion": "1.5.17", "moduleVersion": "1.5.16",
"moduleLicense": "GNU Lesser General Public License", "moduleLicense": "GNU Lesser General Public License",
"moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
}, },