Skip to content
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

Jump to bottom

adapt tests to upstream KeyStore validation #861

Merged
merged 2 commits into from
Jul 11, 2024
Merged

adapt tests to upstream KeyStore validation #861

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fa70d7
adapt tests to upstream KeyStore validation
jtnord Jul 8, 2024
941706f
keep codeql happy in test code 🤮
jtnord Jul 11, 2024
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
34 changes: 22 additions & 12 deletions src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
import com.cloudbees.plugins.credentials.Credentials;
import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.CredentialsScope;
import com.cloudbees.plugins.credentials.SecretBytes;
import com.cloudbees.plugins.credentials.impl.CertificateCredentialsImpl;
import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.ByteArrayOutputStream;
import java.security.KeyStore;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import jenkins.authentication.tokens.api.AuthenticationTokenContext;
import jenkins.authentication.tokens.api.AuthenticationTokens;
import org.junit.ClassRule;
Expand Down Expand Up @@ -57,7 +60,7 @@ public void authenticationContextTest() {
}

@Test
public void passwordCredentialsTest() {
public void passwordCredentialsTest() throws Exception {
List<Credentials> list = Collections.<Credentials>singletonList(new UsernamePasswordCredentialsImpl(
CredentialsScope.SYSTEM, "dummy", "dummy", "user", "pass"));
AuthenticationTokenContext ctx = BitbucketAuthenticator.authenticationContext((null));
Expand All @@ -69,9 +72,11 @@ public void passwordCredentialsTest() {
}

@Test
public void certCredentialsTest() {
public void certCredentialsTest() throws Exception {
// random password in test code to keep code-ql happy 🤮
String password = UUID.randomUUID().toString();
List<Credentials> list = Collections.<Credentials>singletonList(new CertificateCredentialsImpl(
CredentialsScope.SYSTEM, "dummy", "dummy", "password", new DummyKeyStoreSource()));
CredentialsScope.SYSTEM, "dummy", "dummy", password, new DummyKeyStoreSource(password)));

AuthenticationTokenContext ctx = BitbucketAuthenticator.authenticationContext(null);
Credentials c = CredentialsMatchers.firstOrNull(list, AuthenticationTokens.matcher(ctx));
Expand All @@ -87,15 +92,20 @@ public void certCredentialsTest() {
assertThat(AuthenticationTokens.convert(ctx, c), notNullValue());
}

private static class DummyKeyStoreSource extends CertificateCredentialsImpl.KeyStoreSource {
@NonNull
@Override
public byte[] getKeyStoreBytes() { return new byte[0]; }
private static class DummyKeyStoreSource extends CertificateCredentialsImpl.UploadedKeyStoreSource {

@Override
public long getKeyStoreLastModified() { return 0; }
DummyKeyStoreSource(String password) throws Exception {
super(null, dummyPKCS12Store(password));
}

private static SecretBytes dummyPKCS12Store(String password) throws Exception {
KeyStore ks = KeyStore.getInstance("PKCS12");
ks.load(null, password.toCharArray());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ks.store(bos, password.toCharArray());
return SecretBytes.fromBytes(bos.toByteArray());
}

@Override
public boolean isSnapshotSource() { return true; }
}

}
Loading