opendev/gerrit
Code Issues Proposed changes

NoShell: Fall-back to anonymous coward name if no name is set

Browse Source 
Otherwise this may result in a "Hi null," message to the user.

Change-Id: I988a83775e07aaa98e7ecf543c4f77097d76a556
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-01-23 11:19:47 +01:00
parent 920186d141
commit 123c4b0ae1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/com/google/gerrit/sshd/NoShell.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.sshd;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.AnonymousCowardName;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.gerrit.server.ssh.SshInfo;
import com.google.gerrit.sshd.SshScope.Context;
@@ -127,13 +128,18 @@ class NoShell implements Factory<Command> {
private final IdentifiedUser user;
private final SshInfo sshInfo;
private final Provider<String> urlProvider;
private final String anonymousCowardName;
@Inject
MessageFactory(
IdentifiedUser user, SshInfo sshInfo, @CanonicalWebUrl Provider<String> urlProvider) {
IdentifiedUser user,
SshInfo sshInfo,
@CanonicalWebUrl Provider<String> urlProvider,
@AnonymousCowardName String anonymousCowardName) {
this.user = user;
this.sshInfo = sshInfo;
this.urlProvider = urlProvider;
this.anonymousCowardName = anonymousCowardName;
}
String getMessage() {
@@ -146,7 +152,7 @@ class NoShell implements Factory<Command> {
Account account = user.getAccount();
String name = account.getFullName();
if (name == null || name.isEmpty()) {
name = user.getUserName();
name = user.getUserName() != null ? user.getUserName() : anonymousCowardName;
}
msg.append(" Hi ");
msg.append(name);