remoteBackup: fix invalid config file breaks Artifactory instance

jfrog · Dec 9, 2020 · c0a14a6 · c0a14a6
1 parent 333f82d
commit c0a14a6
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/storage/remoteBackup/remoteBackup.groovy b/storage/remoteBackup/remoteBackup.groovy
@@ -51,7 +51,13 @@ storage {
   afterCreate { item ->
     def etcdir = ctx.artifactoryHome.etcDir
     def cfgfile = new File(etcdir, REMOTE_BACKUP)
-    def cfg = new JsonSlurper().parse(cfgfile)
+
+    // Ensure invalid json config does not prevent Artifactory
+    // from serving and receiving artifacts.
+    if (!cfgfile.exists()) return
+    cfg = parseJson(cfgfile)
+    if (!cfg) return
+
     if (item.repoKey in cfg && !item.isFolder()) {
       asSystem {
         def dest = cfg[item.repoKey]
@@ -66,10 +72,24 @@ storage {
   }
 }
 
+def parseJson(cfgfile) {
+  try {
+    return new JsonSlurper().parse(cfgfile)
+  } catch (Exception e) {
+    log.warn("Invalid json, error was: $e")
+  }
+}
+
 def runBackup(repos) {
   def etcdir = ctx.artifactoryHome.etcDir
   def cfgfile = new File(etcdir, REMOTE_BACKUP)
-  def cfg = new JsonSlurper().parse(cfgfile)
+
+  // Ensure invalid json config does not prevent Artifactory
+  // from serving and receiving artifacts.
+  if (!cfgfile.exists()) return
+  cfg = parseJson(cfgfile)
+  if (!cfg) return
+
   if (repos) {
     def cfgtmp = [:]
     for (repo in repos) {