Merge pull request #7365 from chaen/v8.0_FIX-accountingJson

fix (WLCG Json accounting): make sure the file we download is json
DIRACGrid · Dec 11, 2023 · 07037d0 · 07037d0
2 parents e9d5937 + 56732f2
commit 07037d0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/DIRAC/Resources/Storage/OccupancyPlugins/WLCGAccountingJson.py b/src/DIRAC/Resources/Storage/OccupancyPlugins/WLCGAccountingJson.py
@@ -44,6 +44,10 @@ def _downloadJsonFile(self, occupancyLFN, filePath):
                     continue
                 occupancyURL = res["Value"]
                 ctx.filecopy(params, occupancyURL, "file://" + filePath)
+                # Just make sure the file is json, and not SSO HTML
+                with open(filePath) as f:
+                    json.load(f)
+
                 return
             except gfal2.GError as e:
                 detailMsg = "Failed to copy file %s to destination url %s: [%d] %s" % (
@@ -54,6 +58,9 @@ def _downloadJsonFile(self, occupancyLFN, filePath):
                 )
                 self.log.debug("Exception while copying", detailMsg)
                 continue
+            except json.decoder.JSONDecodeError as e:
+                self.log.debug("Downloaded file is not json")
+                continue
 
     def getOccupancy(self, **kwargs):
         """Returns the space information given by WLCG Accouting Json