Skip to content

Make authentication request parameter order to be deterministic #8185

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
DaanHoogland merged 1 commit into from
Nov 6, 2023
Merged

Make authentication request parameter order to be deterministic #8185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .../network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -120,7 +120,7 @@ private CloseableHttpResponse handleSuccessResponse(final HttpUriRequest request
}

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()
Expand Down
4 changes: 2 additions & 2 deletions ...work-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
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;
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion utils/src/main/java/com/cloud/utils/rest/HttpUriRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
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;

Expand All @@ -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() {

Expand Down