Make authentication request parameter order to be deterministic (#8185)

This commit is contained in:
rRajivramachandran 2023-11-06 02:53:49 -06:00 committed by GitHub
parent 2bb182c3e1
commit e9b24b6c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -20,7 +20,7 @@
package com.cloud.network.nicira;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.http.HttpEntity;
@ -120,7 +120,7 @@ public class NiciraRestClient extends BasicRestClient {
}
private HttpUriRequest createAuthenticationRequest() {
final Map<String, String> parameters = new HashMap<>();
final Map<String, String> parameters = new LinkedHashMap<>();
parameters.put("username", username);
parameters.put("password", password);
return HttpUriRequestBuilder.create()

View File

@ -32,7 +32,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.http.HttpHost;
@ -70,7 +70,7 @@ public class NiciraRestClientTest {
private static final StatusLine HTTP_200_STATUSLINE = new BasicStatusLine(new ProtocolVersion(HTTPS, 1, 1), 200, "OK");
private static final StatusLine HTTP_401_STATUSLINE = new BasicStatusLine(new ProtocolVersion(HTTPS, 1, 1), 401, "Unauthorized");
private static final Map<String, String> loginParameters = new HashMap<String, String>();
private static final Map<String, String> loginParameters = new LinkedHashMap<String, String>();
private static HttpUriRequest request;
private static HttpUriRequest loginRequest;
private final CloseableHttpClient httpClient = mock(CloseableHttpClient.class);

View File

@ -22,6 +22,7 @@ package com.cloud.utils.rest;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
@ -47,7 +48,7 @@ public class HttpUriRequestBuilder {
private String path;
private Optional<String> jsonPayload = ABSENT;
private final Map<String, String> parameters = new HashMap<String, String>();
private final Map<String, String> methodParameters = new HashMap<String, String>();
private final Map<String, String> methodParameters = new LinkedHashMap<String, String>();
private HttpUriRequestBuilder() {