diff options
| author | Florian Zschocke <2362065+flaix@users.noreply.github.com> | 2022-11-01 01:00:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 01:00:55 +0100 |
| commit | 66365658af0b6784aa12f99254f2e1dcf5d2b531 (patch) | |
| tree | 15fbd5f0f58f796386a02d6f60119dbeff133871 | |
| parent | 0ca5cf292fd1c6c02a2a24734ad6612ecffd45d9 (diff) | |
| parent | 1c86273edb63f641064bca3a7d40f425e0da09ec (diff) | |
| download | gitblit-66365658af0b6784aa12f99254f2e1dcf5d2b531.tar.gz gitblit-66365658af0b6784aa12f99254f2e1dcf5d2b531.zip | |
Merge pull request #1435 from flaix/fix-authority-np
Fix crash in Gitblit Authority for deleted users
| -rw-r--r-- | releases.moxie | 3 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/authority/GitblitAuthority.java | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/releases.moxie b/releases.moxie index 41ad6642..35e4cce4 100644 --- a/releases.moxie +++ b/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: ~ 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();
|