Merge branch 'master' into feat/have-add-flag-for-update-project

Author: tngraf

ChangeLog.md

@@ -3,6 +3,7 @@
 ## NEXT
 * new method `update_project_release_relationship`.
 * original get_health_status() endpoint URL has been restored by the SW360 team.
+* fix: better check assumptions on returned data, see https://github.com/sw360/sw360python/issues/5.
 * `update_project` has a new parameter `add_subprojects` to only **add** the new
   sub-projects and not to overwrite all existing sub-projects.
 

sw360/sw360_api.py

@@ -267,6 +267,13 @@ def get_projects_by_type(self, project_type):
         :raises SW360Error: if there is a negative HTTP response
         """
         resp = self.api_get(self.url + "resource/api/projects?type=" + project_type)
+
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:projects" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:projects"]
         return resp
 
@@ -280,8 +287,16 @@ def get_project_names(self):
         :raises SW360Error: if there is a negative HTTP response
         """
         projects = self.get_projects()
-        projects = projects["_embedded"]["sw360:projects"]
         resp = []
+
+        if "_embedded" not in projects:
+            return resp
+
+        if "sw360:projects" not in projects["_embedded"]:
+            return resp
+
+        projects = projects["_embedded"]["sw360:projects"]
+        
         for key in projects:
             resp.append(key["name"] + ", " + key["version"])
 
@@ -302,6 +317,12 @@ def get_projects_by_name(self, name):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:projects" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:projects"]
         return resp
 
@@ -324,6 +345,12 @@ def get_projects_by_external_id(self, ext_id_name, ext_id_value=""):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:projects" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:projects"]
         return resp
 
@@ -346,6 +373,12 @@ def get_projects_by_group(self, group, all_details=False):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:projects" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:projects"]
         return resp
 
@@ -365,6 +398,12 @@ def get_projects_by_tag(self, tag):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:projects" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:projects"]
         return resp
 
@@ -905,6 +944,12 @@ def get_all_components(self, fields=None, page=-1, page_size=-1):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:components" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:components"]
         return resp
 
@@ -925,6 +970,12 @@ def get_components_by_type(self, component_type):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:components" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:components"]
         return resp
 
@@ -1148,6 +1199,12 @@ def get_all_vendors(self):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:vendors" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:vendors"]
         return resp
 
@@ -1265,6 +1322,13 @@ def get_attachment_infos_for_resource(self, resource_type, resource_id):
             + resource_id
             + "/attachments"
         )
+
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:attachments" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:attachments"]
         return resp
 
@@ -1500,6 +1564,12 @@ def get_all_licenses(self):
         if not resp:
             return None
 
+        if "_embedded" not in resp:
+            return None
+
+        if "sw360:licenses" not in resp["_embedded"]:
+            return None
+
         resp = resp["_embedded"]["sw360:licenses"]
         return resp