diff options
author | Rob Daugherty <rd472p@att.com> | 2018-04-18 16:57:11 -0400 |
---|---|---|
committer | Rob Daugherty <rd472p@att.com> | 2018-04-18 17:07:26 -0400 |
commit | 9218d80e65bf3eaa01e7942730bac8c72dcb7862 (patch) | |
tree | 2c3d32d4b1bb532d75b8bf2c65afc827e9add69c /common/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java | |
parent | cb28756cf544a5dd6d35d6a134a471181c0abcc1 (diff) |
AAIRestClient support for Basic Auth
Adding support for Basic Auth in the AAI Rest Clients because
ONAP uses this (whereas ECOMP uses 2-way SSL).
In general, each AAI client will allow the user to configure
properties called "aai.auth" and "mso.msoKey". If these are
set, then the client will add the Authorization header to every
request.
Change-Id: I7c81ec05d2ec4a7dca131f2e9e19d341ac89b09f
Issue-ID: SO-576
Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'common/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java')
-rw-r--r-- | common/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/common/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java b/common/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java index 9348beb02a..e36033faa0 100644 --- a/common/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java +++ b/common/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java @@ -28,22 +28,31 @@ import java.util.UUID; import javax.ws.rs.client.ClientResponseFilter; import javax.ws.rs.ext.ContextResolver; -import org.openecomp.mso.client.RestProperties; import org.openecomp.mso.client.policy.RestClient; import org.openecomp.mso.client.policy.RestClientSSL; import com.fasterxml.jackson.databind.ObjectMapper; public class AAIRestClient extends RestClientSSL { + + private final AAIProperties props; - protected AAIRestClient(RestProperties props, UUID requestId, URI uri) { + protected AAIRestClient(AAIProperties props, UUID requestId, URI uri) { super(props, requestId, Optional.of(uri)); + this.props = props; headerMap.put("X-TransactionId", requestId.toString()); } @Override protected void initializeHeaderMap(Map<String, String> headerMap) { headerMap.put("X-FromAppId", "MSO"); + + String auth = props.getAuth(); + String key = props.getKey(); + + if (auth != null && !auth.isEmpty() && key != null && !key.isEmpty()) { + addBasicAuthHeader(auth, key); + } } @Override |