Hello Yair Zaslavsky,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/31743
to review the following change.
Change subject: aaa: Coverity fixing
......................................................................
aaa: Coverity fixing
Topic: AAA
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720
Change-Id: I1bb986dd9df608cac00f9387cfee7c84b65b2631
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
4 files changed, 56 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/31743/1
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java
index a6bdc9f..74b4072 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/utils/kerberos/KrbConfCreator.java
@@ -118,7 +118,7 @@
public void toFile(String krb5ConfPath, StringBuffer sb) throws
FileNotFoundException, IOException {
try (FileOutputStream fos = new FileOutputStream(krb5ConfPath)) {
- fos.write(sb.toString().getBytes());
+ fos.write(sb.toString().getBytes(Charset.forName("UTF-8")));
}
}
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
index 08aec0b..9e18351 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java
@@ -53,8 +53,8 @@
import org.apache.log4j.Logger;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.Pair;
-import
org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.dns.DnsSRVLocator.DnsSRVResult;
import
org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.dns.DnsSRVLocator;
+import
org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.dns.DnsSRVLocator.DnsSRVResult;
import
org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ipa.ReturnStatus;
import
org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.ipa.SimpleAuthenticationCheck;
import
org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.KDCLocator;
@@ -261,7 +261,8 @@
System.console()
.readLine("Please enter message or URL to appear when
user tries to login with an expired password"
+ emptyValueDescription + ":");
- if (changePasswordMsgStr.indexOf("http") == 0 ||
changePasswordMsgStr.indexOf("https") == 0) {
+ if (changePasswordMsgStr != null
+ && (changePasswordMsgStr.indexOf("http") == 0 ||
changePasswordMsgStr.indexOf("https") == 0)) {
try {
URL url = new URL(changePasswordMsgStr);
log.debug("Validated that " + url + " is in correct format");
@@ -487,39 +488,43 @@
LdapProviderType ldapProviderType = args.getLdapProvider();
- adUserNameEntry.setValueForDomain(domainName, userName);
- adUserPasswordEntry.setValueForDomain(domainName, getPasswordInput());
- authModeEntry.setValueForDomain(domainName, authMode);
- ldapProviderTypesEntry.setValueForDomain(domainName,
ldapProviderType.name());
- if (args.contains(ARG_LDAP_SERVERS)) {
- setLdapServersPerDomain(domainName, ldapServersEntry,
StringUtils.join(ldapServers, ","));
+ if (ldapProviderType == null) {
+ System.err.println("Provider typ was not provided. Use
--providerType=<ldap_provider_type");
+ } else {
+ adUserNameEntry.setValueForDomain(domainName, userName);
+ adUserPasswordEntry.setValueForDomain(domainName,
getPasswordInput());
+ authModeEntry.setValueForDomain(domainName, authMode);
+ ldapProviderTypesEntry.setValueForDomain(domainName,
ldapProviderType.name());
+ if (args.contains(ARG_LDAP_SERVERS)) {
+ setLdapServersPerDomain(domainName, ldapServersEntry,
StringUtils.join(ldapServers, ","));
+ }
+ handleChangePasswordMsg(domainName, changePasswordUrlEntry, false);
+ testConfiguration(domainName,
+ domainNameEntry,
+ adUserNameEntry,
+ adUserPasswordEntry,
+ authModeEntry,
+ adUserIdEntry,
+ ldapProviderTypesEntry,
+ ldapServersEntry,
+ ldapServerPort,
+ true,
+ false,
+ ldapServers);
+
+ handleAddPermissions(domainName, userName,
adUserIdEntry.getValueForDomain(domainName));
+
+ // Update the configuration
+ setConfigurationEntries(domainNameEntry,
+ adUserNameEntry,
+ adUserPasswordEntry,
+ authModeEntry,
+ ldapServersEntry,
+ adUserIdEntry,
+ ldapProviderTypesEntry, changePasswordUrlEntry);
+
+ printSuccessMessage(domainName, "added");
}
- handleChangePasswordMsg(domainName, changePasswordUrlEntry, false);
- testConfiguration(domainName,
- domainNameEntry,
- adUserNameEntry,
- adUserPasswordEntry,
- authModeEntry,
- adUserIdEntry,
- ldapProviderTypesEntry,
- ldapServersEntry,
- ldapServerPort,
- true,
- false,
- ldapServers);
-
- handleAddPermissions(domainName, userName,
adUserIdEntry.getValueForDomain(domainName));
-
- // Update the configuration
- setConfigurationEntries(domainNameEntry,
- adUserNameEntry,
- adUserPasswordEntry,
- authModeEntry,
- ldapServersEntry,
- adUserIdEntry,
- ldapProviderTypesEntry, changePasswordUrlEntry);
-
- printSuccessMessage(domainName, "added");
}
private void setLdapServersPerDomain(String domainName,
@@ -794,13 +799,21 @@
SimpleAuthenticationCheck simpleAuthenticationCheck = new
SimpleAuthenticationCheck();
Pair<ReturnStatus, String> simpleCheckResult =
simpleAuthenticationCheck.printUserGuid(domain, userName,
password, userGuid, ldapProviderType, ldapServers);
- if (!simpleCheckResult.getFirst().equals(ReturnStatus.OK)) {
+ ManageDomainsResult result = null;
+ if (simpleCheckResult == null) {
+ result =
+ new
ManageDomainsResult(ManageDomainsResultEnum.FAILURE_WHILE_TESTING_DOMAIN, new
String[] {
+ domain, "Unexepcted error has occured during
testing." });
+ }
+ else if (!simpleCheckResult.getFirst().equals(ReturnStatus.OK)) {
System.err.println(simpleCheckResult.getSecond());
- return new
ManageDomainsResult(ManageDomainsResultEnum.FAILURE_WHILE_TESTING_DOMAIN,
+ result = new
ManageDomainsResult(ManageDomainsResultEnum.FAILURE_WHILE_TESTING_DOMAIN,
new String[] { domain,
simpleCheckResult.getFirst().getDetailedMessage() });
+ } else {
+ result = OK_RESULT;
}
log.info("Successfully tested domain " + domain);
- return OK_RESULT;
+ return result;
}
private void checkSimpleDomains(String domainName,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
index de832c4..1184e46 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.api.restapi.resource.aaa;
+import java.nio.charset.Charset;
import java.util.List;
import javax.ws.rs.WebApplicationException;
@@ -384,7 +385,7 @@
assertEquals(GUIDS[index].toString(), model.getId());
assertEquals(GROUP_NAMES[index], model.getName());
assertNotNull(model.getDomain());
- assertEquals(new Guid(DOMAIN.getBytes(), true).toString(),
model.getDomain().getId());
+ assertEquals(new Guid(DOMAIN.getBytes(Charset.forName("UTF-8")),
true).toString(), model.getDomain().getId());
verifyLinks(model);
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
index 9546aa6..b5059be 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.api.restapi.resource.aaa;
+import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedList;
@@ -159,7 +160,7 @@
User model = new User();
model.setUserName(NAMES[0]);
Domain domain = new Domain();
- domain.setId(new Guid(DOMAIN.getBytes(), true).toString());
+ domain.setId(new Guid(DOMAIN.getBytes(Charset.forName("UTF-8")),
true).toString());
model.setDomain(domain);
Response response = collection.add(model);
verifyAddUser(response);
@@ -227,7 +228,7 @@
assertEquals(GUIDS[index].toString(), model.getId());
assertEquals(NAMES[index] + "@" + DOMAIN, model.getUserName());
assertNotNull(model.getDomain());
- assertEquals(new Guid(DOMAIN.getBytes(), true).toString(),
model.getDomain().getId());
+ assertEquals(new Guid(DOMAIN.getBytes(Charset.forName("UTF-8")),
true).toString(), model.getDomain().getId());
assertTrue(model.isSetGroups());
assertEquals(PARSED_GROUPS.length,
model.getGroups().getGroups().size());
HashSet<String> groupNames = new HashSet<>();
--
To view, visit http://gerrit.ovirt.org/31743
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bb986dd9df608cac00f9387cfee7c84b65b2631
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
