Skip to content

Fix case where "SecretTokenAsPlainText" is null #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 2, 2023
Merged

Fix case where "SecretTokenAsPlainText" is null #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a8c986
Fix case where "SecretTokenAsPlainText" is null
jmini May 26, 2023
4371353
Add missing import
jmini May 30, 2023
a26cdf2
Add missing import (again)
jmini May 30, 2023
840a5f2
Apply spotless
jmini May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabHookCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,14 @@ public static void register(
return;
}
String hookUrl = getHookUrl(server, true);
String secretToken = server.getSecretTokenAsPlainText();
if (hookUrl.equals("")) {
return;
}
String secretToken = server.getSecretTokenAsPlainText();
if (secretToken == null) {
// sending 'null' to GitLab will ignore the value, when we want to update it to be empty.
secretToken = "";
}
if (credentials != null) {
try {
GitLabApi gitLabApi = new GitLabApi(
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMNavigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,17 @@ public void visitSources(@NonNull final SCMSourceObserver observer) throws IOExc
try {
GitLabServer server = GitLabServers.get().findServer(serverName);
if (webhookGitLabApi != null && webHookUrl != null) {
String secretToken = server.getSecretTokenAsPlainText();
if (secretToken == null) {
// sending 'null' to GitLab will ignore the value, when we want to update it to be empty.
secretToken = "";
}
observer.getListener()
.getLogger()
.format(
"Web hook %s%n",
GitLabHookCreator.createWebHookWhenMissing(
webhookGitLabApi,
projectPathWithNamespace,
webHookUrl,
server.getSecretTokenAsPlainText()));
webhookGitLabApi, projectPathWithNamespace, webHookUrl, secretToken));
}
} catch (GitLabApiException e) {
observer.getListener().getLogger().format("Cannot set web hook: %s%n", e.getReason());
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.FilterChain;
Expand Down Expand Up @@ -84,7 +85,11 @@ private boolean isValidToken(String secretToken) {
try {
List<GitLabServer> servers = GitLabServers.get().getServers();
for (GitLabServer server : servers) {
if (server.getSecretTokenAsPlainText().equals(secretToken)) {
String secretTokenAsPlainText = server.getSecretTokenAsPlainText();
if (Objects.equals(secretToken, secretTokenAsPlainText)
|| (secretTokenAsPlainText != null
&& secretTokenAsPlainText.isEmpty()
&& secretToken == null)) {
return true;
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.FilterChain;
Expand Down Expand Up @@ -84,8 +85,11 @@ private boolean isValidToken(String secretToken) {
try {
List<GitLabServer> servers = GitLabServers.get().getServers();
for (GitLabServer server : servers) {
if (server.getSecretTokenAsPlainText().equals(secretToken)
|| (server.getSecretTokenAsPlainText().isEmpty() && secretToken == null)) {
String secretTokenAsPlainText = server.getSecretTokenAsPlainText();
if (Objects.equals(secretToken, secretTokenAsPlainText)
|| (secretTokenAsPlainText != null
&& secretTokenAsPlainText.isEmpty()
&& secretToken == null)) {
return true;
}
}
Expand Down