From 92b0b3293081c06b651260fdabc9692618df04cd Mon Sep 17 00:00:00 2001 From: Say Date: Thu, 12 Dec 2024 03:04:34 -0500 Subject: [PATCH 01/17] Corrected DMESG and temporarily comment out pytest and string get result ar.payload_param --- app/models/score.py | 8 ++++---- app/score_card/app.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/score.py b/app/models/score.py index 27e1b34..d38ee54 100644 --- a/app/models/score.py +++ b/app/models/score.py @@ -175,7 +175,7 @@ def get_test_results(self): # noqa: C901 "pytest_skipped", ]: if not ar.payload_param == "NA": - entry += "(" + ar.payload_param + ")" + entry += "("+ str(ar.payload_param) +")" if entry in report[bn][test]["data"]: report[bn][test]["data"][entry].append( details @@ -194,9 +194,9 @@ def get_test_results(self): # noqa: C901 "drivers_missing", "dmesg_warnings_found", "dmesg_errors_found", - "pytest_errors", - "pytest_failures", - "pytest_skipped", + # "pytest_errors", + # "pytest_failures", + # "pytest_skipped", ]: if isinstance(report[bn][test]["data"], list): try: diff --git a/app/score_card/app.py b/app/score_card/app.py index 299c680..85cbcfa 100644 --- a/app/score_card/app.py +++ b/app/score_card/app.py @@ -547,7 +547,7 @@ def generate_dmesg_errors(data): dbc.Tab( generate_dash_table(data, "dmesg_errors_found"), tab_id="tab-2", - label="Dmeg Errors", + label="Dmesg Errors", ), ], active_tab="tab-1", From 3f2e98a484a884c8385ae7ed371b7f5967cb2f9b Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 3 Feb 2025 20:05:16 -0500 Subject: [PATCH 02/17] fix in trigger url Signed-off-by: Say --- app/utility.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/utility.py b/app/utility.py index 8d401c2..e55901e 100644 --- a/app/utility.py +++ b/app/utility.py @@ -45,7 +45,7 @@ def url_gen( if trigger_dict[0] == "auto": trigger_project_name = trigger_dict[1].split("/")[0] trigger_build_number = trigger_dict[2] - url_trigger = "http://{}/job/{}/{}/".format( + url_trigger = "http://{}/view/all/job/Triggers/job/{}/{}/".format( jenkins_server, trigger_project_name, trigger_build_number ) else: From 6d248d147eee10f8acf73cbe6a5f3643c9fe823e Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 3 Feb 2025 22:53:27 -0500 Subject: [PATCH 03/17] added whitespace, upgrade click for black formatting Signed-off-by: Say --- app/models/score.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/score.py b/app/models/score.py index d38ee54..296a7ab 100644 --- a/app/models/score.py +++ b/app/models/score.py @@ -175,7 +175,7 @@ def get_test_results(self): # noqa: C901 "pytest_skipped", ]: if not ar.payload_param == "NA": - entry += "("+ str(ar.payload_param) +")" + entry += "(" + str(ar.payload_param) + ")" if entry in report[bn][test]["data"]: report[bn][test]["data"][entry].append( details From ed11661b9d2c2234f117d232fd6dadcb0feff616 Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 3 Feb 2025 23:07:32 -0500 Subject: [PATCH 04/17] Apply black formatting Signed-off-by: Say --- app/models/artifacts.py | 2 -- app/models/boot_tests.py | 3 --- app/score_card/app.py | 5 ----- 3 files changed, 10 deletions(-) diff --git a/app/models/artifacts.py b/app/models/artifacts.py index b326ddc..26535c9 100644 --- a/app/models/artifacts.py +++ b/app/models/artifacts.py @@ -17,7 +17,6 @@ def __init__(self, raw_artifact_result=None): self.__initialize_fields() def __initialize_fields(self): - fields = [ "archive_date", "url", @@ -47,7 +46,6 @@ def display(self): class Artifacts: def __init__(self, **filters): - self.db = DB(index_name="artifacts", keywords=Artifact.KEYWORDS) db_res = self.db.search(sort="archive_date", **filters) # create boards object from raw db_res diff --git a/app/models/boot_tests.py b/app/models/boot_tests.py index 0f67f88..d28a042 100644 --- a/app/models/boot_tests.py +++ b/app/models/boot_tests.py @@ -2,7 +2,6 @@ class BootTest: - KEYWORDS = [ "boot_folder_name", "hdl_branch", @@ -20,7 +19,6 @@ def __init__(self, raw_boot_test_result=None): self.__initialize_fields() def __initialize_fields(self): - fields = [ "boot_folder_name", "hdl_hash", @@ -143,7 +141,6 @@ def __init__( source_adjacency_matrix=None, filters=None, ): - # if not boot_folder_name: # raise ValueError('boot_folder_name must not be null or empty') diff --git a/app/score_card/app.py b/app/score_card/app.py index 85cbcfa..d49d187 100644 --- a/app/score_card/app.py +++ b/app/score_card/app.py @@ -345,7 +345,6 @@ def generate_header(data): def generate_options(data): - options_div = html.Div( children=[ html.H5("Project"), @@ -421,7 +420,6 @@ def generate_options(data): def generate_dash_table(data, target, groupby="item"): - latest_build = list(data["builds"].keys())[0] label = " ".join([ele.title() for ele in target.split("_")]) @@ -476,7 +474,6 @@ def generate_dash_table(data, target, groupby="item"): def generate_top_boot_failing(data): - tabs = dbc.Tabs( [ dbc.Tab( @@ -567,7 +564,6 @@ def generate_dmesg_errors(data): def generate_pytest_results(data): - tabs = dbc.Tabs( [ dbc.Tab( @@ -648,7 +644,6 @@ def generate_panel(data): def report_tabs(data, active_tab="t_summary"): - tabs = dbc.Tabs( [ dbc.Tab( From e0da11332c5f30595586cb038fd973b5c89491ea Mon Sep 17 00:00:00 2001 From: Say Date: Wed, 19 Feb 2025 00:25:42 -0500 Subject: [PATCH 05/17] modify CORS setting Signed-off-by: Say --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 1507b3a..5455d16 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,7 +7,7 @@ def create_app(): server = Flask(__name__) - CORS(server) + CORS(server, resources={r"/*": {"origins": "*"}}) register_dashapps(server) # register_extensions(server) From e68f71c1396bab7b4ebe7fcf14f6e0aef603876f Mon Sep 17 00:00:00 2001 From: Say Date: Wed, 19 Feb 2025 05:39:04 -0500 Subject: [PATCH 06/17] allow CORS in the function of api/board/boardname Signed-off-by: Say --- app/__init__.py | 2 +- app/app.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 5455d16..31edb72 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,7 +7,7 @@ def create_app(): server = Flask(__name__) - CORS(server, resources={r"/*": {"origins": "*"}}) + CORS(server, resources={r"/api/*": {"origins": "*"}}) register_dashapps(server) # register_extensions(server) diff --git a/app/app.py b/app/app.py index 645d818..5a5fdbb 100644 --- a/app/app.py +++ b/app/app.py @@ -25,6 +25,7 @@ request, send_from_directory, url_for, + cross_origin, ) from flask.helpers import get_root_path @@ -91,6 +92,7 @@ def api(param=None): @server_bp.route("api/board//") @server_bp.route("api/board//") +@cross_origin() def board_api(board_name, param=None): boot_test_filtered = [] jenkins_project_name = "HW_tests/HW_test_multiconfig" From dbbc1cbf2dcad4355c8f11c6df4884a5f5f88cb7 Mon Sep 17 00:00:00 2001 From: Say Date: Sun, 23 Feb 2025 21:09:59 -0500 Subject: [PATCH 07/17] add import cross origin and add headers to cors --- app/__init__.py | 4 ++-- app/app.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 31edb72..7527626 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,12 +2,12 @@ from flask.helpers import get_root_path from dash import Dash import dash_bootstrap_components as dbc -from flask_cors import CORS +from flask_cors import CORS, cross_origin def create_app(): server = Flask(__name__) - CORS(server, resources={r"/api/*": {"origins": "*"}}) + CORS(server, resources={r"/api/*": {"origins": ["http://localhost:4200", "https://10.116.110.150/constellation/api","http://10.116.110.150/constellation/api"]}}) register_dashapps(server) # register_extensions(server) diff --git a/app/app.py b/app/app.py index 5a5fdbb..4cbcd13 100644 --- a/app/app.py +++ b/app/app.py @@ -25,9 +25,10 @@ request, send_from_directory, url_for, - cross_origin, ) from flask.helpers import get_root_path +from flask_cors import cross_origin + # from junit2htmlreport import parser From d50aa6541bbea0501bc2a1977240b3ff0e50170c Mon Sep 17 00:00:00 2001 From: Say Date: Tue, 25 Feb 2025 23:28:58 -0500 Subject: [PATCH 08/17] removed headers and correct trigger url link Signed-off-by: Say --- app/__init__.py | 2 +- app/utility.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 7527626..92d4617 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,7 +7,7 @@ def create_app(): server = Flask(__name__) - CORS(server, resources={r"/api/*": {"origins": ["http://localhost:4200", "https://10.116.110.150/constellation/api","http://10.116.110.150/constellation/api"]}}) + CORS(server) register_dashapps(server) # register_extensions(server) diff --git a/app/utility.py b/app/utility.py index e55901e..8d53486 100644 --- a/app/utility.py +++ b/app/utility.py @@ -45,8 +45,9 @@ def url_gen( if trigger_dict[0] == "auto": trigger_project_name = trigger_dict[1].split("/")[0] trigger_build_number = trigger_dict[2] - url_trigger = "http://{}/view/all/job/Triggers/job/{}/{}/".format( - jenkins_server, trigger_project_name, trigger_build_number + trigger_job_name = trigger_dict[1].split("/")[1] + url_trigger = "http://{}/view/all/job/Triggers/job/{}/{}/{}".format( + jenkins_server, trigger_project_name,trigger_job_name,trigger_build_number ) else: url_trigger = trigger From 82757949cf352b4676c0c490a5f951354a7b46ab Mon Sep 17 00:00:00 2001 From: Say Date: Tue, 25 Feb 2025 23:30:20 -0500 Subject: [PATCH 09/17] ssl crt and key for bypasscors Signed-off-by: Say --- ssl/cert.crt | 22 ++++++++++++++++++++++ ssl/cert.key | 28 ++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 ssl/cert.crt create mode 100644 ssl/cert.key diff --git a/ssl/cert.crt b/ssl/cert.crt new file mode 100644 index 0000000..16d9633 --- /dev/null +++ b/ssl/cert.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDpzCCAo+gAwIBAgIUF+XUZGcFtHUSZADxd6KserxP+gswDQYJKoZIhvcNAQEL +BQAwYzELMAkGA1UEBhMCUEgxDDAKBgNVBAgMA0NBVjEWMBQGA1UEBwwNR2VuZXJh +bCBUcmlhczEMMAoGA1UECgwDQURJMQwwCgYDVQQLDANTRFAxEjAQBgNVBAMMCWxv +Y2FsaG9zdDAeFw0yNTAyMjQwMjI2MTdaFw0yNjAyMjQwMjI2MTdaMGMxCzAJBgNV +BAYTAlBIMQwwCgYDVQQIDANDQVYxFjAUBgNVBAcMDUdlbmVyYWwgVHJpYXMxDDAK +BgNVBAoMA0FESTEMMAoGA1UECwwDU0RQMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnyU7ChIPnIJ1VBvuIs51ROqtg +eAufHIDGpyaEgCRUIxzb3jRXxKxby2vrLSxXei+PtMMssTaIDKIEHiH1cygKvTXJ +OfozUJRYRgWaGmUeWX5iUDfFCIqquIWLF3Q7fzebwMUbR6hTvXGLDghwSI0gmPqx +51+R8YLBhKhHy7A8HQtB3GR9Z29eBqVWKfTiH253R7kARJ90U4bQAYIa0iOu/J+u +Baie87yOcpQk7LYL+qXQ5EKCe5vsNfgvqELAL0ZXMB72/Sfk7bLyz3aj/APBL3A4 +9jDgK5ltiVZBq6GUidXq087Q5DVHRHFhaK+t6OlWuh9QNN91gOLiILjbjGaDAgMB +AAGjUzBRMB0GA1UdDgQWBBR8u0QxHj8JQWsK4QzOIGmqTzODEjAfBgNVHSMEGDAW +gBR8u0QxHj8JQWsK4QzOIGmqTzODEjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQALrTZTYnkw+Z1mkmg9BAPJS9+FauV9dtYpxHG5iqFyhQfbl/Em +f1tMrNNs71Wru33E4EjqX5/JNYpITi6ud1uPGQJL6AsR43Vgd4zL1ikO7B2I/9+i +WAnXAAvuo+BGpsomYA6W9vvq+U7RKMHO/Ott4fijk9eyV/Lh/2ngQVo64Nc+chsp +yfs6RRgiwXIqiS+yf9K+z5WkVyz0ooGWEz98TDDj5lVeKZPNY3Dp8WftMyI9woeK +ocX7olF0ItSnU0Z74+sAapykTZW3GLwurUMrkWiBGkvfwaOYGauLi43d0VueSr2J +rTEub63yOxLuwgshOgjvSkcx4IARMOEJhDpI +-----END CERTIFICATE----- diff --git a/ssl/cert.key b/ssl/cert.key new file mode 100644 index 0000000..9dc577a --- /dev/null +++ b/ssl/cert.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDnyU7ChIPnIJ1V +BvuIs51ROqtgeAufHIDGpyaEgCRUIxzb3jRXxKxby2vrLSxXei+PtMMssTaIDKIE +HiH1cygKvTXJOfozUJRYRgWaGmUeWX5iUDfFCIqquIWLF3Q7fzebwMUbR6hTvXGL +DghwSI0gmPqx51+R8YLBhKhHy7A8HQtB3GR9Z29eBqVWKfTiH253R7kARJ90U4bQ +AYIa0iOu/J+uBaie87yOcpQk7LYL+qXQ5EKCe5vsNfgvqELAL0ZXMB72/Sfk7bLy +z3aj/APBL3A49jDgK5ltiVZBq6GUidXq087Q5DVHRHFhaK+t6OlWuh9QNN91gOLi +ILjbjGaDAgMBAAECggEAbShQ/yqJNAAYGEMBko+ENwz6SKRAVN6HhwaRDTWL5lPi +82jiHbNxuIlEeaz8hPX2ECeBAzsyA0BvzKCkPYPOB8Cz4+B6BFCejDPtz3U+ydw7 +uPEuUoyDQYNE4QxaoOp4tdFDAmXs0AMXxfUF5FtGm2NwLPhZ+dFTUu+2kJlMlgHy +F5viRU2jJElVrMXxSSLeK3+QxQUImeBqpxTVWmYjq2zp2R5E3k/lUCDMynfN/Hci +o6cgQQ0WNicEGeLKIftNB77AfDqT5ute2Y1vbFhH0CnlAzpNdfAgcQaC1FZN7u// +SURMu6gil66VymTY+L5TiOqmrBHuGEKQTjg9CraRgQKBgQD573vd9eiexvDwbf67 +BuVXSHJ9VKaqXnXqmlz97u0tw7u/s6Voqa/e8tLTHOsccK+LMrXtlBrs+d+eAWaR +/Nr00+lwtOQlm8pcskTvI/9FAjmb/qvYzplSU9ERm0tXEOhYk2exubibCGy3yD4V +rsdxKdCRTxIo4vpAeCYDA3FU5QKBgQDtaRZkA7a/uEq1YxiHof5xTrPSIHzMnhXX +mhv8agpmteYOgnhrhAXcA+Jmj7tTXfA0Rj7Ba8/Vzd1eBZb9kDDCjrloXGpcHmk6 +V4fu7wCxI6yHi2H1/jcvVem8y9uPnP7u3ZBLRj4QXCl+/4gAmjWsI19F4vBUz/c8 +OEZDKDu/RwKBgH0D8hRTJXkOD4RjsI/CYkLnZQUVq4v6Vcb0UWFe+lny1t2LsUgJ +4IOHODcK9vsxzky1H9TnSRSR4+13y+Nn8+mUeea7RIcfRvhY3ywy+EN/WmuR1klL +BdvtOt0wrV2uglmT2cFHIXTCoQbIbW2REAeln8KfJ3k2F3DZ6EGHnk+VAoGBAKt8 +zBKkaB4mVbieAvr99ZgM/HEczGjVC/v3sp1qT2cPn0T901P+QmlBWQkya2J1qWtp +Di2S3caXdH5U1VMFE2OFysFqd91gjiv5TBQ4CazqktY5xSH2ZhBII5UfP9KF2dPa +sT7eVzhkCglVNP0SZxCXYFtP6L+qlPCnyYD7D+VDAoGBAPFj8aU9ljka76+5MOGl +dUT2Lz9pLO5grKybm/Hnw95dfHEuSD7eE9oaJrAIZvzGiZGc0QLpQn6k4Wdl7ile +LRAqwXrFxxUWfd3OHRZEaWTRmM8qW8NV2XCV84p+mH0NoYUpcsRQ/oRAiyXo/OQP +YtDu/CN1c0kQgeIsDdVTVJ0a +-----END PRIVATE KEY----- From e5e14b1fca6b07b56e926073f615f9374434f5cb Mon Sep 17 00:00:00 2001 From: Say Date: Tue, 25 Feb 2025 23:37:06 -0500 Subject: [PATCH 10/17] update flask run with ssl cert Signed-off-by: Say --- README.md | 2 +- entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 708ed7e..9df4b66 100644 --- a/README.md +++ b/README.md @@ -32,4 +32,4 @@ virtual environment of constellation 7. Once installed, run the in development mode. export FLASK_ENV=development export ES=192.168.10.12 - flask run --host=0.0.0.0 --port=5002 + flask run --host=0.0.0.0 --port=5000 --cert=./ssl/cert.crt --key=./ssl/cert.key diff --git a/entrypoint.sh b/entrypoint.sh index be88c3d..066dee0 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -flask run --host=0.0.0.0 +flask run --host=0.0.0.0 --port=5000 --cert=./ssl/cert.crt --key=./ssl/cert.key From e781f8386e8fbb5d177403993b61119eb4434db5 Mon Sep 17 00:00:00 2001 From: Say Date: Tue, 25 Feb 2025 23:42:25 -0500 Subject: [PATCH 11/17] Revert "ssl crt and key for bypasscors" This reverts commit 82757949cf352b4676c0c490a5f951354a7b46ab. --- ssl/cert.crt | 22 ---------------------- ssl/cert.key | 28 ---------------------------- 2 files changed, 50 deletions(-) delete mode 100644 ssl/cert.crt delete mode 100644 ssl/cert.key diff --git a/ssl/cert.crt b/ssl/cert.crt deleted file mode 100644 index 16d9633..0000000 --- a/ssl/cert.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDpzCCAo+gAwIBAgIUF+XUZGcFtHUSZADxd6KserxP+gswDQYJKoZIhvcNAQEL -BQAwYzELMAkGA1UEBhMCUEgxDDAKBgNVBAgMA0NBVjEWMBQGA1UEBwwNR2VuZXJh -bCBUcmlhczEMMAoGA1UECgwDQURJMQwwCgYDVQQLDANTRFAxEjAQBgNVBAMMCWxv -Y2FsaG9zdDAeFw0yNTAyMjQwMjI2MTdaFw0yNjAyMjQwMjI2MTdaMGMxCzAJBgNV -BAYTAlBIMQwwCgYDVQQIDANDQVYxFjAUBgNVBAcMDUdlbmVyYWwgVHJpYXMxDDAK -BgNVBAoMA0FESTEMMAoGA1UECwwDU0RQMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnyU7ChIPnIJ1VBvuIs51ROqtg -eAufHIDGpyaEgCRUIxzb3jRXxKxby2vrLSxXei+PtMMssTaIDKIEHiH1cygKvTXJ -OfozUJRYRgWaGmUeWX5iUDfFCIqquIWLF3Q7fzebwMUbR6hTvXGLDghwSI0gmPqx -51+R8YLBhKhHy7A8HQtB3GR9Z29eBqVWKfTiH253R7kARJ90U4bQAYIa0iOu/J+u -Baie87yOcpQk7LYL+qXQ5EKCe5vsNfgvqELAL0ZXMB72/Sfk7bLyz3aj/APBL3A4 -9jDgK5ltiVZBq6GUidXq087Q5DVHRHFhaK+t6OlWuh9QNN91gOLiILjbjGaDAgMB -AAGjUzBRMB0GA1UdDgQWBBR8u0QxHj8JQWsK4QzOIGmqTzODEjAfBgNVHSMEGDAW -gBR8u0QxHj8JQWsK4QzOIGmqTzODEjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQALrTZTYnkw+Z1mkmg9BAPJS9+FauV9dtYpxHG5iqFyhQfbl/Em -f1tMrNNs71Wru33E4EjqX5/JNYpITi6ud1uPGQJL6AsR43Vgd4zL1ikO7B2I/9+i -WAnXAAvuo+BGpsomYA6W9vvq+U7RKMHO/Ott4fijk9eyV/Lh/2ngQVo64Nc+chsp -yfs6RRgiwXIqiS+yf9K+z5WkVyz0ooGWEz98TDDj5lVeKZPNY3Dp8WftMyI9woeK -ocX7olF0ItSnU0Z74+sAapykTZW3GLwurUMrkWiBGkvfwaOYGauLi43d0VueSr2J -rTEub63yOxLuwgshOgjvSkcx4IARMOEJhDpI ------END CERTIFICATE----- diff --git a/ssl/cert.key b/ssl/cert.key deleted file mode 100644 index 9dc577a..0000000 --- a/ssl/cert.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDnyU7ChIPnIJ1V -BvuIs51ROqtgeAufHIDGpyaEgCRUIxzb3jRXxKxby2vrLSxXei+PtMMssTaIDKIE -HiH1cygKvTXJOfozUJRYRgWaGmUeWX5iUDfFCIqquIWLF3Q7fzebwMUbR6hTvXGL -DghwSI0gmPqx51+R8YLBhKhHy7A8HQtB3GR9Z29eBqVWKfTiH253R7kARJ90U4bQ -AYIa0iOu/J+uBaie87yOcpQk7LYL+qXQ5EKCe5vsNfgvqELAL0ZXMB72/Sfk7bLy -z3aj/APBL3A49jDgK5ltiVZBq6GUidXq087Q5DVHRHFhaK+t6OlWuh9QNN91gOLi -ILjbjGaDAgMBAAECggEAbShQ/yqJNAAYGEMBko+ENwz6SKRAVN6HhwaRDTWL5lPi -82jiHbNxuIlEeaz8hPX2ECeBAzsyA0BvzKCkPYPOB8Cz4+B6BFCejDPtz3U+ydw7 -uPEuUoyDQYNE4QxaoOp4tdFDAmXs0AMXxfUF5FtGm2NwLPhZ+dFTUu+2kJlMlgHy -F5viRU2jJElVrMXxSSLeK3+QxQUImeBqpxTVWmYjq2zp2R5E3k/lUCDMynfN/Hci -o6cgQQ0WNicEGeLKIftNB77AfDqT5ute2Y1vbFhH0CnlAzpNdfAgcQaC1FZN7u// -SURMu6gil66VymTY+L5TiOqmrBHuGEKQTjg9CraRgQKBgQD573vd9eiexvDwbf67 -BuVXSHJ9VKaqXnXqmlz97u0tw7u/s6Voqa/e8tLTHOsccK+LMrXtlBrs+d+eAWaR -/Nr00+lwtOQlm8pcskTvI/9FAjmb/qvYzplSU9ERm0tXEOhYk2exubibCGy3yD4V -rsdxKdCRTxIo4vpAeCYDA3FU5QKBgQDtaRZkA7a/uEq1YxiHof5xTrPSIHzMnhXX -mhv8agpmteYOgnhrhAXcA+Jmj7tTXfA0Rj7Ba8/Vzd1eBZb9kDDCjrloXGpcHmk6 -V4fu7wCxI6yHi2H1/jcvVem8y9uPnP7u3ZBLRj4QXCl+/4gAmjWsI19F4vBUz/c8 -OEZDKDu/RwKBgH0D8hRTJXkOD4RjsI/CYkLnZQUVq4v6Vcb0UWFe+lny1t2LsUgJ -4IOHODcK9vsxzky1H9TnSRSR4+13y+Nn8+mUeea7RIcfRvhY3ywy+EN/WmuR1klL -BdvtOt0wrV2uglmT2cFHIXTCoQbIbW2REAeln8KfJ3k2F3DZ6EGHnk+VAoGBAKt8 -zBKkaB4mVbieAvr99ZgM/HEczGjVC/v3sp1qT2cPn0T901P+QmlBWQkya2J1qWtp -Di2S3caXdH5U1VMFE2OFysFqd91gjiv5TBQ4CazqktY5xSH2ZhBII5UfP9KF2dPa -sT7eVzhkCglVNP0SZxCXYFtP6L+qlPCnyYD7D+VDAoGBAPFj8aU9ljka76+5MOGl -dUT2Lz9pLO5grKybm/Hnw95dfHEuSD7eE9oaJrAIZvzGiZGc0QLpQn6k4Wdl7ile -LRAqwXrFxxUWfd3OHRZEaWTRmM8qW8NV2XCV84p+mH0NoYUpcsRQ/oRAiyXo/OQP -YtDu/CN1c0kQgeIsDdVTVJ0a ------END PRIVATE KEY----- From bd2df2bda9518b5b30c0ab590b9a2a23cf0e6aef Mon Sep 17 00:00:00 2001 From: Say Date: Tue, 11 Mar 2025 06:54:44 -0400 Subject: [PATCH 12/17] changed ssl cert and key --- app/app.py | 5 +++-- entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/app.py b/app/app.py index 4cbcd13..4c9da52 100644 --- a/app/app.py +++ b/app/app.py @@ -24,16 +24,17 @@ render_template, request, send_from_directory, - url_for, + url_for ) from flask.helpers import get_root_path -from flask_cors import cross_origin +from flask_cors import cross_origin,CORS # from junit2htmlreport import parser # app = Flask(__name__) server_bp = Blueprint("constellation", __name__) +CORS(server_bp, origins=["https://cos.ad.analog.com/constellation/"]) JENKINS_SERVER = ( "jenkinsci" if "JENKINS_SERVER" not in os.environ else os.environ["JENKINS_SERVER"] diff --git a/entrypoint.sh b/entrypoint.sh index 066dee0..183d143 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -flask run --host=0.0.0.0 --port=5000 --cert=./ssl/cert.crt --key=./ssl/cert.key +flask run --host=0.0.0.0 --port=5000 --cert=./ssl/cos_analog_com.crt --key=./ssl/cos_analog_com.key From a7f9b4f6002b0b34ceeb5b043659409e3982c8d2 Mon Sep 17 00:00:00 2001 From: Say Date: Tue, 11 Mar 2025 06:56:38 -0400 Subject: [PATCH 13/17] Add comment of copying ssl from apache to docker. --- Dockerfile | 3 +++ ssl/cos_analog_com.crt | 36 ++++++++++++++++++++++++++++++++++++ ssl/cos_analog_com.key | 28 ++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 ssl/cos_analog_com.crt create mode 100644 ssl/cos_analog_com.key diff --git a/Dockerfile b/Dockerfile index 9762469..1a4c253 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,9 @@ ADD . /app RUN pip install -r requirements.txt RUN git clone https://github.com/sdgtt/telemetry.git RUN cd telemetry && pip install -r requirements.txt && pip install . && cd .. +# Copy SSL certificates +COPY cos_analog_com.crt ./ssl/cos_analog_com.crt +COPY cos_analog_com.key ./ssl/cos_analog_com.key RUN chmod u+x ./entrypoint.sh ENTRYPOINT ["./entrypoint.sh"] EXPOSE 5000 diff --git a/ssl/cos_analog_com.crt b/ssl/cos_analog_com.crt new file mode 100644 index 0000000..8043135 --- /dev/null +++ b/ssl/cos_analog_com.crt @@ -0,0 +1,36 @@ +-----BEGIN CERTIFICATE----- +MIIGSDCCBDCgAwIBAgITYADM7k8s1bJFmzv3DQAAAMzuTzANBgkqhkiG9w0BAQsF +ADB4MRMwEQYKCZImiZPyLGQBGRYDY29tMRYwFAYKCZImiZPyLGQBGRYGYW5hbG9n +MRIwEAYKCZImiZPyLGQBGRYCYWQxNTAzBgNVBAMTLEFuYWxvZyBTSEEyIEVudGVy +cHJpc2UgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTI0MTIwNDEyMTIzMVoXDTI1 +MTIwNDEyMTIzMVoweDELMAkGA1UEBhMCUEgxDzANBgNVBAgTBkNhdml0ZTEWMBQG +A1UEBxMNR2VuZXJhbCBUcmlhczEdMBsGA1UEChMUQW5hbG9nIERldmljZXMsIElu +Yy4xITAfBgNVBAMTGGFkZ3RzZWNhZDEuYWQuYW5hbG9nLmNvbTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBALEdB7Rs30zJwd+ywIGUV6V+M0xmMGHs2tXS +qoLfcPtuaddRGbQeVxHbEENkJh72NiDgx9h8JcYTaQ2LNcErtl+4BakFpkpVmdk7 +uTGsg71acSvDQmPhaorsqjQv4NuhBapl+ng2nK8r4RuJy61asOCovHqQfxSfpZOr +Qr+6khdO8Gz7MjSHY37hvcoKogo5vnsEefLVxDg9ZxJRoa3Y6cFWp5ZL+bda0s5f +ldkPEuZt/4pEtfAICQjAYXZXrFbIMyJ90V41Ldq5XHSTuvqEXaKXYw+ZSo1BFcQX +zwweM3VnPn05O0VM/vlZFGMSrsLny1RYnPNAjZyZvjYlzQgg40cCAwEAAaOCAckw +ggHFMBwGA1UdEQQVMBOCEWNvcy5hZC5hbmFsb2cuY29tMB0GA1UdDgQWBBSQJJHy +Q67iCqSEsZEkVJqBgugvQzAfBgNVHSMEGDAWgBQ9WhDmqMRx2Ym0IuBzzmSfn8Ua +mzA8BgNVHR8ENTAzMDGgL6AthitodHRwOi8vcGtpLmFkLmFuYWxvZy5jb20vcGtp +L0FOQUxPRy1FQ0EuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBrBggrBgEFBQcwAoZf +aHR0cDovL3BraS5hZC5hbmFsb2cuY29tL3BraS9BTkFMT0ctRUNBQW5hbG9nJTIw +U0hBMiUyMEVudGVycHJpc2UlMjBDZXJ0aWZpY2F0ZSUyMEF1dGhvcml0eS5jcnQw +KQYIKwYBBQUHMAGGHWh0dHA6Ly9wa2kuYWQuYW5hbG9nLmNvbS9vY3NwMAsGA1Ud +DwQEAwIFoDA9BgkrBgEEAYI3FQcEMDAuBiYrBgEEAYI3FQiBor5hhtuiNumdHobF +1xKBybIugQGEvMpthObkdgIBZAIBDjATBgNVHSUEDDAKBggrBgEFBQcDATAbBgkr +BgEEAYI3FQoEDjAMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4ICAQCNtPnP +Xf4liCjaEh/Opdj1qzG7371vSSFpVdX63Njj06qtZwG2mMOx9efkvYJC2GIDn3Yn +SbwnPZo/JDoviYjTqsE0MpJUbq9XFwpBTKD6iLNWelbrmlcUztmXOGrCvAUYhRmC +1RmVCqcThdj1+J1LdIEGUT1rq6MW0X90DQ0EngAxuEgPP+xebDY6aZu9tN82PD0k +jqox6yTDw5sZeKKH14QkQaZVx/qKw744v70lvwaTfkOXQveR2S2kbOSqW8GP8vrj +AsGL2ZHR4bOoRNS2tsu2mfcTGhjDXDFpAsG2oAgV7a87/QzAgD6oW4Af7l2i3xb5 +zLcrsS7iqb7ASAtolHhyqrWPtaZCQDoR3bT0o5YJIdmip0BBQy4MBIdrsZmBjAd6 +/R5Jc5t2YTDm0nSU7BYHYrthP+WIIgJtZyU0k53TCoQqjS1tSKwfUlRF2ZXLIeCU +3x+U4no5G9DVxWTMhnqLx7WzIkLkPCrxaGCumN5L69y6d60U0qtdPxurXJokT6d0 +3HkUrMSi3SIbhLichSr8Q5XWlgvDSsykpvdHUNfrvAOOZINOZg+m33yiHcQ7u+OI +nE7u5uJ8AjkSoA2k/zXZtLHlG4oGmXcgjndbqcudo7o9LxodO3V/S3o4/m2LwAh8 +rshBGgsCRVmAf5wSkWItcieRncM/3ABUu685gA== +-----END CERTIFICATE----- diff --git a/ssl/cos_analog_com.key b/ssl/cos_analog_com.key new file mode 100644 index 0000000..51051d3 --- /dev/null +++ b/ssl/cos_analog_com.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxHQe0bN9MycHf +ssCBlFelfjNMZjBh7NrV0qqC33D7bmnXURm0HlcR2xBDZCYe9jYg4MfYfCXGE2kN +izXBK7ZfuAWpBaZKVZnZO7kxrIO9WnErw0Jj4WqK7Ko0L+DboQWqZfp4NpyvK+Eb +icutWrDgqLx6kH8Un6WTq0K/upIXTvBs+zI0h2N+4b3KCqIKOb57BHny1cQ4PWcS +UaGt2OnBVqeWS/m3WtLOX5XZDxLmbf+KRLXwCAkIwGF2V6xWyDMifdFeNS3auVx0 +k7r6hF2il2MPmUqNQRXEF88MHjN1Zz59OTtFTP75WRRjEq7C58tUWJzzQI2cmb42 +Jc0IIONHAgMBAAECggEATY9sbdcVjH93/rm9MqGfJjJXTZgcjO2XwXZhRDGMPRcT +k36I9oco0wFvJEvpo7pnZst4yLVJJ24dnZg+YIr/cPhZxjRap4fH+Uj9pyKoiFXg +ZG08GBhBO3g7auIioptnq0DASD+GKvHYwOH9hztFZQSPkU7Qz9u/uySO9P5Ddp/Y +PxQ1IFAxrb6IvruN2/ICzyr8IcWeiOv0Ass4+jEVGdrPU+lKQxBsIEFzTOd4zPBa +7DRGAiFHmNpRv4d3PmZXIwV6OsOVF6f6urYXOWMF3Rym8bQ5Jy33Z9Q6en4TEZS2 +QbC6LTo7XvMnwCus13NJ7R2mcP6kWUD+vjCUqjJNvQKBgQDplAqydB3KHS5NoFxg +hYBNkaiynZwGzfAAmHpTIwGY1/a6fbEW0SI8dGHVHys7DtbP+opv30A850dyLelg +q14RNpJwuemV5XQFolWf4c2HMgNats0fdZot1gruM/qPOnrEx0k4IfngBIwPQcXm +94xRgkV4exPkGt+/ZzQ6eHg/FQKBgQDCHWs4AfsNr5IeFTlzs9UHRSyP9IV7QnPI +olFn8V8lv4uLHLq/QHMniV1f+fpXkG8okCrcOLQxkWftg39NuhLpihRIT26TIDKi +iFwWKx5TUHdPRW0dC1LNh0k7m6JgZqbPwi0LUEcmPgZo3cfQahjF6MDT+nbEPa+h +XFKwwwnP6wKBgAyhjNKJpPLBETfxbA1sKrwHHHBMRZu4lznxBOxqADQbuaPsGB97 +v7Y1NPUpclUHQGaOzd2u3PJuL1blVLF9kuCras/dvdv1RIjpdmfm9g5RjgzhxcXl +viisYnrvJKWKLAloHXWDoNeUZ16L1//dcyEVQlx5i2HScjcPhauDyDzhAoGBAI1D +NXy7zESoaVBlJ7swuq2gxI46Z01NDc+LeGyJNjHVVCq3jJuTvnmeOIqY83r3zD0b +tWUwCsorxBMP5/vbltnHt3zr+U8uVkr7qvAjDt2YqErS/lXtoKObeUrctu0qpuh4 +qakbEbwd1TJJe5kLLN4RxQo+smGbdo2aDz89oI1jAoGBAMsb9SKsS5gDfptkJ/bE ++40qkzGZC5C5Bza55hzgzJZZdgygCYBD5JhovwD/adFEDNUUyYqaRTvNP+/03QYr +AKlrySB7Fk79HlQf38McbmsJOd+9vytW1uwSPGQcqu0wrPQxmNLJMfZN8hkvJXQW +Oly/6TeqYav+EBmD+ECE8vMM +-----END PRIVATE KEY----- From 484280e013823d6cc0b0f38c64ad944f36059cf6 Mon Sep 17 00:00:00 2001 From: Say Date: Wed, 12 Mar 2025 02:46:03 -0400 Subject: [PATCH 14/17] added origins --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 92d4617..b591ba7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,7 +7,7 @@ def create_app(): server = Flask(__name__) - CORS(server) + CORS(server,origins=["https://cos.ad.analog.com/constellation/"]) register_dashapps(server) # register_extensions(server) From dcde04573fc7d75581e3de37a8a8f54b98d46692 Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 17 Mar 2025 00:14:56 -0400 Subject: [PATCH 15/17] Removed origins and placed back nginx ssl --- app/__init__.py | 2 +- app/app.py | 2 +- entrypoint.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index b591ba7..92d4617 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,7 +7,7 @@ def create_app(): server = Flask(__name__) - CORS(server,origins=["https://cos.ad.analog.com/constellation/"]) + CORS(server) register_dashapps(server) # register_extensions(server) diff --git a/app/app.py b/app/app.py index 4c9da52..ceb2869 100644 --- a/app/app.py +++ b/app/app.py @@ -34,7 +34,7 @@ # app = Flask(__name__) server_bp = Blueprint("constellation", __name__) -CORS(server_bp, origins=["https://cos.ad.analog.com/constellation/"]) +CORS(server_bp) JENKINS_SERVER = ( "jenkinsci" if "JENKINS_SERVER" not in os.environ else os.environ["JENKINS_SERVER"] diff --git a/entrypoint.sh b/entrypoint.sh index 183d143..8fa74d2 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,2 +1,3 @@ #!/usr/bin/env bash -flask run --host=0.0.0.0 --port=5000 --cert=./ssl/cos_analog_com.crt --key=./ssl/cos_analog_com.key +flask run --host=0.0.0.0 --port=5000 --cert=./ssl/cert.crt --key=./ssl/cert.key +# flask run --host=0.0.0.0 --port=5000 --cert=./ssl/cos_analog_com.crt --key=./ssl/cos_analog_com.key From 0093cac9172ba988d1a327af6390dd4679743035 Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 17 Mar 2025 22:53:58 -0400 Subject: [PATCH 16/17] changed copy ssl crt and key --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a4c253..0e496dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,10 @@ RUN pip install -r requirements.txt RUN git clone https://github.com/sdgtt/telemetry.git RUN cd telemetry && pip install -r requirements.txt && pip install . && cd .. # Copy SSL certificates -COPY cos_analog_com.crt ./ssl/cos_analog_com.crt -COPY cos_analog_com.key ./ssl/cos_analog_com.key +# COPY cos_analog_com.crt ./ssl/cos_analog_com.crt +# COPY cos_analog_com.key ./ssl/cos_analog_com.key +COPY cert.crt ./ssl/cert.crt +COPY cert.key ./ssl/cert.key RUN chmod u+x ./entrypoint.sh ENTRYPOINT ["./entrypoint.sh"] EXPOSE 5000 From f18b051669c21400439b7f4cd9a7a2c9c6b6265e Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 17 Mar 2025 23:25:06 -0400 Subject: [PATCH 17/17] selfcert --- ssl/cert.crt | 36 ++++++++++++++++++++++++++++++++++++ ssl/cert.key | 28 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 ssl/cert.crt create mode 100644 ssl/cert.key diff --git a/ssl/cert.crt b/ssl/cert.crt new file mode 100644 index 0000000..8043135 --- /dev/null +++ b/ssl/cert.crt @@ -0,0 +1,36 @@ +-----BEGIN CERTIFICATE----- +MIIGSDCCBDCgAwIBAgITYADM7k8s1bJFmzv3DQAAAMzuTzANBgkqhkiG9w0BAQsF +ADB4MRMwEQYKCZImiZPyLGQBGRYDY29tMRYwFAYKCZImiZPyLGQBGRYGYW5hbG9n +MRIwEAYKCZImiZPyLGQBGRYCYWQxNTAzBgNVBAMTLEFuYWxvZyBTSEEyIEVudGVy +cHJpc2UgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTI0MTIwNDEyMTIzMVoXDTI1 +MTIwNDEyMTIzMVoweDELMAkGA1UEBhMCUEgxDzANBgNVBAgTBkNhdml0ZTEWMBQG +A1UEBxMNR2VuZXJhbCBUcmlhczEdMBsGA1UEChMUQW5hbG9nIERldmljZXMsIElu +Yy4xITAfBgNVBAMTGGFkZ3RzZWNhZDEuYWQuYW5hbG9nLmNvbTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBALEdB7Rs30zJwd+ywIGUV6V+M0xmMGHs2tXS +qoLfcPtuaddRGbQeVxHbEENkJh72NiDgx9h8JcYTaQ2LNcErtl+4BakFpkpVmdk7 +uTGsg71acSvDQmPhaorsqjQv4NuhBapl+ng2nK8r4RuJy61asOCovHqQfxSfpZOr +Qr+6khdO8Gz7MjSHY37hvcoKogo5vnsEefLVxDg9ZxJRoa3Y6cFWp5ZL+bda0s5f +ldkPEuZt/4pEtfAICQjAYXZXrFbIMyJ90V41Ldq5XHSTuvqEXaKXYw+ZSo1BFcQX +zwweM3VnPn05O0VM/vlZFGMSrsLny1RYnPNAjZyZvjYlzQgg40cCAwEAAaOCAckw +ggHFMBwGA1UdEQQVMBOCEWNvcy5hZC5hbmFsb2cuY29tMB0GA1UdDgQWBBSQJJHy +Q67iCqSEsZEkVJqBgugvQzAfBgNVHSMEGDAWgBQ9WhDmqMRx2Ym0IuBzzmSfn8Ua +mzA8BgNVHR8ENTAzMDGgL6AthitodHRwOi8vcGtpLmFkLmFuYWxvZy5jb20vcGtp +L0FOQUxPRy1FQ0EuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBrBggrBgEFBQcwAoZf +aHR0cDovL3BraS5hZC5hbmFsb2cuY29tL3BraS9BTkFMT0ctRUNBQW5hbG9nJTIw +U0hBMiUyMEVudGVycHJpc2UlMjBDZXJ0aWZpY2F0ZSUyMEF1dGhvcml0eS5jcnQw +KQYIKwYBBQUHMAGGHWh0dHA6Ly9wa2kuYWQuYW5hbG9nLmNvbS9vY3NwMAsGA1Ud +DwQEAwIFoDA9BgkrBgEEAYI3FQcEMDAuBiYrBgEEAYI3FQiBor5hhtuiNumdHobF +1xKBybIugQGEvMpthObkdgIBZAIBDjATBgNVHSUEDDAKBggrBgEFBQcDATAbBgkr +BgEEAYI3FQoEDjAMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4ICAQCNtPnP +Xf4liCjaEh/Opdj1qzG7371vSSFpVdX63Njj06qtZwG2mMOx9efkvYJC2GIDn3Yn +SbwnPZo/JDoviYjTqsE0MpJUbq9XFwpBTKD6iLNWelbrmlcUztmXOGrCvAUYhRmC +1RmVCqcThdj1+J1LdIEGUT1rq6MW0X90DQ0EngAxuEgPP+xebDY6aZu9tN82PD0k +jqox6yTDw5sZeKKH14QkQaZVx/qKw744v70lvwaTfkOXQveR2S2kbOSqW8GP8vrj +AsGL2ZHR4bOoRNS2tsu2mfcTGhjDXDFpAsG2oAgV7a87/QzAgD6oW4Af7l2i3xb5 +zLcrsS7iqb7ASAtolHhyqrWPtaZCQDoR3bT0o5YJIdmip0BBQy4MBIdrsZmBjAd6 +/R5Jc5t2YTDm0nSU7BYHYrthP+WIIgJtZyU0k53TCoQqjS1tSKwfUlRF2ZXLIeCU +3x+U4no5G9DVxWTMhnqLx7WzIkLkPCrxaGCumN5L69y6d60U0qtdPxurXJokT6d0 +3HkUrMSi3SIbhLichSr8Q5XWlgvDSsykpvdHUNfrvAOOZINOZg+m33yiHcQ7u+OI +nE7u5uJ8AjkSoA2k/zXZtLHlG4oGmXcgjndbqcudo7o9LxodO3V/S3o4/m2LwAh8 +rshBGgsCRVmAf5wSkWItcieRncM/3ABUu685gA== +-----END CERTIFICATE----- diff --git a/ssl/cert.key b/ssl/cert.key new file mode 100644 index 0000000..51051d3 --- /dev/null +++ b/ssl/cert.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxHQe0bN9MycHf +ssCBlFelfjNMZjBh7NrV0qqC33D7bmnXURm0HlcR2xBDZCYe9jYg4MfYfCXGE2kN +izXBK7ZfuAWpBaZKVZnZO7kxrIO9WnErw0Jj4WqK7Ko0L+DboQWqZfp4NpyvK+Eb +icutWrDgqLx6kH8Un6WTq0K/upIXTvBs+zI0h2N+4b3KCqIKOb57BHny1cQ4PWcS +UaGt2OnBVqeWS/m3WtLOX5XZDxLmbf+KRLXwCAkIwGF2V6xWyDMifdFeNS3auVx0 +k7r6hF2il2MPmUqNQRXEF88MHjN1Zz59OTtFTP75WRRjEq7C58tUWJzzQI2cmb42 +Jc0IIONHAgMBAAECggEATY9sbdcVjH93/rm9MqGfJjJXTZgcjO2XwXZhRDGMPRcT +k36I9oco0wFvJEvpo7pnZst4yLVJJ24dnZg+YIr/cPhZxjRap4fH+Uj9pyKoiFXg +ZG08GBhBO3g7auIioptnq0DASD+GKvHYwOH9hztFZQSPkU7Qz9u/uySO9P5Ddp/Y +PxQ1IFAxrb6IvruN2/ICzyr8IcWeiOv0Ass4+jEVGdrPU+lKQxBsIEFzTOd4zPBa +7DRGAiFHmNpRv4d3PmZXIwV6OsOVF6f6urYXOWMF3Rym8bQ5Jy33Z9Q6en4TEZS2 +QbC6LTo7XvMnwCus13NJ7R2mcP6kWUD+vjCUqjJNvQKBgQDplAqydB3KHS5NoFxg +hYBNkaiynZwGzfAAmHpTIwGY1/a6fbEW0SI8dGHVHys7DtbP+opv30A850dyLelg +q14RNpJwuemV5XQFolWf4c2HMgNats0fdZot1gruM/qPOnrEx0k4IfngBIwPQcXm +94xRgkV4exPkGt+/ZzQ6eHg/FQKBgQDCHWs4AfsNr5IeFTlzs9UHRSyP9IV7QnPI +olFn8V8lv4uLHLq/QHMniV1f+fpXkG8okCrcOLQxkWftg39NuhLpihRIT26TIDKi +iFwWKx5TUHdPRW0dC1LNh0k7m6JgZqbPwi0LUEcmPgZo3cfQahjF6MDT+nbEPa+h +XFKwwwnP6wKBgAyhjNKJpPLBETfxbA1sKrwHHHBMRZu4lznxBOxqADQbuaPsGB97 +v7Y1NPUpclUHQGaOzd2u3PJuL1blVLF9kuCras/dvdv1RIjpdmfm9g5RjgzhxcXl +viisYnrvJKWKLAloHXWDoNeUZ16L1//dcyEVQlx5i2HScjcPhauDyDzhAoGBAI1D +NXy7zESoaVBlJ7swuq2gxI46Z01NDc+LeGyJNjHVVCq3jJuTvnmeOIqY83r3zD0b +tWUwCsorxBMP5/vbltnHt3zr+U8uVkr7qvAjDt2YqErS/lXtoKObeUrctu0qpuh4 +qakbEbwd1TJJe5kLLN4RxQo+smGbdo2aDz89oI1jAoGBAMsb9SKsS5gDfptkJ/bE ++40qkzGZC5C5Bza55hzgzJZZdgygCYBD5JhovwD/adFEDNUUyYqaRTvNP+/03QYr +AKlrySB7Fk79HlQf38McbmsJOd+9vytW1uwSPGQcqu0wrPQxmNLJMfZN8hkvJXQW +Oly/6TeqYav+EBmD+ECE8vMM +-----END PRIVATE KEY-----