You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/01/11 15:41:28 UTC
[45/50] [abbrv] jclouds git commit: Default to unscoped authentication
Default to unscoped authentication
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/93562f8d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/93562f8d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/93562f8d
Branch: refs/heads/keystonev3
Commit: 93562f8da533a4b1ca773c3c07d6b02ae931507a
Parents: c1f0e15
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Jan 10 17:24:47 2018 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Jan 11 16:21:31 2018 +0100
----------------------------------------------------------------------
.../org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java | 3 +++
.../openstack/keystone/v3/binders/BindAuthToJsonPayload.java | 5 -----
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/93562f8d/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java
index 14fe19a..81c7b29 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java
@@ -18,7 +18,9 @@ package org.jclouds.openstack.keystone.v3;
import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.SCOPE;
import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE;
+import static org.jclouds.openstack.keystone.v3.domain.Auth.Scope.UNSCOPED;
import java.net.URI;
import java.util.Properties;
@@ -59,6 +61,7 @@ public class KeystoneApiMetadata extends BaseHttpApiMetadata<KeystoneApi> {
properties.setProperty(CREDENTIAL_TYPE, org.jclouds.openstack.keystone.auth.config.CredentialTypes.PASSWORD_CREDENTIALS);
properties.setProperty(SERVICE_TYPE, ServiceType.IDENTITY);
properties.setProperty(KEYSTONE_VERSION, "3");
+ properties.setProperty(SCOPE, UNSCOPED);
return properties;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/93562f8d/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAuthToJsonPayload.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAuthToJsonPayload.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAuthToJsonPayload.java
index c706877..3b9ddc2 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAuthToJsonPayload.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/binders/BindAuthToJsonPayload.java
@@ -73,12 +73,7 @@ public abstract class BindAuthToJsonPayload<T> extends BindToJsonPayload impleme
}
private Object parseScope(TenantOrDomainAndCredentials<T> credentials) {
- // If no scope has been explicitly configured, use a domain-scoped
- // authentication, as we have everything we need.
String scope = credentials.scope();
- if (scope == null) {
- return DomainScope.create(Domain.create(credentials.tenantOrDomainName()));
- }
// If there is no prefix, assume an unscoped authentication
if (!scope.contains(":")) {
checkArgument(scope.equals(Scope.UNSCOPED), "Invalid scope: %s", scope);