DaanHoogland closed pull request #2555: Remove 'md5Hashed' variable from
Javascript.
URL: https://github.com/apache/cloudstack/pull/2555
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index a9f7381e641..529e5e391d0 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -1359,9 +1359,6 @@
};
var password = args.data.password;
- if (md5Hashed) {
- password = $.md5(password);
- }
$.extend(data, {
password: password
});
@@ -1502,9 +1499,6 @@
var password =
args.data.newPassword;
- if (md5Hashed)
- password =
$.md5(password);
-
$.ajax({
url:
createURL('updateUser'),
data: {
diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js
index 7fc4014de68..78d4dd50e62 100644
--- a/ui/scripts/accountsWizard.js
+++ b/ui/scripts/accountsWizard.js
@@ -205,20 +205,12 @@
}
if (!ldapStatus) {
- var password = args.data.password;
- if (md5Hashed) {
- password = $.md5(password);
- }
array1.push("&email=" + args.data.email);
array1.push("&firstname=" + args.data.firstname);
array1.push("&lastname=" + args.data.lastname);
- password = args.data.password;
- if (md5Hashed) {
- password = $.md5(password);
- } else {
- password = todb(password);
- }
+ var password = args.data.password;
+ password = todb(password);
array1.push("&password=" + password);
}
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 119013326fb..f2173e1a965 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -223,11 +223,7 @@
var array1 = [];
array1.push("&username=" +
encodeURIComponent(args.data.username));
- var password;
- if (md5HashedLogin)
- password = $.md5(args.data.password);
- else
- password = todb(args.data.password);
+ var password = todb(args.data.password);
array1.push("&password=" + password);
var domain;
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
index 9d7c23da476..8ba82dd28ae 100644
--- a/ui/scripts/installWizard.js
+++ b/ui/scripts/installWizard.js
@@ -35,7 +35,7 @@
url: createURL('updateUser'),
data: {
id: cloudStack.context.users[0].userid,
- password: md5Hashed ? $.md5(args.data.password) :
args.data.password
+ password: args.data.password
},
type: 'POST',
dataType: 'json',
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 923ab76b5bf..a2dc4eb21e6 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -45,10 +45,6 @@ var ERROR_INTERNET_NAME_NOT_RESOLVED = 12007;
var ERROR_INTERNET_CANNOT_CONNECT = 12029;
var ERROR_VMOPS_ACCOUNT_ERROR = 531;
-// Default password is MD5 hashed. Set the following variable to false to
disable this.
-var md5Hashed = false;
-var md5HashedLogin = false;
-
//page size for API call (e.g."listXXXXXXX&pagesize=N" )
var pageSize = 20;
//var pageSize = 1; //for testing only
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
