Fix loading invalid metadata YAML #4

New Issue

PeterSurda · 2021-11-19T07:52:25Z

PeterSurda commented

2021-11-19 07:52:25 +00:00

diff --git a/main.py b/main.py
index 929b0a1..3629e2b 100644
--- a/main.py
+++ b/main.py
@@ -147,7 +147,10 @@ class CloudInitApp:
         filepath = os.path.join(PATH, "data", data['local-hostname'], META_DATA_FILENAME)
         if os.path.exists(filepath):
             with open(filepath, "r") as metadata:
-                data.update(yaml.safe_load(metadata))
+                try:
+                    data.update(yaml.safe_load(metadata))
+                except ValueError:
+                    pass
 
         cherrypy.response.headers['Content-Type'] = \
             'text/yaml'

``` diff --git a/main.py b/main.py index 929b0a1..3629e2b 100644 --- a/main.py +++ b/main.py @@ -147,7 +147,10 @@ class CloudInitApp: filepath = os.path.join(PATH, "data", data['local-hostname'], META_DATA_FILENAME) if os.path.exists(filepath): with open(filepath, "r") as metadata: - data.update(yaml.safe_load(metadata)) + try: + data.update(yaml.safe_load(metadata)) + except ValueError: + pass cherrypy.response.headers['Content-Type'] = \ 'text/yaml' ```

PeterSurda self-assigned this 2023-01-28 02:57:38 +00:00

Sign in to join this conversation.

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Sysdeploy/cloud-init-cherrypy#4