etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudian: fix auth failure cases 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-10-03 17:24:35 +05:30
parent 160ede3393
commit de5a6d0e3c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java
View File

@ -28,6 +28,8 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.cloudian.api.CloudianSsoLoginCmd;
import org.apache.cloudstack.cloudian.api.CloudianIsEnabledCmd;
import org.apache.cloudstack.cloudian.client.CloudianClient;
@ -195,6 +197,10 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
if (caller.getAccountName().equals("admin") && caller.getRoleId() == RoleType.Admin.getId()) {
user = CloudianCmcAdminUser.value();
group = "0";
final CloudianUser adminUser = getClient().listUser(user, group);
if (adminUser == null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to find mapped Cloudian admin user, please fix integration issues.");
}
} else {
addOrUpdateGroup(domain);
addOrUpdateUserAccount(caller, domain);

4
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java
View File

@ -37,6 +37,7 @@ import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.AuthCache;
import org.apache.http.client.CredentialsProvider;
@ -106,7 +107,8 @@ public class CloudianClient {
private void checkAuthFailure(final HttpResponse response) {
if (response != null && response.getStatusLine().getStatusCode() == HttpStatus.SC_UNAUTHORIZED) {
LOG.error("Cloudian admin API authentication failed, please check Cloudian configuration");
final Credentials credentials = httpContext.getCredentialsProvider().getCredentials(AuthScope.ANY);
LOG.error("Cloudian admin API authentication failed, please check Cloudian configuration. Admin auth principal=" + credentials.getUserPrincipal() + ", password=" + credentials.getPassword() + ", API url=" + adminApiUrl);
}
}

6
ui/plugins/cloudian/cloudian.js
View File

@ -46,7 +46,7 @@
},
show: function() {
var description = 'Cloudian management console should open in another window.';
var description = 'Cloudian Management Console should open in another window.';
$.ajax({
url: createURL('cloudianSsoLogin'),
async: false,
@ -56,10 +56,10 @@
cmcWindow.focus();
},
error: function(data) {
description = 'Single-Sign-On failed for Cloudian management console.';
description = 'Single-Sign-On failed for Cloudian Management Console. Please ask your administrator to fix integration issues.';
}
});
return $('<div>').html(description);
return $('<div style="margin: 20px;">').html(description);
}
});
};