Skip to content

fix(scripts): correct END marker parsing in addCertificatesInTs.py #866

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(scripts): correct END marker parsing in addCertificatesInTs.py #866

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
29 changes: 20 additions & 9 deletions common/src/scripts/addCertificatesInTs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
import os
import re


def read_certificate_content(file_path):
"""Read and return the complete PEM certificate including headers, removing any extra lines."""
with open(file_path, 'r') as f:
full_text = f.read()
# Extract just the chunk from BEGIN CERTIFICATE to END CERTIFICATE
start_idx = full_text.find("-----BEGIN CERTIFICATE-----")
end_idx = full_text.find("-----END CERTIFICATE-----") + len("-----END CERTIFICATE-----")
if start_idx == -1 or end_idx == -1:
begin_marker = "-----BEGIN CERTIFICATE-----"
end_marker = "-----END CERTIFICATE-----"
start_idx = full_text.find(begin_marker)
if start_idx == -1:
# If not found, just return what we have
return full_text.strip()
end_pos = full_text.find(end_marker, start_idx)
if end_pos == -1:
# If not found, just return what we have
return full_text.strip()
pem_chunk = full_text[start_idx:end_idx]
pem_chunk = full_text[start_idx:end_pos + len(end_marker)]

cleaned_lines = []
for line in pem_chunk.splitlines():
Expand All @@ -28,12 +34,17 @@ def read_private_key_content(file_path):
with open(file_path, 'r') as f:
full_text = f.read()
# Extract just the chunk from BEGIN PRIVATE KEY to END PRIVATE KEY
start_idx = full_text.find("-----BEGIN PRIVATE KEY-----")
end_idx = full_text.find("-----END PRIVATE KEY-----") + len("-----END PRIVATE KEY-----")
if start_idx == -1 or end_idx == -1:
begin_marker = "-----BEGIN PRIVATE KEY-----"
end_marker = "-----END PRIVATE KEY-----"
start_idx = full_text.find(begin_marker)
if start_idx == -1:
# If not found, just return what we have
return full_text.strip()
end_pos = full_text.find(end_marker, start_idx)
if end_pos == -1:
# If not found, just return what we have
return full_text.strip()
pem_chunk = full_text[start_idx:end_idx]
pem_chunk = full_text[start_idx:end_pos + len(end_marker)]

cleaned_lines = []
for line in pem_chunk.splitlines():
Expand Down Expand Up @@ -100,4 +111,4 @@ def generate_typescript_file():


if __name__ == "__main__":
generate_typescript_file()
generate_typescript_file()
Loading