authority: Fix null pointer crash for deleted users

When a user had a certificate, i.e. an entry in the Gitblit Authority
database, but the user was deleted from the Gitblit database, then the
Authority application crashes upon loading. This patch prevents the
crash. The deleted user is no longer shown in the Authority. But the
database entry still is kept. This should be improved to show deleted
users and give the possibility to delete them from the Authority's
database.

This fixes #1359

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java
index 15c23a79..34931bb5 100644
--- a/src/main/java/com/gitblit/authority/GitblitAuthority.java
+++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -299,7 +299,11 @@ public class GitblitAuthority extends JFrame implements X509Log {
 					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();