Sebastian Sdorra avatar Sebastian Sdorra committed cb3f696

fix possible npe in ScmRealm

Comments (0)

Files changed (1)

scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java

 
     for (Repository repository : repositoryDAO.getAll())
     {
-      List<Permission> repositoryPermissions = repository.getPermissions();
+      if (logger.isTraceEnabled())
+      {
+        logger.trace("collect permissions for repository {} and user {}",
+          repository.getName(), user.getName());
+      }
+
+      collectRepositoryPermissions(permissions, repository, user, groups);
+    }
+
+    return permissions;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param permissions
+   * @param repository
+   * @param user
+   * @param groups
+   */
+  private void collectRepositoryPermissions(
+    List<org.apache.shiro.authz.Permission> permissions, Repository repository,
+    User user, Collection<String> groups)
+  {
+    List<Permission> repositoryPermissions = repository.getPermissions();
+
+    if (Util.isNotEmpty(repositoryPermissions))
+    {
 
       for (Permission permission : repositoryPermissions)
       {
         }
       }
     }
-
-    return permissions;
+    else if (logger.isTraceEnabled())
+    {
+      logger.trace("repository {} has not permission entries",
+        repository.getName());
+    }
   }
 
   /**
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.