Merge pull request #1435 from flaix/fix-authority-np

Fix crash in Gitblit Authority for deleted users

Author: flaix

releases.moxie

@@ -11,7 +11,8 @@ r34: {
     html: ~
     text: ~
     security: ~
-    fixes: ~
+    fixes:
+      - Fix crash in Gitblit Authority when users were deleted from Gitblit but still had entries (certificates) in the Authority.
     changes:
       - Minimum Java required increased to Java 8
     additions: ~

src/main/java/com/gitblit/authority/GitblitAuthority.java

@@ -299,7 +299,11 @@ private void load(File folder) {
 					List<UserCertificateModel> list = UserCertificateConfig.KEY.parse(config).list;
 					for (UserCertificateModel ucm : list) {
 						ucm.user = userService.getUserModel(ucm.user.username);
-						map.put(ucm.user.username, ucm);
+						// Users may have been deleted, but are still present in authority.conf.
+						// TODO: Currently this only keeps the app from crashing. It should provide means to show obsolete user entries and delete them.
+						if (ucm.user != null) {
+							map.put(ucm.user.username, ucm);
+						}
 					}
 				} catch (IOException e) {
 					e.printStackTrace();