Skip to content

Fix an exception thrown when an SSH mirror has an invalid credential type #1336

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
minwoox merged 2 commits into from
Jul 21, 2026
Merged

Fix an exception thrown when an SSH mirror has an invalid credential type #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c125124
Fix an exception thrown when an SSH mirror has an invalid credential …
minwoox Jul 16, 2026
e8a3f18
AI comment
minwoox Jul 16, 2026
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
10 changes: 10 additions & 0 deletions ...git/src/main/java/com/linecorp/centraldogma/server/internal/mirror/GitMirrorProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,19 @@

import java.net.URI;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.linecorp.centraldogma.server.internal.credential.SshKeyCredential;
import com.linecorp.centraldogma.server.mirror.Mirror;
import com.linecorp.centraldogma.server.mirror.MirrorContext;
import com.linecorp.centraldogma.server.mirror.MirrorProvider;
import com.linecorp.centraldogma.server.mirror.RepositoryUri;

public final class GitMirrorProvider implements MirrorProvider {

private static final Logger logger = LoggerFactory.getLogger(GitMirrorProvider.class);

@Override
public Mirror newMirror(MirrorContext context) {
requireNonNull(context, "context");
Expand All @@ -44,6 +50,10 @@ public Mirror newMirror(MirrorContext context) {

switch (scheme) {
case SCHEME_GIT_SSH: {
if (!(context.credential() instanceof SshKeyCredential)) {

@ikhoon ikhoon Jul 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question) Could we validate the configuration correctness also when a mirror is created.?

@minwoox minwoox Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's already validated. 😉
https://github.com/line/centraldogma/blob/main/server/src/main/java/com/linecorp/centraldogma/server/internal/storage/repository/DefaultMetaRepository.java#L398

logger.debug("'{}': SSH mirror requires an SSH_KEY credential, " +
"but got: {}", context.id(), context.credential().type());
}
Comment thread
minwoox marked this conversation as resolved.
final RepositoryUri repositoryUri = RepositoryUri.parse(remoteUri, "git");
return new SshGitMirror(context.id(), context.enabled(), context.schedule(),
context.direction(), context.credential(),
Expand Down
4 changes: 0 additions & 4 deletions ...rror-git/src/main/java/com/linecorp/centraldogma/server/internal/mirror/SshGitMirror.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ final class SshGitMirror extends AbstractGitMirror {
super(id, enabled, schedule, direction, credential, localRepo, localPath,
remoteUri, gitignore, zone);
this.trustedHostKeys = requireNonNull(trustedHostKeys, "trustedHostKeys");
if (!(credential instanceof SshKeyCredential)) {
throw new MirrorException(
"SSH mirror requires an SSH_KEY credential, but got: " + credential.type());
}
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...a/com/linecorp/centraldogma/server/internal/storage/repository/DefaultMetaRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ private CompletableFuture<List<Mirror>> handleAllMirrors(Map<String, Entry<?>> e
} catch (Exception e) {
// Skip a malformed mirror so that a single bad mirror does not
// prevent the rest of the mirrors from being loaded.
logger.debug("Failed to convert a mirror configuration to a mirror. " +
"project: {}, mirror: {}", parent().name(), mirrorConfig,
e);
logger.warn("Failed to convert a mirror configuration to a mirror. " +
"project: {}, mirror: {}", parent().name(), mirrorConfig,
e);
return null;
}
})
Expand Down
Loading