root
/
sonarqube
mirror of https://github.com/SonarSource/sonarqube.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

NO-JIRA Fix quality gate on master

This commit is contained in:
Alain Kermis 2025-10-24 12:55:52 +02:00 committed by sonartech
parent 46dd4ea759
commit eeca5ec1f9
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/sonar-main/src/test/java/org/sonar/application/es/EsConnectorImplTest.java
View File

@ -116,14 +116,15 @@ public class EsConnectorImplTest {
@Test
public void should_add_authentication_header() throws InterruptedException {
mockServerResponse(200, JSON_SUCCESS_RESPONSE);
String password = "test-password";
String password = "test-elasticsearch-password";
String expectedAuth = java.util.Base64.getEncoder().encodeToString(("elastic:" + password).getBytes());
EsConnectorImpl underTest = new EsConnectorImpl(Sets.newHashSet(HostAndPort.fromParts(mockWebServer.getHostName(), mockWebServer.getPort())),
EsConnectorImpl esConnector = new EsConnectorImpl(Sets.newHashSet(HostAndPort.fromParts(mockWebServer.getHostName(), mockWebServer.getPort())),
password, null, null);
assertThat(underTest.getClusterHealthStatus())
assertThat(esConnector.getClusterHealthStatus())
.hasValue(ClusterHealthStatus.YELLOW);
assertThat(mockWebServer.takeRequest().getHeader("Authorization")).isEqualTo("Basic ZWxhc3RpYzp0ZXN0LXBhc3N3b3Jk");
assertThat(mockWebServer.takeRequest().getHeader("Authorization")).isEqualTo("Basic " + expectedAuth);
}
@Test
@ -131,15 +132,15 @@ public class EsConnectorImplTest {
mockServerResponse(200, JSON_SUCCESS_RESPONSE);
Path keyStorePath = temp.newFile("keystore.p12").toPath();
String password = "password";
String password = "test-keystore-password";
HandshakeCertificates certificate = createCertificate(mockWebServer.getHostName(), keyStorePath, password);
mockWebServer.useHttps(certificate.sslSocketFactory(), false);
EsConnectorImpl underTest = new EsConnectorImpl(Sets.newHashSet(HostAndPort.fromParts(mockWebServer.getHostName(),
EsConnectorImpl esConnector = new EsConnectorImpl(Sets.newHashSet(HostAndPort.fromParts(mockWebServer.getHostName(),
mockWebServer.getPort())), null, keyStorePath, password);
assertThat(underTest.getClusterHealthStatus()).hasValue(ClusterHealthStatus.YELLOW);
assertThat(esConnector.getClusterHealthStatus()).hasValue(ClusterHealthStatus.YELLOW);
}
private HandshakeCertificates createCertificate(String hostName, Path keyStorePath, String password)

17
server/sonar-server-common/src/test/java/org/sonar/server/es/EsClientTest.java
View File

@ -94,7 +94,7 @@ public class EsClientTest {
" }" +
"}";
private final static String EXAMPLE_NODE_STATS_JSON = "{" +
private static final String EXAMPLE_NODE_STATS_JSON = "{" +
" \"nodes\": {" +
" \"YnKPZcbGRamRQGxjErLWoQ\": {" +
" \"name\": \"sonarqube\"," +
@ -264,12 +264,13 @@ public class EsClientTest {
.setBody(EXAMPLE_CLUSTER_STATS_JSON)
.setHeader("Content-Type", "application/json"));
String password = "test-password";
EsClient underTest = new EsClient(password, null, null, new HttpHost(mockWebServer.getHostName(), mockWebServer.getPort()));
String password = "test-elasticsearch-password";
String expectedAuth = java.util.Base64.getEncoder().encodeToString(("elastic:" + password).getBytes());
EsClient esClient = new EsClient(password, null, null, new HttpHost(mockWebServer.getHostName(), mockWebServer.getPort()));
assertThat(underTest.clusterStats()).isNotNull();
assertThat(esClient.clusterStats()).isNotNull();
assertThat(mockWebServer.takeRequest().getHeader("Authorization")).isEqualTo("Basic ZWxhc3RpYzp0ZXN0LXBhc3N3b3Jk");
assertThat(mockWebServer.takeRequest().getHeader("Authorization")).isEqualTo("Basic " + expectedAuth);
}
@Test
@ -280,15 +281,15 @@ public class EsClientTest {
.setHeader("Content-Type", "application/json"));
Path keyStorePath = temp.newFile("keystore.p12").toPath();
String password = "password";
String password = "test-keystore-password";
HandshakeCertificates certificate = createCertificate(mockWebServer.getHostName(), keyStorePath, password);
mockWebServer.useHttps(certificate.sslSocketFactory(), false);
EsClient underTest = new EsClient(null, keyStorePath.toString(), password,
EsClient esClient = new EsClient(null, keyStorePath.toString(), password,
new HttpHost(mockWebServer.getHostName(), mockWebServer.getPort(), "https"));
assertThat(underTest.clusterStats()).isNotNull();
assertThat(esClient.clusterStats()).isNotNull();
}
static HandshakeCertificates createCertificate(String hostName, Path keyStorePath, String password) throws GeneralSecurityException, IOException {

6
server/sonar-webserver-auth/src/test/java/org/sonar/server/authentication/RequestAuthenticatorImplTest.java
View File

@ -121,8 +121,10 @@ public class RequestAuthenticatorImplTest {
@Test
public void authenticate_from_basic_token() {
when(request.getHeader("Authorization")).thenReturn("Basic dGVzdDo=");
when(userTokenAuthentication.getUserToken("test")).thenReturn(A_USER_TOKEN);
String token = "test-user-authentication-token";
String basicAuthHeader = "Basic " + java.util.Base64.getEncoder().encodeToString((token + ":").getBytes());
when(request.getHeader("Authorization")).thenReturn(basicAuthHeader);
when(userTokenAuthentication.getUserToken(token)).thenReturn(A_USER_TOKEN);
when(userTokenAuthentication.authenticate(request)).thenReturn(Optional.of(new UserAuthResult(A_USER, A_USER_TOKEN, UserAuthResult.AuthType.TOKEN)));
when(httpHeadersAuthentication.authenticate(request, response)).thenReturn(Optional.empty());
when(jwtHttpHandler.validateToken(request, response)).thenReturn(Optional.empty());